From c0b2363358ae3bbb3c268aaec07d273a706ae7a0 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 15 Feb 2012 13:25:54 +0000 Subject: fix [#30153] Crash in outline datablock display after switch to edit mode --- source/blender/makesrna/intern/rna_mesh_utils.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source/blender/makesrna/intern/rna_mesh_utils.h') diff --git a/source/blender/makesrna/intern/rna_mesh_utils.h b/source/blender/makesrna/intern/rna_mesh_utils.h index 82b91ac4815..b946089b8d2 100644 --- a/source/blender/makesrna/intern/rna_mesh_utils.h +++ b/source/blender/makesrna/intern/rna_mesh_utils.h @@ -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); \ } -- cgit v1.2.3