griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

UI: use same light icon for all light types in properties editor tabs.

Browse Source 
Differential Revision: https://developer.blender.org/D4237
This commit is contained in:
Joep Peters
2019-01-22 15:35:51 +01:00
committed by Brecht Van Lommel
parent 1651879d34
commit 63729bc11f
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/space_buttons/buttons_context.c
View File

@@ -653,7 +653,10 @@ void buttons_context_compute(const bContext *C, SpaceButs *sbuts)
ptr = &path->ptr[path->len - 1];
if (ptr->type) {
sbuts->dataicon = RNA_struct_ui_icon(ptr->type);
if(RNA_struct_is_a(ptr->type, &RNA_Light))
sbuts->dataicon = ICON_OUTLINER_DATA_LIGHT;
else
sbuts->dataicon = RNA_struct_ui_icon(ptr->type);
}
else {
sbuts->dataicon = ICON_EMPTY_DATA;

2
source/blender/makesrna/intern/rna_lightprobe.c
View File

@@ -74,7 +74,7 @@ static void rna_def_lightprobe(BlenderRNA *brna)
srna = RNA_def_struct(brna, "LightProbe", "ID");
RNA_def_struct_ui_text(srna, "LightProbe", "Light Probe data-block for lighting capture objects");
RNA_def_struct_ui_icon(srna, ICON_LIGHTPROBE_CUBEMAP);
RNA_def_struct_ui_icon(srna, ICON_OUTLINER_OB_LIGHTPROBE);
prop = RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_items(prop, lightprobe_type_items);