[Bf-blender-cvs] [2700d8509fb] lanpr-under-gp: LineArt: UI and property name changes

[YimingWu]

Commit: 2700d8509fb1fe74f49f6bf4d203ec5fcabab7bf
Author: YimingWu
Date:   Wed Nov 4 14:49:58 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rB2700d8509fb1fe74f49f6bf4d203ec5fcabab7bf

LineArt: UI and property name changes

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

M	release/scripts/startup/bl_ui/properties_lineart.py
M	release/scripts/startup/bl_ui/properties_render.py
M	source/blender/makesrna/intern/rna_object.c

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

diff --git a/release/scripts/startup/bl_ui/properties_lineart.py b/release/scripts/startup/bl_ui/properties_lineart.py
index 4044c2500d1..147854560e7 100644
--- a/release/scripts/startup/bl_ui/properties_lineart.py
+++ b/release/scripts/startup/bl_ui/properties_lineart.py
@@ -27,7 +27,7 @@ class LineartButtonsPanel:
 
 
 class OBJECT_PT_lineart(LineartButtonsPanel, Panel):
-    bl_label = "Line Art Settings"
+    bl_label = "Line Art"
 
     @classmethod
     def poll(cls, context):
@@ -37,10 +37,15 @@ class OBJECT_PT_lineart(LineartButtonsPanel, Panel):
     def draw(self, context):
         layout = self.layout
         lineart = context.object.lineart
+
+        layout.use_property_split = True
+
         layout.prop(lineart, 'usage')
-        layout.prop(lineart, "own_crease", text='Use Own Crease')
-        if lineart.own_crease:
-            layout.prop(lineart, "crease_threshold", slider=True)
+        layout.use_property_split = True
+
+        row = layout.row(heading="Override Crease")
+        row.prop(lineart, "use_crease_override", text="")
+        row.prop(lineart, "crease_threshold", slider=True, text="")
 
 
 classes = (
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py
index 8a80a7883d3..dc017f4ebb1 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -800,7 +800,7 @@ class RENDER_PT_lineart_extras(RenderButtonsPanel, Panel):
 
         layout.label(text="Advanced Options:")
         layout.prop(lineart, "fuzzy_everything")
-        layout.prop(lineart, "allow_duplication", text="Allow Instances")
+        layout.prop(lineart, "allow_duplication", text="Instancing")
         layout.prop(lineart, "allow_overlapping_edges")
         layout.prop(lineart, "allow_clipping_boundaries",
                     text="Show Clipping Boundaries")
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 0a725aa9535..870f315f5da 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -2644,7 +2644,7 @@ static void rna_def_object_lineart(BlenderRNA *brna)
   RNA_def_property_ui_text(prop, "Usage", "How to use this object");
   RNA_def_property_update(prop, 0, "rna_object_lineart_update");
 
-  prop = RNA_def_property(srna, "own_crease", PROP_BOOLEAN, PROP_NONE);
+  prop = RNA_def_property(srna, "use_crease_override", PROP_BOOLEAN, PROP_NONE);
   RNA_def_property_boolean_sdna(prop, NULL, "flags", OBJECT_LRT_OWN_CREASE);
   RNA_def_property_ui_text(prop, "Own Crease", "Use own crease setting to overwrite scene global");
   RNA_def_property_update(prop, 0, "rna_object_lineart_update");