[Bf-blender-cvs] [b75a9e36fa4] temp-lanpr-cleanup2: LANPR: add freestyle option back for the edge mark ui.
YimingWu
noreply at git.blender.org
Sun Nov 3 12:58:52 CET 2019
Commit: b75a9e36fa4f734f978e2631f9a81a9078975dd4
Author: YimingWu
Date: Sun Nov 3 19:57:15 2019 +0800
Branches: temp-lanpr-cleanup2
https://developer.blender.org/rBb75a9e36fa4f734f978e2631f9a81a9078975dd4
LANPR: add freestyle option back for the edge mark ui.
===================================================================
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 f77b3559c59..5d115884a34 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -3505,7 +3505,7 @@ class VIEW3D_MT_edit_mesh_context_menu(Menu):
col.operator("mesh.mark_sharp", text="Clear Sharp").clear = True
scene = context.scene
- if scene.lanpr.enabled or scene.render.engine=="BLENDER_LANPR":
+ if render.use_freestyle or 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,7 +3695,7 @@ class VIEW3D_MT_edit_mesh_edges_data(Menu):
props.use_verts = True
props.clear = True
- if context.scene.lanpr.enabled or render.engine=="BLENDER_LANPR":
+ if render.use_freestyle or 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
@@ -3707,6 +3707,8 @@ class VIEW3D_MT_edit_mesh_edges(Menu):
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")
@@ -3750,7 +3752,7 @@ class VIEW3D_MT_edit_mesh_edges(Menu):
props.clear = True
scene = context.scene
- if scene.lanpr.enabled or scene.render.engine=="BLENDER_LANPR":
+ if with_freestyle or 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,6 +3764,8 @@ class VIEW3D_MT_edit_mesh_faces_data(Menu):
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")
@@ -3773,7 +3777,7 @@ class VIEW3D_MT_edit_mesh_faces_data(Menu):
layout.operator("mesh.uvs_reverse")
scene = context.scene
- if scene.lanpr.enabled or scene.render.engine=="BLENDER_LANPR":
+ if with_freestyle or scene.lanpr.enabled or scene.render.engine=="BLENDER_LANPR":
layout.separator()
layout.operator("mesh.mark_freestyle_face").clear = False
layout.operator("mesh.mark_freestyle_face", text="Clear Freestyle Face").clear = True
More information about the Bf-blender-cvs
mailing list