Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-02-15 17:25:54 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-02-15 17:25:54 +0400
commitc0b2363358ae3bbb3c268aaec07d273a706ae7a0 (patch)
tree0e7ced3f6e641ac62b9e4bae1c13c62fbff1a466 /source/blender/makesrna/intern/rna_mesh_utils.h
parent1eb48de1998df3066d648758f98103e1cd1b0738 (diff)
fix [#30153] Crash in outline datablock display after switch to edit mode
Diffstat (limited to 'source/blender/makesrna/intern/rna_mesh_utils.h')
-rw-r--r--source/blender/makesrna/intern/rna_mesh_utils.h5
1 files changed, 3 insertions, 2 deletions
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); \
}