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 | |
| parent | 040eb18837296831b50053ba2465b3e563360d76 (diff) | |
| parent | 5fa7d8643fb638de550590fbf606095e9a8ca583 (diff) | |
Merge branch 'blender-v2.81-release'
| -rw-r--r-- | release/scripts/startup/bl_ui/space_userpref.py | 4 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 4 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 8 |
3 files changed, 9 insertions, 7 deletions
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 4c90f987c50..cf4326ed764 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -383,7 +383,7 @@ class USERPREF_PT_edit_objects_duplicate_data(PreferencePanel, Panel): col.prop(edit, "use_duplicate_action", text="Action") col.prop(edit, "use_duplicate_armature", text="Armature") col.prop(edit, "use_duplicate_curve", text="Curve") - # col.prop(edit, "use_duplicate_fcurve", text="F-Curve") + # col.prop(edit, "use_duplicate_fcurve", text="F-Curve") # Not implemented. col.prop(edit, "use_duplicate_light", text="Light") col.prop(edit, "use_duplicate_lightprobe", text="Light Probe") col = flow.column() @@ -394,7 +394,7 @@ class USERPREF_PT_edit_objects_duplicate_data(PreferencePanel, Panel): col = flow.column() col.prop(edit, "use_duplicate_surface", text="Surface") col.prop(edit, "use_duplicate_text", text="Text") - col.prop(edit, "use_duplicate_texture", text="Texture") + # col.prop(edit, "use_duplicate_texture", text="Texture") # Not implemented. col.prop(edit, "use_duplicate_grease_pencil", text="Grease Pencil") diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index c726c5e132e..752d2853707 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -1090,9 +1090,9 @@ typedef enum eDupli_ID_Flags { USER_DUP_FONT = (1 << 3), USER_DUP_MBALL = (1 << 4), USER_DUP_LAMP = (1 << 5), - USER_DUP_IPO = (1 << 6), + /* USER_DUP_FCURVE = (1 << 6), */ /* UNUSED, keep because we may implement. */ USER_DUP_MAT = (1 << 7), - USER_DUP_TEX = (1 << 8), + /* USER_DUP_TEX = (1 << 8), */ /* UNUSED, keep because we may implement. */ USER_DUP_ARM = (1 << 9), USER_DUP_ACT = (1 << 10), USER_DUP_PSYS = (1 << 11), 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( |