[Bf-blender-cvs] [1067924979f] soc-2019-npr: LANPR: modified modifier and main panel UI for clarity.

[YimingWu]

Commit: 1067924979fb7e72e6ebd3eb50b537a4f148ad57
Author: YimingWu
Date:   Thu Jun 27 13:05:20 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB1067924979fb7e72e6ebd3eb50b537a4f148ad57

LANPR: modified modifier and main panel UI for clarity.

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

M	release/datafiles/locale
M	release/scripts/addons
M	release/scripts/addons_contrib
M	release/scripts/startup/bl_ui/properties_data_modifier.py
M	release/scripts/startup/bl_ui/properties_render.py
M	source/tools

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

diff --git a/release/datafiles/locale b/release/datafiles/locale
index d1f85e37b7f..ad82c4ce43e 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit d1f85e37b7fa2574243a112670fd36fbebc61d4c
+Subproject commit ad82c4ce43ef2801ef51e75af1f9702992478b02
diff --git a/release/scripts/addons b/release/scripts/addons
index 4fe2c612f13..8e6f485cf5b 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 4fe2c612f133640c0ab5d4bba3c0eb121bfe555d
+Subproject commit 8e6f485cf5b160c425d7da7c743879b20f3d6a96
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index e83541d42c7..7077ff07384 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit e83541d42c71bfb689acf9a53a6eb66b0c190451
+Subproject commit 7077ff07384491d1f7630484995557f1c7302dae
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 15a69e78b54..2f0752a903d 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -1669,6 +1669,10 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         col.prop(md, "face_influence")
 
     def FEATURE_LINE(self, layout, ob, md):
+        lanpr_enabled = bpy.context.scene.lanpr.enabled
+        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)
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py
index cf24fc4b6e3..09f680c94e3 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -720,17 +720,18 @@ class RENDER_PT_lanpr(RenderButtonsPanel, Panel):
         self.layout.prop(context.scene.lanpr, "enabled", text="")
 
     def draw(self, context):
-        layout = self.layout
         scene = context.scene
         lanpr = scene.lanpr
         active_layer = lanpr.layers.active_layer 
         mode = lanpr.master_mode
 
+        layout = self.layout
+
+        layout.active = lanpr.enabled
+
+        layout.prop(lanpr, "master_mode", expand=True) 
 
-        
         if scene.render.engine!='BLENDER_LANPR':
-            layout.prop(lanpr, "master_mode", expand=True) 
-        else:
             layout.label(text='Only Software mode result is used to generate GP stroke.')
 
         if mode == "SOFTWARE":
@@ -783,7 +784,7 @@ class RENDER_PT_lanpr_line_types(RenderButtonsPanel, Panel):
         scene = context.scene
         lanpr = scene.lanpr
         active_layer = lanpr.layers.active_layer
-        return active_layer and lanpr.master_mode != "SNAKE"
+        return lanpr.enabled and active_layer and lanpr.master_mode != "SNAKE"
 
     def draw(self, context):
         layout = self.layout
@@ -863,7 +864,7 @@ class RENDER_PT_lanpr_line_components(RenderButtonsPanel, Panel):
         scene = context.scene
         lanpr = scene.lanpr
         active_layer = lanpr.layers.active_layer
-        return active_layer and lanpr.master_mode == "SOFTWARE" and not lanpr.enable_chaining
+        return lanpr.enabled and active_layer and lanpr.master_mode == "SOFTWARE" and not lanpr.enable_chaining
 
     def draw(self, context):
         layout = self.layout
@@ -902,7 +903,8 @@ class RENDER_PT_lanpr_line_effects(RenderButtonsPanel, Panel):
     def poll(cls, context):
         scene = context.scene
         lanpr = scene.lanpr
-        return lanpr.master_mode == "DPIX" or lanpr.master_mode == "SOFTWARE"
+        active_layer = lanpr.layers.active_layer
+        return lanpr.enabled and active_layer and (lanpr.master_mode == "DPIX" or lanpr.master_mode == "SOFTWARE")
 
     def draw(self, context):
         layout = self.layout
@@ -943,7 +945,7 @@ class RENDER_PT_lanpr_snake_sobel_parameters(RenderButtonsPanel, Panel):
     def poll(cls, context):
         scene = context.scene
         lanpr = scene.lanpr
-        return lanpr.master_mode == "SNAKE"
+        return lanpr.enabled and lanpr.master_mode == "SNAKE"
 
     def draw(self, context):
         layout = self.layout
@@ -966,7 +968,7 @@ class RENDER_PT_lanpr_snake_settings(RenderButtonsPanel, Panel):
     def poll(cls, context):
         scene = context.scene
         lanpr = scene.lanpr
-        return lanpr.master_mode == "SNAKE" and lanpr.enable_vector_trace == "ENABLED"
+        return lanpr.enabled and lanpr.master_mode == "SNAKE" and lanpr.enable_vector_trace == "ENABLED"
 
     def draw(self, context):
         layout = self.layout
@@ -1023,7 +1025,7 @@ class RENDER_PT_lanpr_software_chain_styles(RenderButtonsPanel, Panel):
     def poll(cls, context):
         scene = context.scene
         lanpr = scene.lanpr
-        return lanpr.master_mode == "SOFTWARE" and lanpr.enable_chaining
+        return lanpr.enabled and lanpr.master_mode == "SOFTWARE" and lanpr.enable_chaining
 
     def draw(self, context):
         layout = self.layout
diff --git a/source/tools b/source/tools
index eb406b701d5..2afbb8ec472 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit eb406b701d5a251818e425fec489417477019d61
+Subproject commit 2afbb8ec472cac5102eb239f57b006f8c9387685