[Bf-blender-cvs] [e4724b1c8bf] blender2.8: UI: remove create panel
Campbell Barton
noreply at git.blender.org
Tue Apr 24 16:14:26 CEST 2018
Commit: e4724b1c8bf84d03c4562203dd2c0912a72a2463
Author: Campbell Barton
Date: Tue Apr 24 16:13:03 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBe4724b1c8bf84d03c4562203dd2c0912a72a2463
UI: remove create panel
Move create to the menus.
===================================================================
M release/scripts/startup/bl_ui/space_view3d.py
M release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 6e61ad975d3..380ce871642 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -1184,13 +1184,23 @@ class INFO_MT_mesh_add(Menu):
bl_label = "Mesh"
def draw(self, context):
- from .space_view3d_toolbar import VIEW3D_PT_tools_add_object
-
layout = self.layout
layout.operator_context = 'INVOKE_REGION_WIN'
- VIEW3D_PT_tools_add_object.draw_add_mesh(layout)
+ 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')
+
+ layout.separator()
+
+ layout.operator("mesh.primitive_grid_add", text="Grid", icon='MESH_GRID')
+ layout.operator("mesh.primitive_monkey_add", text="Monkey", icon='MESH_MONKEY')
class INFO_MT_curve_add(Menu):
@@ -1198,12 +1208,22 @@ class INFO_MT_curve_add(Menu):
bl_label = "Curve"
def draw(self, context):
- from .space_view3d_toolbar import VIEW3D_PT_tools_add_object
layout = self.layout
layout.operator_context = 'INVOKE_REGION_WIN'
- VIEW3D_PT_tools_add_object.draw_add_curve(layout)
+ layout.operator("curve.primitive_bezier_curve_add", text="Bezier", icon='CURVE_BEZCURVE')
+ layout.operator("curve.primitive_bezier_circle_add", text="Circle", icon='CURVE_BEZCIRCLE')
+
+ 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')
class INFO_MT_surface_add(Menu):
@@ -1211,12 +1231,22 @@ class INFO_MT_surface_add(Menu):
bl_label = "Surface"
def draw(self, context):
- from .space_view3d_toolbar import VIEW3D_PT_tools_add_object
layout = self.layout
layout.operator_context = 'INVOKE_REGION_WIN'
- VIEW3D_PT_tools_add_object.draw_add_surface(layout)
+ layout.operator("curve.primitive_bezier_curve_add", text="Bezier", icon='CURVE_BEZCURVE')
+ layout.operator("curve.primitive_bezier_circle_add", text="Circle", icon='CURVE_BEZCIRCLE')
+
+ 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')
class INFO_MT_metaball_add(Menu):
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index e56fb362bef..0b61e315f47 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -125,101 +125,6 @@ class VIEW3D_PT_tools_object(View3DPanel, Panel):
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')
-
- 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"
@@ -403,19 +308,6 @@ class VIEW3D_PT_tools_meshweight(View3DPanel, Panel):
self.draw_generic(layout)
-class VIEW3D_PT_tools_add_mesh_edit(View3DPanel, Panel):
- bl_category = "Create"
- bl_context = "mesh_edit"
- bl_label = "Add Meshes"
-
- def draw(self, context):
- layout = self.layout
-
- col = layout.column(align=True)
-
- VIEW3D_PT_tools_add_object.draw_add_mesh(col, label=True)
-
-
class VIEW3D_PT_tools_shading(View3DPanel, Panel):
bl_category = "Shading / UVs"
bl_context = "mesh_edit"
@@ -555,19 +447,6 @@ class VIEW3D_PT_tools_curveedit(View3DPanel, Panel):
col.operator("transform.vertex_random")
-class VIEW3D_PT_tools_add_curve_edit(View3DPanel, Panel):
- bl_category = "Create"
- bl_context = "curve_edit"
- bl_label = "Add Curves"
-
- def draw(self, context):
- layout = self.layout
-
- col = layout.column(align=True)
-
- VIEW3D_PT_tools_add_object.draw_add_curve(col, label=True)
-
-
class VIEW3D_PT_tools_curveedit_options_stroke(View3DPanel, Panel):
bl_category = "Options"
bl_context = "curve_edit"
@@ -664,19 +543,6 @@ class VIEW3D_PT_tools_surfaceedit(View3DPanel, Panel):
col.operator("transform.vertex_random")
-class VIEW3D_PT_tools_add_surface_edit(View3DPanel, Panel):
- bl_category = "Create"
- bl_context = "surface_edit"
- bl_label = "Add Surfaces"
-
- def draw(self, context):
- layout = self.layout
-
- col = layout.column(align=True)
-
- VIEW3D_PT_tools_add_object.draw_add_surface(col)
-
-
# ********** default tools for editmode_text ****************
@@ -774,19 +640,6 @@ class VIEW3D_PT_tools_mballedit(View3DPanel, Panel):
col.operator("transform.vertex_random")
-class VIEW3D_PT_tools_add_mball_edit(View3DPanel, Panel):
- bl_category = "Create"
- bl_context = "mbal
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list