diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-10-24 11:37:44 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-10-24 11:37:44 +0300 |
| commit | 672f6b79fbb356474f280c85664a352c1f4c0f26 (patch) | |
| tree | 9696973cc5fc8703a080fe9d7b71930be811b3ef /source/blender/makesrna | |
| parent | 040eb18837296831b50053ba2465b3e563360d76 (diff) | |
| parent | 5fa7d8643fb638de550590fbf606095e9a8ca583 (diff) | |
Merge branch 'blender-v2.81-release'
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 07ce07710b1..3df678358d8 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -4767,17 +4767,19 @@ static void rna_def_userdef_edit(BlenderRNA *brna) RNA_def_property_ui_text( prop, "Duplicate Material", "Causes material data to be duplicated with the object"); + /* Not implemented, keep because this is useful functionality. */ +# if 0 prop = RNA_def_property(srna, "use_duplicate_texture", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "dupflag", USER_DUP_TEX); RNA_def_property_ui_text( prop, "Duplicate Texture", "Causes texture data to be duplicated with the object"); - /* xxx */ prop = RNA_def_property(srna, "use_duplicate_fcurve", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "dupflag", USER_DUP_IPO); + RNA_def_property_boolean_sdna(prop, NULL, "dupflag", USER_DUP_FCURVE); RNA_def_property_ui_text( prop, "Duplicate F-Curve", "Causes F-curve data to be duplicated with the object"); - /* xxx */ +# endif + prop = RNA_def_property(srna, "use_duplicate_action", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "dupflag", USER_DUP_ACT); RNA_def_property_ui_text( |