Commit: 5a7efaf2877c3c9763135bb955e77aa00306f94a
Author: Lukas Tönne
Date: Wed Jul 27 09:50:45 2016 +0200
Branches: strand_editmode strand_nodes
https://developer.blender.org/rB5a7efaf2877c3c9763135bb955e77aa00306f94a
Added "show_brush" option for hair edit settings, expected by common paint UI.
This setting has no effect yet for hair editing, but the UI script expects it.
===================================================================
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesrna/intern/rna_sculpt_paint.c
===================================================================
diff --git a/source/blender/makesdna/DNA_scene_types.h
b/source/blender/makesdna/DNA_scene_types.h
index fdda180..64f4a0a 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1053,6 +1053,7 @@ typedef enum HairEditSelectMode {
/* HairEditSettings->flag */
typedef enum HairEditFlag {
+ HAIR_EDIT_SHOW_BRUSH = (1 << 0),
HAIR_EDIT_SHOW_DEBUG = (1 << 16),
} HairEditFlag;
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c
b/source/blender/makesrna/intern/rna_sculpt_paint.c
index 4beaed7..b16e0e5 100644
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@ -1105,6 +1105,11 @@ static void rna_def_hair_edit(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Brush", "Active Brush");
RNA_def_property_update(prop, 0, "rna_HairEdit_brush_update");
+ prop = RNA_def_property(srna, "show_brush", PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "flag", HAIR_EDIT_SHOW_BRUSH);
+ RNA_def_property_ui_text(prop, "Show Brush", "");
+ RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL);
+
prop = RNA_def_property(srna, "select_mode", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_bitflag_sdna(prop, NULL, "select_mode");
RNA_def_property_enum_items(prop, select_mode_items);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
