[Bf-blender-cvs] [51f222f91d9] master: Fix: T64213 Properties Editor Icon Colors are wrong for Text and Light Probes

[William Reynish]

Commit: 51f222f91d94130090cfa355bc1e17b21c1d448f
Author: William Reynish
Date:   Mon May 6 19:44:33 2019 +0200
Branches: master
https://developer.blender.org/rB51f222f91d94130090cfa355bc1e17b21c1d448f

Fix: T64213 Properties Editor Icon Colors are wrong for Text and Light Probes

===================================================================

M	source/blender/editors/include/UI_icons.h
M	source/blender/makesrna/intern/rna_lightprobe.c

===================================================================

diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h
index e86170f717e..c68f47da447 100644
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -243,7 +243,7 @@ DEF_ICON_SHADING(BRUSH_DATA)
 DEF_ICON_SHADING(IMAGE_DATA)
 DEF_ICON(FILE)
 DEF_ICON(FCURVE)
-DEF_ICON(FONT_DATA)
+DEF_ICON_OBJECT_DATA(FONT_DATA)
 DEF_ICON(RENDER_RESULT)
 DEF_ICON_OBJECT_DATA(SURFACE_DATA)
 DEF_ICON_OBJECT_DATA(EMPTY_DATA)
diff --git a/source/blender/makesrna/intern/rna_lightprobe.c b/source/blender/makesrna/intern/rna_lightprobe.c
index 125d2ade567..8b6b248eac2 100644
--- a/source/blender/makesrna/intern/rna_lightprobe.c
+++ b/source/blender/makesrna/intern/rna_lightprobe.c
@@ -77,7 +77,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_OUTLINER_OB_LIGHTPROBE);
+  RNA_def_struct_ui_icon(srna, ICON_OUTLINER_DATA_LIGHTPROBE);
 
   prop = RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
   RNA_def_property_enum_items(prop, lightprobe_type_items);