[Bf-blender-cvs] [8708a96ddec] soc-2019-npr: LANPR: UI refactor: naming fixes.

YimingWu noreply at git.blender.org
Mon Aug 5 02:29:27 CEST 2019


Commit: 8708a96ddec516e8435332f0ccb3d2b2923902ea
Author: YimingWu
Date:   Mon Aug 5 08:29:05 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB8708a96ddec516e8435332f0ccb3d2b2923902ea

LANPR: UI refactor: naming fixes.

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

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

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

diff --git a/release/scripts/startup/bl_ui/properties_lanpr.py b/release/scripts/startup/bl_ui/properties_lanpr.py
index e20228c09d8..3277921d2b9 100644
--- a/release/scripts/startup/bl_ui/properties_lanpr.py
+++ b/release/scripts/startup/bl_ui/properties_lanpr.py
@@ -81,7 +81,7 @@ class OBJECT_PT_lanpr_settings(LanprButtonsPanel, Panel):
         layout.prop(md,'enable_modifier_mark')
 
 class OBJECT_PT_lanpr_modifier_target(LanprButtonsPanel, Panel):
-    bl_label = "GPencil Target"
+    bl_label = "Grease Pencil"
     bl_parent_id = "OBJECT_PT_lanpr_settings"
     COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_LANPR', 'BLENDER_OPENGL', 'BLENDER_EEVEE'}
 
@@ -101,13 +101,7 @@ class OBJECT_PT_lanpr_modifier_target(LanprButtonsPanel, Panel):
         layout.use_property_split = True
         layout.use_property_decorate = False
 
-        split = layout.split(factor=0.5)
-        col = split.column()
-        col.label(text="Object:")
-        col.prop(md, "target", text="")
-        col = split.column()
-        col.label(text="Vertex Group:")
-        col.label(text="Inoperative")
+        layout.prop(md, "target")
         
         if md.target:
             if not is_unit_transformation(md.target):
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py
index dcd0b503e93..12577e78146 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -832,15 +832,15 @@ class RENDER_PT_lanpr_layer_settings(RenderButtonsPanel, Panel):
         col = layout.column(align=True)
         if not expand:
             col.prop(active_layer, "color")
-        col.prop(active_layer, "thickness")
+        col.prop(active_layer, "thickness", text="Main Thickness")
 
-        lanpr_make_line_type(expand,layout,active_layer.contour,"Draw Contour")
-        lanpr_make_line_type(expand,layout,active_layer.crease,"Draw Crease")
-        lanpr_make_line_type(expand,layout,active_layer.edge_mark,"Draw EdgeMark")
-        lanpr_make_line_type(expand,layout,active_layer.material_separate,"Draw Material")
+        lanpr_make_line_type(expand,layout,active_layer.contour,"Contour")
+        lanpr_make_line_type(expand,layout,active_layer.crease,"Crease")
+        lanpr_make_line_type(expand,layout,active_layer.edge_mark,"EdgeMark")
+        lanpr_make_line_type(expand,layout,active_layer.material_separate,"Material")
 
         if lanpr.enable_intersections:
-            lanpr_make_line_type(expand,layout,active_layer.intersection,"Draw Intersection")
+            lanpr_make_line_type(expand,layout,active_layer.intersection,"Intersection")
         else:
             layout.label(text= "Intersection calculation disabled.")
 
@@ -1065,7 +1065,7 @@ class RENDER_PT_lanpr_gpencil(RenderButtonsPanel, Panel):
         layout.prop(lanpr,"auto_update", text='Auto Update')
         layout.prop(lanpr,"gpencil_overwrite", text='Overwrite')
         if not lanpr.auto_update:
-            layout.operator("scene.lanpr_update_gp_strokes", icon='FILE_REFRESH', text='Update GPencil Targets')
+            layout.operator("scene.lanpr_update_gp_strokes", icon='FILE_REFRESH', text='Update Grease Pencil Targets')
         layout.operator("scene.lanpr_bake_gp_strokes", icon='RENDER_ANIMATION', text='Bake All Frames')
 
 class RENDER_PT_lanpr_software_chain_styles(RenderButtonsPanel, Panel):
@@ -1133,8 +1133,8 @@ class RENDER_PT_lanpr_options(RenderButtonsPanel, Panel):
         layout.prop(lanpr,"enable_intersections")
         layout.prop(lanpr, "disable_edge_splits")
 
-        if scene.render.engine=='BLENDER_LANPR':
-            layout.prop(lanpr,"enable_chaining", text = "Chain lines")
+        if scene.render.engine=='BLENDER_LANPR' and lanpr.master_mode=='SOFTWARE':
+            layout.prop(lanpr,"enable_chaining", text = "Chained Lines")
 
 
 classes = (



More information about the Bf-blender-cvs mailing list