[Bf-blender-cvs] [0a6dd063ef3] soc-2019-npr: LANPR: Edge/face mark UI now forllows LANPR checkbox.

[YimingWu]

Commit: 0a6dd063ef30d6654d8bb59e8bb283e8787ac4dc
Author: YimingWu
Date:   Fri Jul 19 10:23:33 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB0a6dd063ef30d6654d8bb59e8bb283e8787ac4dc

LANPR: Edge/face mark UI now forllows LANPR checkbox.

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

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 f6dec93b4b1..2e06c3e8063 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -3474,7 +3474,7 @@ 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 context.scene.lanpr.enabled:
+            if scene.lanpr.enabled or render.engine=="BLENDER_LANPR":
                 col.separator()
 
                 col.operator("mesh.mark_lanpr_edge").clear = False
@@ -3665,10 +3665,9 @@ class VIEW3D_MT_edit_mesh_edges_data(Menu):
         props.use_verts = True
         props.clear = True
 
-        if render.use_freestyle:
+        if scene.lanpr.enabled or render.engine=="BLENDER_LANPR":
             layout.separator()
 
-        #if with_freestyle:     we still presere freestyle mark functions.
             layout.operator("mesh.mark_lanpr_edge").clear = False
             layout.operator("mesh.mark_lanpr_edge", text="Clear Freestyle Edge").clear = True
 
@@ -3748,9 +3747,9 @@ class VIEW3D_MT_edit_mesh_faces_data(Menu):
         layout.operator("mesh.uvs_rotate")
         layout.operator("mesh.uvs_reverse")
 
-        layout.separator()
+        if scene.lanpr.enabled or render.engine=="BLENDER_LANPR":
+            layout.separator()
 
-        if with_freestyle:
             layout.operator("mesh.mark_lanpr_face").clear = False
             layout.operator("mesh.mark_lanpr_cface", text="Clear Freestyle Face").clear = True