diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-12-13 04:41:23 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-12-13 04:41:23 +0400 |
| commit | d6a291ca37fbe183873a62034692eab53e8d9278 (patch) | |
| tree | 3923a257af683edc275e2dfa9ab0a46f5baa697c /source/blender/makesrna/intern/rna_object.c | |
| parent | 9a848c1a9d286bc3fd3bef837963f59000524a59 (diff) | |
fix another crash from missing update in Auto-Merge from r52911
Diffstat (limited to 'source/blender/makesrna/intern/rna_object.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index df7c4d78531..c49bdf032fc 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -94,6 +94,7 @@ static EnumPropertyItem parent_type_items[] = { {0, NULL, 0, NULL, NULL} }; +#ifndef RNA_RUNTIME static EnumPropertyItem dupli_items[] = { {0, "NONE", 0, "None", ""}, {OB_DUPLIFRAMES, "FRAMES", 0, "Frames", "Make copy of object for every frame"}, @@ -102,6 +103,7 @@ static EnumPropertyItem dupli_items[] = { {OB_DUPLIGROUP, "GROUP", 0, "Group", "Enable group instancing"}, {0, NULL, 0, NULL, NULL} }; +#endif static EnumPropertyItem collision_bounds_items[] = { {OB_BOUND_BOX, "BOX", 0, "Box", ""}, |