[Bf-blender-cvs] [bdb5cc17779] hair_object: Shorter name for hair edit settings property.

[Lukas Tönne]

Commit: bdb5cc177794f5563dd70bc29e02b99ade71fbbc
Author: Lukas Tönne
Date:   Sat Dec 1 11:10:01 2018 +0000
Branches: hair_object
https://developer.blender.org/rBbdb5cc177794f5563dd70bc29e02b99ade71fbbc

Shorter name for hair edit settings property.

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

M	release/scripts/startup/bl_ui/space_view3d.py
M	source/blender/draw/modes/edit_hair_mode.c
M	source/blender/editors/hair/edithair_select.c
M	source/blender/editors/space_view3d/view3d_iterators.c
M	source/blender/makesdna/DNA_scene_types.h
M	source/blender/makesrna/intern/rna_scene.c
M	source/blender/makesrna/intern/rna_sculpt_paint.c

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

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 04d665d1b87..d1c953d5783 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -62,8 +62,8 @@ class VIEW3D_HT_header(Header):
             # Hair edit
             if object_mode == 'EDIT' and obj.type == 'HAIR':
                 row = layout.row()
-                row.prop(tool_settings.hair_edit_settings, "select_mode", text="")
-                row.prop(tool_settings.hair_edit_settings, "follicle_draw_mode", text="")
+                row.prop(tool_settings.hair_edit, "select_mode", text="")
+                row.prop(tool_settings.hair_edit, "follicle_draw_mode", text="")
 
         # Grease Pencil
         if obj and obj.type == 'GPENCIL' and context.gpencil_data:
diff --git a/source/blender/draw/modes/edit_hair_mode.c b/source/blender/draw/modes/edit_hair_mode.c
index 91ee41050cc..bc27e648362 100644
--- a/source/blender/draw/modes/edit_hair_mode.c
+++ b/source/blender/draw/modes/edit_hair_mode.c
@@ -215,7 +215,7 @@ static void EDIT_HAIR_cache_populate(void *vedata, Object *ob)
 	const DRWContextState *draw_ctx = DRW_context_state_get();
 	Scene *scene = draw_ctx->scene;
 	Object *obedit = draw_ctx->object_edit;
-	HairEditSettings *editsettings = &scene->toolsettings->hair_edit_settings;
+	HairEditSettings *editsettings = &scene->toolsettings->hair_edit;
 
 	UNUSED_VARS(psl);
 
diff --git a/source/blender/editors/hair/edithair_select.c b/source/blender/editors/hair/edithair_select.c
index 871112a966a..c814df1fa6a 100644
--- a/source/blender/editors/hair/edithair_select.c
+++ b/source/blender/editors/hair/edithair_select.c
@@ -109,7 +109,7 @@ static int hair_select_all_exec(bContext *C, wmOperator *op)
 	int action = RNA_enum_get(op->ptr, "action");
 
 	if (action == SEL_TOGGLE) {
-		switch (settings->hair_edit_settings.select_mode) {
+		switch (settings->hair_edit.select_mode) {
 			case HAIR_SELECT_FOLLICLES: {
 				action = hair_has_selected_follicles(edit) ? SEL_DESELECT : SEL_SELECT;
 				break;
@@ -125,7 +125,7 @@ static int hair_select_all_exec(bContext *C, wmOperator *op)
 		}
 	}
 
-	switch (settings->hair_edit_settings.select_mode) {
+	switch (settings->hair_edit.select_mode) {
 		case HAIR_SELECT_FOLLICLES: {
 			HairFollicle *follicle;
 			HairIterator iter;
diff --git a/source/blender/editors/space_view3d/view3d_iterators.c b/source/blender/editors/space_view3d/view3d_iterators.c
index cb26af598a5..2636701a97f 100644
--- a/source/blender/editors/space_view3d/view3d_iterators.c
+++ b/source/blender/editors/space_view3d/view3d_iterators.c
@@ -404,7 +404,7 @@ void hair_foreachScreenVert(
             const float screen_co[2]),
         void *userData, const eV3DProjTest clip_flag)
 {
-	HairEditSettings *edit_settings = &vc->scene->toolsettings->hair_edit_settings;
+	HairEditSettings *edit_settings = &vc->scene->toolsettings->hair_edit;
 	Object *obedit = vc->obedit;
 	HairSystem *hsys = obedit->data;
 	EditHair *edit = hsys->edithair;
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 0ac5e786e07..f4d19621925 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1347,7 +1347,7 @@ typedef struct ToolSettings {
 	struct ParticleEditSettings particle;
 
 	/* Hair Editing */
-	struct HairEditSettings hair_edit_settings;
+	struct HairEditSettings hair_edit;
 
 	/* Transform Proportional Area of Effect */
 	float proportional_size;
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 4c86a89f596..0e2f8bac5e8 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -2312,9 +2312,9 @@ static void rna_def_tool_settings(BlenderRNA  *brna)
 	RNA_def_property_pointer_sdna(prop, NULL, "particle");
 	RNA_def_property_ui_text(prop, "Particle Edit", "");
 
-	prop = RNA_def_property(srna, "hair_edit_settings", PROP_POINTER, PROP_NONE);
+	prop = RNA_def_property(srna, "hair_edit", PROP_POINTER, PROP_NONE);
 	RNA_def_property_struct_type(prop, "HairEditSettings");
-	RNA_def_property_ui_text(prop, "Hair Edit Settings", "");
+	RNA_def_property_ui_text(prop, "Hair Edit", "");
 
 	prop = RNA_def_property(srna, "use_uv_sculpt", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "use_uv_sculpt", 1);
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c
index 3665d4a38c4..01fec1b84d8 100644
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@ -273,7 +273,7 @@ static char *rna_ParticleEdit_path(PointerRNA *UNUSED(ptr))
 
 static char *rna_HairEditSettings_path(PointerRNA *UNUSED(ptr))
 {
-	return BLI_strdup("tool_settings.hair_edit_settings");
+	return BLI_strdup("tool_settings.hair_edit");
 }
 
 static void rna_HairEditSettings_update(bContext *C, PointerRNA *UNUSED(ptr))