Revision: 22729
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22729
Author: dingto
Date: 2009-08-24 00:13:56 +0200 (Mon, 24 Aug 2009)
Log Message:
-----------
2.5 3DView:
Patch by Lorenzo Pierfederici (lento). Many thanks!
* Ported some more menus to python (Pose, Particle...)
* Some cleanup and reorganization in the python file to reduce code. :)
* Cleanup of old C buttons code.
Modified Paths:
--------------
branches/blender2.5/blender/release/ui/space_view3d.py
branches/blender2.5/blender/source/blender/editors/include/UI_interface.h
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_ui_api.c
Modified: branches/blender2.5/blender/release/ui/space_view3d.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_view3d.py 2009-08-23
22:11:19 UTC (rev 22728)
+++ branches/blender2.5/blender/release/ui/space_view3d.py 2009-08-23
22:13:56 UTC (rev 22729)
@@ -24,8 +24,7 @@
sub.itemM("VIEW3D_MT_view")
# Select Menu
- if mode_string not in ('EDIT_TEXT', 'SCULPT',
'PAINT_WEIGHT', 'PAINT_VERTEX', 'PAINT_TEXTURE', 'PARTICLE'):
- # XXX: Particle Mode has Select Menu.
+ if mode_string not in ('EDIT_TEXT', 'SCULPT',
'PAINT_WEIGHT', 'PAINT_VERTEX', 'PAINT_TEXTURE'):
sub.itemM("VIEW3D_MT_select_%s" % mode_string)
if edit_object:
@@ -33,17 +32,44 @@
elif object:
ob_mode_string = object.mode
- if ob_mode_string == 'OBJECT':
- sub.itemM("VIEW3D_MT_object")
- elif ob_mode_string == 'SCULPT':
- sub.itemM("VIEW3D_MT_sculpt")
- elif ob_mode_string == 'VERTEX_PAINT':
- sub.itemM("VIEW3D_MT_vertex_paint")
+ if mode_string not in ['PAINT_WEIGHT',
'PAINT_TEXTURE']:
+ sub.itemM("VIEW3D_MT_%s" % mode_string)
layout.template_header_3D()
# ********** Menu **********
+# ********** Utilities **********
+
+class VIEW3D_MT_showhide(bpy.types.Menu):
+ __space_type__ = "VIEW_3D"
+ __label__ = "Show/Hide"
+ _operator_name = ""
+
+ def draw(self, context):
+ layout = self.layout
+
+ layout.itemO("%s.reveal" % self._operator_name, text="Show
Hidden")
+ layout.itemO("%s.hide" % self._operator_name, text="Hide
Selected")
+ layout.item_booleanO("%s.hide" % self._operator_name,
"unselected", True, text="Hide Unselected")
+
+class VIEW3D_MT_snap(bpy.types.Menu):
+ __space_type__ = "VIEW_3D"
+ __label__ = "Snap"
+
+ def draw(self, context):
+ layout = self.layout
+
+ layout.itemO("view3d.snap_selected_to_grid")
+ layout.itemO("view3d.snap_selected_to_cursor")
+ layout.itemO("view3d.snap_selected_to_center")
+
+ layout.itemS()
+
+ layout.itemO("view3d.snap_cursor_to_selected")
+ layout.itemO("view3d.snap_cursor_to_grid")
+ layout.itemO("view3d.snap_cursor_to_active")
+
# ********** View menus **********
class VIEW3D_MT_view(bpy.types.Menu):
@@ -63,30 +89,21 @@
layout.item_enumO("view3d.viewnumpad", "type", 'FRONT')
layout.item_enumO("view3d.viewnumpad", "type", 'RIGHT')
- # layout.itemM("VIEW3D_MT_view_cameras", text="Cameras")
+ layout.itemM("VIEW3D_MT_view_cameras", text="Cameras")
layout.itemS()
-
+
layout.itemO("view3d.view_persportho")
layout.itemS()
- # layout.itemO("view3d.view_show_all_layers")
-
- # layout.itemS()
-
- # layout.itemO("view3d.view_local_view")
- # layout.itemO("view3d.view_global_view")
-
- # layout.itemS()
-
layout.itemM("VIEW3D_MT_view_navigation")
- # layout.itemM("VIEW3D_MT_view_align", text="Align View")
+ layout.itemM("VIEW3D_MT_view_align")
layout.itemS()
layout.operator_context = "INVOKE_REGION_WIN"
-
+
layout.itemO("view3d.clip_border")
layout.itemO("view3d.zoom_border")
@@ -99,7 +116,7 @@
layout.itemO("screen.region_foursplit", text="Toggle Quad View")
layout.itemO("screen.screen_full_area", text="Toggle Full
Screen")
-
+
class VIEW3D_MT_view_navigation(bpy.types.Menu):
__space_type__ = 'VIEW_3D'
__label__ = "Navigation"
@@ -107,9 +124,6 @@
def draw(self, context):
layout = self.layout
- # layout.itemO("view3d.view_fly_mode")
- # layout.itemS()
-
layout.items_enumO("view3d.view_orbit", "type")
layout.itemS()
@@ -121,6 +135,22 @@
layout.item_floatO("view3d.zoom", "delta", 1.0, text="Zoom In")
layout.item_floatO("view3d.zoom", "delta", -1.0, text="Zoom
Out")
+class VIEW3D_MT_view_align(bpy.types.Menu):
+ __space_type__ = "VIEW_3D"
+ __label__ = "Align View"
+
+ def draw(self, context):
+ layout = self.layout
+
+ layout.itemO("view3d.view_center")
+
+class VIEW3D_MT_view_cameras(bpy.types.Menu):
+ __space_type__ = "VIEW_3D"
+ __label__ = "Cameras"
+
+ def draw(self, context):
+ layout = self.layout
+
# ********** Select menus, suffix from context.mode **********
class VIEW3D_MT_select_OBJECT(bpy.types.Menu):
@@ -187,9 +217,6 @@
layout.itemS()
- #layout.itemO("particle.select_last")
- #layout.itemO("particle.select_first")
-
layout.itemO("particle.select_more")
layout.itemO("particle.select_less")
@@ -303,12 +330,12 @@
layout.itemS()
- layout.itemL(text="Select/Deselect All")
- layout.itemL(text="Inverse")
+ layout.itemO("mball.select_deselect_all_metaelems")
+ layout.itemO("mball.select_inverse_metaelems")
layout.itemS()
- layout.itemL(text="Random")
+ layout.itemO("mball.select_random_metaelems")
class VIEW3D_MT_select_EDIT_LATTICE(bpy.types.Menu):
__space_type__ = 'VIEW_3D'
@@ -363,7 +390,7 @@
# ********** Object menu **********
-class VIEW3D_MT_object(bpy.types.Menu):
+class VIEW3D_MT_OBJECT(bpy.types.Menu):
__space_type__ = 'VIEW_3D'
__context__ = "objectmode"
__label__ = "Object"
@@ -371,8 +398,8 @@
def draw(self, context):
layout = self.layout
- layout.itemM("VIEW3D_MT_object_clear")
- layout.itemM("VIEW3D_MT_object_snap")
+ layout.itemM("VIEW3D_MT_OBJECT_clear")
+ layout.itemM("VIEW3D_MT_snap")
layout.itemS()
@@ -388,10 +415,10 @@
layout.itemS()
- layout.itemM("VIEW3D_MT_object_parent")
- layout.itemM("VIEW3D_MT_object_track")
- layout.itemM("VIEW3D_MT_object_group")
- layout.itemM("VIEW3D_MT_object_constraints")
+ layout.itemM("VIEW3D_MT_OBJECT_parent")
+ layout.itemM("VIEW3D_MT_OBJECT_track")
+ layout.itemM("VIEW3D_MT_OBJECT_group")
+ layout.itemM("VIEW3D_MT_OBJECT_constraints")
layout.itemS()
@@ -399,9 +426,9 @@
layout.itemS()
- layout.itemM("VIEW3D_MT_object_show")
+ layout.itemM("VIEW3D_MT_OBJECT_showhide")
-class VIEW3D_MT_object_clear(bpy.types.Menu):
+class VIEW3D_MT_OBJECT_clear(bpy.types.Menu):
__space_type__ = 'VIEW_3D'
__label__ = "Clear"
@@ -413,25 +440,8 @@
layout.itemO("object.scale_clear")
layout.itemO("object.origin_clear")
-class VIEW3D_MT_object_snap(bpy.types.Menu):
+class VIEW3D_MT_OBJECT_parent(bpy.types.Menu):
__space_type__ = 'VIEW_3D'
- __label__ = "Snap"
-
- def draw(self, context):
- layout = self.layout
-
- layout.itemO("view3d.snap_selected_to_grid")
- layout.itemO("view3d.snap_selected_to_cursor")
- layout.itemO("view3d.snap_selected_to_center")
-
- layout.itemS()
-
- layout.itemO("view3d.snap_cursor_to_selected")
- layout.itemO("view3d.snap_cursor_to_grid")
- layout.itemO("view3d.snap_cursor_to_active")
-
-class VIEW3D_MT_object_parent(bpy.types.Menu):
- __space_type__ = 'VIEW_3D'
__label__ = "Parent"
def draw(self, context):
@@ -440,7 +450,7 @@
layout.itemO("object.parent_set")
layout.itemO("object.parent_clear")
-class VIEW3D_MT_object_track(bpy.types.Menu):
+class VIEW3D_MT_OBJECT_track(bpy.types.Menu):
__space_type__ = 'VIEW_3D'
__label__ = "Track"
@@ -450,7 +460,7 @@
layout.itemO("object.track_set")
layout.itemO("object.track_clear")
-class VIEW3D_MT_object_group(bpy.types.Menu):
+class VIEW3D_MT_OBJECT_group(bpy.types.Menu):
__space_type__ = 'VIEW_3D'
__label__ = "Group"
@@ -465,7 +475,7 @@
layout.itemO("group.objects_add_active")
layout.itemO("group.objects_remove_active")
-class VIEW3D_MT_object_constraints(bpy.types.Menu):
+class VIEW3D_MT_OBJECT_constraints(bpy.types.Menu):
__space_type__ = 'VIEW_3D'
__label__ = "Constraints"
@@ -475,20 +485,20 @@
layout.itemO("object.constraint_add_with_targets")
layout.itemO("object.constraints_clear")
-class VIEW3D_MT_object_show(bpy.types.Menu):
+class VIEW3D_MT_OBJECT_showhide(bpy.types.Menu):
__space_type__ = 'VIEW_3D'
__label__ = "Show/Hide"
def draw(self, context):
layout = self.layout
- layout.itemO("object.restrictview_clear")
- layout.itemO("object.restrictview_set")
+ layout.itemO("object.restrictview_clear", text="Show Hidden")
+ layout.itemO("object.restrictview_set", text="Hide Selected")
layout.item_booleanO("object.restrictview_set", "unselected",
True, text="Hide Unselected")
# ********** Vertex paint menu **********
-class VIEW3D_MT_vertex_paint(bpy.types.Menu):
+class VIEW3D_MT_PAINT_VERTEX(bpy.types.Menu):
__space_type__ = 'VIEW_3D'
__label__ = "Paint"
@@ -503,7 +513,7 @@
# ********** Sculpt menu **********
-class VIEW3D_MT_sculpt(bpy.types.Menu):
+class VIEW3D_MT_SCULPT(bpy.types.Menu):
__space_type__ = 'VIEW_3D'
__label__ = "Sculpt"
@@ -537,25 +547,173 @@
layout.itemR(brush, "persistent")
layout.itemO("sculpt.set_persistent_base")
-# ********** Edit Menus, suffix from ob.type **********
-
-class VIEW3D_MT_edit_snap(bpy.types.Menu):
+# ********** Particle menu **********
+
+class VIEW3D_MT_PARTICLE(bpy.types.Menu):
__space_type__ = 'VIEW_3D'
- __label__ = "Snap"
+ __label__ = "Particle"
def draw(self, context):
layout = self.layout
- layout.itemO("view3d.snap_selected_to_grid")
- layout.itemO("view3d.snap_selected_to_cursor")
- layout.itemO("view3d.snap_selected_to_center")
+ particle_edit = context.tool_settings.particle_edit
+ layout.itemO("particle.mirror")
+
layout.itemS()
- layout.itemO("view3d.snap_cursor_to_selected")
- layout.itemO("view3d.snap_cursor_to_grid")
- layout.itemO("view3d.snap_cursor_to_active")
+ layout.itemO("particle.remove_doubles")
+ layout.itemO("particle.delete")
+
+ if particle_edit.selection_mode == 'POINT':
+ layout.itemO("particle.subdivide")
+
+ layout.itemO("particle.rekey")
+
+ layout.itemS()
+
+ layout.itemM("VIEW3D_MT_PARTICLE_showhide")
+class VIEW3D_MT_PARTICLE_showhide(VIEW3D_MT_showhide):
+ _operator_name = "particle"
+
+# ********** Pose Menu **********
+
+class VIEW3D_MT_POSE(bpy.types.Menu):
+ __space_type__ = "VIEW_3D"
+ __label__ = "Pose"
+
+ def draw(self, context):
+ layout = self.layout
+
+ arm = context.active_object.data
+
+ if arm.drawtype in ('BBONE', 'ENVELOPE'):
+ layout.item_enumO("tfm.transform", "mode", 'BONESIZE',
text="Scale Envelope Distance")
+
+ layout.itemM("VIEW3D_MT_POSE_transform")
+
+ layout.itemS()
+
+ layout.itemO("anim.insert_keyframe_menu")
+ layout.itemO("anim.delete_keyframe_v3d")
+
+ layout.itemS()
+
+ layout.itemO("pose.apply")
+
+ layout.itemS()
+
+ layout.itemO("pose.copy")
+ layout.itemO("pose.paste")
+ layout.item_booleanO("pose.paste", "flipped", True, text="Paste
X-Flipped Pose")
+
+ layout.itemS()
+
+ layout.itemM("VIEW3D_MT_POSE_pose")
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
