[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28095] trunk/blender/source/blender: no functional change

[Campbell Barton]

Revision: 28095
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28095
Author:   campbellbarton
Date:     2010-04-08 18:08:06 +0200 (Thu, 08 Apr 2010)

Log Message:
-----------
no functional change
- convert solidify edge crease values into chars once rather then for each edge.
- sort vertex was checking the array all the time when it wasnt needed.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/modifier.c
    trunk/blender/source/blender/editors/object/object_vgroup.c

Modified: trunk/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/modifier.c	2010-04-08 14:39:16 UTC (rev 28094)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c	2010-04-08 16:08:06 UTC (rev 28095)
@@ -6028,7 +6028,11 @@
 
 	if(smd->flag & MOD_SOLIDIFY_RIM) {
 
-		static int edge_indices[4][4] = {
+		const unsigned char crease_rim= smd->crease_rim * 255.0f;
+		const unsigned char crease_outer= smd->crease_outer * 255.0f;
+		const unsigned char crease_inner= smd->crease_inner * 255.0f;
+
+		const int edge_indices[4][4] = {
 				{1, 0, 0, 1},
 				{2, 1, 1, 2},
 				{3, 2, 2, 3},
@@ -6041,8 +6045,8 @@
 			ed->v2= new_vert_arr[i] + numVerts;
 			ed->flag |= ME_EDGEDRAW;
 
-			if(smd->crease_rim)
-				ed->crease= smd->crease_rim * 255.0f;
+			if(crease_rim)
+				ed->crease= crease_rim;
 		}
 
 		/* faces */
@@ -6080,16 +6084,13 @@
 				mf->v2= ed->v1;
 				mf->v3= ed->v1 + numVerts;
 				mf->v4= ed->v2 + numVerts;
-
-
 			}
 
-			if(smd->crease_outer > 0.0f)
-				ed->crease= smd->crease_outer * 255.0f;
+			if(crease_outer)
+				ed->crease= crease_outer;
 
-			if(smd->crease_inner > 0.0f) {
-				ed= medge + (numEdges + eidx);
-				ed->crease= smd->crease_inner * 255.0f;
+			if(crease_inner) {
+				medge[numEdges + eidx].crease= crease_inner;
 			}
 		}
 

Modified: trunk/blender/source/blender/editors/object/object_vgroup.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_vgroup.c	2010-04-08 14:39:16 UTC (rev 28094)
+++ trunk/blender/source/blender/editors/object/object_vgroup.c	2010-04-08 16:08:06 UTC (rev 28095)
@@ -1976,7 +1976,7 @@
 	}
 	else {
 		ED_vgroup_give_array(ob->data, &dvert, &dvert_tot);
-		while(dvert && dvert_tot--) {
+		while(dvert_tot--) {
 			if(dvert->totweight)
 				defvert_remap(dvert, sort_map);
 			dvert++;