[Bf-blender-cvs] [0706b410bd0] blender2.8: UI: use same "Viewport Display" name for scene/object/material panels.

[Brecht Van Lommel]

Commit: 0706b410bd05cf9448e00b55e59e48a56682f84d
Author: Brecht Van Lommel
Date:   Fri Jun 1 16:07:25 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB0706b410bd05cf9448e00b55e59e48a56682f84d

UI: use same "Viewport Display" name for scene/object/material panels.

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

M	release/scripts/startup/bl_ui/properties_material.py
M	release/scripts/startup/bl_ui/properties_object.py
M	source/blender/makesrna/intern/rna_object.c

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

diff --git a/release/scripts/startup/bl_ui/properties_material.py b/release/scripts/startup/bl_ui/properties_material.py
index 6876cf65cb6..369772f7258 100644
--- a/release/scripts/startup/bl_ui/properties_material.py
+++ b/release/scripts/startup/bl_ui/properties_material.py
@@ -215,7 +215,7 @@ class EEVEE_MATERIAL_PT_options(MaterialButtonsPanel, Panel):
 
 
 class MATERIAL_PT_viewport(MaterialButtonsPanel, Panel):
-    bl_label = "Viewport"
+    bl_label = "Viewport Display"
     bl_context = "material"
     bl_options = {'DEFAULT_CLOSED'}
 
diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py
index 54b647f5b66..6486fbf0d63 100644
--- a/release/scripts/startup/bl_ui/properties_object.py
+++ b/release/scripts/startup/bl_ui/properties_object.py
@@ -199,7 +199,7 @@ class OBJECT_PT_collections(ObjectButtonsPanel, Panel):
 
 
 class OBJECT_PT_display(ObjectButtonsPanel, Panel):
-    bl_label = "Display"
+    bl_label = "Viewport Display"
     bl_options = {'DEFAULT_CLOSED'}
 
     def draw(self, context):
@@ -252,11 +252,6 @@ class OBJECT_PT_display(ObjectButtonsPanel, Panel):
             # Only useful with object having faces/materials...
             col.prop(obj, "color")
 
-        col = layout.column(align=True)
-        col.active = bool(is_dupli or obj.particle_systems)
-        col.prop(obj, "show_duplicator_for_viewport")
-        col.prop(obj, "show_duplicator_for_render")
-
 
 class OBJECT_PT_duplication(ObjectButtonsPanel, Panel):
     bl_label = "Duplication"
@@ -296,6 +291,13 @@ class OBJECT_PT_duplication(ObjectButtonsPanel, Panel):
         elif ob.dupli_type == 'COLLECTION':
             layout.prop(ob, "dupli_group", text="Collection")
 
+        if ob.dupli_type != 'NONE' or len(ob.particle_systems):
+            layout.separator()
+
+            col = layout.column(align=True)
+            col.prop(ob, "show_duplicator_for_viewport")
+            col.prop(ob, "show_duplicator_for_render")
+
 
 from .properties_animviz import (
     MotionPathButtonsPanel,
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 114f8e42006..10a31c9c070 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -2291,7 +2291,7 @@ static void rna_def_object(BlenderRNA *brna)
 
 	prop = RNA_def_property(srna, "show_duplicator_for_viewport", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "duplicator_visibility_flag", OB_DUPLI_FLAG_VIEWPORT);
-	RNA_def_property_ui_text(prop, "Show Duplicator", "Make duplicator visible in the viewport");
+	RNA_def_property_ui_text(prop, "Display Duplicator", "Make duplicator visible in the viewport");
 
 	prop = RNA_def_property(srna, "is_visible", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_funcs(prop, "rna_Object_is_visible_get", NULL);