Commit: 1b686ca61ab1cd3497a264c60b6e7b8e7f409953
Author: Lukas Tönne
Date: Thu Jan 8 13:10:51 2015 +0100
Branches: temp_hair_flow
https://developer.blender.org/rB1b686ca61ab1cd3497a264c60b6e7b8e7f409953
Revert "New `mode` enum for hair edit mode to toggle between direct mesh-style"
This reverts commit b29a6f1c5b4badd4dfe8c50b6925e7e18fdf350f.
===================================================================
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/makesdna/DNA_scene_types.h
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 cd6400c..1374bf9 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -51,10 +51,7 @@ class VIEW3D_HT_header(Header):
if mode == 'PARTICLE_EDIT':
row.prop(toolsettings.particle_edit, "select_mode", text="",
expand=True)
elif mode == 'HAIR_EDIT':
- hair_edit = toolsettings.hair_edit
- row.prop(hair_edit, "mode", text="")
- if hair_edit.mode == 'MESH':
- row.prop(toolsettings.hair_edit, "select_mode", text="",
expand=True)
+ row.prop(toolsettings.hair_edit, "select_mode", text="",
expand=True)
# Occlude geometry
if ((view.viewport_shade not in {'BOUNDBOX', 'WIREFRAME'} and
(mode == 'PARTICLE_EDIT' or (mode == 'EDIT' and obj.type == 'MESH'))) or
@@ -165,12 +162,8 @@ class VIEW3D_MT_editor_menus(Menu):
elif obj:
if mode_string not in {'PAINT_TEXTURE'}:
layout.menu("VIEW3D_MT_%s" % mode_string.lower())
- if mode_string in {'SCULPT', 'PAINT_VERTEX', 'PAINT_WEIGHT',
'PAINT_TEXTURE'}:
+ if mode_string in {'SCULPT', 'PAINT_VERTEX', 'PAINT_WEIGHT',
'PAINT_TEXTURE', 'HAIR'}:
layout.menu("VIEW3D_MT_brush")
- if mode_string == 'HAIR':
- hair_edit = context.tool_settings.hair_edit
- if hair_edit.mode == 'MESH':
- layout.menu("VIEW3D_MT_brush")
if mode_string == 'SCULPT':
layout.menu("VIEW3D_MT_hide_mask")
else:
diff --git a/source/blender/makesdna/DNA_scene_types.h
b/source/blender/makesdna/DNA_scene_types.h
index b2cc043..890fb50 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -889,11 +889,6 @@ typedef struct ParticleEditSettings {
/* ------------------------------------------- */
/* Hair Edit */
-typedef enum HairEditMode {
- HAIR_EDIT_MESH = 0, /* use mesh-based editing */
- HAIR_EDIT_FLOW = 1, /* use flow field construction */
-} HairEditMode;
-
/* HairEditSettings->select_mode */
typedef enum HairEditSelectMode {
HAIR_SELECT_STRAND = 0,
@@ -908,9 +903,7 @@ typedef enum HairEditFlag {
typedef struct HairEditSettings {
int flag;
- int mode;
int select_mode;
- int pad;
struct Brush *brush;
struct Object *shape_object;
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c
b/source/blender/makesrna/intern/rna_sculpt_paint.c
index e22e073..4e31045 100644
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@ -993,14 +993,8 @@ static void rna_def_hair_edit(BlenderRNA *brna)
StructRNA *srna;
PropertyRNA *prop;
- static EnumPropertyItem mode_items[] = {
- {HAIR_EDIT_MESH, "MESH", ICON_MESH_DATA, "Mesh", "Strand edit
mode"},
- {HAIR_EDIT_FLOW, "FLOW", ICON_SURFACE_DATA, "Flow", "Flow edit
mode"},
- {0, NULL, 0, NULL, NULL}
- };
-
static EnumPropertyItem select_mode_items[] = {
- {HAIR_SELECT_STRAND, "STRAND", ICON_PARTICLE_PATH, "Strand",
"Strand select mode"},
+ {HAIR_SELECT_STRAND, "STRAND", ICON_PARTICLE_PATH, "Strand",
"Strand edit mode"},
{HAIR_SELECT_VERTEX, "VERTEX", ICON_PARTICLE_POINT, "Vertex",
"Vertex select mode"},
{HAIR_SELECT_TIP, "TIP", ICON_PARTICLE_TIP, "Tip", "Tip select
mode"},
{0, NULL, 0, NULL, NULL}
@@ -1017,12 +1011,6 @@ 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, "mode", PROP_ENUM, PROP_NONE);
- RNA_def_property_enum_bitflag_sdna(prop, NULL, "mode");
- RNA_def_property_enum_items(prop, mode_items);
- RNA_def_property_ui_text(prop, "Mode", "Hair editing mode");
- RNA_def_property_update(prop, NC_OBJECT | ND_DRAW,
"rna_HairEdit_update");
-
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]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
