Revision: 37836
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37836
Author: campbellbarton
Date: 2011-06-27 03:36:14 +0000 (Mon, 27 Jun 2011)
Log Message:
-----------
Minor warning cleanup & fix
- comment/remove assignments from values to themselves.
- add case break statements (no functional change but some source code checkers
notice).
- fix python errors when the sculpt brush is None.
Modified Paths:
--------------
trunk/blender/intern/iksolver/intern/IK_QSegment.cpp
trunk/blender/intern/itasc/ConstraintSet.cpp
trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
trunk/blender/source/blender/editors/object/object_bake.c
trunk/blender/source/blender/editors/transform/transform_constraints.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_glare.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_rotate.c
trunk/blender/source/blender/python/generic/mathutils_Matrix.c
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
Modified: trunk/blender/intern/iksolver/intern/IK_QSegment.cpp
===================================================================
--- trunk/blender/intern/iksolver/intern/IK_QSegment.cpp 2011-06-26
23:34:27 UTC (rev 37835)
+++ trunk/blender/intern/iksolver/intern/IK_QSegment.cpp 2011-06-27
03:36:14 UTC (rev 37836)
@@ -905,9 +905,6 @@
lmin = MT_clamp(lmin, -MT_PI, MT_PI);
lmax = MT_clamp(lmax, -MT_PI, MT_PI);
- lmin = lmin;
- lmax = lmax;
-
if (axis == 1) {
m_min_twist = lmin;
m_max_twist = lmax;
Modified: trunk/blender/intern/itasc/ConstraintSet.cpp
===================================================================
--- trunk/blender/intern/itasc/ConstraintSet.cpp 2011-06-26 23:34:27 UTC
(rev 37835)
+++ trunk/blender/intern/itasc/ConstraintSet.cpp 2011-06-27 03:36:14 UTC
(rev 37836)
@@ -134,6 +134,7 @@
break;
default:
assert(action==ACT_NONE);
+ break;
}
return setControlParameters(&values, 1, timestep);
}
Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2011-06-26
23:34:27 UTC (rev 37835)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2011-06-27
03:36:14 UTC (rev 37836)
@@ -1106,17 +1106,18 @@
layout.operator_menu_enum("brush.curve_preset", "shape")
layout.separator()
- sculpt_tool = brush.sculpt_tool
+ if brush is not None: # unlikely but can happen
+ sculpt_tool = brush.sculpt_tool
- if sculpt_tool != 'GRAB':
- layout.prop_menu_enum(brush, "stroke_method")
+ if sculpt_tool != 'GRAB':
+ layout.prop_menu_enum(brush, "stroke_method")
- if sculpt_tool in {'DRAW', 'PINCH', 'INFLATE', 'LAYER', 'CLAY'}:
- layout.prop_menu_enum(brush, "direction")
+ if sculpt_tool in {'DRAW', 'PINCH', 'INFLATE', 'LAYER',
'CLAY'}:
+ layout.prop_menu_enum(brush, "direction")
- if sculpt_tool == 'LAYER':
- layout.prop(brush, "use_persistent")
- layout.operator("sculpt.set_persistent_base")
+ if sculpt_tool == 'LAYER':
+ layout.prop(brush, "use_persistent")
+ layout.operator("sculpt.set_persistent_base")
layout.separator()
layout.prop(sculpt, "use_threaded", text="Threaded Sculpt")
Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
2011-06-26 23:34:27 UTC (rev 37835)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
2011-06-27 03:36:14 UTC (rev 37836)
@@ -997,7 +997,11 @@
@classmethod
def poll(cls, context):
- return (context.sculpt_object and context.tool_settings.sculpt) or
(context.vertex_paint_object and context.tool_settings.vertex_paint) or
(context.weight_paint_object and context.tool_settings.weight_paint) or
(context.image_paint_object and context.tool_settings.image_paint)
+ ts = context.tool_settings
+ return ((context.sculpt_object and ts.sculpt) or
+ (context.vertex_paint_object and ts.vertex_paint) or
+ (context.weight_paint_object and ts.weight_paint) or
+ (context.image_paint_object and ts.image_paint))
def draw(self, context):
layout = self.layout
@@ -1005,6 +1009,10 @@
settings = __class__.paint_settings(context)
brush = settings.brush
+ if brush is None: # unlikely but can happen
+ layout.label(text="Brush Unset")
+ return
+
col = layout.column()
if context.sculpt_object and context.tool_settings.sculpt:
Modified: trunk/blender/source/blender/editors/object/object_bake.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_bake.c 2011-06-26
23:34:27 UTC (rev 37835)
+++ trunk/blender/source/blender/editors/object/object_bake.c 2011-06-27
03:36:14 UTC (rev 37836)
@@ -852,7 +852,6 @@
for(link= bkr->image.first; link; link= link->next) {
Image *ima= (Image*)link->data;
- int i;
ImBuf *ibuf= BKE_image_get_ibuf(ima, NULL);
if(ibuf->x<=0 || ibuf->y<=0)
Modified: trunk/blender/source/blender/editors/transform/transform_constraints.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_constraints.c
2011-06-26 23:34:27 UTC (rev 37835)
+++ trunk/blender/source/blender/editors/transform/transform_constraints.c
2011-06-27 03:36:14 UTC (rev 37836)
@@ -105,8 +105,8 @@
if (getConstraintSpaceDimension(t) == 2) {
int axis = mode & (CON_AXIS0|CON_AXIS1|CON_AXIS2);
if (axis == (CON_AXIS0|CON_AXIS1)) {
- vec[0] = vec[0];
- vec[1] = vec[1];
+ /* vec[0] = vec[0]; */ /* same */
+ /* vec[1] = vec[1]; */ /* same */
vec[2] = nval;
}
else if (axis == (CON_AXIS1|CON_AXIS2)) {
@@ -115,14 +115,14 @@
vec[0] = nval;
}
else if (axis == (CON_AXIS0|CON_AXIS2)) {
- vec[0] = vec[0];
+ /* vec[0] = vec[0]; */ /* same */
vec[2] = vec[1];
vec[1] = nval;
}
}
else if (getConstraintSpaceDimension(t) == 1) {
if (mode & CON_AXIS0) {
- vec[0] = vec[0];
+ /* vec[0] = vec[0]; */ /* same */
vec[1] = nval;
vec[2] = nval;
}
Modified: trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
2011-06-26 23:34:27 UTC (rev 37835)
+++ trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
2011-06-27 03:36:14 UTC (rev 37836)
@@ -97,6 +97,7 @@
default:
break;
}
+ break;
}
default:
break;
Modified: trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_glare.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_glare.c
2011-06-26 23:34:27 UTC (rev 37835)
+++ trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_glare.c
2011-06-27 03:36:14 UTC (rev 37836)
@@ -467,6 +467,7 @@
case 2:
default:
streaks(ndg, new, src);
+ break;
}
free_compbuf(src);
Modified: trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_rotate.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_rotate.c
2011-06-26 23:34:27 UTC (rev 37835)
+++ trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_rotate.c
2011-06-27 03:36:14 UTC (rev 37836)
@@ -97,6 +97,7 @@
break;
case 2:
bicubic_interpolation(ibuf,
obuf, u, v, xo, yo);
+ break;
}
}
Modified: trunk/blender/source/blender/python/generic/mathutils_Matrix.c
===================================================================
--- trunk/blender/source/blender/python/generic/mathutils_Matrix.c
2011-06-26 23:34:27 UTC (rev 37835)
+++ trunk/blender/source/blender/python/generic/mathutils_Matrix.c
2011-06-27 03:36:14 UTC (rev 37836)
@@ -779,7 +779,7 @@
for(blank_columns = (4 - self->col_size); blank_columns > 0;
blank_columns--){
self->contigPtr[new_pos + blank_columns] = 0.0f;
}
- for(curr_pos = curr_pos; curr_pos >= first_row_elem;
curr_pos--){
+ for( ; curr_pos >= first_row_elem; curr_pos--){
self->contigPtr[new_pos] = self->contigPtr[curr_pos];
new_pos--;
}
Modified:
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
===================================================================
--- trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
2011-06-26 23:34:27 UTC (rev 37835)
+++ trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
2011-06-27 03:36:14 UTC (rev 37836)
@@ -2142,6 +2142,7 @@
}
collisionShape = compoundShape;
}
+ break;
}
return collisionShape;
}
Modified: trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
===================================================================
--- trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
2011-06-26 23:34:27 UTC (rev 37835)
+++ trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
2011-06-27 03:36:14 UTC (rev 37836)
@@ -128,7 +128,7 @@
virtual void setFixedTimeStep(bool
useFixedTimeStep,float fixedTimeStep)
{
//based on DEFAULT_PHYSICS_TIC_RATE of 60 hertz
- setNumTimeSubSteps(fixedTimeStep/60.f);
+ setNumTimeSubSteps((int)(fixedTimeStep / 60.f));
}
//returns 0.f if no fixed timestep is used
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
