diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-02-11 02:32:11 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-11 02:55:22 +0300 |
| commit | 69b2f5268114bbb82c06a040e8d7127ea5fdd64e (patch) | |
| tree | 710cb5d4afc167007f68b509ffbcde737553be0b /source/blender/makesrna | |
| parent | ffd0fee97c364866d387718a9ee172466054133b (diff) | |
DNA: remove Object.display struct
We have a display flag already, use it instead.
Object.display is kept in RNA, exposed via a nested struct,
we can move other display options there.
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 74237f58861..01d4b543f74 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -1097,6 +1097,11 @@ static char *rna_MaterialSlot_path(PointerRNA *ptr) return BLI_sprintfN("material_slots[%d]", index); } +static PointerRNA rna_Object_display_get(PointerRNA *ptr) +{ + return rna_pointer_inherit_refine(ptr, &RNA_ObjectDisplay, ptr->data); +} + static char *rna_ObjectDisplay_path(PointerRNA *UNUSED(ptr)) { return BLI_strdup("display"); @@ -2073,11 +2078,12 @@ static void rna_def_object_display(BlenderRNA *brna) srna = RNA_def_struct(brna, "ObjectDisplay", NULL); RNA_def_struct_ui_text(srna, "Object Display", "Object display settings for 3d viewport"); - RNA_def_struct_sdna(srna, "ObjectDisplay"); + RNA_def_struct_sdna(srna, "Object"); + RNA_def_struct_nested(brna, srna, "Object"); RNA_def_struct_path_func(srna, "rna_ObjectDisplay_path"); prop = RNA_def_property(srna, "show_shadows", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "flag", OB_SHOW_SHADOW); + RNA_def_property_boolean_negative_sdna(prop, NULL, "dtx", OB_DRAW_NO_SHADOW_CAST); RNA_def_property_boolean_default(prop, true); RNA_def_property_ui_text(prop, "Shadow", "Object cast shadows in the 3d viewport"); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL); @@ -2753,8 +2759,9 @@ static void rna_def_object(BlenderRNA *brna) /* Object Display */ prop = RNA_def_property(srna, "display", PROP_POINTER, PROP_NONE); - RNA_def_property_pointer_sdna(prop, NULL, "display"); + RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_struct_type(prop, "ObjectDisplay"); + RNA_def_property_pointer_funcs(prop, "rna_Object_display_get", NULL, NULL, NULL); RNA_def_property_ui_text(prop, "Object Display", "Object display settings for 3d viewport"); RNA_api_object(srna); |