diff options
Diffstat (limited to 'release/scripts')
| -rw-r--r-- | release/scripts/startup/bl_operators/freestyle.py | 4 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_data_modifier.py | 6 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 6 |
3 files changed, 5 insertions, 11 deletions
diff --git a/release/scripts/startup/bl_operators/freestyle.py b/release/scripts/startup/bl_operators/freestyle.py index b86c6eba5a9..baac3556fb2 100644 --- a/release/scripts/startup/bl_operators/freestyle.py +++ b/release/scripts/startup/bl_operators/freestyle.py @@ -148,7 +148,7 @@ class SCENE_OT_freestyle_add_edge_marks_to_keying_set(bpy.types.Operator): scene = context.scene ks = scene.keying_sets.active if ks is None: - ks = scene.keying_sets.new(idname="LanprEdgeMarkKeyingSet", name="Freestyle Edge Mark Keying Set") + ks = scene.keying_sets.new(idname="FreestyleEdgeMarkKeyingSet", name="Freestyle Edge Mark Keying Set") ks.bl_description = "" # add data paths to the keying set ob = context.active_object @@ -179,7 +179,7 @@ class SCENE_OT_freestyle_add_face_marks_to_keying_set(bpy.types.Operator): scene = context.scene ks = scene.keying_sets.active if ks is None: - ks = scene.keying_sets.new(idname="LanprFaceMarkKeyingSet", name="Freestyle Face Mark Keying Set") + ks = scene.keying_sets.new(idname="FreestyleFaceMarkKeyingSet", name="Freestyle Face Mark Keying Set") ks.bl_description = "" # add data paths to the keying set ob = context.active_object diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index 2b7e9e785a7..124fe77cb52 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -1641,12 +1641,6 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): col.prop(md, "thresh", text="Threshold") col.prop(md, "face_influence") - def FEATURE_LINE(self, layout, _ob, _md): - if not (bpy.context.scene.render.engine == "BLENDER_LANPR" or bpy.context.scene.lanpr.enabled): - layout.label(text="LANPR is disabled.") - else: - layout.label(text="Settings are inside the LANPR tab.") - class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel): bl_label = "Modifiers" diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 2c34c8cbafe..6732f8fcc68 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -3462,11 +3462,11 @@ class VIEW3D_MT_edit_mesh_context_menu(Menu): col.operator("mesh.mark_sharp") col.operator("mesh.mark_sharp", text="Clear Sharp").clear = True - if scene.lanpr.enabled or render.engine=="BLENDER_LANPR": + if render.use_freestyle or scene.lanpr.enabled or render.engine=="BLENDER_LANPR": col.separator() - col.operator("mesh.mark_lanpr_edge").clear = False - col.operator("mesh.mark_lanpr_edge", text="Clear Freestyle Edge").clear = True + col.operator("mesh.mark_freestyle_edge").clear = False + col.operator("mesh.mark_freestyle_edge", text="Clear Freestyle Edge").clear = True col.separator() |