[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21616] branches/soc-2009-yukishiro: merge till 21588

Jingyuan Huang jingyuan.huang at gmail.com
Thu Jul 16 06:44:38 CEST 2009


Revision: 21616
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21616
Author:   yukishiro
Date:     2009-07-16 06:44:38 +0200 (Thu, 16 Jul 2009)

Log Message:
-----------
merge till 21588

Modified Paths:
--------------
    branches/soc-2009-yukishiro/release/ui/buttons_data_armature.py
    branches/soc-2009-yukishiro/release/ui/buttons_data_bone.py
    branches/soc-2009-yukishiro/release/ui/buttons_object_constraint.py
    branches/soc-2009-yukishiro/release/ui/buttons_objects.py
    branches/soc-2009-yukishiro/release/ui/buttons_scene.py
    branches/soc-2009-yukishiro/source/blender/editors/armature/editarmature.c
    branches/soc-2009-yukishiro/source/blender/editors/armature/poseobject.c
    branches/soc-2009-yukishiro/source/blender/editors/include/ED_armature.h
    branches/soc-2009-yukishiro/source/blender/editors/include/ED_object.h
    branches/soc-2009-yukishiro/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2009-yukishiro/source/blender/editors/object/editconstraint.c
    branches/soc-2009-yukishiro/source/blender/editors/object/editgroup.c
    branches/soc-2009-yukishiro/source/blender/editors/object/object_edit.c
    branches/soc-2009-yukishiro/source/blender/editors/object/object_intern.h
    branches/soc-2009-yukishiro/source/blender/editors/object/object_ops.c
    branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_context.c
    branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_intern.h
    branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_ops.c
    branches/soc-2009-yukishiro/source/blender/editors/space_buttons/space_buttons.c
    branches/soc-2009-yukishiro/source/blender/editors/space_outliner/outliner.c
    branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2009-yukishiro/source/blender/editors/transform/transform_orientations.c
    branches/soc-2009-yukishiro/source/blender/makesrna/RNA_define.h
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_armature.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_define.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_object.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_pose.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_scene.c

Added Paths:
-----------
    branches/soc-2009-yukishiro/source/blender/nodes/intern/TEX_nodes/TEX_lightenv.c

Modified: branches/soc-2009-yukishiro/release/ui/buttons_data_armature.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_data_armature.py	2009-07-16 03:16:03 UTC (rev 21615)
+++ branches/soc-2009-yukishiro/release/ui/buttons_data_armature.py	2009-07-16 04:44:38 UTC (rev 21616)
@@ -42,11 +42,12 @@
 
 
 		if arm:
-			layout.itemR(arm, "rest_position")
-
 			split = layout.split()
 
-			sub = split.column()
+			col = split.column()
+			col.itemR(arm, "rest_position")
+
+			sub = col.column()
 			sub.itemL(text="Deform:")
 			sub.itemR(arm, "deform_vertexgroups", text="Vertes Groups")
 			sub.itemR(arm, "deform_envelope", text="Envelopes")
@@ -69,17 +70,14 @@
 		layout = self.layout
 		arm = context.armature
 
-		split = layout.split()
+		layout.row().itemR(arm, "drawtype", expand=True)
 
-		sub = split.column()
-		sub.itemR(arm, "drawtype", text="Style")
-		sub.itemR(arm, "delay_deform", text="Delay Refresh")
-
-		sub = split.column()
+		sub = layout.column_flow()
 		sub.itemR(arm, "draw_names", text="Names")
 		sub.itemR(arm, "draw_axes", text="Axes")
 		sub.itemR(arm, "draw_custom_bone_shapes", text="Shapes")
 		sub.itemR(arm, "draw_group_colors", text="Colors")
+		sub.itemR(arm, "delay_deform", text="Delay Refresh")
 
 class DATA_PT_paths(DataButtonsPanel):
 	__idname__ = "DATA_PT_paths"
@@ -93,14 +91,15 @@
 		
 		sub = split.column()
 		sub.itemR(arm, "paths_show_around_current_frame", text="Around Frame")
+		col = sub.column(align=True)
 		if (arm.paths_show_around_current_frame):
-			sub.itemR(arm, "path_before_current", text="Before")
-			sub.itemR(arm, "path_after_current", text="After")
+			col.itemR(arm, "path_before_current", text="Before")
+			col.itemR(arm, "path_after_current", text="After")
 		else:
-			sub.itemR(arm, "path_start_frame", text="Start")
-			sub.itemR(arm, "path_end_frame", text="End")
+			col.itemR(arm, "path_start_frame", text="Start")
+			col.itemR(arm, "path_end_frame", text="End")
 
-		sub.itemR(arm, "path_size", text="Step")	
+		col.itemR(arm, "path_size", text="Step")	
 		sub.itemR(arm, "paths_calculate_head_positions", text="Head")
 		
 		sub = split.column()
@@ -121,13 +120,15 @@
 
 		sub = split.column()
 		sub.itemR(arm, "ghost_type", text="Scope")
+
+		col = sub.column(align=True)
 		if arm.ghost_type == 'RANGE':
-			sub.itemR(arm, "ghost_start_frame", text="Start")
-			sub.itemR(arm, "ghost_end_frame", text="End")
-			sub.itemR(arm, "ghost_size", text="Step")
+			col.itemR(arm, "ghost_start_frame", text="Start")
+			col.itemR(arm, "ghost_end_frame", text="End")
+			col.itemR(arm, "ghost_size", text="Step")
 		elif arm.ghost_type == 'CURRENT_FRAME':
-			sub.itemR(arm, "ghost_step", text="Range")
-			sub.itemR(arm, "ghost_size", text="Step")
+			col.itemR(arm, "ghost_step", text="Range")
+			col.itemR(arm, "ghost_size", text="Step")
 
 		sub = split.column()
 		sub.itemR(arm, "ghost_only_selected", text="Selected Only")

Modified: branches/soc-2009-yukishiro/release/ui/buttons_data_bone.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_data_bone.py	2009-07-16 03:16:03 UTC (rev 21615)
+++ branches/soc-2009-yukishiro/release/ui/buttons_data_bone.py	2009-07-16 04:44:38 UTC (rev 21616)
@@ -23,23 +23,52 @@
 		split.itemL(text="", icon="ICON_BONE_DATA")
 		split.itemR(bone, "name", text="")
 
-class BONE_PT_transform_bone(BoneButtonsPanel):
-	__idname__ = "BONE_PT_transform_bone"
+class BONE_PT_transform(BoneButtonsPanel):
+	__idname__ = "BONE_PT_transform"
 	__label__ = "Transform"
 
 	def draw(self, context):
 		layout = self.layout
+		ob = context.object
 		bone = context.bone
+
 		if not bone:
 			bone = context.edit_bone
 
-#Seems to be missing from RNA?
-		row = layout.row()
-		row.column().itemR(bone, "location")
-		row.column().itemR(bone, "rotation")
-		row.column().itemR(bone, "scale")
+			row = layout.row()
+			row.column().itemR(bone, "head")
+			row.column().itemR(bone, "tail")
 
+			col = row.column()
+			sub = col.column(align=True)
+			sub.itemL(text="Roll:")
+			sub.itemR(bone, "roll", text="")
+			sub.itemL()
+			sub.itemR(bone, "locked")
+			sub.itemS()
+		else:
+			pchan = ob.pose.pose_channels[context.bone.name]
 
+			layout.itemR(pchan, "rotation_mode")
+
+			row = layout.row()
+			col = row.column()
+			col.itemR(pchan, "location")
+			col.active = not (bone.parent and bone.connected)
+
+			col = row.column()
+			if pchan.rotation_mode == 'QUATERNION':
+				col.itemR(pchan, "rotation", text="Rotation")
+			else:
+				col.itemR(pchan, "euler_rotation", text="Rotation")
+
+			row.column().itemR(pchan, "scale")
+
+			if pchan.rotation_mode == 'QUATERNION':
+				col = layout.column(align=True)
+				col.itemL(text="Euler:")
+				col.row().itemR(pchan, "euler_rotation", text="")
+
 class BONE_PT_bone(BoneButtonsPanel):
 	__idname__ = "BONE_PT_bone"
 	__label__ = "Bone"
@@ -48,14 +77,21 @@
 	def draw(self, context):
 		layout = self.layout
 		bone = context.bone
+		arm = context.armature
 		if not bone:
 			bone = context.edit_bone
 
 		split = layout.split()
 
 		sub = split.column()
-		sub.itemR(bone, "parent")
-		sub.itemR(bone, "connected")
+		sub.itemL(text="Parent:")
+		if context.bone:
+			sub.itemR(bone, "parent", text="")
+		else:
+			sub.item_pointerR(bone, "parent", arm, "edit_bones", text="")
+		row = sub.row()
+		row.itemR(bone, "connected")
+		row.active = bone.parent != None
 
 		sub.itemL(text="Layers:")
 		sub.template_layers(bone, "layer")
@@ -70,8 +106,6 @@
 		sub.itemR(bone, "draw_wire", text="Wireframe")
 		sub.itemR(bone, "hidden", text="Hide")
 
-
-		
 class BONE_PT_deform(BoneButtonsPanel):
 	__idname__ = "BONE_PT_deform"
 	__label__ = "Deform"
@@ -94,22 +128,30 @@
 			
 		split = layout.split()
 
-		sub = split.column()
-		sub.itemL(text="Envelope:")
+		col = split.column()
+		col.itemL(text="Envelope:")
+		sub = col.column(align=True)
 		sub.itemR(bone, "envelope_distance", text="Distance")
 		sub.itemR(bone, "envelope_weight", text="Weight")
-		sub.itemR(bone, "multiply_vertexgroup_with_envelope", text="Multiply")
-		sub = split.column()
-		
-		sub.itemL(text="Curved Bones:")
+		col.itemR(bone, "multiply_vertexgroup_with_envelope", text="Multiply")
+
+		sub = col.column(align=True)
+		sub.itemL(text="Radius:")
+		sub.itemR(bone, "head_radius", text="Head")
+		sub.itemR(bone, "tail_radius", text="Tail")
+
+		col = split.column()
+		col.itemL(text="Curved Bones:")
+		sub = col.column(align=True)
 		sub.itemR(bone, "bbone_segments", text="Segments")
 		sub.itemR(bone, "bbone_in", text="Ease In")
 		sub.itemR(bone, "bbone_out", text="Ease Out")
 		
-		sub.itemR(bone, "cyclic_offset")
+		col.itemL(text="Offset:")
+		col.itemR(bone, "cyclic_offset")
 
-
 bpy.types.register(BONE_PT_context_bone)
-bpy.types.register(BONE_PT_transform_bone)
+bpy.types.register(BONE_PT_transform)
 bpy.types.register(BONE_PT_bone)
 bpy.types.register(BONE_PT_deform)
+

Modified: branches/soc-2009-yukishiro/release/ui/buttons_object_constraint.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_object_constraint.py	2009-07-16 03:16:03 UTC (rev 21615)
+++ branches/soc-2009-yukishiro/release/ui/buttons_object_constraint.py	2009-07-16 04:44:38 UTC (rev 21616)
@@ -528,7 +528,7 @@
 
 class BONE_PT_constraints(ConstraintButtonsPanel):
 	__idname__ = "BONE_PT_constraints"
-	__label__ = "Bone Constraints"
+	__label__ = "Constraints"
 	__context__ = "bone"
 
 	def poll(self, context):
@@ -541,7 +541,7 @@
 		layout = self.layout
 
 		row = layout.row()
-		row.item_menu_enumO("OBJECT_OT_constraint_add", "type")
+		row.item_menu_enumO("POSE_OT_constraint_add", "type")
 		row.itemL();
 
 		for con in pchan.constraints:

Modified: branches/soc-2009-yukishiro/release/ui/buttons_objects.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_objects.py	2009-07-16 03:16:03 UTC (rev 21615)
+++ branches/soc-2009-yukishiro/release/ui/buttons_objects.py	2009-07-16 04:44:38 UTC (rev 21616)
@@ -31,6 +31,31 @@
 		row.column().itemR(ob, "rotation")
 		row.column().itemR(ob, "scale")
 
+class OBJECT_PT_relations(ObjectButtonsPanel):
+	__idname__ = "OBJECT_PT_relations"
+	__label__ = "Relations"
+
+	def draw(self, context):
+		layout = self.layout
+		ob = context.object
+
+		split = layout.split()
+		col = split.column()
+		col.itemR(ob, "layers")
+		col.itemS()
+		col.itemR(ob, "pass_index")
+
+		col = split.column()
+		col.itemL(text="Parent:")
+		col.itemR(ob, "parent", text="")
+
+		sub = col.column()
+		sub.itemR(ob, "parent_type", text="Type")
+		parent = ob.parent
+		if parent and ob.parent_type == 'BONE' and parent.type == 'ARMATURE':
+			sub.item_pointerR(ob, "parent_bone", parent.data, "bones", text="")
+		sub.active = parent != None
+
 class OBJECT_PT_groups(ObjectButtonsPanel):
 	__idname__ = "OBJECT_PT_groups"
 	__label__ = "Groups"
@@ -39,24 +64,23 @@
 		layout = self.layout
 		ob = context.object
 
-		row = layout.row()
-		row.itemR(ob, "pass_index")
-		row.itemR(ob, "parent")
+		split = layout.split()
+		split.item_menu_enumO("OBJECT_OT_group_add", "group", text="Add to Group")
+		split.itemL()
 
-		# layout.left_right()
-		# layout.itemO("OBJECT_OT_add_group");
-
 		for group in bpy.data.groups:
 			if ob.name in group.objects:
 				col = layout.column(align=True)
 
+				col.set_context_pointer("group", group)
+
 				row = col.box().row()
 				row.itemR(group, "name", text="")
-				#row.itemO("OBJECT_OT_remove_group")
+				row.itemO("OBJECT_OT_group_remove", text="", icon="VICON_X")
 
 				split = col.box().split()
-				split.column().itemR(group, "layer")
-				split.column().itemR(group, "dupli_offset")
+				split.column().itemR(group, "layer", text="Dupli")
+				split.column().itemR(group, "dupli_offset", text="")
 
 class OBJECT_PT_display(ObjectButtonsPanel):
 	__idname__ = "OBJECT_PT_display"
@@ -125,19 +149,29 @@
 		sub = split.column()
 		sub.itemL(text="Time Offset:")
 		sub.itemR(ob, "time_offset_edit", text="Edit")
-		sub.itemR(ob, "time_offset_particle", text="Particle")
-		sub.itemR(ob, "time_offset_parent", text="Parent")
-		sub.itemR(ob, "slow_parent")
+		row = sub.row()
+		row.itemR(ob, "time_offset_particle", text="Particle")
+		row.active = len(ob.particle_systems) != 0
+		row = sub.row()
+		row.itemR(ob, "time_offset_parent", text="Parent")
+		row.active = ob.parent != None
+		row = sub.row()
+		row.itemR(ob, "slow_parent")

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list