[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59928] trunk/blender/source: code cleanup : warnings and redundant checks.
Campbell Barton
ideasman42 at gmail.com
Sun Sep 8 22:25:32 CEST 2013
Revision: 59928
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59928
Author: campbellbarton
Date: 2013-09-08 20:25:31 +0000 (Sun, 08 Sep 2013)
Log Message:
-----------
code cleanup: warnings and redundant checks.
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/operators/bmo_poke.c
trunk/blender/source/blender/render/intern/source/rayshade.c
trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
Modified: trunk/blender/source/blender/bmesh/operators/bmo_poke.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_poke.c 2013-09-08 18:59:39 UTC (rev 59927)
+++ trunk/blender/source/blender/bmesh/operators/bmo_poke.c 2013-09-08 20:25:31 UTC (rev 59928)
@@ -65,7 +65,7 @@
break;
default:
BLI_assert(0);
- break;
+ return;
}
BMO_ITER (f, &oiter, op->slots_in, "faces", BM_FACE) {
Modified: trunk/blender/source/blender/render/intern/source/rayshade.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/rayshade.c 2013-09-08 18:59:39 UTC (rev 59927)
+++ trunk/blender/source/blender/render/intern/source/rayshade.c 2013-09-08 20:25:31 UTC (rev 59928)
@@ -2317,9 +2317,7 @@
}
copy_v3_v3(isec->start, start);
- isec->dir[0] = end[0]-isec->start[0];
- isec->dir[1] = end[1]-isec->start[1];
- isec->dir[2] = end[2]-isec->start[2];
+ sub_v3_v3v3(isec->dir, end, start);
isec->dist = normalize_v3(isec->dir);
if (shi->obi->flag & R_ENV_TRANSFORMED)
Modified: trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp 2013-09-08 18:59:39 UTC (rev 59927)
+++ trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp 2013-09-08 20:25:31 UTC (rev 59928)
@@ -205,8 +205,8 @@
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 @@
{
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 @@
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;
More information about the Bf-blender-cvs
mailing list