Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2017-06-22 18:20:39 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-06-22 18:30:15 +0300
commit4cd9a3e3375e396dc0c09a492633be9ad4774b09 (patch)
tree1695b5536026e0200143ff19541ac2c71e2485a6 /release
parent7773a8ad0482a3069f82b3321b3c492b1f2e5059 (diff)
Light Probes: interface changes, and renames
Although we are calling all of them light probes, there are a lot of differences between them. This commit does the following: * Prevent user from changing the probe type once added * Unify "sphere" and "cube" probes into reflection cubemap (as before you can switch between them from the probe UI) To be done ========== * Don't show add probe menus unless we are on Eevee * Light probes panels should not be visible in Clay. Light probe objects should not be visible in Clay viewport (nor on Cycles). Notes ===== * We need icons for the different light probes, and for lightprobes as a whole (we are using RADIO for now).
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/properties_data_lightprobe.py7
-rw-r--r--release/scripts/startup/bl_ui/space_view3d.py1
2 files changed, 5 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_lightprobe.py b/release/scripts/startup/bl_ui/properties_data_lightprobe.py
index af6a1affd69..f56ee24fdc0 100644
--- a/release/scripts/startup/bl_ui/properties_data_lightprobe.py
+++ b/release/scripts/startup/bl_ui/properties_data_lightprobe.py
@@ -60,8 +60,6 @@ class DATA_PT_lightprobe(DataButtonsPanel, Panel):
ob = context.object
probe = context.lightprobe
- layout.prop(probe, "type", expand=True)
-
split = layout.split()
if probe.type == 'GRID':
@@ -76,11 +74,13 @@ class DATA_PT_lightprobe(DataButtonsPanel, Panel):
col.label("Influence:")
col.prop(probe, "influence_distance", "Distance")
col.prop(probe, "falloff")
- elif probe.type == "PLANAR":
+
+ elif probe.type == 'PLANAR':
col = split.column(align=True)
col.label("Influence:")
col.prop(probe, "influence_distance", "Distance")
col.prop(probe, "falloff")
+
else:
col = split.column(align=True)
col.label("Influence:")
@@ -96,6 +96,7 @@ class DATA_PT_lightprobe(DataButtonsPanel, Panel):
col = split.column(align=True)
col.label("Clipping:")
col.prop(probe, "clip_start", text="Start")
+
if probe.type != "PLANAR":
col.prop(probe, "clip_end", text="End")
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 0e1a142a41f..b3792686fc4 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -1263,6 +1263,7 @@ class INFO_MT_add(Menu):
INFO_MT_camera_add.draw(self, context)
layout.menu("INFO_MT_lamp_add", icon='OUTLINER_OB_LAMP')
+ layout.separator()
layout.menu("INFO_MT_lightprobe_add")
layout.separator()