diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-09-09 00:25:31 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-09-09 00:25:31 +0400 |
commit | 108a4c41c4ffc56db474c33bff1a8917310fca17 (patch) | |
tree | 935c3f14f517b0881949468d01ac3e4ee776163f /source/gameengine | |
parent | 5a6bcd1d42f7498a91316232f70bf2d69fb4df2a (diff) |
code cleanup: warnings and redundant checks.
Diffstat (limited to 'source/gameengine')
-rw-r--r-- | source/gameengine/Converter/KX_ConvertActuators.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/source/gameengine/Converter/KX_ConvertActuators.cpp b/source/gameengine/Converter/KX_ConvertActuators.cpp index 9d8e9e85461..e9461a15578 100644 --- a/source/gameengine/Converter/KX_ConvertActuators.cpp +++ b/source/gameengine/Converter/KX_ConvertActuators.cpp @@ -205,8 +205,8 @@ void BL_ConvertActuators(const char* maggiename, case ACT_ACTION: { bActionActuator* actact = (bActionActuator*) bact->data; - STR_String propname = (actact->name ? actact->name : ""); - STR_String propframe = (actact->frameProp ? actact->frameProp : ""); + STR_String propname = actact->name; + STR_String propframe = actact->frameProp; short ipo_flags = 0; @@ -241,8 +241,8 @@ void BL_ConvertActuators(const char* maggiename, { if (blenderobject->type==OB_MESH) { bActionActuator* actact = (bActionActuator*) bact->data; - STR_String propname = (actact->name ? actact->name : ""); - STR_String propframe = (actact->frameProp ? actact->frameProp : ""); + STR_String propname = actact->name; + STR_String propframe = actact->frameProp; BL_ShapeActionActuator* tmpbaseact = new BL_ShapeActionActuator( gameobj, @@ -748,9 +748,8 @@ void BL_ConvertActuators(const char* maggiename, break; }; - if (sceneact->scene) - { - nextSceneName = sceneact->scene->id.name + 2; // this '2' is necessary to remove prefix 'SC' + if (sceneact->scene) { + nextSceneName = sceneact->scene->id.name + 2; } break; |