Commit: de1994174bab4249ca9865ae3b471cb0f449ee77
Author: YimingWu
Date: Fri Jul 5 10:17:41 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rBde1994174bab4249ca9865ae3b471cb0f449ee77
LANPR: Fixed always-on contour in UI.
===================================================================
M release/scripts/startup/bl_ui/properties_render.py
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_render.py
b/release/scripts/startup/bl_ui/properties_render.py
index 6965f7af682..a64908c2417 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -866,7 +866,7 @@ class RENDER_PT_lanpr_line_types(RenderButtonsPanel, Panel):
col.prop(active_layer, "enable_intersection", text="Intersection",
toggle=True)
col = split.column()
row = col.row(align = True)
- #row.enabled = active_layer.enable_contour this is always enabled
now
+ row.enabled = active_layer.enable_contour
row.prop(active_layer, "contour_color", text="")
row.prop(active_layer, "thickness_contour", text="", slider=True)
row = col.row(align = True)
@@ -882,18 +882,18 @@ class RENDER_PT_lanpr_line_types(RenderButtonsPanel,
Panel):
row.prop(active_layer, "material_color", text="")
row.prop(active_layer, "thickness_material", text="", slider=True)
row = col.row(align = True)
- if lanpr.enable_intersections:
- row.enabled = active_layer.enable_intersection
- row.prop(active_layer, "intersection_color", text="")
- row.prop(active_layer, "thickness_intersection", text="",
slider=True)
- else:
- row.label(text= "Intersection Calculation Disabled")
-
- if lanpr.master_mode == "DPIX" and active_layer.enable_intersection:
- row = col.row(align = True)
- row.prop(lanpr,"enable_intersections", toggle = True, text =
"Enable")
- if lanpr.enable_intersections:
- row.operator("scene.lanpr_calculate", text= "Recalculate")
+ row.enabled = (active_layer.enable_intersection and
lanpr.enable_intersections)
+ row.prop(active_layer, "intersection_color", text="")
+ row.prop(active_layer, "thickness_intersection", text="",
slider=True)
+
+ if lanpr.master_mode == "DPIX" and
active_layer.enable_intersection:
+ row = col.row(align = True)
+ row.prop(lanpr,"enable_intersections", toggle = True, text =
"Enable")
+ if lanpr.enable_intersections:
+ row.operator("scene.lanpr_calculate", text= "Recalculate")
+
+ if not lanpr.enable_intersections:
+ layout.label(text= "Intersection calculation disabled.")
class RENDER_PT_lanpr_line_components(RenderButtonsPanel, Panel):
bl_label = "Including"
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
