Revision: 21850
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21850
Author: ben2610
Date: 2009-07-24 14:36:38 +0200 (Fri, 24 Jul 2009)
Log Message:
-----------
svn merge -r 21841:21848
https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender
Modified Paths:
--------------
branches/itasc/release/ui/buttons_data_mesh.py
branches/itasc/release/ui/space_view3d.py
branches/itasc/release/ui/space_view3d_toolbar.py
branches/itasc/source/blender/makesrna/intern/rna_armature.c
branches/itasc/source/blender/makesrna/intern/rna_define.c
branches/itasc/source/blender/makesrna/intern/rna_object.c
branches/itasc/source/blender/makesrna/intern/rna_scene.c
Modified: branches/itasc/release/ui/buttons_data_mesh.py
===================================================================
--- branches/itasc/release/ui/buttons_data_mesh.py 2009-07-24 12:27:42 UTC
(rev 21849)
+++ branches/itasc/release/ui/buttons_data_mesh.py 2009-07-24 12:36:38 UTC
(rev 21850)
@@ -49,14 +49,6 @@
sub.itemR(mesh, "vertex_normal_flip")
sub.itemR(mesh, "double_sided")
- row = layout.row(align=True)
- if context.edit_object:
- row.itemO("MESH_OT_faces_shade_smooth")
- row.itemO("MESH_OT_faces_shade_flat")
- else:
- row.itemO("OBJECT_OT_shade_smooth")
- row.itemO("OBJECT_OT_shade_flat")
-
class DATA_PT_vertex_groups(DataButtonsPanel):
__idname__ = "DATA_PT_vertex_groups"
__label__ = "Vertex Groups"
Modified: branches/itasc/release/ui/space_view3d.py
===================================================================
--- branches/itasc/release/ui/space_view3d.py 2009-07-24 12:27:42 UTC (rev
21849)
+++ branches/itasc/release/ui/space_view3d.py 2009-07-24 12:36:38 UTC (rev
21850)
@@ -73,7 +73,8 @@
layout.itemS()
- layout.itemO("screen.screen_full_area")
+ layout.itemO("screen.region_foursplit", text="Toggle Quad View")
+ layout.itemO("screen.screen_full_area", text="Toggle Full
Screen")
class VIEW3D_HT_header(bpy.types.Header):
__space_type__ = "VIEW_3D"
@@ -101,6 +102,7 @@
def draw(self, context):
view = context.space_data
+ scene = context.scene
layout = self.layout
split = layout.split()
@@ -113,6 +115,7 @@
col.itemL(text="Grid:")
col.itemR(view, "grid_spacing", text="Spacing")
col.itemR(view, "grid_subdivisions", text="Subdivisions")
+ col.itemR(scene, "cursor_location", text="3D Cursor:")
class VIEW3D_PT_3dview_display(bpy.types.Panel):
__space_type__ = "VIEW_3D"
Modified: branches/itasc/release/ui/space_view3d_toolbar.py
===================================================================
--- branches/itasc/release/ui/space_view3d_toolbar.py 2009-07-24 12:27:42 UTC
(rev 21849)
+++ branches/itasc/release/ui/space_view3d_toolbar.py 2009-07-24 12:36:38 UTC
(rev 21850)
@@ -14,14 +14,29 @@
def draw(self, context):
layout = self.layout
+
+ layout.itemL(text="Transform:")
+
+ split = layout.split()
+ col = split.column(align=True)
+ col.itemO("tfm.translate")
+ col.itemO("tfm.rotate")
+ col.itemO("tfm.resize", text="Scale")
+
+ layout.itemL(text="Object:")
+
+ split = layout.split()
+ col = split.column(align=True)
+ col.itemO("object.duplicate")
+ col.itemO("object.delete")
+
+ layout.itemL(text="Keyframes:")
+
+ split = layout.split()
+ col = split.column(align=True)
+ col.itemO("anim.insert_keyframe_menu", text="Insert")
+ col.itemO("anim.delete_keyframe_v3d", text="Remove")
- layout.row().itemO("object.duplicate")
- layout.row().itemO("object.delete")
- layout.row().itemO("object.mesh_add")
- layout.row().itemO("object.curve_add")
- layout.row().itemO("object.text_add")
- layout.row().itemO("object.surface_add")
-
# ********** default tools for editmode_mesh ****************
class View3DPanel(bpy.types.Panel):
@@ -35,18 +50,43 @@
def draw(self, context):
layout = self.layout
+ layout.itemL(text="Transform:")
+
+ split = layout.split()
+ col = split.column(align=True)
+ col.itemO("tfm.translate")
+ col.itemO("tfm.rotate")
+ col.itemO("tfm.resize", text="Scale")
+
+ layout.itemL(text="Mesh:")
+ split = layout.split()
+ col = split.column(align=True)
+ col.itemO("mesh.duplicate")
+ col.itemO("mesh.delete")
+
+ layout.itemL(text="Modeling:")
+ split = layout.split()
+ col = split.column(align=True)
+ col.itemO("mesh.extrude")
+ col.itemO("mesh.subdivide")
+ col.itemO("mesh.spin")
+ col.itemO("mesh.screw")
+
+ layout.itemL(text="Shading:")
+
+ split = layout.split()
+ col = split.column(align=True)
+ col.itemO("mesh.faces_shade_smooth", text="Smooth")
+ col.itemO("mesh.faces_shade_flat", text="Flat")
+
+ layout.itemL(text="UV Mapping:")
+
+ split = layout.split()
+ col = split.column(align=True)
+ col.itemO("uv.mapping_menu", text="Unwrap")
+ col.itemO("mesh.uvs_rotate")
+ col.itemO("mesh.uvs_mirror")
- layout.row().itemO("mesh.duplicate")
- layout.row().itemO("mesh.delete")
- layout.row().itemO("mesh.spin")
- layout.row().itemO("mesh.screw")
- layout.row().itemO("mesh.primitive_plane_add")
- layout.row().itemO("mesh.primitive_cube_add")
- layout.row().itemO("mesh.primitive_circle_add")
- layout.row().itemO("mesh.primitive_cylinder_add")
- layout.row().itemO("mesh.faces_shade_smooth")
- layout.row().itemO("mesh.faces_shade_flat")
-
# ********** default tools for editmode_curve ****************
class View3DPanel(bpy.types.Panel):
@@ -60,12 +100,28 @@
def draw(self, context):
layout = self.layout
+ layout.itemL(text="Transform:")
+
+ split = layout.split()
+ col = split.column(align=True)
+ col.itemO("tfm.translate")
+ col.itemO("tfm.rotate")
+ col.itemO("tfm.resize", text="Scale")
+
+ layout.itemL(text="Curve:")
+ split = layout.split()
+ col = split.column(align=True)
+ col.itemO("curve.duplicate")
+ col.itemO("curve.delete")
+ col.itemO("curve.cyclic_toggle")
+ col.itemO("curve.switch_direction")
+
+ layout.itemL(text="Modeling:")
+ split = layout.split()
+ col = split.column(align=True)
+ col.itemO("curve.extrude")
+ col.itemO("curve.subdivide")
- layout.row().itemO("curve.duplicate")
- layout.row().itemO("curve.delete")
- layout.row().itemO("object.curve_add")
- layout.row().itemO("curve.subdivide")
-
# ********** default tools for editmode_surface ****************
class View3DPanel(bpy.types.Panel):
@@ -79,12 +135,27 @@
def draw(self, context):
layout = self.layout
+ layout.itemL(text="Transform:")
+ split = layout.split()
+ col = split.column(align=True)
+ col.itemO("tfm.translate")
+ col.itemO("tfm.rotate")
+ col.itemO("tfm.resize", text="Scale")
+
+ layout.itemL(text="Curve:")
+ split = layout.split()
+ col = split.column(align=True)
+ col.itemO("curve.duplicate")
+ col.itemO("curve.delete")
+ col.itemO("curve.cyclic_toggle")
+ col.itemO("curve.switch_direction")
+
+ layout.itemL(text="Modeling:")
+ split = layout.split()
+ col = split.column(align=True)
+ col.itemO("curve.extrude")
+ col.itemO("curve.subdivide")
- layout.row().itemO("curve.duplicate")
- layout.row().itemO("curve.delete")
- layout.row().itemO("object.surface_add")
- layout.row().itemO("curve.subdivide")
-
# ********** default tools for editmode_text ****************
class View3DPanel(bpy.types.Panel):
@@ -117,12 +188,26 @@
def draw(self, context):
layout = self.layout
-
- layout.row().itemO("armature.duplicate_selected")
- layout.row().itemO("armature.bone_primitive_add")
- layout.row().itemO("armature.delete")
- layout.row().itemO("armature.parent_clear")
-
+ layout.itemL(text="Transform:")
+ split = layout.split()
+ col = split.column(align=True)
+ col.itemO("tfm.translate")
+ col.itemO("tfm.rotate")
+ col.itemO("tfm.resize", text="Scale")
+
+ layout.itemL(text="Bones:")
+ split = layout.split()
+ col = split.column(align=True)
+ col.itemO("armature.bone_primitive_add", text="Add")
+ col.itemO("armature.duplicate_selected", text="Duplicate")
+ col.itemO("armature.delete", text="Delete")
+
+ layout.itemL(text="Modeling:")
+ split = layout.split()
+ col = split.column(align=True)
+ col.itemO("armature.extrude")
+
+
# ********** default tools for editmode_mball ****************
class View3DPanel(bpy.types.Panel):
@@ -136,9 +221,13 @@
def draw(self, context):
layout = self.layout
+ layout.itemL(text="Transform:")
+ split = layout.split()
+ col = split.column(align=True)
+ col.itemO("tfm.translate")
+ col.itemO("tfm.rotate")
+ col.itemO("tfm.resize", text="Scale")
- row = layout.row()
-
# ********** default tools for editmode_lattice ****************
class View3DPanel(bpy.types.Panel):
@@ -152,9 +241,13 @@
def draw(self, context):
layout = self.layout
+ layout.itemL(text="Transform:")
+ split = layout.split()
+ col = split.column(align=True)
+ col.itemO("tfm.translate")
+ col.itemO("tfm.rotate")
+ col.itemO("tfm.resize", text="Scale")
- row = layout.row()
-
# ********** default tools for posemode ****************
class View3DPanel(bpy.types.Panel):
@@ -168,28 +261,38 @@
def draw(self, context):
layout = self.layout
+ layout.itemL(text="Transform:")
+ split = layout.split()
+ col = split.column(align=True)
+ col.itemO("tfm.translate")
+ col.itemO("tfm.rotate")
+ col.itemO("tfm.resize", text="Scale")
+
+ layout.itemL(text="Bones:")
+ split = layout.split()
+ col = split.column(align=True)
+ col.itemO("pose.hide", text="Hide")
+ col.itemO("pose.reveal", text="Reveal")
+
+ layout.itemL(text="Keyframes:")
+
+ split = layout.split()
+ col = split.column(align=True)
+ col.itemO("anim.insert_keyframe_menu", text="Insert")
+ col.itemO("anim.delete_keyframe_v3d", text="Remove")
+
+ layout.itemL(text="Pose:")
+
+ split = layout.split()
+ col = split.column(align=True)
+ col.itemO("pose.copy", text="Copy")
+ col.itemO("pose.paste", text="Paste")
+ col.itemO("poselib.pose_add", text="Add to Library")
+ col.itemO("poselib.pose_remove", text="Remove From Library")
- layout.row().itemO("pose.hide")
- layout.row().itemO("pose.reveal")
- layout.row().itemO("pose.rot_clear")
- layout.row().itemO("pose.loc_clear")
+# ********** default tools for paint modes ****************
-# ********** default tools for sculptmode ****************
-class View3DPanel(bpy.types.Panel):
- __space_type__ = "VIEW_3D"
- __region_type__ = "TOOLS"
- __context__ = "sculptmode"
-
-#class VIEW3D_PT_tools_sculptmode(View3DPanel):
-# __idname__ = "VIEW3D_PT_tools_sculptmode"
-# __label__ = "Sculpt Tools"
-#
-# def draw(self, context):
-# layout = self.layout
-#
-# layout.row().itemO("sculpt.radial_control")
-
class VIEW3D_PT_tools_brush(bpy.types.Panel):
__space_type__ = "VIEW_3D"
__region_type__ = "TOOLS"
@@ -203,6 +306,8 @@
return ts.vpaint
elif context.wpaint_object:
return ts.wpaint
+ elif context.tpaint_object:
+ return ts.tpaint
return False
def poll(self, context):
@@ -220,27 +325,65 @@
split = layout.split()
col = split.column()
- col.itemR(brush, "size", slider=True)
+ row = col.row(align=True)
+ row.itemR(brush, "size", slider=True)
+ row.itemR(brush, "size_pressure", toggle=True,
icon='ICON_BRUSH_DATA', text="")
if context.wpaint_object:
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
