diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-02-16 02:44:15 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-16 02:44:15 +0300 |
commit | ec471a9b1c14ea5dcb855de7e570e27ad70661c5 (patch) | |
tree | ab84e5d466b440a0202ff6271f43484763902f79 /source/blender/makesrna | |
parent | 419911b1d19ceeb87cd1c0a7b78f0133bee4a6cd (diff) |
DNA: rename SpaceButs -> SpaceProperties
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 18 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index d1b99f59835..3b012581f23 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -93,7 +93,7 @@ const EnumPropertyItem rna_enum_space_type_items[] = { /* Data */ {0, "", ICON_NONE, "Data", ""}, {SPACE_OUTLINER, "OUTLINER", ICON_OUTLINER, "Outliner", "Overview of scene graph and all available data-blocks"}, - {SPACE_BUTS, "PROPERTIES", ICON_PROPERTIES, "Properties", "Edit properties of active object and related data-blocks"}, + {SPACE_PROPERTIES, "PROPERTIES", ICON_PROPERTIES, "Properties", "Edit properties of active object and related data-blocks"}, {SPACE_FILE, "FILE_BROWSER", ICON_FILEBROWSER, "File Browser", "Browse for files and assets"}, {SPACE_USERPREF, "PREFERENCES", ICON_PREFERENCES, "Preferences", "Edit persistent configuration settings"}, @@ -389,7 +389,7 @@ static StructRNA *rna_Space_refine(struct PointerRNA *ptr) return &RNA_SpaceGraphEditor; case SPACE_OUTLINER: return &RNA_SpaceOutliner; - case SPACE_BUTS: + case SPACE_PROPERTIES: return &RNA_SpaceProperties; case SPACE_FILE: return &RNA_SpaceFileBrowser; @@ -1217,13 +1217,13 @@ static void rna_SpaceTextEditor_updateEdited(Main *UNUSED(bmain), Scene *UNUSED( /* note: this function exists only to avoid id refcounting */ static void rna_SpaceProperties_pin_id_set(PointerRNA *ptr, PointerRNA value) { - SpaceButs *sbuts = (SpaceButs *)(ptr->data); + SpaceProperties *sbuts = (SpaceProperties *)(ptr->data); sbuts->pinid = value.data; } static StructRNA *rna_SpaceProperties_pin_id_typef(PointerRNA *ptr) { - SpaceButs *sbuts = (SpaceButs *)(ptr->data); + SpaceProperties *sbuts = (SpaceProperties *)(ptr->data); if (sbuts->pinid) return ID_code_to_RNA_type(GS(sbuts->pinid->name)); @@ -1233,7 +1233,7 @@ static StructRNA *rna_SpaceProperties_pin_id_typef(PointerRNA *ptr) static void rna_SpaceProperties_pin_id_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { - SpaceButs *sbuts = (SpaceButs *)(ptr->data); + SpaceProperties *sbuts = (SpaceProperties *)(ptr->data); ID *id = sbuts->pinid; if (id == NULL) { @@ -1262,7 +1262,7 @@ static void rna_SpaceProperties_pin_id_update(Main *UNUSED(bmain), Scene *UNUSED static void rna_SpaceProperties_context_set(PointerRNA *ptr, int value) { - SpaceButs *sbuts = (SpaceButs *)(ptr->data); + SpaceProperties *sbuts = (SpaceProperties *)(ptr->data); sbuts->mainb = value; sbuts->mainbuser = value; @@ -1272,7 +1272,7 @@ static const EnumPropertyItem *rna_SpaceProperties_context_itemf( bContext *UNUSED(C), PointerRNA *ptr, PropertyRNA *UNUSED(prop), bool *r_free) { - SpaceButs *sbuts = (SpaceButs *)(ptr->data); + SpaceProperties *sbuts = (SpaceProperties *)(ptr->data); EnumPropertyItem *item = NULL; int totitem = 0; @@ -1361,7 +1361,7 @@ static const EnumPropertyItem *rna_SpaceProperties_context_itemf( static void rna_SpaceProperties_context_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { - SpaceButs *sbuts = (SpaceButs *)(ptr->data); + SpaceProperties *sbuts = (SpaceProperties *)(ptr->data); /* XXX BCONTEXT_DATA is ugly, but required for lights... See T51318. */ if (ELEM(sbuts->mainb, BCONTEXT_WORLD, BCONTEXT_MATERIAL, BCONTEXT_TEXTURE, BCONTEXT_DATA)) { sbuts->preview = 1; @@ -3450,7 +3450,7 @@ static void rna_def_space_buttons(BlenderRNA *brna) PropertyRNA *prop; srna = RNA_def_struct(brna, "SpaceProperties", "Space"); - RNA_def_struct_sdna(srna, "SpaceButs"); + RNA_def_struct_sdna(srna, "SpaceProperties"); RNA_def_struct_ui_text(srna, "Properties Space", "Properties space data"); prop = RNA_def_property(srna, "context", PROP_ENUM, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 714f11a5ee0..913d29510d8 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -1352,7 +1352,7 @@ static void rna_def_userdef_theme_space_common(StructRNA *srna) RNA_def_property_update(prop, 0, "rna_userdef_update"); /* buttons */ -/* if (! ELEM(spacetype, SPACE_BUTS, SPACE_OUTLINER)) { */ +/* if (! ELEM(spacetype, SPACE_PROPERTIES, SPACE_OUTLINER)) { */ prop = RNA_def_property(srna, "button", PROP_FLOAT, PROP_COLOR_GAMMA); RNA_def_property_array(prop, 4); RNA_def_property_ui_text(prop, "Region Background", ""); |