godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1170 from UsernameIsAReservedWord/fix_cubemap_ressource_editor

Browse Source 
fixes cubemap ressource editor bug, fixes issue #908
This commit is contained in:
Juan Linietsky 2015-02-09 21:37:01 -03:00
commit 3b4fd0f24d
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
scene/resources/texture.cpp
View File

@ -935,21 +935,21 @@ float CubeMap::get_lossy_storage_quality() const {
bool CubeMap::_set(const StringName& p_name, const Variant& p_value) { bool CubeMap::_set(const StringName& p_name, const Variant& p_value) {
if (p_name=="side/left") if (p_name=="side/left") {
set_side(SIDE_LEFT,p_value); set_side(SIDE_LEFT,p_value);
if (p_name=="side/right") } else if (p_name=="side/right") {
set_side(SIDE_RIGHT,p_value); set_side(SIDE_RIGHT,p_value);
if (p_name=="side/bottom") } else if (p_name=="side/bottom") {
set_side(SIDE_BOTTOM,p_value); set_side(SIDE_BOTTOM,p_value);
if (p_name=="side/top") } else if (p_name=="side/top") {
set_side(SIDE_TOP,p_value); set_side(SIDE_TOP,p_value);
if (p_name=="side/front") } else if (p_name=="side/front") {
set_side(SIDE_FRONT,p_value); set_side(SIDE_FRONT,p_value);
if (p_name=="side/back") } else if (p_name=="side/back") {
set_side(SIDE_BACK,p_value); set_side(SIDE_BACK,p_value);
else if (p_name=="flags") } else if (p_name=="flags") {
set_flags(p_value); set_flags(p_value);
else if (p_name=="storage") { } else if (p_name=="storage") {
storage=Storage(p_value.operator int()); storage=Storage(p_value.operator int());
} else if (p_name=="lossy_quality") { } else if (p_name=="lossy_quality") {
lossy_storage_quality=p_value; lossy_storage_quality=p_value;
@ -962,25 +962,25 @@ bool CubeMap::_set(const StringName& p_name, const Variant& p_value) {
bool CubeMap::_get(const StringName& p_name,Variant &r_ret) const { bool CubeMap::_get(const StringName& p_name,Variant &r_ret) const {
if (p_name=="side/left") if (p_name=="side/left") {
r_ret=get_side(SIDE_LEFT); r_ret=get_side(SIDE_LEFT);
if (p_name=="side/right") } else if (p_name=="side/right") {
r_ret=get_side(SIDE_RIGHT); r_ret=get_side(SIDE_RIGHT);
if (p_name=="side/bottom") } else if (p_name=="side/bottom") {
r_ret=get_side(SIDE_BOTTOM); r_ret=get_side(SIDE_BOTTOM);
if (p_name=="side/top") } else if (p_name=="side/top") {
r_ret=get_side(SIDE_TOP); r_ret=get_side(SIDE_TOP);
if (p_name=="side/front") } else if (p_name=="side/front") {
r_ret=get_side(SIDE_FRONT); r_ret=get_side(SIDE_FRONT);
if (p_name=="side/back") } else if (p_name=="side/back") {
r_ret=get_side(SIDE_BACK); r_ret=get_side(SIDE_BACK);
else if (p_name=="flags") } else if (p_name=="flags") {
r_ret= flags; r_ret= flags;
else if (p_name=="storage") } else if (p_name=="storage") {
r_ret= storage; r_ret= storage;
else if (p_name=="lossy_quality") } else if (p_name=="lossy_quality") {
r_ret= lossy_storage_quality; r_ret= lossy_storage_quality;
else } else
return false; return false;
return true; return true;