[Bf-blender-cvs] [b4f707424ed] soc-2019-npr: LANPR: UI refactor: main panel.
YimingWu
noreply at git.blender.org
Wed Jul 24 04:22:48 CEST 2019
Commit: b4f707424edd62fe51edd352e0331e6546b9f9aa
Author: YimingWu
Date: Wed Jul 24 10:22:06 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rBb4f707424edd62fe51edd352e0331e6546b9f9aa
LANPR: UI refactor: main panel.
===================================================================
M release/datafiles/locale
M release/scripts/addons
M release/scripts/addons_contrib
M release/scripts/startup/bl_ui/properties_render.py
===================================================================
diff --git a/release/datafiles/locale b/release/datafiles/locale
index 6625026f62f..ad82c4ce43e 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 6625026f62f492dd677f5f29c68b9d70c96fb34b
+Subproject commit ad82c4ce43ef2801ef51e75af1f9702992478b02
diff --git a/release/scripts/addons b/release/scripts/addons
index 97929851191..8e6f485cf5b 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 979298511916b25ec97bb22feb1c06cc9fbc86dd
+Subproject commit 8e6f485cf5b160c425d7da7c743879b20f3d6a96
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index b4fce25e94e..7077ff07384 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit b4fce25e94ec139554e821f58bbada3384b13afa
+Subproject commit 7077ff07384491d1f7630484995557f1c7302dae
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py
index a8a2f218563..f8c790c75b4 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -739,100 +739,101 @@ class RENDER_PT_lanpr(RenderButtonsPanel, Panel):
mode = lanpr.master_mode
layout = self.layout
-
layout.active = scene.render.engine=="BLENDER_LANPR" or lanpr.enabled
+ layout.use_property_split = True
+ layout.use_property_decorate = False # No animation.
+
+ col = layout.column()
if scene.render.engine=="BLENDER_LANPR":
- layout.prop(lanpr, "master_mode")
+ col.prop(lanpr, "master_mode")
- if scene.render.engine!="BLENDER_LANPR" and mode != "SOFTWARE":
+ elif mode != "SOFTWARE":
mode = "SOFTWARE"
if mode == "DPIX" and lanpr.shader_error:
layout.label(text="DPIX transform shader compile error!")
- return;
+ return
- if mode == "SOFTWARE" or mode == "DPIX":
- if not scene.camera:
- has_camera=False
- layout.label(text="No active camera.")
- else:
- has_camera=True
-
- if scene.render.engine!="BLENDER_LANPR":
- row=layout.row(align=True)
- row.enabled=has_camera
- row.prop(lanpr,"auto_update",toggle=True,text='Auto Update')
- row.prop(lanpr,"gpencil_overwrite",toggle=True,text='Overwrite')
- if not lanpr.auto_update:
- row=layout.row()
- row.enabled=has_camera
- row.operator("scene.lanpr_update_gp_strokes", icon='RENDER_STILL', text='Update GPencil Targets')
- row=layout.row()
- row.enabled=has_camera
- row.operator("scene.lanpr_bake_gp_strokes", icon='RENDER_ANIMATION', text='Bake All Frames')
- else:
- row=layout.row(align=True)
- row.enabled = has_camera
- 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='FILE_REFRESH', text=txt)
- layout.operator("scene.lanpr_export_svg", icon='OUTLINER_OB_CURVE', text="Generate SVG to a text block")
-
- if mode == "DPIX":
- layout.label(text="Cache Size:")
- layout.prop(lanpr,"gpu_cache_size", expand=True)
- layout.prop(lanpr,"enable_intersections", text = "Intersection Lines")
+ #if mode == "SOFTWARE" or mode == "DPIX":
+ if not scene.camera:
+ has_camera=False
+ col.label(text="No active camera.")
+ else:
+ has_camera=True
+
+ c=col.column()
+ c.enabled = has_camera
+ if scene.render.engine!="BLENDER_LANPR":
+ c=layout.row(align=True)
+ c.enabled=has_camera
+ c.prop(lanpr,"auto_update", text='Auto Update')
+ c.prop(lanpr,"gpencil_overwrite", text='Overwrite')
+ if not lanpr.auto_update:
+ c=layout.row()
+ c.enabled=has_camera
+ c.operator("scene.lanpr_update_gp_strokes", icon='RENDER_STILL', text='Update GPencil Targets')
+ c=layout.row()
+ c.enabled=has_camera
+ c.operator("scene.lanpr_bake_gp_strokes", icon='RENDER_ANIMATION', text='Bake All Frames')
+ else:
+ c.prop(lanpr,'auto_update', text='Auto Update')
+ txt = "Update" if mode == "SOFTWARE" else "Intersection Cache"
+ if not lanpr.auto_update:
+ c.operator("scene.lanpr_calculate", icon='FILE_REFRESH', text=txt)
- layout.prop(lanpr, "disable_edge_splits")
-
- layout.label(text="Background Color:")
- row = layout.row(align=True)
- row.prop(lanpr,"use_world_background",toggle=True,icon='WORLD',text="Use World")
- if(lanpr.use_world_background):
- row.prop(scene.world, "color",text="")
+ c.operator("scene.lanpr_export_svg", icon='OUTLINER_OB_CURVE', text="Generate SVG to a text block")
+
+ layout.prop(lanpr, "crease_threshold", slider=True)
+
+ #goes to option panel
+ #if mode == "DPIX":
+ # layout.label(text="Cache Size:")
+ # layout.prop(lanpr,"gpu_cache_size", expand=True)
+ # layout.prop(lanpr,"enable_intersections", text = "Intersection Lines")
+ #layout.prop(lanpr, "disable_edge_splits")
+ #row = layout.row()
+ #row.prop(lanpr,"enable_intersections", text = "Intersection Lines")
+ #else:
+ # row = layout.row()
+ # row.label(text='Chain is enabled to generate GP strokes.')
+ #row.prop(lanpr,"enable_chaining", text = "Chaining")
+
+ #deprecated
+ #layout.label(text="Background Color:")
+ #row = layout.row(align=True)
+ #row.prop(lanpr,"use_world_background",toggle=True,icon='WORLD',text="Use World")
+ #if(lanpr.use_world_background):
+ # row.prop(scene.world, "color",text="")
+ #else:
+ # row.prop(lanpr, "background_color",text="")
+
+
+ if mode == "DPIX" and len(lanpr.layers)==0:
+ layout.label(text="You don't have a layer to display.")
+ layout.operator("scene.lanpr_add_line_layer");
+
+ if scene.render.engine=="BLENDER_LANPR" and mode == "SOFTWARE":
+ layout.operator("scene.lanpr_auto_create_line_layer", text = "Default", icon = "ADD")
+ row=layout.row()
+ row.template_list("LANPR_UL_linesets", "", lanpr, "layers", lanpr.layers, "active_layer_index", rows=4)
+ col=row.column(align=True)
+ if active_layer:
+ col.operator("scene.lanpr_add_line_layer", icon="ADD", text='')
+ col.operator("scene.lanpr_delete_line_layer", icon="REMOVE", text='')
+ col.separator()
+ col.operator("scene.lanpr_move_line_layer",icon='TRIA_UP', text='').direction = "UP"
+ col.operator("scene.lanpr_move_line_layer",icon='TRIA_DOWN', text='').direction = "DOWN"
+ col.separator()
+ col.operator("scene.lanpr_rebuild_all_commands",icon="FILE_REFRESH", text='')
else:
- row.prop(lanpr, "background_color",text="")
- layout.prop(lanpr, "crease_threshold")
-
- if mode == "DPIX" and len(lanpr.layers)==0:
- layout.label(text="You don't have a layer to display.")
- layout.operator("scene.lanpr_add_line_layer");
-
- if mode == "SOFTWARE":
- row = layout.row()
- row.prop(lanpr,"enable_intersections", text = "Intersection Lines")
-
- if scene.render.engine=="BLENDER_LANPR":
- row.prop(lanpr,"enable_chaining", text = "Chaining")
-
- split = layout.split(factor=0.4)
- col = split.column()
- col.label(text="Line Layers:")
- col = split.column()
- col.operator("scene.lanpr_auto_create_line_layer", text = "Default", icon = "ADD")
- row=layout.row()
- row.template_list("LANPR_UL_linesets", "", lanpr, "layers", lanpr.layers, "active_layer_index", rows=4)
- col=row.column(align=True)
- if active_layer:
- col.operator("scene.lanpr_add_line_layer", icon="ADD", text='')
- col.operator("scene.lanpr_delete_line_layer", icon="REMOVE", text='')
- col.separator()
- col.operator("scene.lanpr_move_line_layer",icon='TRIA_UP', text='').direction = "UP"
- col.operator("scene.lanpr_move_line_layer",icon='TRIA_DOWN', text='').direction = "DOWN"
- col.separator()
- col.operator("scene.lanpr_rebuild_all_commands",icon="FILE_REFRESH", text='')
- else:
- col.operator("scene.lanpr_add_line_layer", icon="ADD", text='')
- else:
- row = layout.row()
- row.label(text='Chain is enabled to generate GP strokes.')
- else:
- layout.label(text="Vectorization:")
- layout.prop(lanpr, "enable_vector_trace", expand = True)
+ col.operator("scene.lanpr_add_line_layer", icon="ADD", text='')
+
+ #else:
+ # layout.label(text="Vectorization:")
+ # layout.prop(lanpr, "enable_vector_trace", expand = True)
-class RENDER_PT_lanpr_line_types(RenderButtonsPanel, Panel):
+class RENDER_PT_lanpr_layer_settings(RenderButtonsPanel, Panel):
bl_label = "Layer Settings"
bl_parent_id = "RENDER_PT_lanpr"
bl_options = {'DEFAULT_CLOSED'}
@@ -846,11 +847,14 @@ class RENDER_PT_lanpr_line_types(RenderButtonsPanel, Panel):
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list