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
path: root/intern
diff options
context:
space:
mode:
authorSebastian Parborg <darkdefende@gmail.com>2020-05-18 16:50:36 +0300
committerSebastian Parborg <darkdefende@gmail.com>2020-05-18 16:50:36 +0300
commit27cac4a102b917f9045ed4a4682bd8740852458c (patch)
tree858faf0aa0be0ce814ed19d009da5c92366e12a4 /intern
parentdcf67fdf7f7239c7c1c4fc867541bf7d5da561e6 (diff)
Fix T62422: Baking ray distance do not work
The previous naming scheme for the "selected to active" baking options lead to confusion and they were not describing what they actually did. To remedy this, I've added a new settings that does what the older setting implied it did. Reviewed By: Brecht, Dalai, Andy Davies Differential Revision: http://developer.blender.org/D7733
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/blender/addon/ui.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 08641c05941..a15daee706f 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -1907,10 +1907,15 @@ class CYCLES_RENDER_PT_bake_selected_to_active(CyclesButtonsPanel, Panel):
col.prop(cbk, "use_cage", text="Cage")
if cbk.use_cage:
- col.prop(cbk, "cage_extrusion", text="Extrusion")
- col.prop(cbk, "cage_object", text="Cage Object")
+ col.prop(cbk, "cage_object")
+ col = layout.column()
+ col.prop(cbk, "cage_extrusion")
+ col.active = cbk.cage_object is None
else:
- col.prop(cbk, "cage_extrusion", text="Ray Distance")
+ col.prop(cbk, "cage_extrusion", text="Extrusion")
+
+ col = layout.column()
+ col.prop(cbk, "max_ray_distance")
class CYCLES_RENDER_PT_bake_output(CyclesButtonsPanel, Panel):