[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21622] branches/itasc: svn merge -r 21580 :21605 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/ blender
Benoit Bolsee
benoit.bolsee at online.be
Thu Jul 16 10:20:28 CEST 2009
Revision: 21622
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21622
Author: ben2610
Date: 2009-07-16 10:20:27 +0200 (Thu, 16 Jul 2009)
Log Message:
-----------
svn merge -r 21580:21605 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender
Modified Paths:
--------------
branches/itasc/config/win32-vc-config.py
branches/itasc/config/win64-vc-config.py
branches/itasc/release/ui/buttons_data_armature.py
branches/itasc/release/ui/buttons_data_bone.py
branches/itasc/release/ui/buttons_object_constraint.py
branches/itasc/release/ui/buttons_objects.py
branches/itasc/release/ui/buttons_scene.py
branches/itasc/release/ui/buttons_texture.py
branches/itasc/release/ui/space_info.py
branches/itasc/source/blender/blenkernel/intern/material.c
branches/itasc/source/blender/blenloader/intern/readfile.c
branches/itasc/source/blender/editors/armature/editarmature.c
branches/itasc/source/blender/editors/armature/poseobject.c
branches/itasc/source/blender/editors/include/ED_armature.h
branches/itasc/source/blender/editors/include/ED_object.h
branches/itasc/source/blender/editors/interface/interface_panel.c
branches/itasc/source/blender/editors/interface/interface_templates.c
branches/itasc/source/blender/editors/interface/resources.c
branches/itasc/source/blender/editors/mesh/editmesh_tools.c
branches/itasc/source/blender/editors/object/editconstraint.c
branches/itasc/source/blender/editors/object/editgroup.c
branches/itasc/source/blender/editors/object/object_edit.c
branches/itasc/source/blender/editors/object/object_intern.h
branches/itasc/source/blender/editors/object/object_ops.c
branches/itasc/source/blender/editors/screen/area.c
branches/itasc/source/blender/editors/space_buttons/buttons_context.c
branches/itasc/source/blender/editors/space_buttons/buttons_intern.h
branches/itasc/source/blender/editors/space_buttons/buttons_ops.c
branches/itasc/source/blender/editors/space_buttons/space_buttons.c
branches/itasc/source/blender/editors/space_info/space_info.c
branches/itasc/source/blender/editors/space_outliner/outliner.c
branches/itasc/source/blender/editors/space_view3d/view3d_buttons.c
branches/itasc/source/blender/editors/transform/transform_orientations.c
branches/itasc/source/blender/makesrna/RNA_define.h
branches/itasc/source/blender/makesrna/intern/rna_armature.c
branches/itasc/source/blender/makesrna/intern/rna_brush.c
branches/itasc/source/blender/makesrna/intern/rna_context.c
branches/itasc/source/blender/makesrna/intern/rna_define.c
branches/itasc/source/blender/makesrna/intern/rna_internal.h
branches/itasc/source/blender/makesrna/intern/rna_lamp.c
branches/itasc/source/blender/makesrna/intern/rna_material.c
branches/itasc/source/blender/makesrna/intern/rna_object.c
branches/itasc/source/blender/makesrna/intern/rna_pose.c
branches/itasc/source/blender/makesrna/intern/rna_scene.c
branches/itasc/source/blender/makesrna/intern/rna_world.c
Added Paths:
-----------
branches/itasc/release/windows/extra/python30.zip
branches/itasc/release/windows/extra/python31.zip
Modified: branches/itasc/config/win32-vc-config.py
===================================================================
--- branches/itasc/config/win32-vc-config.py 2009-07-16 08:20:15 UTC (rev 21621)
+++ branches/itasc/config/win32-vc-config.py 2009-07-16 08:20:27 UTC (rev 21622)
@@ -9,10 +9,10 @@
BF_FFMPEG_LIB = 'avformat-52.lib avcodec-52.lib avdevice-52.lib avutil-50.lib swscale-0.lib'
BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_VERSION = '2.6'
+BF_PYTHON_VERSION = '3.1'
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = 'python'
-BF_PYTHON_LIB = 'python26'
+BF_PYTHON_LIB = 'python31'
BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
WITH_BF_OPENAL = True
@@ -149,7 +149,7 @@
CC = 'cl.exe'
CXX = 'cl.exe'
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT']
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT', '/wd4244', '/wd4305', '/wd4800']
CXXFLAGS = ['/EHsc']
BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
Modified: branches/itasc/config/win64-vc-config.py
===================================================================
--- branches/itasc/config/win64-vc-config.py 2009-07-16 08:20:15 UTC (rev 21621)
+++ branches/itasc/config/win64-vc-config.py 2009-07-16 08:20:27 UTC (rev 21622)
@@ -9,10 +9,10 @@
BF_FFMPEG_LIB = 'avformat-52.lib avcodec-51.lib avdevice-52.lib avutil-49.lib swscale-0.lib'
BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_VERSION = '3.0'
+BF_PYTHON_VERSION = '3.1'
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = 'python'
-BF_PYTHON_LIB = 'python30'
+BF_PYTHON_LIB = 'python31'
BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
WITH_BF_OPENAL = False
@@ -152,7 +152,7 @@
CC = 'cl.exe'
CXX = 'cl.exe'
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT']
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT', '/wd4244', '/wd4305', '/wd4800']
CXXFLAGS = ['/EHsc']
BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
Modified: branches/itasc/release/ui/buttons_data_armature.py
===================================================================
--- branches/itasc/release/ui/buttons_data_armature.py 2009-07-16 08:20:15 UTC (rev 21621)
+++ branches/itasc/release/ui/buttons_data_armature.py 2009-07-16 08:20:27 UTC (rev 21622)
@@ -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/itasc/release/ui/buttons_data_bone.py
===================================================================
--- branches/itasc/release/ui/buttons_data_bone.py 2009-07-16 08:20:15 UTC (rev 21621)
+++ branches/itasc/release/ui/buttons_data_bone.py 2009-07-16 08:20:27 UTC (rev 21622)
@@ -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,11 +106,83 @@
sub.itemR(bone, "draw_wire", text="Wireframe")
sub.itemR(bone, "hidden", text="Hide")
+class BONE_PT_inverse_kinematics(BoneButtonsPanel):
+ __idname__ = "BONE_PT_inverse_kinematics"
+ __label__ = "Inverse Kinematics"
+ __default_closed__ = True
+
+ def poll(self, context):
+ ob = context.object
+ bone = context.bone
+ if ob and context.bone:
+ pchan = ob.pose.pose_channels[context.bone.name]
+ return pchan.has_ik
+ return False
+
+ def draw(self, context):
+ layout = self.layout
+ ob = context.object
+ bone = context.bone
+ pchan = ob.pose.pose_channels[context.bone.name]
+
+ row = layout.row()
+ row.itemR(ob.pose, "ik_solver")
+
+ split = layout.split(percentage=0.25)
+ split.itemR(pchan, "ik_dof_x", text="X")
+ row = split.row()
+ row.itemR(pchan, "ik_stiffness_x", text="Stiffness")
+ row.active = pchan.ik_dof_x
+
+ split = layout.split(percentage=0.25)
+ row = split.row()
+ row.itemR(pchan, "ik_limit_x", text="Limit")
+ row.active = pchan.ik_dof_x
+ row = split.row(align=True)
+ row.itemR(pchan, "ik_min_x", text="")
+ row.itemR(pchan, "ik_max_x", text="")
+ row.active = pchan.ik_dof_x and pchan.ik_limit_x
+
+ split = layout.split(percentage=0.25)
+ split.itemR(pchan, "ik_dof_y", text="Y")
+ row = split.row()
+ row.itemR(pchan, "ik_stiffness_y", text="Stiffness")
+ row.active = pchan.ik_dof_y
+
+ split = layout.split(percentage=0.25)
+ row = split.row()
+ row.itemR(pchan, "ik_limit_y", text="Limit")
+ row.active = pchan.ik_dof_y
+ row = split.row(align=True)
+ row.itemR(pchan, "ik_min_y", text="")
+ row.itemR(pchan, "ik_max_y", text="")
+ row.active = pchan.ik_dof_y and pchan.ik_limit_y
+
+ split = layout.split(percentage=0.25)
+ split.itemR(pchan, "ik_dof_z", text="Z")
+ row = split.row()
+ row.itemR(pchan, "ik_stiffness_z", text="Stiffness")
+ row.active = pchan.ik_dof_z
+
+ split = layout.split(percentage=0.25)
+ row = split.row()
+ row.itemR(pchan, "ik_limit_z", text="Limit")
+ row.active = pchan.ik_dof_z
+ row = split.row(align=True)
+ row.itemR(pchan, "ik_min_z", text="")
+ row.itemR(pchan, "ik_max_z", text="")
+ row.active = pchan.ik_dof_z and pchan.ik_limit_z
+
+ split = layout.split()
+ split.itemR(pchan, "ik_stretch", text="Stretch")
+ split.itemL()
+
class BONE_PT_deform(BoneButtonsPanel):
__idname__ = "BONE_PT_deform"
__label__ = "Deform"
+ __default_closed__ = True
def draw_header(self, context):
layout = self.layout
@@ -94,22 +202,31 @@
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")
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list