diff options
Diffstat (limited to 'source')
8 files changed, 10 insertions, 7 deletions
diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c index cc9a6f7f5f0..57f6c9de88e 100644 --- a/source/blender/editors/object/object_bake.c +++ b/source/blender/editors/object/object_bake.c @@ -852,7 +852,6 @@ static void finish_images(MultiresBakeRender *bkr) 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) diff --git a/source/blender/editors/transform/transform_constraints.c b/source/blender/editors/transform/transform_constraints.c index 0ca0812f050..be5f539431f 100644 --- a/source/blender/editors/transform/transform_constraints.c +++ b/source/blender/editors/transform/transform_constraints.c @@ -105,8 +105,8 @@ void constraintNumInput(TransInfo *t, float vec[3]) 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 @@ void constraintNumInput(TransInfo *t, float vec[3]) 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; } diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c b/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c index b32c531d8f9..e395716f36d 100644 --- a/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c +++ b/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c @@ -97,6 +97,7 @@ static void do_channel_matte(bNode *node, float *out, float *in) default: break; } + break; } default: break; diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_glare.c b/source/blender/nodes/intern/CMP_nodes/CMP_glare.c index 1a339b45a05..2e0822a4511 100644 --- a/source/blender/nodes/intern/CMP_nodes/CMP_glare.c +++ b/source/blender/nodes/intern/CMP_nodes/CMP_glare.c @@ -467,6 +467,7 @@ static void node_composit_exec_glare(void *UNUSED(data), bNode *node, bNodeStack case 2: default: streaks(ndg, new, src); + break; } free_compbuf(src); diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_rotate.c b/source/blender/nodes/intern/CMP_nodes/CMP_rotate.c index b6b1764ff0f..eccac4f0e6d 100644 --- a/source/blender/nodes/intern/CMP_nodes/CMP_rotate.c +++ b/source/blender/nodes/intern/CMP_nodes/CMP_rotate.c @@ -97,6 +97,7 @@ static void node_composit_exec_rotate(void *UNUSED(data), bNode *node, bNodeStac break; case 2: bicubic_interpolation(ibuf, obuf, u, v, xo, yo); + break; } } diff --git a/source/blender/python/generic/mathutils_Matrix.c b/source/blender/python/generic/mathutils_Matrix.c index 4b7f9dc0d97..bed7dd12f08 100644 --- a/source/blender/python/generic/mathutils_Matrix.c +++ b/source/blender/python/generic/mathutils_Matrix.c @@ -779,7 +779,7 @@ static PyObject *Matrix_resize_4x4(MatrixObject *self) 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--; } diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp index 0c5cbb22fbc..2bc11ef5f5b 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp @@ -2142,6 +2142,7 @@ btCollisionShape* CcdShapeConstructionInfo::CreateBulletShape(btScalar margin, b } collisionShape = compoundShape; } + break; } return collisionShape; } diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h index 51e00b9111f..18e1282b111 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h +++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h @@ -128,7 +128,7 @@ protected: 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 |