[Bf-blender-cvs] [ca65c70] gooseberry: warnings

Campbell Barton noreply at git.blender.org
Wed Nov 19 15:27:40 CET 2014


Commit: ca65c70ce18afaf607fc9c6a99bfe1ec6915c6d6
Author: Campbell Barton
Date:   Wed Nov 19 15:27:56 2014 +0100
Branches: gooseberry
https://developer.blender.org/rBca65c70ce18afaf607fc9c6a99bfe1ec6915c6d6

warnings

===================================================================

M	source/blender/editors/physics/particle_edit.c
M	source/blender/modifiers/intern/MOD_particleinstance.c
M	source/blender/physics/intern/implicit_blender.c

===================================================================

diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c
index b739f15..2c3280a 100644
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -4151,7 +4151,7 @@ static void shape_cut(PEData *data, int pa_index)
 	}
 }
 
-static int shape_cut_exec(bContext *C, wmOperator *op)
+static int shape_cut_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Scene *scene = CTX_data_scene(C);
 	Object *ob = CTX_data_active_object(C);
diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c
index e6e2295..2f49209 100644
--- a/source/blender/modifiers/intern/MOD_particleinstance.c
+++ b/source/blender/modifiers/intern/MOD_particleinstance.c
@@ -186,7 +186,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 	int maxvert, maxpoly, maxloop, totpart = 0, first_particle = 0;
 	int k, p, p_skip;
 	short track = ob->trackflag % 3, trackneg, axis = pimd->axis;
-	float max_co = 0.0, min_co = 0.0, temp_co[3], cross[3];
+	float max_co = 0.0, min_co = 0.0, temp_co[3];
 	float *size = NULL;
 
 	trackneg = ((ob->trackflag > 2) ? 1 : 0);
diff --git a/source/blender/physics/intern/implicit_blender.c b/source/blender/physics/intern/implicit_blender.c
index 82b98df..2f9adc6 100644
--- a/source/blender/physics/intern/implicit_blender.c
+++ b/source/blender/physics/intern/implicit_blender.c
@@ -332,7 +332,6 @@ static void print_sparse_matrix(fmatrix3x3 *m)
 		}
 	}
 }
-#endif
 
 static void print_lvector(lfVector *v, int numverts)
 {
@@ -389,6 +388,7 @@ static void print_bfmatrix(fmatrix3x3 *m)
 	
 	MEM_freeN(t);
 }
+#endif
 
 /* copy 3x3 matrix */
 DO_INLINE void cp_fmatrix(float to[3][3], float from[3][3])




More information about the Bf-blender-cvs mailing list