Commit: 625c2c2943cf251b74ff417fa6db141122411c9b
Author: Pablo Vazquez
Date: Fri May 11 16:02:09 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB625c2c2943cf251b74ff417fa6db141122411c9b
Use Light Probe icons
===================================================================
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/editors/animation/anim_channels_defines.c
M source/blender/editors/interface/interface_icons.c
M source/blender/editors/object/object_add.c
M source/blender/editors/space_outliner/outliner_draw.c
M source/blender/makesrna/intern/rna_ID.c
M source/blender/makesrna/intern/rna_lightprobe.c
M source/blender/makesrna/intern/rna_space.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_view3d.py
b/release/scripts/startup/bl_ui/space_view3d.py
index edb853e4099..f69fba9f603 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -1376,7 +1376,7 @@ class INFO_MT_add(Menu):
layout.menu("INFO_MT_lamp_add", icon='OUTLINER_OB_LAMP')
layout.separator()
- layout.menu("INFO_MT_lightprobe_add")
+ layout.menu("INFO_MT_lightprobe_add", icon='OUTLINER_OB_LIGHTPROBE')
layout.separator()
layout.operator_menu_enum("object.effector_add", "type", text="Force
Field", icon='OUTLINER_OB_FORCE_FIELD')
diff --git a/source/blender/editors/animation/anim_channels_defines.c
b/source/blender/editors/animation/anim_channels_defines.c
index 87fe002e536..c8d606db229 100644
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ -647,6 +647,8 @@ static int acf_object_icon(bAnimListElem *ale)
return ICON_OUTLINER_OB_LATTICE;
case OB_SPEAKER:
return ICON_OUTLINER_OB_SPEAKER;
+ case OB_LIGHTPROBE:
+ return ICON_OUTLINER_OB_LIGHTPROBE;
case OB_ARMATURE:
return ICON_OUTLINER_OB_ARMATURE;
case OB_FONT:
diff --git a/source/blender/editors/interface/interface_icons.c
b/source/blender/editors/interface/interface_icons.c
index 12b549e8f8b..afd57fdcd05 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -1538,7 +1538,7 @@ int UI_idcode_icon_get(const int idcode)
case ID_PC:
return ICON_CURVE_BEZCURVE; /* TODO! this would need
its own icon! */
case ID_LP:
- return ICON_RADIO;
+ return ICON_LIGHTPROBE_CUBEMAP;
case ID_SCE:
return ICON_SCENE_DATA;
case ID_SPK:
diff --git a/source/blender/editors/object/object_add.c
b/source/blender/editors/object/object_add.c
index db32f4842b5..366667163b0 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -148,11 +148,11 @@ static const EnumPropertyItem field_type_items[] = {
};
static EnumPropertyItem lightprobe_type_items[] = {
- {LIGHTPROBE_TYPE_CUBE, "CUBEMAP", ICON_MESH_UVSPHERE, "Reflection
Cubemap",
+ {LIGHTPROBE_TYPE_CUBE, "CUBEMAP", ICON_LIGHTPROBE_CUBEMAP, "Reflection
Cubemap",
"Reflection probe with spherical or cubic attenuation"},
- {LIGHTPROBE_TYPE_PLANAR, "PLANAR", ICON_MESH_PLANE, "Reflection Plane",
+ {LIGHTPROBE_TYPE_PLANAR, "PLANAR", ICON_LIGHTPROBE_PLANAR, "Reflection
Plane",
"Planar reflection probe"},
- {LIGHTPROBE_TYPE_GRID, "GRID", ICON_MESH_GRID, "Irradiance Volume",
+ {LIGHTPROBE_TYPE_GRID, "GRID", ICON_LIGHTPROBE_GRID, "Irradiance
Volume",
"Irradiance probe to capture diffuse indirect lighting"},
{0, NULL, 0, NULL, NULL}
};
diff --git a/source/blender/editors/space_outliner/outliner_draw.c
b/source/blender/editors/space_outliner/outliner_draw.c
index 25e40ccf6e5..5d981bdad0d 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -34,6 +34,7 @@
#include "DNA_gpencil_types.h"
#include "DNA_group_types.h"
#include "DNA_lamp_types.h"
+#include "DNA_lightprobe_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
#include "DNA_sequence_types.h"
@@ -1127,6 +1128,8 @@ static void tselem_draw_icon(uiBlock *block, int xmax,
float x, float y, TreeSto
tselem_draw_icon_uibut(&arg,
ICON_OUTLINER_OB_SURFACE); break;
case OB_SPEAKER:
tselem_draw_icon_uibut(&arg,
ICON_OUTLINER_OB_SPEAKER); break;
+ case OB_LIGHTPROBE:
+ tselem_draw_icon_uibut(&arg,
ICON_OUTLINER_OB_LIGHTPROBE); break;
case OB_EMPTY:
tselem_draw_icon_uibut(&arg,
ICON_OUTLINER_OB_EMPTY); break;
}
@@ -1205,6 +1208,21 @@ static void tselem_draw_icon(uiBlock *block, int xmax,
float x, float y, TreeSto
tselem_draw_icon_uibut(&arg,
ICON_LINE_DATA); break;
case ID_GD:
tselem_draw_icon_uibut(&arg,
ICON_GREASEPENCIL); break;
+ case ID_LP:
+ {
+ LightProbe * lp = (LightProbe
*)tselem->id;
+ switch (lp->type) {
+ case LIGHTPROBE_TYPE_CUBE:
+
tselem_draw_icon_uibut(&arg, ICON_LIGHTPROBE_CUBEMAP); break;
+ case LIGHTPROBE_TYPE_PLANAR:
+
tselem_draw_icon_uibut(&arg, ICON_LIGHTPROBE_PLANAR); break;
+ case LIGHTPROBE_TYPE_GRID:
+
tselem_draw_icon_uibut(&arg, ICON_LIGHTPROBE_GRID); break;
+ default:
+
tselem_draw_icon_uibut(&arg, ICON_LIGHTPROBE_CUBEMAP); break;
+ }
+ break;
+ }
default:
break;
}
diff --git a/source/blender/makesrna/intern/rna_ID.c
b/source/blender/makesrna/intern/rna_ID.c
index 27c3cee422c..02379802c95 100644
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@ -75,7 +75,7 @@ const EnumPropertyItem rna_enum_id_type_items[] = {
{ID_PC, "PAINTCURVE", ICON_CURVE_BEZCURVE, "Paint Curve", ""},
{ID_PAL, "PALETTE", ICON_COLOR, "Palette", ""},
{ID_PA, "PARTICLE", ICON_PARTICLE_DATA, "Particle", ""},
- {ID_LT, "LIGHT_PROBE", ICON_RADIO, "Light Probe", ""},
+ {ID_LT, "LIGHT_PROBE", ICON_LIGHTPROBE_CUBEMAP, "Light Probe", ""},
{ID_SCE, "SCENE", ICON_SCENE_DATA, "Scene", ""},
{ID_SCR, "SCREEN", ICON_SPLITSCREEN, "Screen", ""},
{ID_SO, "SOUND", ICON_PLAY_AUDIO, "Sound", ""},
diff --git a/source/blender/makesrna/intern/rna_lightprobe.c
b/source/blender/makesrna/intern/rna_lightprobe.c
index 675615d6c1f..df43e7ebe02 100644
--- a/source/blender/makesrna/intern/rna_lightprobe.c
+++ b/source/blender/makesrna/intern/rna_lightprobe.c
@@ -61,9 +61,9 @@ static EnumPropertyItem parallax_type_items[] = {
};
static EnumPropertyItem lightprobe_type_items[] = {
- {LIGHTPROBE_TYPE_CUBE, "CUBEMAP", ICON_NONE, "Reflection Cubemap",
"Capture reflections"},
- {LIGHTPROBE_TYPE_PLANAR, "PLANAR", ICON_NONE, "Reflection Plane", ""},
- {LIGHTPROBE_TYPE_GRID, "GRID", ICON_NONE, "Irradiance Volume", "Volume
used for precomputing indirect lighting"},
+ {LIGHTPROBE_TYPE_CUBE, "CUBEMAP", ICON_LIGHTPROBE_CUBEMAP, "Reflection
Cubemap", "Capture reflections"},
+ {LIGHTPROBE_TYPE_PLANAR, "PLANAR", ICON_LIGHTPROBE_PLANAR, "Reflection
Plane", ""},
+ {LIGHTPROBE_TYPE_GRID, "GRID", ICON_LIGHTPROBE_GRID, "Irradiance
Volume", "Volume used for precomputing indirect lighting"},
{0, NULL, 0, NULL, NULL}
};
@@ -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_RADIO);
+ RNA_def_struct_ui_icon(srna, ICON_LIGHTPROBE_CUBEMAP);
prop = RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_items(prop, lightprobe_type_items);
diff --git a/source/blender/makesrna/intern/rna_space.c
b/source/blender/makesrna/intern/rna_space.c
index d80f9d8d91a..124a0477f4c 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -3788,7 +3788,7 @@ static void rna_def_fileselect_params(BlenderRNA *brna)
"Particles Settings", "Show/hide Particle
Settings data-blocks"},
{FILTER_ID_PAL, "PALETTE", ICON_COLOR, "Palettes", "Show/hide
Palette data-blocks"},
{FILTER_ID_PC, "PAINT_CURVE", ICON_CURVE_BEZCURVE, "Paint
Curves", "Show/hide Paint Curve data-blocks"},
- {FILTER_ID_LP, "LIGHT_PROBE", ICON_RADIO, "Light Probes",
"Show/hide Light Probe data-blocks"},
+ {FILTER_ID_LP, "LIGHT_PROBE", ICON_LIGHTPROBE_CUBEMAP, "Light
Probes", "Show/hide Light Probe data-blocks"},
{FILTER_ID_SCE, "SCENE", ICON_SCENE_DATA, "Scenes", "Show/hide
Scene data-blocks"},
{FILTER_ID_SPK, "SPEAKER", ICON_SPEAKER, "Speakers", "Show/hide
Speaker data-blocks"},
{FILTER_ID_SO, "SOUND", ICON_SOUND, "Sounds", "Show/hide Sound
data-blocks"},
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
