[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41942] branches/bmesh/blender/source/ blender: warning cleanup

[Andrew Wiggin]

Revision: 41942
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41942
Author:   ender79
Date:     2011-11-17 06:08:58 +0000 (Thu, 17 Nov 2011)
Log Message:
-----------
warning cleanup

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
    branches/bmesh/blender/source/blender/blenkernel/intern/pointcache.c
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c	2011-11-17 05:33:02 UTC (rev 41941)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c	2011-11-17 06:08:58 UTC (rev 41942)
@@ -1131,9 +1131,10 @@
 }
 
 	for (i=0, ltri=em->looptris[0]; i<em->tottri; i++, ltri += 3) {
-		int drawSmooth= BM_TestHFlag(efa, BM_SMOOTH);
+		int drawSmooth;
 
 		efa = ltri[0]->f;
+		drawSmooth = BM_TestHFlag(efa, BM_SMOOTH);
 
 		/* face hiding */
 		if(setFace && !setFace(userData, BM_GetIndex(efa)))

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/pointcache.c	2011-11-17 05:33:02 UTC (rev 41941)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/pointcache.c	2011-11-17 06:08:58 UTC (rev 41942)
@@ -2287,7 +2287,7 @@
 
 	if(timescale) {
 		time= BKE_curframe(scene);
-		nexttime= BKE_frame_to_ctime(scene, CFRA+1);
+		nexttime= BKE_frame_to_ctime(scene, CFRA + 1.0f);
 		
 		*timescale= MAX2(nexttime - time, 0.0f);
 	}

Modified: branches/bmesh/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c	2011-11-17 05:33:02 UTC (rev 41941)
+++ branches/bmesh/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c	2011-11-17 06:08:58 UTC (rev 41942)
@@ -1125,14 +1125,6 @@
 	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	Mesh *me = (Mesh*)obedit->data;
-	BMEditMesh *em= me->edit_btmesh;
-	BMFace *efa;
-	BMLoop *l;
-	BMIter iter, liter;
-	MLoopUV *luv;
-	BLI_array_declare(uvs);
-	float **uvs = NULL;
-	int i;
 
 	/* add uvs if they don't exist yet */
 	if (!ED_uvedit_ensure_uvs(C, scene, obedit)) {
@@ -1146,8 +1138,6 @@
 	DAG_id_tag_update(obedit->data, 0);
 	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
 	
-	BLI_array_free(uvs);
-
 	return OPERATOR_FINISHED;
 }