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:
authorClément Foucault <foucault.clem@gmail.com>2017-06-09 23:30:49 +0300
committerClément Foucault <foucault.clem@gmail.com>2017-06-09 23:30:49 +0300
commit20572497a4d2388d8d37663f340ce925ca3caf85 (patch)
treee14da4803faefb7706c37b19fe2a14439380c63f /release
parentda305097250b98dc7b71265e524b934fd50d4b53 (diff)
Eevee: Add parallax correction to probe reflections
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/properties_data_probe.py57
1 files changed, 48 insertions, 9 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_probe.py b/release/scripts/startup/bl_ui/properties_data_probe.py
index b6f4b1ce30d..2f515d71ddf 100644
--- a/release/scripts/startup/bl_ui/properties_data_probe.py
+++ b/release/scripts/startup/bl_ui/properties_data_probe.py
@@ -62,22 +62,61 @@ class DATA_PT_probe(DataButtonsPanel, Panel):
layout.prop(probe, "type", expand=True)
- split = layout.split()
+ layout.label("Influence:")
+ layout.prop(probe, "influence_type", expand=True)
- col = split.column(align=True)
- col.label("Influence:")
- col.prop(probe, "influence_distance", text="Distance")
- col.prop(probe, "falloff")
+ if probe.influence_type == 'ELIPSOID':
+ layout.prop(probe, "influence_distance", "Radius")
+ layout.prop(probe, "falloff")
+ else:
+ split = layout.split()
+ col = split.column(align=True)
+ col.prop(probe, "influence_minimum", text="Min:")
+ col = split.column(align=True)
+ col.prop(probe, "influence_maximum", text="Max:")
- col = split.column(align=True)
- col.label("Clipping:")
- col.prop(probe, "clip_start", text="Start")
- col.prop(probe, "clip_end", text="End")
+ layout.prop(probe, "falloff")
+
+ layout.separator()
+
+ layout.label("Clipping:")
+ row = layout.row(align=True)
+ row.prop(probe, "clip_start", text="Start")
+ row.prop(probe, "clip_end", text="End")
+
+
+class DATA_PT_parallax(DataButtonsPanel, Panel):
+ bl_label = "Parallax"
+ COMPAT_ENGINES = {'BLENDER_CLAY', 'BLENDER_EEVEE'}
+
+ def draw(self, context):
+ layout = self.layout
+
+ ob = context.object
+ probe = context.probe
+
+ layout.prop(probe, "use_custom_parallax")
+
+ col = layout.column()
+ col.active = probe.use_custom_parallax
+
+ row = col.row()
+ row.prop(probe, "parallax_type", expand=True)
+
+ if probe.parallax_type == 'ELIPSOID':
+ col.prop(probe, "parallax_distance", "Radius")
+ else:
+ split = col.split()
+ col = split.column(align=True)
+ col.prop(probe, "parallax_minimum", text="Min:")
+ col = split.column(align=True)
+ col.prop(probe, "parallax_maximum", text="Max:")
classes = (
DATA_PT_context_probe,
DATA_PT_probe,
+ DATA_PT_parallax,
)
if __name__ == "__main__": # only for live edit.