[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43895] trunk/blender/source/blender: Code Cleanup: minor changes & sync with bmesh.

[Campbell Barton]

Revision: 43895
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43895
Author:   campbellbarton
Date:     2012-02-05 07:40:15 +0000 (Sun, 05 Feb 2012)
Log Message:
-----------
Code Cleanup: minor changes & sync with bmesh.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/deform.c
    trunk/blender/source/blender/blenkernel/intern/mesh.c
    trunk/blender/source/blender/blenkernel/intern/particle.c
    trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
    trunk/blender/source/blender/editors/curve/editcurve.c

Modified: trunk/blender/source/blender/blenkernel/intern/deform.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/deform.c	2012-02-05 07:12:46 UTC (rev 43894)
+++ trunk/blender/source/blender/blenkernel/intern/deform.c	2012-02-05 07:40:15 UTC (rev 43895)
@@ -650,11 +650,11 @@
 					dvert->dw[i]= dvert->dw[dvert->totweight];
 				}
 				memcpy(dw_new, dvert->dw, sizeof(MDeformWeight) * dvert->totweight);
-				MEM_freeN(dvert->dw);
 #else
 				memcpy(dw_new, dvert->dw, sizeof(MDeformWeight)*i);
 				memcpy(dw_new+i, dvert->dw+i+1, sizeof(MDeformWeight)*(dvert->totweight-i));
 #endif
+				MEM_freeN(dvert->dw);
 			}
 			dvert->dw = dw_new;
 		}

Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c	2012-02-05 07:12:46 UTC (rev 43894)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c	2012-02-05 07:40:15 UTC (rev 43895)
@@ -1315,7 +1315,7 @@
 	for(a=0; a<totface; a++, mf++)
 		if(!selected || (!(mf->flag & ME_HIDE) && (mf->flag & ME_FACE_SEL)))
 			totuv += (mf->v4)? 4: 3;
-		
+
 	if(totuv==0)
 		return NULL;
 	

Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c	2012-02-05 07:12:46 UTC (rev 43894)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c	2012-02-05 07:40:15 UTC (rev 43895)
@@ -4524,7 +4524,6 @@
 	madd_v3_v3fl(center, yvec, bb->offset[1]);
 }
 
-
 void psys_apply_hair_lattice(Scene *scene, Object *ob, ParticleSystem *psys)
 {
 	ParticleSimulationData sim= {0};

Modified: trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2012-02-05 07:12:46 UTC (rev 43894)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2012-02-05 07:40:15 UTC (rev 43895)
@@ -44,12 +44,12 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
+#include "BLI_utildefines.h"
 #include "BLI_blenlib.h"
 #include "BLI_edgehash.h"
 #include "BLI_math.h"
 #include "BLI_memarena.h"
 #include "BLI_pbvh.h"
-#include "BLI_utildefines.h"
 
 #include "BKE_cdderivedmesh.h"
 #include "BKE_global.h"

Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c	2012-02-05 07:12:46 UTC (rev 43894)
+++ trunk/blender/source/blender/editors/curve/editcurve.c	2012-02-05 07:40:15 UTC (rev 43895)
@@ -3389,8 +3389,12 @@
 			nu->orderu= 4;
 			nu->orderv= 1;
 			nu->type = type;
+
+#if 0		/* UNUSED */
 			if(nu->flagu & CU_NURB_CYCLIC) c= nu->orderu-1; 
 			else c= 0;
+#endif
+
 			if(type== CU_NURBS) {
 				nu->flagu &= CU_NURB_CYCLIC; /* disable all flags except for cyclic */
 				nu->flagu |= CU_NURB_BEZIER;