Commit: ca0bb3eded0d73485dd11ee64422dd231acb5988
Author: YimingWu
Date: Sun Nov 3 18:27:37 2019 +0800
Branches: temp-lanpr-cleanup2
https://developer.blender.org/rBca0bb3eded0d73485dd11ee64422dd231acb5988
LANPR: Cleanup space_view3d.py for lanpr entries.
===================================================================
M release/scripts/startup/bl_ui/space_view3d.py
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_view3d.py
b/release/scripts/startup/bl_ui/space_view3d.py
index 81756d09ad7..f77b3559c59 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -3504,9 +3504,9 @@ class VIEW3D_MT_edit_mesh_context_menu(Menu):
col.operator("mesh.mark_sharp")
col.operator("mesh.mark_sharp", text="Clear Sharp").clear = True
- if render.use_freestyle or scene.lanpr.enabled or
render.engine=="BLENDER_LANPR":
- col.separator()
-
+ scene = context.scene
+ if scene.lanpr.enabled or scene.render.engine=="BLENDER_LANPR":
+ layout.separator()
col.operator("mesh.mark_freestyle_edge").clear = False
col.operator("mesh.mark_freestyle_edge", text="Clear Freestyle
Edge").clear = True
@@ -3695,9 +3695,8 @@ class VIEW3D_MT_edit_mesh_edges_data(Menu):
props.use_verts = True
props.clear = True
- if scene.lanpr.enabled or render.engine=="BLENDER_LANPR":
+ if context.scene.lanpr.enabled or render.engine=="BLENDER_LANPR":
layout.separator()
-
layout.operator("mesh.mark_freestyle_edge").clear = False
layout.operator("mesh.mark_freestyle_edge", text="Clear Freestyle
Edge").clear = True
@@ -3705,11 +3704,9 @@ class VIEW3D_MT_edit_mesh_edges_data(Menu):
class VIEW3D_MT_edit_mesh_edges(Menu):
bl_label = "Edge"
- def draw(self, _context):
+ def draw(self, context):
layout = self.layout
- with_freestyle = bpy.app.build_options.freestyle
-
layout.operator_context = 'INVOKE_REGION_WIN'
layout.operator("mesh.extrude_edges_move", text="Extrude Edges")
@@ -3752,9 +3749,9 @@ class VIEW3D_MT_edit_mesh_edges(Menu):
props.use_verts = True
props.clear = True
- if with_freestyle:
+ scene = context.scene
+ if scene.lanpr.enabled or scene.render.engine=="BLENDER_LANPR":
layout.separator()
-
layout.operator("mesh.mark_freestyle_edge").clear = False
layout.operator("mesh.mark_freestyle_edge", text="Clear Freestyle
Edge").clear = True
@@ -3762,11 +3759,9 @@ class VIEW3D_MT_edit_mesh_edges(Menu):
class VIEW3D_MT_edit_mesh_faces_data(Menu):
bl_label = "Face Data"
- def draw(self, _context):
+ def draw(self, context):
layout = self.layout
- with_freestyle = bpy.app.build_options.freestyle
-
layout.operator_context = 'INVOKE_REGION_WIN'
layout.operator("mesh.colors_rotate")
@@ -3777,11 +3772,11 @@ class VIEW3D_MT_edit_mesh_faces_data(Menu):
layout.operator("mesh.uvs_rotate")
layout.operator("mesh.uvs_reverse")
- if scene.lanpr.enabled or render.engine=="BLENDER_LANPR":
+ scene = context.scene
+ if scene.lanpr.enabled or scene.render.engine=="BLENDER_LANPR":
layout.separator()
-
layout.operator("mesh.mark_freestyle_face").clear = False
- layout.operator("mesh.mark_freestyle_cface", text="Clear Freestyle
Face").clear = True
+ layout.operator("mesh.mark_freestyle_face", text="Clear Freestyle
Face").clear = True
class VIEW3D_MT_edit_mesh_faces(Menu):
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
