[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44122] branches/bmesh/blender/source/ blender/makesrna/intern/rna_mesh_utils.h: fix [#30153] Crash in outline datablock display after switch to edit mode

Campbell Barton ideasman42 at gmail.com
Wed Feb 15 14:26:09 CET 2012


Revision: 44122
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44122
Author:   campbellbarton
Date:     2012-02-15 13:25:54 +0000 (Wed, 15 Feb 2012)
Log Message:
-----------
fix [#30153] Crash in outline datablock display after switch to edit mode

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh_utils.h

Modified: branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh_utils.h
===================================================================
--- branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh_utils.h	2012-02-15 12:39:18 UTC (rev 44121)
+++ branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh_utils.h	2012-02-15 13:25:54 UTC (rev 44122)
@@ -51,7 +51,8 @@
 																								\
 	static int rna_Mesh_##collection_name##s_length(PointerRNA *ptr)		\
 	{																							\
-		return CustomData_number_of_layers(rna_mesh_##customdata_type(ptr), layer_type); \
+		CustomData *data = rna_mesh_##customdata_type(ptr);					\
+		return data ? CustomData_number_of_layers(data, layer_type) : 0;	\
 	}																							\
 																								\
 	static void rna_Mesh_##collection_name##_index_range(PointerRNA *ptr, int *min, int *max) \
@@ -59,7 +60,7 @@
 		CustomData *data= rna_mesh_##customdata_type(ptr);						\
 																								\
 		*min= 0;																				\
-		*max= CustomData_number_of_layers(data, layer_type)-1;				\
+		*max= data ? CustomData_number_of_layers(data, layer_type) - 1 : 0;		\
 		*max= MAX2(0, *max);																\
 	}
 




More information about the Bf-blender-cvs mailing list