[Bf-blender-cvs] [2d01192c4dd] soc-2019-npr: LANPR: intersection update button in GPU mode, small UI modifications.

YimingWu noreply at git.blender.org
Tue Jul 2 08:27:44 CEST 2019


Commit: 2d01192c4dd7845feaf0de77806055916cbe9968
Author: YimingWu
Date:   Tue Jul 2 14:27:08 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB2d01192c4dd7845feaf0de77806055916cbe9968

LANPR: intersection update button in GPU mode, small UI modifications.

===================================================================

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 0f167b0263c..c24df04e22e 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -731,15 +731,20 @@ class RENDER_PT_lanpr(RenderButtonsPanel, Panel):
 
         layout.prop(lanpr, "master_mode", expand=True) 
 
+        if scene.render.engine!="BLENDER_LANPR" and mode != "SOFTWARE":
+            layout.label(text="Not in LANPR engine, mode disabled.")
+            return;
+
         if mode == "DPIX" and lanpr.shader_error:
             layout.label(text="DPIX transfor shader compile error!")
             return;
 
-        if mode == "SOFTWARE":
+        if mode == "SOFTWARE" or mode == "DPIX":
             row=layout.row(align=True)
             row.prop(lanpr,'auto_update',toggle=True,text='Auto Update')
+            txt = "Update" if mode == "SOFTWARE" else "Intersection Cache"
             if not lanpr.auto_update:
-                row.operator("scene.lanpr_calculate", icon='RENDER_STILL', text='Update')
+                row.operator("scene.lanpr_calculate", icon='FILE_REFRESH', text=txt)
             layout.prop(lanpr, "disable_edge_splits")
 
         if mode == "DPIX" or mode == "SOFTWARE":
@@ -779,10 +784,11 @@ class RENDER_PT_lanpr(RenderButtonsPanel, Panel):
             layout.label(text="Vectorization:")
             layout.prop(lanpr, "enable_vector_trace", expand = True)
         
-        row=layout.row()
-        row.operator("scene.lanpr_update_gp_strokes", icon='RENDER_STILL', text='Update GPencil Targets')
-        row=layout.row()
-        row.operator("scene.lanpr_bake_gp_strokes", icon='RENDER_ANIMATION', text='Bake All Frames')
+        if mode == "SOFTWARE":
+            row=layout.row()
+            row.operator("scene.lanpr_update_gp_strokes", icon='RENDER_STILL', text='Update GPencil Targets')
+            row=layout.row()
+            row.operator("scene.lanpr_bake_gp_strokes", icon='RENDER_ANIMATION', text='Bake All Frames')
 
 
 class RENDER_PT_lanpr_line_types(RenderButtonsPanel, Panel):



More information about the Bf-blender-cvs mailing list