[Bf-blender-cvs] [1447fecbbf5] hair_guides: Merge branch 'blender2.8' into hair_guides

Lukas Tönne noreply at git.blender.org
Sun May 6 11:30:02 CEST 2018


Commit: 1447fecbbf571e076e12b3bbde73a90ea1105c33
Author: Lukas Tönne
Date:   Sun May 6 10:00:02 2018 +0100
Branches: hair_guides
https://developer.blender.org/rB1447fecbbf571e076e12b3bbde73a90ea1105c33

Merge branch 'blender2.8' into hair_guides

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



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

diff --cc release/scripts/startup/bl_ui/space_view3d.py
index e601dcde7b2,42facabbc41..a30cc7c64bc
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -48,11 -61,11 +61,13 @@@ class VIEW3D_HT_header(Header)
          layout.template_header_3D()
  
          if obj:
-             mode = obj.mode
+             # Set above:
+             # mode = obj.mode
+ 
              # Particle edit
 -            if mode == 'PARTICLE_EDIT':
 +            if mode == 'EDIT' and obj.type == 'GROOM':
 +                row.prop(toolsettings.groom_edit_settings, "mode", text="", expand=True)
 +            elif mode == 'PARTICLE_EDIT':
                  row.prop(toolsettings.particle_edit, "select_mode", text="", expand=True)
  
              # Occlude geometry
diff --cc release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 67bf99d04c8,f1569e9df8a..43b38c84628
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@@ -64,408 -64,13 +64,12 @@@ def draw_vpaint_symmetry(layout, vpaint
      col = layout.column()
      col.prop(vpaint, "radial_symmetry", text="Radial")
  
- # ********** default tools for object-mode ****************
- 
- 
- class VIEW3D_PT_tools_transform(View3DPanel, Panel):
-     bl_category = "Tools"
-     bl_context = "objectmode"
-     bl_label = "Transform"
- 
-     def draw(self, context):
-         layout = self.layout
- 
-         col = layout.column(align=True)
-         col.operator("transform.translate")
-         col.operator("transform.rotate")
-         col.operator("transform.resize", text="Scale")
- 
-         col = layout.column(align=True)
-         col.operator("transform.mirror", text="Mirror")
- 
- 
- class VIEW3D_PT_tools_object(View3DPanel, Panel):
-     bl_category = "Tools"
-     bl_context = "objectmode"
-     bl_label = "Edit"
- 
-     def draw(self, context):
-         layout = self.layout
- 
-         col = layout.column(align=True)
-         col.operator("object.duplicate_move", text="Duplicate")
-         col.operator("object.duplicate_move_linked", text="Duplicate Linked")
- 
-         col.operator("object.delete")
- 
-         obj = context.active_object
-         if obj:
-             obj_type = obj.type
- 
-             if obj_type in {'MESH', 'CURVE', 'SURFACE', 'ARMATURE'}:
-                 col = layout.column(align=True)
-                 col.operator("object.join")
- 
-             if obj_type in {'MESH', 'CURVE', 'SURFACE', 'ARMATURE', 'FONT', 'LATTICE'}:
-                 col = layout.column(align=True)
-                 col.operator_menu_enum("object.origin_set", "type", text="Set Origin")
- 
-             if obj_type in {'MESH', 'CURVE', 'SURFACE'}:
-                 col = layout.column(align=True)
-                 col.label(text="Shading:")
-                 row = col.row(align=True)
-                 row.operator("object.shade_smooth", text="Smooth")
-                 row.operator("object.shade_flat", text="Flat")
- 
-             if obj_type == 'MESH':
-                 col = layout.column(align=True)
-                 col.label(text="Data Transfer:")
-                 row = col.row(align=True)
-                 row.operator("object.data_transfer", text="Data")
-                 row.operator("object.datalayout_transfer", text="Data Layout")
- 
- 
- class VIEW3D_PT_tools_add_object(View3DPanel, Panel):
-     bl_category = "Create"
-     bl_context = "objectmode"
-     bl_label = "Add Primitive"
- 
-     @staticmethod
-     def draw_add_mesh(layout, label=False):
-         if label:
-             layout.label(text="Primitives:")
-         layout.operator("mesh.primitive_plane_add", text="Plane", icon='MESH_PLANE')
-         layout.operator("mesh.primitive_cube_add", text="Cube", icon='MESH_CUBE')
-         layout.operator("mesh.primitive_circle_add", text="Circle", icon='MESH_CIRCLE')
-         layout.operator("mesh.primitive_uv_sphere_add", text="UV Sphere", icon='MESH_UVSPHERE')
-         layout.operator("mesh.primitive_ico_sphere_add", text="Ico Sphere", icon='MESH_ICOSPHERE')
-         layout.operator("mesh.primitive_cylinder_add", text="Cylinder", icon='MESH_CYLINDER')
-         layout.operator("mesh.primitive_cone_add", text="Cone", icon='MESH_CONE')
-         layout.operator("mesh.primitive_torus_add", text="Torus", icon='MESH_TORUS')
- 
-         if label:
-             layout.label(text="Special:")
-         else:
-             layout.separator()
-         layout.operator("mesh.primitive_grid_add", text="Grid", icon='MESH_GRID')
-         layout.operator("mesh.primitive_monkey_add", text="Monkey", icon='MESH_MONKEY')
- 
-     @staticmethod
-     def draw_add_curve(layout, label=False):
- 
-         if label:
-             layout.label(text="Bezier:")
-         layout.operator("curve.primitive_bezier_curve_add", text="Bezier", icon='CURVE_BEZCURVE')
-         layout.operator("curve.primitive_bezier_circle_add", text="Circle", icon='CURVE_BEZCIRCLE')
- 
-         if label:
-             layout.label(text="Nurbs:")
-         else:
-             layout.separator()
-         layout.operator("curve.primitive_nurbs_curve_add", text="Nurbs Curve", icon='CURVE_NCURVE')
-         layout.operator("curve.primitive_nurbs_circle_add", text="Nurbs Circle", icon='CURVE_NCIRCLE')
-         layout.operator("curve.primitive_nurbs_path_add", text="Path", icon='CURVE_PATH')
- 
-         layout.separator()
- 
-         layout.operator("curve.draw", icon='LINE_DATA')
- 
-     @staticmethod
-     def draw_add_surface(layout):
-         layout.operator("surface.primitive_nurbs_surface_curve_add", text="Nurbs Curve", icon='SURFACE_NCURVE')
-         layout.operator("surface.primitive_nurbs_surface_circle_add", text="Nurbs Circle", icon='SURFACE_NCIRCLE')
-         layout.operator("surface.primitive_nurbs_surface_surface_add", text="Nurbs Surface", icon='SURFACE_NSURFACE')
-         layout.operator("surface.primitive_nurbs_surface_cylinder_add", text="Nurbs Cylinder", icon='SURFACE_NCYLINDER')
-         layout.operator("surface.primitive_nurbs_surface_sphere_add", text="Nurbs Sphere", icon='SURFACE_NSPHERE')
-         layout.operator("surface.primitive_nurbs_surface_torus_add", text="Nurbs Torus", icon='SURFACE_NTORUS')
- 
-     @staticmethod
-     def draw_add_mball(layout):
-         layout.operator_enum("object.metaball_add", "type")
- 
-     @staticmethod
-     def draw_add_lamp(layout):
-         layout.operator_enum("object.lamp_add", "type")
- 
-     @staticmethod
-     def draw_add_other(layout):
-         layout.operator("object.text_add", text="Text", icon='OUTLINER_OB_FONT')
-         layout.operator("object.armature_add", text="Armature", icon='OUTLINER_OB_ARMATURE')
-         layout.operator("object.add", text="Lattice", icon='OUTLINER_OB_LATTICE').type = 'LATTICE'
-         layout.operator("object.empty_add", text="Empty", icon='OUTLINER_OB_EMPTY').type = 'PLAIN_AXES'
-         layout.operator("object.speaker_add", text="Speaker", icon='OUTLINER_OB_SPEAKER')
-         layout.operator("object.camera_add", text="Camera", icon='OUTLINER_OB_CAMERA')
-         layout.operator("object.groom_add", text="Groom", icon='NONE')
- 
-     def draw(self, context):
-         layout = self.layout
- 
-         col = layout.column(align=True)
-         col.label(text="Mesh:")
-         self.draw_add_mesh(col)
- 
-         col = layout.column(align=True)
-         col.label(text="Curve:")
-         self.draw_add_curve(col)
- 
-         # not used here:
-         # draw_add_surface
-         # draw_add_mball
- 
-         col = layout.column(align=True)
-         col.label(text="Lamp:")
-         self.draw_add_lamp(col)
- 
-         col = layout.column(align=True)
-         col.label(text="Other:")
-         self.draw_add_other(col)
- 
- 
- class VIEW3D_PT_tools_relations(View3DPanel, Panel):
-     bl_category = "Relations"
-     bl_context = "objectmode"
-     bl_label = "Relations"
- 
-     def draw(self, context):
-         layout = self.layout
- 
-         col = layout.column(align=True)
- 
-         col.label(text="Group:")
-         col.operator("group.create", text="New Group")
-         col.operator("group.objects_add_active", text="Add to Active")
-         col.operator("group.objects_remove", text="Remove from Group")
- 
-         col.separator()
- 
-         col.label(text="Parent:")
-         row = col.row(align=True)
-         row.operator("object.parent_set", text="Set")
-         row.operator("object.parent_clear", text="Clear")
- 
-         col.separator()
- 
-         col.label(text="Object Data:")
-         col.operator("object.make_links_data")
-         col.operator("object.make_single_user")
- 
-         col.separator()
- 
-         col.label(text="Linked Objects:")
-         col.operator("object.make_local")
-         col.operator("object.proxy_make")
- 
- 
- class VIEW3D_PT_tools_animation(View3DPanel, Panel):
-     bl_category = "Animation"
-     bl_context = "objectmode"
-     bl_label = "Animation"
- 
-     def draw(self, context):
-         layout = self.layout
- 
-         ob = context.active_object
-         mpath = ob.motion_path if ob else None
- 
-         draw_keyframing_tools(context, layout)
- 
-         col = layout.column(align=True)
-         col.label(text="Motion Paths:")
-         if mpath:
-             row = col.row(align=True)
-             row.operator("object.paths_update", text="Update")
-             row.operator("object.paths_clear", text="", icon='X')
-         else:
-             col.operator("object.paths_calculate", text="Calculate")
- 
-         col.separator()
- 
-         col.label(text="Action:")
-         col.operator("nla.bake", text="Bake Action")
- 
- 
- class VIEW3D_PT_tools_rigid_body(View3DPanel, Panel):
-     bl_category = "Physics"
-     bl_context = "objectmode"
-     bl_label = "Rigid Body Tools"
- 
-     def draw(self, context):
-         layout = self.layout
- 
-         col = layout.column(align=True)
-         col.label(text="Add/Remove:")
-         row = col.row(align=True)
-         row.operator("rigidbody.objects_add", text="Add Active").type = 'ACTIVE'
-         row.operator("rigidbody.objects_add", text="Add Passive").type = 'PASS

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list