[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21647] branches/soc-2009-yukishiro: merge till 21642
Jingyuan Huang
jingyuan.huang at gmail.com
Fri Jul 17 04:10:28 CEST 2009
Revision: 21647
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21647
Author: yukishiro
Date: 2009-07-17 04:10:27 +0200 (Fri, 17 Jul 2009)
Log Message:
-----------
merge till 21642
Modified Paths:
--------------
branches/soc-2009-yukishiro/config/win32-mingw-config.py
branches/soc-2009-yukishiro/config/win32-vc-config.py
branches/soc-2009-yukishiro/config/win64-vc-config.py
branches/soc-2009-yukishiro/extern/bullet2/src/SConscript
branches/soc-2009-yukishiro/extern/ffmpeg/SConscript
branches/soc-2009-yukishiro/extern/libopenjpeg/SConscript
branches/soc-2009-yukishiro/intern/elbeem/SConscript
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_physics_fluid.py
branches/soc-2009-yukishiro/release/ui/buttons_scene.py
branches/soc-2009-yukishiro/release/ui/buttons_texture.py
branches/soc-2009-yukishiro/release/ui/space_info.py
branches/soc-2009-yukishiro/release/ui/space_text.py
branches/soc-2009-yukishiro/source/Makefile
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_context.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_report.h
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/context.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/effect.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/fluidsim.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/material.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/modifier.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/particle.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/report.c
branches/soc-2009-yukishiro/source/blender/blenloader/intern/readfile.c
branches/soc-2009-yukishiro/source/blender/blenloader/intern/writefile.c
branches/soc-2009-yukishiro/source/blender/editors/Makefile
branches/soc-2009-yukishiro/source/blender/editors/SConscript
branches/soc-2009-yukishiro/source/blender/editors/animation/keyframes_draw.c
branches/soc-2009-yukishiro/source/blender/editors/animation/keyframes_general.c
branches/soc-2009-yukishiro/source/blender/editors/armature/editarmature_retarget.c
branches/soc-2009-yukishiro/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2009-yukishiro/source/blender/editors/include/ED_space_api.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_transform.h
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_panel.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_style.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_templates.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_utils.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_widgets.c
branches/soc-2009-yukishiro/source/blender/editors/interface/resources.c
branches/soc-2009-yukishiro/source/blender/editors/interface/view2d.c
branches/soc-2009-yukishiro/source/blender/editors/interface/view2d_ops.c
branches/soc-2009-yukishiro/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2009-yukishiro/source/blender/editors/object/object_vgroup.c
branches/soc-2009-yukishiro/source/blender/editors/physics/ed_fluidsim.c
branches/soc-2009-yukishiro/source/blender/editors/physics/editparticle.c
branches/soc-2009-yukishiro/source/blender/editors/preview/previewrender.c
branches/soc-2009-yukishiro/source/blender/editors/screen/area.c
branches/soc-2009-yukishiro/source/blender/editors/screen/screen_ops.c
branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2009-yukishiro/source/blender/editors/space_api/spacetypes.c
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2009-yukishiro/source/blender/editors/space_file/filesel.c
branches/soc-2009-yukishiro/source/blender/editors/space_info/space_info.c
branches/soc-2009-yukishiro/source/blender/editors/space_node/SConscript
branches/soc-2009-yukishiro/source/blender/editors/space_outliner/outliner_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/drawobject.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2009-yukishiro/source/blender/editors/transform/transform.c
branches/soc-2009-yukishiro/source/blender/editors/transform/transform_generics.c
branches/soc-2009-yukishiro/source/blender/editors/transform/transform_manipulator.c
branches/soc-2009-yukishiro/source/blender/editors/transform/transform_ops.c
branches/soc-2009-yukishiro/source/blender/gpu/intern/gpu_draw.c
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_space_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2009-yukishiro/source/blender/makesrna/RNA_access.h
branches/soc-2009-yukishiro/source/blender/makesrna/intern/SConscript
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_access.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_brush.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_context.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_internal.h
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_material.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_particle.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_pose.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_scene.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_screen.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_space.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_world.c
branches/soc-2009-yukishiro/source/blender/python/SConscript
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_operator_wrap.c
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_ui.c
branches/soc-2009-yukishiro/source/blender/windowmanager/WM_types.h
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_subwindow.c
branches/soc-2009-yukishiro/source/blender/windowmanager/wm.h
branches/soc-2009-yukishiro/source/gameengine/BlenderRoutines/SConscript
branches/soc-2009-yukishiro/source/gameengine/Expressions/SConscript
branches/soc-2009-yukishiro/source/gameengine/GameLogic/SConscript
branches/soc-2009-yukishiro/source/gameengine/GamePlayer/common/SConscript
branches/soc-2009-yukishiro/source/gameengine/GamePlayer/ghost/SConscript
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KXNetwork/SConscript
branches/soc-2009-yukishiro/source/gameengine/Ketsji/SConscript
branches/soc-2009-yukishiro/source/gameengine/Physics/Bullet/SConscript
branches/soc-2009-yukishiro/source/gameengine/Physics/common/SConscript
branches/soc-2009-yukishiro/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
branches/soc-2009-yukishiro/source/gameengine/Rasterizer/SConscript
branches/soc-2009-yukishiro/source/gameengine/SceneGraph/SConscript
branches/soc-2009-yukishiro/source/gameengine/VideoTexture/SConscript
branches/soc-2009-yukishiro/tools/Blender.py
Added Paths:
-----------
branches/soc-2009-yukishiro/release/ui/buttons_physics_cloth.py
branches/soc-2009-yukishiro/release/ui/space_console.py
branches/soc-2009-yukishiro/release/windows/extra/python30.zip
branches/soc-2009-yukishiro/release/windows/extra/python31.zip
branches/soc-2009-yukishiro/source/blender/editors/space_console/
branches/soc-2009-yukishiro/source/blender/editors/space_console/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_console/SConscript
branches/soc-2009-yukishiro/source/blender/editors/space_console/console_draw.c
branches/soc-2009-yukishiro/source/blender/editors/space_console/console_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_console/console_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_console/space_console.c
Removed Paths:
-------------
branches/soc-2009-yukishiro/release/ui/buttons_physic_cloth.py
branches/soc-2009-yukishiro/source/blender/editors/space_console/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_console/SConscript
branches/soc-2009-yukishiro/source/blender/editors/space_console/console_draw.c
branches/soc-2009-yukishiro/source/blender/editors/space_console/console_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_console/console_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_console/space_console.c
Modified: branches/soc-2009-yukishiro/config/win32-mingw-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/win32-mingw-config.py 2009-07-17 02:07:35 UTC (rev 21646)
+++ branches/soc-2009-yukishiro/config/win32-mingw-config.py 2009-07-17 02:10:27 UTC (rev 21647)
@@ -2,7 +2,7 @@
LIBDIR = "${LCGDIR}"
BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_VERSION = '2.5'
+BF_PYTHON_VERSION = '3.1'
#BF_PYTHON_VERSION = '2.6'
WITH_BF_STATICPYTHON = False
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
Modified: branches/soc-2009-yukishiro/config/win32-vc-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/win32-vc-config.py 2009-07-17 02:07:35 UTC (rev 21646)
+++ branches/soc-2009-yukishiro/config/win32-vc-config.py 2009-07-17 02:10:27 UTC (rev 21647)
@@ -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
@@ -154,7 +154,7 @@
CC = 'cl.exe'
CXX = 'cl.exe'
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT']
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267']
CXXFLAGS = ['/EHsc']
BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
@@ -170,7 +170,7 @@
LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32', 'comdlg32', 'advapi32', 'shfolder', 'shell32', 'ole32', 'oleaut32', 'uuid']
-PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:IX86','/ENTRY:mainCRTStartup','/INCREMENTAL:NO','/NODEFAULTLIB:"msvcprt.lib"','/NODEFAULTLIB:"glut32.lib"','/NODEFAULTLIB:"libc.lib"','/NODEFAULTLIB:"libcd.lib"','/NODEFAULTLIB:"libcpd.lib"','/NODEFAULTLIB:"libcp.lib"','/LARGEADDRESSAWARE']
+PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:IX86','/INCREMENTAL:NO','/NODEFAULTLIB:"msvcprt.lib"','/NODEFAULTLIB:"msvcprtd.lib"','/NODEFAULTLIB:"glut32.lib"','/NODEFAULTLIB:"libc.lib"','/NODEFAULTLIB:"libcd.lib"','/NODEFAULTLIB:"libcpd.lib"','/NODEFAULTLIB:"libcp.lib"','/NODEFAULTLIB:"msvcrt.lib"', '/NODEFAULTLIB:"msvcrtd.lib"', '/NODEFAULTLIB:"msvcmrt.lib"', '/NODEFAULTLIB:"msvcurt.lib"', '/LARGEADDRESSAWARE']
# # Todo
# BF_PROFILE_CCFLAGS = ['-pg', '-g ']
Modified: branches/soc-2009-yukishiro/config/win64-vc-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/win64-vc-config.py 2009-07-17 02:07:35 UTC (rev 21646)
+++ branches/soc-2009-yukishiro/config/win64-vc-config.py 2009-07-17 02:10:27 UTC (rev 21647)
@@ -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,8 @@
CC = 'cl.exe'
CXX = 'cl.exe'
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT']
+CFLAGS = []
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267']
CXXFLAGS = ['/EHsc']
BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
@@ -172,16 +173,13 @@
BF_DEBUG=False
BF_BSC=False
-CFLAGS = []
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT']
-CXXFLAGS = ['/EHsc']
if BF_DEBUG:
BF_NUMJOBS=1
else:
BF_NUMJOBS=6
-PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/ENTRY:mainCRTStartup','/INCREMENTAL:NO','/NODEFAULTLIB:"msvcprt.lib"','/NODEFAULTLIB:"glut32.lib"','/NODEFAULTLIB:"libc.lib"','/NODEFAULTLIB:"libcd.lib"','/NODEFAULTLIB:"libcpd.lib"','/NODEFAULTLIB:"libcp.lib"']
+PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/INCREMENTAL:NO','/NODEFAULTLIB:"msvcprt.lib"','/NODEFAULTLIB:"msvcprtd.lib"','/NODEFAULTLIB:"glut32.lib"','/NODEFAULTLIB:"libc.lib"','/NODEFAULTLIB:"libcd.lib"','/NODEFAULTLIB:"libcpd.lib"','/NODEFAULTLIB:"libcp.lib"','/NODEFAULTLIB:"msvcrt.lib"', '/NODEFAULTLIB:"msvcrtd.lib"', '/NODEFAULTLIB:"msvcmrt.lib"', '/NODEFAULTLIB:"msvcurt.lib"']
BF_BUILDDIR = '..\\build\\blender25-win64-vc'
BF_INSTALLDIR='..\\install\\blender25-win64-vc'
Modified: branches/soc-2009-yukishiro/extern/bullet2/src/SConscript
===================================================================
--- branches/soc-2009-yukishiro/extern/bullet2/src/SConscript 2009-07-17 02:07:35 UTC (rev 21646)
+++ branches/soc-2009-yukishiro/extern/bullet2/src/SConscript 2009-07-17 02:10:27 UTC (rev 21647)
@@ -10,7 +10,7 @@
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
defs += ' WIN32 NDEBUG _WINDOWS _LIB'
#cflags += ['/MT', '/W3', '/GX', '/O2', '/Op']
- cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6', '/O3']
+ cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6', '/O3', '/EHcs']
elif env['OURPLATFORM']=='win32-mingw':
defs += ' NDEBUG'
cflags += ['-O2']
Modified: branches/soc-2009-yukishiro/extern/ffmpeg/SConscript
===================================================================
--- branches/soc-2009-yukishiro/extern/ffmpeg/SConscript 2009-07-17 02:07:35 UTC (rev 21646)
+++ branches/soc-2009-yukishiro/extern/ffmpeg/SConscript 2009-07-17 02:10:27 UTC (rev 21647)
@@ -148,7 +148,7 @@
break
sources.append(s)
- if env['OURPLATFORM'] in ['win32-mingw', 'win32-vc' , 'darwin'] :
+ if env['OURPLATFORM'] in ['win32-mingw', 'win32-vc', 'win64-vc' , 'darwin'] :
defs = "HAVE_AV_CONFIG_H _ISOC9X_SOURCE"
else :
defs = "HAVE_AV_CONFIG_H _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE _ISOC9X_SOURCE"
Modified: branches/soc-2009-yukishiro/extern/libopenjpeg/SConscript
===================================================================
--- branches/soc-2009-yukishiro/extern/libopenjpeg/SConscript 2009-07-17 02:07:35 UTC (rev 21646)
+++ branches/soc-2009-yukishiro/extern/libopenjpeg/SConscript 2009-07-17 02:10:27 UTC (rev 21647)
@@ -10,14 +10,14 @@
flags = []
defs = []
-if env['OURPLATFORM'] == 'win32-vc':
+if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
flags = []
defs.append('OPJ_STATIC')
else:
flags = ['-Wall', '-O3', '-ffast-math', '-std=c99']
oj_env = env.Clone()
-if not env['OURPLATFORM'] == 'win32-vc':
+if not env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
oj_env.Replace(CCFLAGS = '')
oj_env.Replace(BF_DEBUG_FLAGS = '')
Modified: branches/soc-2009-yukishiro/intern/elbeem/SConscript
===================================================================
--- branches/soc-2009-yukishiro/intern/elbeem/SConscript 2009-07-17 02:07:35 UTC (rev 21646)
+++ branches/soc-2009-yukishiro/intern/elbeem/SConscript 2009-07-17 02:10:27 UTC (rev 21647)
@@ -10,7 +10,7 @@
if env['WITH_BF_OPENMP']:
defs += ' PARALLEL'
-if env['OURPLATFORM']=='win32-vc':
+if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
defs += ' USE_MSVC6FIXES'
incs = env['BF_PNG_INC'] + ' ' + env['BF_ZLIB_INC']
incs += ' extern '
Modified: branches/soc-2009-yukishiro/release/ui/buttons_data_bone.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_data_bone.py 2009-07-17 02:07:35 UTC (rev 21646)
+++ branches/soc-2009-yukishiro/release/ui/buttons_data_bone.py 2009-07-17 02:10:27 UTC (rev 21647)
@@ -106,9 +106,80 @@
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]
+
+ 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
@@ -154,4 +225,5 @@
bpy.types.register(BONE_PT_transform)
bpy.types.register(BONE_PT_bone)
bpy.types.register(BONE_PT_deform)
+bpy.types.register(BONE_PT_inverse_kinematics)
Modified: branches/soc-2009-yukishiro/release/ui/buttons_object_constraint.py
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list