diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-03-31 18:49:54 +0300 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-03-31 18:49:54 +0300 |
commit | 3c0e15c81aec6eb9dee91befde48d36d30edeacd (patch) | |
tree | 435acf9c06c1288501179c286d6783bb0021856b /source/blender/makesrna/intern/rna_object.c | |
parent | 1740fedb644007fadea2efd1cc5b23dffff8d234 (diff) | |
parent | 866537d001c916ebb3e4dac7caefc5c13bf05d04 (diff) |
Merge branch 'alembic' into gooseberry
Conflicts:
source/blender/editors/space_view3d/view3d_intern.h
source/blender/makesrna/intern/rna_modifier.c
Diffstat (limited to 'source/blender/makesrna/intern/rna_object.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 20898500a7a..d9291b08080 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -2886,17 +2886,6 @@ static void rna_def_object(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Dupli Faces Scale", "Scale the DupliFace objects"); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Object_internal_update"); - prop = RNA_def_property(srna, "use_dupli_cache_read", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "transflag", OB_DUPLI_READ_CACHE); - RNA_def_property_ui_text(prop, "Read Dupli Cache", "Use cached data instead of object data"); - RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Object_dependency_update"); - - /* note: inversion of use_dupli_cache_read, for enum-like mode switch */ - prop = RNA_def_property(srna, "use_dupli_cache_write", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_negative_sdna(prop, NULL, "transflag", OB_DUPLI_READ_CACHE); - RNA_def_property_ui_text(prop, "Write Dupli Cache", "Enabling writing of dupli cache data"); - RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Object_dependency_update"); - prop = RNA_def_property(srna, "dupli_group", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "dup_group"); RNA_def_property_flag(prop, PROP_EDITABLE); |