[Bf-blender-cvs] [3aab7537e84] hair_guides: Remove the new hair edit mode.
Lukas Tönne
noreply at git.blender.org
Thu Nov 9 20:26:10 CET 2017
Commit: 3aab7537e84c459566b6b5fd0d0a082807a67a30
Author: Lukas Tönne
Date: Thu Nov 9 08:24:32 2017 +0000
Branches: hair_guides
https://developer.blender.org/rB3aab7537e84c459566b6b5fd0d0a082807a67a30
Remove the new hair edit mode.
The purpose of this branch is to create a new hair system with a dedicated
grooming tool, unlike the current direct editing of hair guide curves.
The modified bmesh-based strand edit mode is quite complex and distracts
from the main purpose of the branch, so its better to remove it for now
and implement a new tool.
===================================================================
M build_files/cmake/macros.cmake
D release/datafiles/brushicons/hairadd.png
D release/datafiles/brushicons/haircomb.png
D release/datafiles/brushicons/haircut.png
D release/datafiles/brushicons/hairlength.png
D release/datafiles/brushicons/hairpuff.png
D release/datafiles/brushicons/hairsmooth.png
D release/datafiles/brushicons/hairweight.png
M release/scripts/startup/bl_operators/wm.py
M release/scripts/startup/bl_ui/properties_paint_common.py
M release/scripts/startup/bl_ui/space_view3d.py
M release/scripts/startup/bl_ui/space_view3d_toolbar.py
M source/blender/blenkernel/BKE_context.h
M source/blender/blenkernel/BKE_customdata.h
D source/blender/blenkernel/BKE_editstrands.h
M source/blender/blenkernel/CMakeLists.txt
M source/blender/blenkernel/intern/brush.c
M source/blender/blenkernel/intern/context.c
M source/blender/blenkernel/intern/customdata.c
D source/blender/blenkernel/intern/editstrands.c
M source/blender/blenkernel/intern/object.c
M source/blender/blenkernel/intern/particle.c
M source/blender/blenkernel/intern/scene.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/writefile.c
M source/blender/bmesh/CMakeLists.txt
M source/blender/bmesh/bmesh.h
M source/blender/bmesh/intern/bmesh_interp.c
M source/blender/bmesh/intern/bmesh_interp.h
M source/blender/bmesh/intern/bmesh_iterators_inline.h
M source/blender/bmesh/intern/bmesh_mesh_conv.c
M source/blender/bmesh/intern/bmesh_mesh_conv.h
M source/blender/bmesh/intern/bmesh_operators_private.h
D source/blender/bmesh/intern/bmesh_strands.c
D source/blender/bmesh/intern/bmesh_strands.h
D source/blender/bmesh/intern/bmesh_strands_conv.c
D source/blender/bmesh/intern/bmesh_strands_conv.h
M source/blender/draw/CMakeLists.txt
M source/blender/draw/engines/eevee/eevee_materials.c
M source/blender/draw/intern/draw_cache.c
M source/blender/draw/intern/draw_cache.h
M source/blender/draw/intern/draw_cache_impl.h
D source/blender/draw/intern/draw_cache_impl_strands.c
M source/blender/draw/intern/draw_manager.c
M source/blender/draw/modes/draw_mode_engines.h
D source/blender/draw/modes/edit_strands_mode.c
M source/blender/draw/modes/object_mode.c
D source/blender/draw/modes/shaders/edit_strands_vert.glsl
M source/blender/editors/CMakeLists.txt
M source/blender/editors/armature/armature_utils.c
M source/blender/editors/curve/editcurve.c
M source/blender/editors/curve/editfont_undo.c
M source/blender/editors/datafiles/CMakeLists.txt
D source/blender/editors/hair/CMakeLists.txt
D source/blender/editors/hair/SConscript
D source/blender/editors/hair/hair_cursor.c
D source/blender/editors/hair/hair_edit.c
D source/blender/editors/hair/hair_intern.h
D source/blender/editors/hair/hair_mirror.c
D source/blender/editors/hair/hair_object_mesh.c
D source/blender/editors/hair/hair_object_particles.c
D source/blender/editors/hair/hair_ops.c
D source/blender/editors/hair/hair_select.c
D source/blender/editors/hair/hair_stroke.c
D source/blender/editors/hair/hair_undo.c
M source/blender/editors/include/ED_datafiles.h
M source/blender/editors/include/ED_physics.h
M source/blender/editors/include/ED_util.h
M source/blender/editors/include/UI_icons.h
M source/blender/editors/interface/interface_icons.c
M source/blender/editors/mesh/editmesh_undo.c
M source/blender/editors/metaball/mball_edit.c
M source/blender/editors/object/CMakeLists.txt
M source/blender/editors/object/object_edit.c
D source/blender/editors/object/object_hair.c
M source/blender/editors/object/object_intern.h
M source/blender/editors/object/object_lattice.c
M source/blender/editors/object/object_ops.c
M source/blender/editors/screen/screen_context.c
M source/blender/editors/sculpt_paint/paint_ops.c
M source/blender/editors/space_api/spacetypes.c
M source/blender/editors/space_view3d/CMakeLists.txt
M source/blender/editors/space_view3d/drawobject.c
D source/blender/editors/space_view3d/drawstrands.c
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/editors/space_view3d/view3d_header.c
M source/blender/editors/space_view3d/view3d_intern.h
M source/blender/editors/space_view3d/view3d_select.c
M source/blender/editors/transform/transform.h
M source/blender/editors/transform/transform_conversions.c
M source/blender/editors/transform/transform_generics.c
M source/blender/editors/transform/transform_orientations.c
M source/blender/editors/util/ed_util.c
M source/blender/editors/util/editmode_undo.c
M source/blender/editors/util/undo.c
M source/blender/makesdna/DNA_brush_types.h
M source/blender/makesdna/DNA_customdata_types.h
M source/blender/makesdna/DNA_mesh_types.h
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/makesdna/DNA_object_types.h
M source/blender/makesdna/DNA_particle_types.h
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesrna/RNA_enum_types.h
M source/blender/makesrna/intern/rna_brush.c
M source/blender/makesrna/intern/rna_context.c
M source/blender/makesrna/intern/rna_object.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/makesrna/intern/rna_sculpt_paint.c
M source/blender/modifiers/intern/MOD_hair.c
D source/blender/physics/BPH_strands.h
M source/blender/physics/CMakeLists.txt
M source/blender/physics/intern/eigen_utils.h
M source/blender/physics/intern/implicit.h
M source/blender/physics/intern/implicit_blender.c
M source/blender/physics/intern/implicit_eigen.cpp
D source/blender/physics/intern/strands.cpp
M source/blender/windowmanager/WM_types.h
===================================================================
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 2a86f8136de..cdc63ef8fba 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -590,7 +590,6 @@ function(SETUP_BLENDER_SORTED_LIBS)
bf_editor_object
bf_editor_armature
bf_editor_physics
- bf_editor_hair
bf_editor_render
bf_editor_scene
bf_editor_screen
diff --git a/release/datafiles/brushicons/hairadd.png b/release/datafiles/brushicons/hairadd.png
deleted file mode 100644
index 074111a5a0b..00000000000
Binary files a/release/datafiles/brushicons/hairadd.png and /dev/null differ
diff --git a/release/datafiles/brushicons/haircomb.png b/release/datafiles/brushicons/haircomb.png
deleted file mode 100644
index 074111a5a0b..00000000000
Binary files a/release/datafiles/brushicons/haircomb.png and /dev/null differ
diff --git a/release/datafiles/brushicons/haircut.png b/release/datafiles/brushicons/haircut.png
deleted file mode 100644
index 074111a5a0b..00000000000
Binary files a/release/datafiles/brushicons/haircut.png and /dev/null differ
diff --git a/release/datafiles/brushicons/hairlength.png b/release/datafiles/brushicons/hairlength.png
deleted file mode 100644
index 074111a5a0b..00000000000
Binary files a/release/datafiles/brushicons/hairlength.png and /dev/null differ
diff --git a/release/datafiles/brushicons/hairpuff.png b/release/datafiles/brushicons/hairpuff.png
deleted file mode 100644
index 074111a5a0b..00000000000
Binary files a/release/datafiles/brushicons/hairpuff.png and /dev/null differ
diff --git a/release/datafiles/brushicons/hairsmooth.png b/release/datafiles/brushicons/hairsmooth.png
deleted file mode 100644
index 074111a5a0b..00000000000
Binary files a/release/datafiles/brushicons/hairsmooth.png and /dev/null differ
diff --git a/release/datafiles/brushicons/hairweight.png b/release/datafiles/brushicons/hairweight.png
deleted file mode 100644
index 074111a5a0b..00000000000
Binary files a/release/datafiles/brushicons/hairweight.png and /dev/null differ
diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py
index 6e3235ee186..20586b727d5 100644
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@ -163,7 +163,6 @@ class BRUSH_OT_active_index_set(Operator):
"vertex_paint": "use_paint_vertex",
"weight_paint": "use_paint_weight",
"image_paint": "use_paint_image",
- "hair_edit": "use_hair_edit",
}
def execute(self, context):
diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py
index 1e6f9b0c776..bc8bc523e12 100644
--- a/release/scripts/startup/bl_ui/properties_paint_common.py
+++ b/release/scripts/startup/bl_ui/properties_paint_common.py
@@ -38,10 +38,10 @@ class UnifiedPaintPanel:
elif context.image_paint_object:
if (toolsettings.image_paint and toolsettings.image_paint.detect_data()):
return toolsettings.image_paint
+
+ return None
elif context.particle_edit_object:
return toolsettings.particle_edit
- elif context.hair_edit_object:
- return toolsettings.hair_edit
return None
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 77af655422c..d449dd20c3e 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -52,12 +52,6 @@ class VIEW3D_HT_header(Header):
# Particle edit
if mode == 'PARTICLE_EDIT':
row.prop(toolsettings.particle_edit, "select_mode", text="", expand=True)
- elif mode == 'HAIR_EDIT':
- row.prop(toolsettings.hair_edit, "select_mode", text="", expand=True)
- row.prop(toolsettings.hair_edit, "hair_draw_mode", text="", expand=True)
- if toolsettings.hair_edit.hair_draw_mode == 'FIBERS':
- row.prop(toolsettings.hair_edit, "hair_draw_size", text="Size")
- row.prop(toolsettings.hair_edit, "hair_draw_subdivision", text="Subdivide")
# Occlude geometry
if ((view.viewport_shade not in {'BOUNDBOX', 'WIREFRAME'} and (mode == 'PARTICLE_EDIT' or (mode == 'EDIT' and obj.type == 'MESH'))) or
@@ -178,7 +172,7 @@ class VIEW3D_MT_editor_menus(Menu):
layout.menu("VIEW3D_MT_select_paint_mask")
elif mesh.use_paint_mask_vertex and mode_string in {'PAINT_WEIGHT', 'PAINT_VERTEX'}:
layout.menu("VIEW3D_MT_select_paint_mask_vertex")
- elif mode_string not in {'SCULPT'}:
+ elif mode_string != 'SCULPT':
layout.menu("VIEW3D_MT_select_%s" % mode_string.lower())
if gp_edit:
@@ -203,7 +197,7 @@ class VIEW3D_MT_editor_menus(Menu):
elif obj:
if mode_string != 'PAINT_TEXTURE':
layout.menu("VIEW3D_MT_%s" % mode_string.lower())
- if mode_string in {'SCULPT', 'PAINT_VERTEX', 'PAINT_WEIGHT', 'PAINT_TEXTURE', 'HAIR'}:
+ if mode_string in {'SCULPT', 'PAINT_VERTEX', 'PAINT_WEIGHT', 'PAINT_TEXTURE'}:
layout.menu("VIEW3D_MT_brush")
if mode_string == 'SCULPT':
layout.menu("VIEW3D_MT_hide_mask")
@@ -1150,13 +1144,6 @@ class VIEW3D_MT_select_paint_mask_vertex(Menu):
layout.operator("paint.vert_select_ungrouped", text="Ungrouped Verts")
-class VIEW3D_MT_select_hair(Menu):
- bl_label = "Select"
-
- def draw(self, context):
- layout = self.layout
-
-
class VIEW3D_MT_angle_control(Menu):
bl_label = "Angle Control"
@@ -1861,7 +1848,7 @@ class VIEW3D_MT_brush(Menu):
return
# brush paint modes
- layout.menu("VIEW3D_MT_brush_object_modes")
+ layout.menu("VIEW3D_MT_brush_paint_modes")
# brush tool
if context.sculpt_object:
@@ -1871,8 +1858,6 @@ class VIEW3D_MT_brush(Menu):
layout.prop_menu_enum(brush, "image_tool")
elif context.vertex_paint_object or context.weight_paint_object:
layout.prop_menu_enum(brush, "vertex_tool")
- elif context.hair_edit_object:
- layout.prop_menu_enum(brush, "hair_tool")
# TODO: still missing a lot of brush options here
@@ -1896,7 +1881,7 @@ class VIEW3D_MT_brush(Menu):
layout.operator("sculpt.set_persistent_base")
-class VIEW3D_MT_brush_object_modes(Menu):
+class VIEW3D_MT_brush_paint_modes(Menu):
bl_label = "Enabled Modes"
def draw(self, context):
@@ -1909,7 +1894,6 @@ class VIEW3D_MT_brush_object_modes(Menu):
layout.prop(brush, "use_paint_vertex", text="Vertex Paint")
layout.prop(brush, "use_paint_weight", text="Weight Paint")
layout.prop(brush, "use_paint_image", text="Texture Paint")
- layout.prop(brush, "use_hair_edit", text="Hair Edit")
class VIEW3D_MT_paint_vertex(Menu):
@@ -2186,14 +2170,6 @@ class VIEW3D_MT_particle_specials(Menu):
class VIEW3D_MT_particle_showhide(ShowHideMenu, Menu):
_operator_name = "particle"
-# ********** Hair menu **********
-
-class VIEW3D_MT_hair(Menu):
- bl_label = "Hair"
-
- def draw(self, context):
- layout = self.layout
-
class VIEW3D_MT_pose(Menu):
bl_label = "Pose"
@@ -3893,7 +3869,6 @@ classes = (
VIEW3D_MT_select_pose,
VIEW3D_MT_select_pose_more_less,
VIEW3D_MT_select_particle,
- VIEW3D_MT_select_hair,
VIEW3D_MT_edit_mesh,
VIEW3D_MT_edit_mesh_select_similar,
VIEW3D_MT_edit_mesh_select_by_trait,
@@ -3936,7 +3911,7 @@ classes = (
VIEW3D_MT_make_links,
VIEW3D_MT_object_game,
VIEW3D_MT_brush,
- VIEW3D_MT_brush_object_modes,
+ VIEW3D_MT_brush_paint_modes,
VIEW3D_MT_paint_vertex,
VIEW3D_MT_hook,
VIEW3D_MT_vertex_group,
@@ -3946,7 +3921,6 @@ classes = (
VIEW3D_MT_particle,
VIEW3D_MT_particle_specials,
VIEW3D_MT_particle_showhide,
- VIEW3D_MT_hair,
VIEW3D_MT_pose,
VIEW3D_MT_pose_transform,
VIEW3D_MT_pose_slide,
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 268fac5b20e..134a91a8c1f 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -987,21 +987,6 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel):
layout.row().prop(brush, "puff_mode", expand=True)
layout.prop(brush, "use_puff_volume")
- # Hair Mode #
-
- elif context.hair_edit_object and brush:
- col = layout.column()
-
- row = col.row(align=True)
- self.prop_unified_size(row, context, brush, "size", slider=True, text="Radius")
- self.prop_unified_size(row, context, brush, "use_pressure_size")
-
- row = col.row(align=True)
- self.prop_unified_strength(row, context, brush, "strength", text="Strength")
- self.prop_unified_strength(row, context, brush, "use_pressure_strength")
-
- col.prop(brush, "hair_tool", text="Tool")
-
# Sculpt Mode #
elif context.sculpt_object and brush:
@@ -2027,23 +2012,6 @@ class VIEW3D_PT_tools_particlemode(View3DPanel, Panel):
sub.prop(pe, "fade_frames", slider=True)
-class VIEW3D_PT_tools_hairmode(View3DPanel, Panel):
- """Tools for hair mode"""
- bl_context = "hairmode"
- bl_label = "Options"
- bl_category = "Tools"
-
- def draw(self, context):
- layout = self.layout
-
- settings = context.tool_settings.hair_edit
- ob = context.active_object
-
- if ob.data:
- col = layout.column(align=True)
- col.prop(ob.data, "use_mirror_x")
-
-
# Grease Pencil drawing tools
class VIEW3D_PT_tools_grease_pencil_draw(GreasePencilDrawingToolsPanel, Panel):
bl_space_type = 'VIEW_3D'
diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h
index 90cc706931b..7b071dc01a5 100644
--- a/source/blender/blenke
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list