[Bf-blender-cvs] [554ae0bd052] lanpr-under-gp: LANPR: UI name fixes.

[YimingWu]

Commit: 554ae0bd0524290cc66e52c2eb584a1b681d555a
Author: YimingWu
Date:   Sat Jun 27 16:11:52 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rB554ae0bd0524290cc66e52c2eb584a1b681d555a

LANPR: UI name fixes.

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

M	release/scripts/startup/bl_ui/properties_collection.py
M	source/blender/editors/include/ED_lineart.h
M	source/blender/makesrna/intern/rna_collection.c
M	source/blender/makesrna/intern/rna_object.c
M	source/blender/makesrna/intern/rna_scene.c

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

diff --git a/release/scripts/startup/bl_ui/properties_collection.py b/release/scripts/startup/bl_ui/properties_collection.py
index 7a9929c032f..88d12899910 100644
--- a/release/scripts/startup/bl_ui/properties_collection.py
+++ b/release/scripts/startup/bl_ui/properties_collection.py
@@ -62,7 +62,7 @@ class COLLECTION_PT_collection_flags(CollectionButtonsPanel, Panel):
         col.prop(collection,"hide_render")
 
 class COLLECTION_PT_lineart_collection(CollectionButtonsPanel, Panel):
-    bl_label = "Collection LRT"
+    bl_label = "Collection Line Art"
     COMPAT_ENGINES =  { 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', 'CYCLES' }
 
     @classmethod
diff --git a/source/blender/editors/include/ED_lineart.h b/source/blender/editors/include/ED_lineart.h
index 3fb9625ec1b..059d82167d6 100644
--- a/source/blender/editors/include/ED_lineart.h
+++ b/source/blender/editors/include/ED_lineart.h
@@ -25,7 +25,7 @@
 #define __ED_LRT_H__
 
 #ifndef WITH_LINEART
-#  error LRT code included in non-LRT-enabled build
+#  error Lineart code included in non-Lineart-enabled build
 #endif
 
 #include "BLI_linklist.h"
diff --git a/source/blender/makesrna/intern/rna_collection.c b/source/blender/makesrna/intern/rna_collection.c
index 605708d9f66..45a4da2d4e4 100644
--- a/source/blender/makesrna/intern/rna_collection.c
+++ b/source/blender/makesrna/intern/rna_collection.c
@@ -417,7 +417,7 @@ static void rna_def_collection_lineart(BlenderRNA *brna)
   StructRNA *srna;
 
   srna = RNA_def_struct(brna, "CollectionLineartLineType", NULL);
-  RNA_def_struct_ui_text(srna, "Collection LRT Line Type", "Collection lineart line type");
+  RNA_def_struct_ui_text(srna, "Collection Line Art Line Type", "Collection lineart line type");
   RNA_def_struct_sdna(srna, "CollectionLineartLineType");
 
   prop = RNA_def_property(srna, "use", PROP_BOOLEAN, PROP_NONE);
@@ -454,7 +454,7 @@ static void rna_def_collection_lineart(BlenderRNA *brna)
 
   srna = RNA_def_struct(brna, "CollectionLineart", NULL);
   RNA_def_struct_sdna(srna, "CollectionLineart");
-  RNA_def_struct_ui_text(srna, "Collection LRT Usage", "LRT usage for this collection");
+  RNA_def_struct_ui_text(srna, "Collection Line Art Usage", "LRT usage for this collection");
   RNA_def_property_update(prop, NC_SCENE, NULL);
 
   prop = RNA_def_property(srna, "usage", PROP_ENUM, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index d3e592ce6de..2b39281d8eb 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -2555,7 +2555,7 @@ static void rna_def_object_lineart(BlenderRNA *brna)
   PropertyRNA *prop;
 
   srna = RNA_def_struct(brna, "ObjectLineartLineType", NULL);
-  RNA_def_struct_ui_text(srna, "Object LRT Line Type", "Object lineart line type");
+  RNA_def_struct_ui_text(srna, "Object Line Art Line Type", "Object lineart line type");
   RNA_def_struct_sdna(srna, "ObjectLineartLineType");
 
   prop = RNA_def_property(srna, "use", PROP_BOOLEAN, PROP_NONE);
@@ -2595,7 +2595,7 @@ static void rna_def_object_lineart(BlenderRNA *brna)
   };
 
   srna = RNA_def_struct(brna, "ObjectLineart", NULL);
-  RNA_def_struct_ui_text(srna, "Object LRT", "Object lineart settings");
+  RNA_def_struct_ui_text(srna, "Object Line Art", "Object lineart settings");
   RNA_def_struct_sdna(srna, "ObjectLineart");
 
   prop = RNA_def_property(srna, "usage", PROP_ENUM, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 8eff018900f..7a02c4e75d8 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -7334,15 +7334,6 @@ static void rna_def_scene_lineart(BlenderRNA *brna)
   StructRNA *srna;
   PropertyRNA *prop;
 
-  static const EnumPropertyItem rna_enum_lineart_gpu_cache_size[] = {
-      {LRT_GPU_CACHE_SIZE_512, "S512", 0, "512", "512px texture as cache"},
-      {LRT_GPU_CACHE_SIZE_1K, "S1K", 0, "1K", "1K px texture as cache"},
-      {LRT_GPU_CACHE_SIZE_2K, "S2K", 0, "2K", "2K px texture as cache"},
-      {LRT_GPU_CACHE_SIZE_4K, "S4K", 0, "4K", "4K px texture as cache"},
-      {LRT_GPU_CACHE_SIZE_8K, "S8K", 0, "8K", "8K px texture as cache"},
-      {LRT_GPU_CACHE_SIZE_16K, "S16K", 0, "16K", "16K px texture as cache"},
-      {0, NULL, 0, NULL, NULL}};
-
   srna = RNA_def_struct(brna, "SceneLineart", NULL);
   RNA_def_struct_sdna(srna, "SceneLineart");
   RNA_def_struct_ui_text(srna, "Scene Line Art Config", "Line Art global config");