[Bf-blender-cvs] [dec9349a75b] modifier-panels-ui: UI: Rename Cast Type to Shape

[William Reynish]

Commit: dec9349a75b99193bf960c4a66d9c3603f5e37b7
Author: William Reynish
Date:   Sat Apr 18 19:25:29 2020 +0200
Branches: modifier-panels-ui
https://developer.blender.org/rBdec9349a75b99193bf960c4a66d9c3603f5e37b7

UI: Rename Cast Type to Shape

Clearer naming

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

M	source/blender/makesrna/intern/rna_modifier.c
M	source/blender/modifiers/intern/MOD_cast.c

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

diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 1ff8afed00f..e776ae23774 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -3271,7 +3271,7 @@ static void rna_def_modifier_cast(BlenderRNA *brna)
   prop = RNA_def_property(srna, "cast_type", PROP_ENUM, PROP_NONE);
   RNA_def_property_enum_sdna(prop, NULL, "type");
   RNA_def_property_enum_items(prop, prop_cast_type_items);
-  RNA_def_property_ui_text(prop, "Cast Type", "Target object shape");
+  RNA_def_property_ui_text(prop, "Shape", "Target object shape");
   RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
   prop = RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE);
diff --git a/source/blender/modifiers/intern/MOD_cast.c b/source/blender/modifiers/intern/MOD_cast.c
index 40fc4af9b50..ac110dec3de 100644
--- a/source/blender/modifiers/intern/MOD_cast.c
+++ b/source/blender/modifiers/intern/MOD_cast.c
@@ -543,10 +543,10 @@ static void panel_draw(const bContext *C, Panel *panel)
   bool has_vertex_group = RNA_string_length(&ptr, "vertex_group") != 0;
   PointerRNA cast_object_ptr = RNA_pointer_get(&ptr, "object");
 
-  uiItemR(layout, &ptr, "cast_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
-
   uiLayoutSetPropSep(layout, true);
 
+  uiItemR(layout, &ptr, "cast_type", 0, NULL, ICON_NONE);
+
   row = uiLayoutRowWithHeading(layout, true, IFACE_("Axis"));
   uiItemR(row, &ptr, "use_x", toggles_flag, NULL, ICON_NONE);
   uiItemR(row, &ptr, "use_y", toggles_flag, NULL, ICON_NONE);