[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45131] trunk/blender/source/blender/ editors/mesh/mesh_data.c: fix for crash removing vertex colors in editmode.

Campbell Barton ideasman42 at gmail.com
Sat Mar 24 11:41:57 CET 2012


Revision: 45131
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45131
Author:   campbellbarton
Date:     2012-03-24 10:41:42 +0000 (Sat, 24 Mar 2012)
Log Message:
-----------
fix for crash removing vertex colors in editmode.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/mesh/mesh_data.c

Modified: trunk/blender/source/blender/editors/mesh/mesh_data.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/mesh_data.c	2012-03-24 07:52:14 UTC (rev 45130)
+++ trunk/blender/source/blender/editors/mesh/mesh_data.c	2012-03-24 10:41:42 UTC (rev 45131)
@@ -448,11 +448,12 @@
 
 int ED_mesh_color_remove(bContext *C, Object *ob, Mesh *me)
 {
+	CustomData *ldata = GET_CD_DATA(me, ldata);
 	CustomDataLayer *cdl;
 	int index;
 
-	index= CustomData_get_active_layer_index(&me->ldata, CD_MLOOPCOL);
-	cdl= (index == -1)? NULL: &me->ldata.layers[index];
+	index= CustomData_get_active_layer_index(ldata, CD_MLOOPCOL);
+	cdl= (index == -1)? NULL: &ldata->layers[index];
 
 	if (!cdl)
 		return 0;
@@ -466,11 +467,12 @@
 
 int ED_mesh_color_remove_named(bContext *C, Object *ob, Mesh *me, const char *name)
 {
+	CustomData *ldata = GET_CD_DATA(me, ldata);
 	CustomDataLayer *cdl;
 	int index;
 
-	index= CustomData_get_named_layer_index(&me->ldata, CD_MLOOPCOL, name);
-	cdl= (index == -1)? NULL: &me->ldata.layers[index];
+	index= CustomData_get_named_layer_index(ldata, CD_MLOOPCOL, name);
+	cdl = (index == -1) ? NULL : &ldata->layers[index];
 
 	if (!cdl)
 		return 0;




More information about the Bf-blender-cvs mailing list