[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24355] trunk/blender/source/blender/ makesrna/intern/rna_mesh.c: Fix for bug #19807: renaming texture layers in editmode crashes.
Brecht Van Lommel
brecht at blender.org
Thu Nov 5 17:40:12 CET 2009
Revision: 24355
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24355
Author: blendix
Date: 2009-11-05 17:40:12 +0100 (Thu, 05 Nov 2009)
Log Message:
-----------
Fix for bug #19807: renaming texture layers in editmode crashes.
Modified Paths:
--------------
trunk/blender/source/blender/makesrna/intern/rna_mesh.c
Modified: trunk/blender/source/blender/makesrna/intern/rna_mesh.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_mesh.c 2009-11-05 16:30:18 UTC (rev 24354)
+++ trunk/blender/source/blender/makesrna/intern/rna_mesh.c 2009-11-05 16:40:12 UTC (rev 24355)
@@ -493,9 +493,10 @@
static void rna_MeshTextureFaceLayer_name_set(PointerRNA *ptr, const char *value)
{
Mesh *me= (Mesh*)ptr->id.data;
+ CustomData *fdata= rna_mesh_fdata(me);
CustomDataLayer *cdl= (CustomDataLayer*)ptr->data;
BLI_strncpy(cdl->name, value, sizeof(cdl->name));
- CustomData_set_layer_unique_name(&me->fdata, cdl - me->fdata.layers);
+ CustomData_set_layer_unique_name(fdata, cdl - fdata->layers);
}
static int rna_vertex_color_check(CollectionPropertyIterator *iter, void *data)
@@ -604,9 +605,10 @@
static void rna_MeshColorLayer_name_set(PointerRNA *ptr, const char *value)
{
Mesh *me= (Mesh*)ptr->id.data;
+ CustomData *fdata= rna_mesh_fdata(me);
CustomDataLayer *cdl= (CustomDataLayer*)ptr->data;
BLI_strncpy(cdl->name, value, sizeof(cdl->name));
- CustomData_set_layer_unique_name(&me->fdata, cdl - me->fdata.layers);
+ CustomData_set_layer_unique_name(fdata, cdl - fdata->layers);
}
static void rna_MeshFloatPropertyLayer_data_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
More information about the Bf-blender-cvs
mailing list