Revision: 41719
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41719
Author: campbellbarton
Date: 2011-11-10 06:06:35 +0000 (Thu, 10 Nov 2011)
Log Message:
-----------
- possible fix for vertex paint 'fill' crash.
- remove unneeded call to defvert_find_index() when weight painting.
Modified Paths:
--------------
trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
2011-11-10 06:05:22 UTC (rev 41718)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
2011-11-10 06:06:35 UTC (rev 41719)
@@ -364,9 +364,10 @@
me= get_mesh(ob);
if(me==NULL || me->totface==0) return;
- if(!me->mcol)
- make_vertexcol(ob);
+ if(!me->mcol) make_vertexcol(ob);
+ if(!me->mcol) return; /* possible we can't make mcol's */
+
selected= (me->editflag & ME_EDIT_PAINT_MASK);
mf = me->mface;
@@ -1679,8 +1680,14 @@
if(dv_copy.dw) {
MEM_freeN(dv_copy.dw);
}
+#if 0
/* dv may have been altered greatly */
dw = defvert_find_index(dv, vgroup);
+#else
+ dw = NULL; /* UNUSED after assignment, set to NULL to ensuyre
we don't
+ * use again, we thats needed un-ifdef the line
above */
+ (void)dw; /* quiet warnigns */
+#endif
if(me->editflag & ME_EDIT_MIRROR_X) { /* x mirror painting */
int index_mirr= mesh_get_x_mirror_vert(ob, index);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
