[Bf-blender-cvs] [65d2374c806] strand_editmode: Merge branch 'blender2.8' into strand_editmode2.8

Lukas Tönne noreply at git.blender.org
Sun Jul 16 12:51:29 CEST 2017


Commit: 65d2374c806ecf42ccf106cd28380e7a7071f789
Author: Lukas Tönne
Date:   Sun Jul 16 11:48:39 2017 +0100
Branches: strand_editmode
https://developer.blender.org/rB65d2374c806ecf42ccf106cd28380e7a7071f789

Merge branch 'blender2.8' into strand_editmode2.8

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



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

diff --cc build_files/cmake/macros.cmake
index 9393cf691fb,836fd5f1a6b..8e3956d06ef
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@@ -580,8 -585,8 +585,9 @@@ 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
  		bf_editor_sculpt_paint
  		bf_editor_sound
diff --cc release/scripts/startup/bl_ui/space_view3d.py
index 893173e643d,28b9180bfa9..da4d7d39fc5
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -1687,8 -1700,13 +1709,13 @@@ class VIEW3D_MT_brush(Menu)
              layout.prop(ups, "use_unified_color", text="Unified Color")
          layout.separator()
  
+         # skip if no active brush
+         if not brush:
+             layout.label(text="No Brushes currently available", icon="INFO")
+             return
+ 
          # brush paint modes
 -        layout.menu("VIEW3D_MT_brush_paint_modes")
 +        layout.menu("VIEW3D_MT_brush_object_modes")
  
          # brush tool
          if context.sculpt_object:
@@@ -1698,13 -1716,7 +1725,9 @@@
              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")
  
-         # skip if no active brush
-         if not brush:
-             return
- 
          # TODO: still missing a lot of brush options here
  
          # sculpt options
@@@ -1740,8 -1752,8 +1763,9 @@@ 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")
  
+ 
  # ********** Vertex paint menu **********
  
  
@@@ -2002,14 -2016,7 +2028,15 @@@ 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
 +
+ 
  # ********** Pose Menu **********
  
  
@@@ -3748,13 -3747,142 +3767,142 @@@ class VIEW3D_PT_context_properties(Pane
              # Draw with no edit button
              rna_prop_ui.draw(self.layout, context, member, object, False)
  
- 
- def register():
-     bpy.utils.register_module(__name__)
- 
- 
- def unregister():
-     bpy.utils.unregister_module(__name__)
- 
- if __name__ == "__main__":
-     register()
+ classes = (
+     VIEW3D_HT_header,
+     VIEW3D_MT_editor_menus,
+     VIEW3D_MT_transform,
+     VIEW3D_MT_transform_base,
+     VIEW3D_MT_transform_object,
+     VIEW3D_MT_transform_armature,
+     VIEW3D_MT_mirror,
+     VIEW3D_MT_snap,
+     VIEW3D_MT_uv_map,
+     VIEW3D_MT_edit_proportional,
+     VIEW3D_MT_view,
+     VIEW3D_MT_view_navigation,
+     VIEW3D_MT_view_align,
+     VIEW3D_MT_view_align_selected,
+     VIEW3D_MT_view_cameras,
+     VIEW3D_MT_select_object,
+     VIEW3D_MT_select_object_more_less,
+     VIEW3D_MT_select_pose,
+     VIEW3D_MT_select_pose_more_less,
+     VIEW3D_MT_select_particle,
+     VIEW3D_MT_edit_mesh,
+     VIEW3D_MT_edit_mesh_select_similar,
+     VIEW3D_MT_edit_mesh_select_by_trait,
+     VIEW3D_MT_edit_mesh_select_more_less,
+     VIEW3D_MT_select_edit_mesh,
+     VIEW3D_MT_select_edit_curve,
+     VIEW3D_MT_select_edit_surface,
+     VIEW3D_MT_select_edit_text,
+     VIEW3D_MT_select_edit_metaball,
+     VIEW3D_MT_select_edit_lattice,
+     VIEW3D_MT_select_edit_armature,
+     VIEW3D_MT_select_gpencil,
+     VIEW3D_MT_select_paint_mask,
+     VIEW3D_MT_select_paint_mask_vertex,
+     VIEW3D_MT_angle_control,
+     INFO_MT_mesh_add,
+     INFO_MT_curve_add,
+     INFO_MT_surface_add,
+     INFO_MT_metaball_add,
+     INFO_MT_edit_curve_add,
+     INFO_MT_edit_armature_add,
+     INFO_MT_armature_add,
+     INFO_MT_lamp_add,
+     INFO_MT_lightprobe_add,
+     INFO_MT_camera_add,
+     INFO_MT_add,
+     VIEW3D_MT_object,
+     VIEW3D_MT_object_animation,
+     VIEW3D_MT_object_clear,
+     VIEW3D_MT_object_specials,
+     VIEW3D_MT_object_apply,
+     VIEW3D_MT_object_parent,
+     VIEW3D_MT_object_track,
+     VIEW3D_MT_object_group,
+     VIEW3D_MT_object_constraints,
+     VIEW3D_MT_object_quick_effects,
+     VIEW3D_MT_make_single_user,
+     VIEW3D_MT_make_links,
+     VIEW3D_MT_object_game,
+     VIEW3D_MT_brush,
 -    VIEW3D_MT_brush_paint_modes,
++    VIEW3D_MT_brush_object_modes,
+     VIEW3D_MT_paint_vertex,
+     VIEW3D_MT_hook,
+     VIEW3D_MT_vertex_group,
+     VIEW3D_MT_paint_weight,
+     VIEW3D_MT_sculpt,
+     VIEW3D_MT_hide_mask,
+     VIEW3D_MT_particle,
+     VIEW3D_MT_particle_specials,
+     VIEW3D_MT_particle_showhide,
+     VIEW3D_MT_pose,
+     VIEW3D_MT_pose_transform,
+     VIEW3D_MT_pose_slide,
+     VIEW3D_MT_pose_propagate,
+     VIEW3D_MT_pose_library,
+     VIEW3D_MT_pose_motion,
+     VIEW3D_MT_pose_group,
+     VIEW3D_MT_pose_ik,
+     VIEW3D_MT_pose_constraints,
+     VIEW3D_MT_pose_showhide,
+     VIEW3D_MT_pose_apply,
+     VIEW3D_MT_pose_specials,
+     VIEW3D_MT_bone_options_toggle,
+     VIEW3D_MT_bone_options_enable,
+     VIEW3D_MT_bone_options_disable,
+     VIEW3D_MT_edit_mesh_specials,
+     VIEW3D_MT_edit_mesh_select_mode,
+     VIEW3D_MT_edit_mesh_extrude,
+     VIEW3D_MT_edit_mesh_vertices,
+     VIEW3D_MT_edit_mesh_edges,
+     VIEW3D_MT_edit_mesh_faces,
+     VIEW3D_MT_edit_mesh_normals,
+     VIEW3D_MT_edit_mesh_clean,
+     VIEW3D_MT_edit_mesh_delete,
+     VIEW3D_MT_edit_mesh_showhide,
+     VIEW3D_MT_edit_gpencil,
+     VIEW3D_MT_edit_gpencil_delete,
+     VIEW3D_MT_edit_curve,
+     VIEW3D_MT_edit_curve_ctrlpoints,
+     VIEW3D_MT_edit_curve_segments,
+     VIEW3D_MT_edit_curve_specials,
+     VIEW3D_MT_edit_curve_delete,
+     VIEW3D_MT_edit_curve_showhide,
+     VIEW3D_MT_edit_surface,
+     VIEW3D_MT_edit_font,
+     VIEW3D_MT_edit_text_chars,
+     VIEW3D_MT_edit_meta,
+     VIEW3D_MT_edit_meta_showhide,
+     VIEW3D_MT_edit_lattice,
+     VIEW3D_MT_edit_armature,
+     VIEW3D_MT_armature_specials,
+     VIEW3D_MT_edit_armature_parent,
+     VIEW3D_MT_edit_armature_roll,
+     VIEW3D_MT_edit_armature_delete,
+     VIEW3D_MT_edit_gpencil_transform,
+     VIEW3D_MT_edit_gpencil_interpolate,
+     VIEW3D_PT_grease_pencil,
+     VIEW3D_PT_grease_pencil_palettecolor,
+     VIEW3D_PT_view3d_properties,
+     VIEW3D_PT_view3d_cursor,
+     VIEW3D_PT_view3d_name,
+     VIEW3D_PT_view3d_display,
+     VIEW3D_PT_view3d_stereo,
+     VIEW3D_PT_view3d_motion_tracking,
+     VIEW3D_PT_view3d_meshdisplay,
+     VIEW3D_PT_view3d_meshstatvis,
+     VIEW3D_PT_view3d_curvedisplay,
+     VIEW3D_PT_background_image,
+     VIEW3D_PT_transform_orientations,
+     VIEW3D_PT_etch_a_ton,
+     VIEW3D_PT_context_properties,
+ )
+ 
+ 
+ if __name__ == "__main__":  # only for live edit.
+     from bpy.utils import register_class
+     for cls in classes:
+         register_class(cls)
diff --cc release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 5011a6d0399,1444a4ba8e3..1c58e5eae57
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@@ -965,26 -967,11 +967,26 @@@ class VIEW3D_PT_tools_brush(Panel, View
                  col.prop(brush, "steps", slider=True)
                  col.prop(settings, "default_key_count", slider=True)
              elif tool == 'LENGTH':
-                 layout.prop(brush, "length_mode", expand=True)
+                 layout.row().prop(brush, "length_mode", expand=True)
              elif tool == 'PUFF':
-                 layout.prop(brush, "puff_mode", expand=True)
+                 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:
diff --cc source/blender/blenkernel/CMakeLists.txt
index 45a10cb33b5,1d4565f1ec6..8d0dedd9f72
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -101,7 -102,7 +102,8 @@@ set(SR
  	intern/editderivedmesh.c
  	intern/editmesh.c
  	intern/editmesh_bvh.c
+ 	intern/editmesh_tangent.c
 +	intern/editstrands.c
  	intern/effect.c
  	intern/fcurve.c
  	intern/fluidsim.c
@@@ -134,7 -135,7 +136,8 @@@
  	intern/mesh_evaluate.c
  	intern/mesh_mapping.c
  	intern/mesh_remap.c
 +	intern/mesh_sample.c
+ 	intern/mesh_tangent.c
  	intern/mesh_validate.c
  	intern/modifier.c
  	intern/modifiers_bmesh.c
@@@ -225,12 -231,11 +233,12 @@@
  	BKE_customdata_file.h
  	BKE_data_transfer.h
  	BKE_deform.h
- 	BKE_depsgraph.h
  	BKE_displist.h
  	BKE_dynamicpaint.h
 +	BKE_editstrands.h
  	BKE_editmesh.h
  	BKE_editmesh_bvh.h
+ 	BKE_editmesh_tangent.h
  	BKE_effect.h
  	BKE_fcurve.h
  	BKE_fluidsim.h
@@@ -260,7 -265,7 +268,8 @@@
  	BKE_mesh.h
  	BKE_mesh_mapping.h
  	BKE_mesh_remap.h
 +	BKE_mesh_sample.h
+ 	BKE_mesh_tangent.h
  	BKE_modifier.h
  	BKE_movieclip.h
  	BKE_multires.h
diff --cc source/blender/blenkernel/intern/editstrands.c
index 23b17c77935,00000000000..799c55b8b35
mode 100644,000000..100644
--- a/source/blender/blenkernel/intern/editstrands.c
+++ b/source/blender/blenkernel/intern/editstrands.c
@@@ -1,264 -1,0 +1,260 @@@
 +/*
 + * ***** BEGIN GPL LICENSE BLOCK *****
 + *
 + * This program is free software; you can redistribute 

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list