[Bf-blender-cvs] [b2ca257e632] soc-2019-npr: LANPR: modified buttons and panels for non-LANPR engine display.

[YimingWu]

Commit: b2ca257e632c80f8a066bd05829255af2e34a29f
Author: YimingWu
Date:   Mon Jul 1 14:50:34 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rBb2ca257e632c80f8a066bd05829255af2e34a29f

LANPR: modified buttons and panels for non-LANPR engine display.

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

M	release/scripts/startup/bl_ui/properties_data_modifier.py
M	release/scripts/startup/bl_ui/properties_render.py

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

diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 2f0752a903d..200dde60849 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -1673,7 +1673,6 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         layout.active = lanpr_enabled
         if not lanpr_enabled:
             layout.label(text="LANPR is not enabled")
-        layout.operator("scene.lanpr_update_gp_strokes", icon='RENDER_STILL', text='Manual Update')
         layout.label(text='Enable Types:')
         row = layout.row(align=True)
         row.prop(md,'enable_contour',toggle=True)
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py
index f7a039a87a9..254472b06c3 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -740,10 +740,6 @@ class RENDER_PT_lanpr(RenderButtonsPanel, Panel):
             row.prop(lanpr,'auto_update',toggle=True,text='Auto')
             if not lanpr.auto_update:
                 row.operator("scene.lanpr_calculate", icon='RENDER_STILL', text='Update')
-        
-        layout.label(text = "CAUTION: this bakes ALL frames!")
-        row=layout.row()
-        row.operator("scene.lanpr_bake_gp_strokes", icon='RENDER_ANIMATION', text='Bake GPencil Strokes')
 
         if mode == "DPIX" or mode == "SOFTWARE":
             
@@ -781,6 +777,11 @@ class RENDER_PT_lanpr(RenderButtonsPanel, Panel):
         else:
             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')
 
 
 class RENDER_PT_lanpr_line_types(RenderButtonsPanel, Panel):
@@ -794,7 +795,7 @@ class RENDER_PT_lanpr_line_types(RenderButtonsPanel, Panel):
         scene = context.scene
         lanpr = scene.lanpr
         active_layer = lanpr.layers.active_layer
-        return lanpr.enabled and active_layer and lanpr.master_mode != "SNAKE"
+        return scene.render.engine=="BLENDER_LANPR" and lanpr.enabled and active_layer and lanpr.master_mode != "SNAKE"
 
     def draw(self, context):
         layout = self.layout
@@ -874,7 +875,7 @@ class RENDER_PT_lanpr_line_components(RenderButtonsPanel, Panel):
         scene = context.scene
         lanpr = scene.lanpr
         active_layer = lanpr.layers.active_layer
-        return lanpr.enabled and active_layer and lanpr.master_mode == "SOFTWARE" and not lanpr.enable_chaining
+        return scene.render.engine=="BLENDER_LANPR" and lanpr.enabled and active_layer and lanpr.master_mode == "SOFTWARE" and not lanpr.enable_chaining
 
     def draw(self, context):
         layout = self.layout
@@ -914,7 +915,7 @@ class RENDER_PT_lanpr_line_effects(RenderButtonsPanel, Panel):
         scene = context.scene
         lanpr = scene.lanpr
         active_layer = lanpr.layers.active_layer
-        return lanpr.enabled and active_layer and (lanpr.master_mode == "DPIX" or lanpr.master_mode == "SOFTWARE")
+        return scene.render.engine=="BLENDER_LANPR" and lanpr.enabled and active_layer and (lanpr.master_mode == "DPIX" or lanpr.master_mode == "SOFTWARE")
 
     def draw(self, context):
         layout = self.layout
@@ -955,7 +956,7 @@ class RENDER_PT_lanpr_snake_sobel_parameters(RenderButtonsPanel, Panel):
     def poll(cls, context):
         scene = context.scene
         lanpr = scene.lanpr
-        return lanpr.enabled and lanpr.master_mode == "SNAKE"
+        return scene.render.engine=="BLENDER_LANPR" and lanpr.enabled and lanpr.master_mode == "SNAKE"
 
     def draw(self, context):
         layout = self.layout
@@ -978,7 +979,7 @@ class RENDER_PT_lanpr_snake_settings(RenderButtonsPanel, Panel):
     def poll(cls, context):
         scene = context.scene
         lanpr = scene.lanpr
-        return lanpr.enabled and lanpr.master_mode == "SNAKE" and lanpr.enable_vector_trace == "ENABLED"
+        return scene.render.engine=="BLENDER_LANPR" and lanpr.enabled and lanpr.master_mode == "SNAKE" and lanpr.enable_vector_trace == "ENABLED"
 
     def draw(self, context):
         layout = self.layout