[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26672] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 26669.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Sun Feb 7 14:19:44 CET 2010
Revision: 26672
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26672
Author: kjym3
Date: 2010-02-07 14:19:44 +0100 (Sun, 07 Feb 2010)
Log Message:
-----------
Merged changes in the trunk up to revision 26669.
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26669
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/SConstruct
branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp
branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
branches/soc-2008-mxcurioni/intern/ghost/make/msvc_9_0/ghost.vcproj
branches/soc-2008-mxcurioni/intern/iksolver/intern/IK_QSegment.cpp
branches/soc-2008-mxcurioni/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
branches/soc-2008-mxcurioni/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
branches/soc-2008-mxcurioni/release/scripts/io/engine_render_pov.py
branches/soc-2008-mxcurioni/release/scripts/io/export_3ds.py
branches/soc-2008-mxcurioni/release/scripts/io/export_fbx.py
branches/soc-2008-mxcurioni/release/scripts/io/export_mdd.py
branches/soc-2008-mxcurioni/release/scripts/io/export_obj.py
branches/soc-2008-mxcurioni/release/scripts/io/export_ply.py
branches/soc-2008-mxcurioni/release/scripts/io/export_x3d.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/mouth.py
branches/soc-2008-mxcurioni/release/scripts/modules/rna_prop_ui.py
branches/soc-2008-mxcurioni/release/scripts/op/object.py
branches/soc-2008-mxcurioni/release/scripts/op/object_randomize_transform.py
branches/soc-2008-mxcurioni/release/scripts/op/uv.py
branches/soc-2008-mxcurioni/release/scripts/op/wm.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_mesh.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_material.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_render.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_scene.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_dopesheet.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_graph.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_image.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d.py
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_constraint.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_deform.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_depsgraph.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_multires.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_scene.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/action.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/armature.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/blender.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/curve.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/deform.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/modifier.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/multires.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_listbase.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_args.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/listbase.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_base_inline.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/collada/DocumentExporter.cpp
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_filter.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_keyframes_edit.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_space_api.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_loop.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/loopcut.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_constraint.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/object/object_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_vgroup.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/space_image.c
branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_window.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.h
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_generics.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_input.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_snap.c
branches/soc-2008-mxcurioni/source/blender/editors/util/editmode_undo.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_actuator_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_sensor_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_enum_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_action.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_brush.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_camera.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_controller.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_curve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_define.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_material.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_particle.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_rna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sensor.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_texture.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_props.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.h
branches/soc-2008-mxcurioni/source/blender/render/intern/include/render_types.h
branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/initrender.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayshade.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeoutput.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/zbuf.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_types.h
branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
branches/soc-2008-mxcurioni/source/creator/creator.c
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Light.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SoundActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsController.h
Added Paths:
-----------
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/shape_key_transforms.py
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2010-02-07 13:07:12 UTC (rev 26671)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2010-02-07 13:19:44 UTC (rev 26672)
@@ -416,7 +416,7 @@
SET(OPENCOLLADA ${LIBDIR}/opencollada)
SET(OPENCOLLADA_INC ${OPENCOLLADA}/include)
SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
- SET(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser UTF xml2 )
+ SET(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser UTF xml2 buffer ftoa)
#pcre is bundled with openCollada
#SET(PCRE ${LIBDIR}/pcre)
#SET(PCRE_LIBPATH ${PCRE}/lib)
Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct 2010-02-07 13:07:12 UTC (rev 26671)
+++ branches/soc-2008-mxcurioni/SConstruct 2010-02-07 13:19:44 UTC (rev 26672)
@@ -592,10 +592,10 @@
#currently win64-vc doesn't appear to have libpng.dll
if env['OURPLATFORM'] != 'win64-vc':
- dllsources += ['${BF_PNG_LIBPATH}/libpng.dll']
+ dllsources += ['${BF_PNG_LIBPATH}/libpng.dll',
+ '${BF_ZLIB_LIBPATH}/zlib.dll']
- dllsources += ['${BF_ZLIB_LIBPATH}/zlib.dll',
- '${BF_TIFF_LIBPATH}/${BF_TIFF_LIB}.dll']
+ dllsources += ['${BF_TIFF_LIBPATH}/${BF_TIFF_LIB}.dll']
if env['OURPLATFORM'] != 'linuxcross':
# pthreads library is already added
Modified: branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp
===================================================================
--- branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp 2010-02-07 13:07:12 UTC (rev 26671)
+++ branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp 2010-02-07 13:19:44 UTC (rev 26672)
@@ -30,22 +30,9 @@
//construct bvh from meshInterface
#ifndef DISABLE_BVH
- btVector3 bvhAabbMin,bvhAabbMax;
- if(meshInterface->hasPremadeAabb())
- {
- meshInterface->getPremadeAabb(&bvhAabbMin, &bvhAabbMax);
- }
- else
- {
- meshInterface->calculateAabbBruteForce(bvhAabbMin,bvhAabbMax);
- }
-
if (buildBvh)
{
- void* mem = btAlignedAlloc(sizeof(btOptimizedBvh),16);
- m_bvh = new (mem) btOptimizedBvh();
- m_bvh->build(meshInterface,m_useQuantizedAabbCompression,bvhAabbMin,bvhAabbMax);
- m_ownsBvh = true;
+ buildOptimizedBvh();
}
#endif //DISABLE_BVH
@@ -343,20 +330,25 @@
if ((getLocalScaling() -scaling).length2() > SIMD_EPSILON)
{
btTriangleMeshShape::setLocalScaling(scaling);
- if (m_ownsBvh)
- {
- m_bvh->~btOptimizedBvh();
- btAlignedFree(m_bvh);
- }
- ///m_localAabbMin/m_localAabbMax is already re-calculated in btTriangleMeshShape. We could just scale aabb, but this needs some more work
- void* mem = btAlignedAlloc(sizeof(btOptimizedBvh),16);
- m_bvh = new(mem) btOptimizedBvh();
- //rebuild the bvh...
- m_bvh->build(m_meshInterface,m_useQuantizedAabbCompression,m_localAabbMin,m_localAabbMax);
- m_ownsBvh = true;
+ buildOptimizedBvh();
}
}
+void btBvhTriangleMeshShape::buildOptimizedBvh()
+{
+ if (m_ownsBvh)
+ {
+ m_bvh->~btOptimizedBvh();
+ btAlignedFree(m_bvh);
+ }
+ ///m_localAabbMin/m_localAabbMax is already re-calculated in btTriangleMeshShape. We could just scale aabb, but this needs some more work
+ void* mem = btAlignedAlloc(sizeof(btOptimizedBvh),16);
+ m_bvh = new(mem) btOptimizedBvh();
+ //rebuild the bvh...
+ m_bvh->build(m_meshInterface,m_useQuantizedAabbCompression,m_localAabbMin,m_localAabbMax);
+ m_ownsBvh = true;
+}
+
void btBvhTriangleMeshShape::setOptimizedBvh(btOptimizedBvh* bvh, const btVector3& scaling)
{
btAssert(!m_bvh);
Modified: branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
===================================================================
--- branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h 2010-02-07 13:07:12 UTC (rev 26671)
+++ branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h 2010-02-07 13:19:44 UTC (rev 26672)
@@ -76,6 +76,8 @@
void setOptimizedBvh(btOptimizedBvh* bvh, const btVector3& localScaling=btVector3(1,1,1));
+ void buildOptimizedBvh();
+
bool usesQuantizedAabbCompression() const
{
return m_useQuantizedAabbCompression;
Modified: branches/soc-2008-mxcurioni/intern/ghost/make/msvc_9_0/ghost.vcproj
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/make/msvc_9_0/ghost.vcproj 2010-02-07 13:07:12 UTC (rev 26671)
+++ branches/soc-2008-mxcurioni/intern/ghost/make/msvc_9_0/ghost.vcproj 2010-02-07 13:19:44 UTC (rev 26672)
@@ -120,7 +120,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..;..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\lib\windows\wintab\INCLUDE;..\..\..\..\..\build\msvc_9\extern\glew\include"
+ AdditionalIncludeDirectories="..\..;..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\lib\windows\wintab\INCLUDE;..\..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\source\blender\imbuf;..\..\..\..\source\blender\makesdna"
PreprocessorDefinitions="WIN32,_DEBUG,_LIB,_USE_MATH_DEFINES"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -389,6 +389,10 @@
>
</File>
<File
+ RelativePath="..\..\intern\GHOST_EventString.h"
+ >
+ </File>
+ <File
RelativePath="..\..\intern\GHOST_EventTrackpad.h"
>
</File>
Modified: branches/soc-2008-mxcurioni/intern/iksolver/intern/IK_QSegment.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/iksolver/intern/IK_QSegment.cpp 2010-02-07 13:07:12 UTC (rev 26671)
+++ branches/soc-2008-mxcurioni/intern/iksolver/intern/IK_QSegment.cpp 2010-02-07 13:19:44 UTC (rev 26672)
@@ -28,6 +28,10 @@
*/
#include "IK_QSegment.h"
+#ifdef WIN32
+#define _USE_MATH_DEFINES
+#endif
+#include <cmath>
// Utility functions
@@ -368,21 +372,21 @@
return;
if (axis == 1) {
- lmin = MT_clamp(lmin, -180, 180);
- lmax = MT_clamp(lmax, -180, 180);
+ lmin = MT_clamp(lmin, -M_PI, M_PI);
+ lmax = MT_clamp(lmax, -M_PI, M_PI);
- m_min_y = MT_radians(lmin);
- m_max_y = MT_radians(lmax);
+ m_min_y = lmin;
+ m_max_y = lmax;
m_limit_y = true;
}
else {
// clamp and convert to axis angle parameters
- lmin = MT_clamp(lmin, -180, 180);
- lmax = MT_clamp(lmax, -180, 180);
+ lmin = MT_clamp(lmin, -M_PI, M_PI);
+ lmax = MT_clamp(lmax, -M_PI, M_PI);
- lmin = sin(MT_radians(lmin)*0.5);
- lmax = sin(MT_radians(lmax)*0.5);
+ lmin = sin(lmin*0.5);
+ lmax = sin(lmax*0.5);
if (axis == 0) {
m_min[0] = -lmax;
@@ -611,11 +615,11 @@
return;
// clamp and convert to axis angle parameters
- lmin = MT_clamp(lmin, -180, 180);
- lmax = MT_clamp(lmax, -180, 180);
+ lmin = MT_clamp(lmin, -M_PI, M_PI);
+ lmax = MT_clamp(lmax, -M_PI, M_PI);
- m_min = MT_radians(lmin);
- m_max = MT_radians(lmax);
+ m_min = lmin;
+ m_max = lmax;
m_limit = true;
}
@@ -750,11 +754,11 @@
return;
// clamp and convert to axis angle parameters
- lmin = MT_clamp(lmin, -180, 180);
- lmax = MT_clamp(lmax, -180, 180);
+ lmin = MT_clamp(lmin, -M_PI, M_PI);
+ lmax = MT_clamp(lmax, -M_PI, M_PI);
- lmin = sin(MT_radians(lmin)*0.5);
- lmax = sin(MT_radians(lmax)*0.5);
+ lmin = sin(lmin*0.5);
+ lmax = sin(lmax*0.5);
// put center of ellispe in the middle between min and max
MT_Scalar offset = 0.5*(lmin + lmax);
@@ -896,11 +900,11 @@
return;
// clamp and convert to axis angle parameters
- lmin = MT_clamp(lmin, -180, 180);
- lmax = MT_clamp(lmax, -180, 180);
+ lmin = MT_clamp(lmin, -M_PI, M_PI);
+ lmax = MT_clamp(lmax, -M_PI, M_PI);
- lmin = MT_radians(lmin);
- lmax = MT_radians(lmax);
+ lmin = lmin;
+ lmax = lmax;
if (axis == 1) {
m_min_twist = lmin;
Modified: branches/soc-2008-mxcurioni/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
===================================================================
--- branches/soc-2008-mxcurioni/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj 2010-02-07 13:07:12 UTC (rev 26671)
+++ branches/soc-2008-mxcurioni/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj 2010-02-07 13:19:44 UTC (rev 26672)
@@ -336,6 +336,10 @@
Name="internal"
>
<File
+ RelativePath="..\..\..\source\blender\python\intern\bpy_app.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\python\intern\bpy_array.c"
>
</File>
@@ -364,10 +368,6 @@
>
</File>
<File
- RelativePath="..\..\..\source\blender\python\intern\bpy_ui.c"
- >
- </File>
- <File
RelativePath="..\..\..\source\blender\python\intern\bpy_util.c"
>
</File>
@@ -429,6 +429,10 @@
Name="internal"
>
<File
+ RelativePath="..\..\..\source\blender\python\intern\bpy_app.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\python\intern\bpy_idprop.h"
>
</File>
@@ -457,10 +461,6 @@
>
</File>
<File
- RelativePath="..\..\..\source\blender\python\intern\bpy_ui.h"
- >
- </File>
- <File
RelativePath="..\..\..\source\blender\python\intern\bpy_util.h"
>
</File>
Modified: branches/soc-2008-mxcurioni/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
===================================================================
--- branches/soc-2008-mxcurioni/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj 2010-02-07 13:07:12 UTC (rev 26671)
+++ branches/soc-2008-mxcurioni/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj 2010-02-07 13:19:44 UTC (rev 26672)
@@ -480,6 +480,10 @@
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
>
<File
+ RelativePath="..\..\..\source\blender\blenlib\intern\BLI_args.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\blenlib\intern\BLI_bfile.c"
>
</File>
@@ -653,6 +657,10 @@
Filter="h;hpp;hxx;hm;inl"
>
<File
+ RelativePath="..\..\..\source\blender\blenlib\BLI_args.h"
+ >
+ </File>
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list