[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46685] branches/soc-2011-tomato: svn merge ^/trunk/blender -r46632:46684
Campbell Barton
ideasman42 at gmail.com
Wed May 16 11:12:19 CEST 2012
Revision: 46685
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46685
Author: campbellbarton
Date: 2012-05-16 09:12:18 +0000 (Wed, 16 May 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r46632:46684
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46632
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/build_files/cmake/macros.cmake
branches/soc-2011-tomato/build_files/cmake/packaging.cmake
branches/soc-2011-tomato/build_files/package_spec/rpm/blender.spec.in
branches/soc-2011-tomato/build_files/scons/config/win64-mingw-config.py
branches/soc-2011-tomato/extern/eltopo/CMakeLists.txt
branches/soc-2011-tomato/extern/eltopo/common/ccd_defs.h
branches/soc-2011-tomato/extern/eltopo/eltopo3d/collisionpipeline.cpp
branches/soc-2011-tomato/extern/eltopo/eltopo3d/dynamicsurface.cpp
branches/soc-2011-tomato/extern/eltopo/eltopo3d/dynamicsurface.h
branches/soc-2011-tomato/extern/eltopo/eltopo3d/eltopo.cpp
branches/soc-2011-tomato/intern/elbeem/CMakeLists.txt
branches/soc-2011-tomato/intern/elbeem/intern/ntl_blenderdumper.cpp
branches/soc-2011-tomato/intern/elbeem/intern/ntl_geometryobject.cpp
branches/soc-2011-tomato/intern/elbeem/intern/ntl_vector3dim.h
branches/soc-2011-tomato/intern/elbeem/intern/ntl_world.cpp
branches/soc-2011-tomato/intern/elbeem/intern/particletracer.cpp
branches/soc-2011-tomato/intern/elbeem/intern/solver_adap.cpp
branches/soc-2011-tomato/intern/elbeem/intern/solver_init.cpp
branches/soc-2011-tomato/intern/elbeem/intern/solver_main.cpp
branches/soc-2011-tomato/intern/elbeem/intern/solver_relax.h
branches/soc-2011-tomato/intern/elbeem/intern/solver_util.cpp
branches/soc-2011-tomato/release/scripts/startup/bl_operators/image.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/presets.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_animviz.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_bone.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_object.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_paint_common.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_text.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_time.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-tomato/source/blender/blenkernel/BKE_colortools.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_mesh.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_object.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/action.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/cloth.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/collision.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/colortools.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/icons.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/multires.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/nla.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/softbody.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/sound.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_ghash.h
branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2011-tomato/source/blender/blenlib/intern/fileops.c
branches/soc-2011-tomato/source/blender/blenlib/intern/pbvh.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readblenentry.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mesh.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_walkers.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_create.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_hull.c
branches/soc-2011-tomato/source/blender/bmesh/tools/BME_bevel.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_filter.c
branches/soc-2011-tomato/source/blender/editors/armature/editarmature.c
branches/soc-2011-tomato/source/blender/editors/armature/editarmature_retarget.c
branches/soc-2011-tomato/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2011-tomato/source/blender/editors/armature/reeb.c
branches/soc-2011-tomato/source/blender/editors/curve/editcurve.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_ops.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-tomato/source/blender/editors/object/object_add.c
branches/soc-2011-tomato/source/blender/editors/render/render_update.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_cursor.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_editor.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_draw.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_intern.h
branches/soc-2011-tomato/source/blender/editors/space_node/node_ops.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2011-tomato/source/blender/imbuf/intern/filetype.c
branches/soc-2011-tomato/source/blender/imbuf/intern/jpeg.c
branches/soc-2011-tomato/source/blender/imbuf/intern/metadata.c
branches/soc-2011-tomato/source/blender/imbuf/intern/readimage.c
branches/soc-2011-tomato/source/blender/imbuf/intern/targa.c
branches/soc-2011-tomato/source/blender/imbuf/intern/util.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_texture_types.h
branches/soc-2011-tomato/source/blender/makesdna/intern/dna_genfile.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_armature.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_brush.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_color.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sequencer_api.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_boolean_util.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_build.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_mask.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_rna_callback.c
branches/soc-2011-tomato/source/blender/render/intern/raytrace/bvh.h
branches/soc-2011-tomato/source/blender/render/intern/raytrace/rayobject.cpp
branches/soc-2011-tomato/source/blender/render/intern/raytrace/rayobject_blibvh.cpp
branches/soc-2011-tomato/source/blender/render/intern/raytrace/rayobject_hint.h
branches/soc-2011-tomato/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
branches/soc-2011-tomato/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
branches/soc-2011-tomato/source/blender/render/intern/raytrace/rayobject_rtbuild.h
branches/soc-2011-tomato/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
branches/soc-2011-tomato/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
branches/soc-2011-tomato/source/blender/render/intern/raytrace/reorganize.h
branches/soc-2011-tomato/source/blender/render/intern/raytrace/svbvh.h
branches/soc-2011-tomato/source/blender/render/intern/raytrace/vbvh.h
branches/soc-2011-tomato/source/blender/render/intern/source/convertblender.c
branches/soc-2011-tomato/source/blender/render/intern/source/sss.c
branches/soc-2011-tomato/source/blender/render/intern/source/strand.c
branches/soc-2011-tomato/source/blender/render/intern/source/texture_ocean.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_window.c
branches/soc-2011-tomato/source/tools/GL/core.gl
branches/soc-2011-tomato/source/tools/GL/extensions.gl
branches/soc-2011-tomato/source/tools/GL/glreport.py
Added Paths:
-----------
branches/soc-2011-tomato/intern/elbeem/intern/globals.h
branches/soc-2011-tomato/source/tools/GL/agl.gl
branches/soc-2011-tomato/source/tools/GL/cgl.gl
branches/soc-2011-tomato/source/tools/GL/deprecated.gl
branches/soc-2011-tomato/source/tools/GL/egl.gl
branches/soc-2011-tomato/source/tools/GL/glX.gl
branches/soc-2011-tomato/source/tools/GL/libraries.gl
branches/soc-2011-tomato/source/tools/GL/wgl.gl
Removed Paths:
-------------
branches/soc-2011-tomato/source/tools/GL/system.gl
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-46632
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-46684
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2012-05-16 08:42:50 UTC (rev 46684)
+++ branches/soc-2011-tomato/CMakeLists.txt 2012-05-16 09:12:18 UTC (rev 46685)
@@ -837,6 +837,15 @@
set(GETTEXT_LIBPATH ${GETTEXT}/lib)
set(GETTEXT_LIBRARIES gnu_gettext)
endif()
+
+ set(LAPACK ${LIBDIR}/lapack)
+ # set(LAPACK_INCLUDE_DIR ${LAPACK}/include)
+ set_lib_path(LAPACK_LIBPATH ${LAPACK}/lib)
+ set(LAPACK_LIBRARIES
+ ${LIBDIR}/lapack/lib/libf2c.lib
+ ${LIBDIR}/lapack/lib/clapack_nowrap.lib
+ ${LIBDIR}/lapack/lib/BLAS_nowrap.lib
+ )
set(PNG_LIBRARIES libpng)
set(JPEG_LIBRARIES libjpeg)
@@ -1011,8 +1020,10 @@
set(PLATFORM_CFLAGS "-pipe -funsigned-char -fno-strict-aliasing")
if(WITH_MINGW64)
- #Yes, the point for MinGW64 is moar optimization by default :)
- set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -mmmx -msse -msse2 -ftree-vectorize")
+ #We need to take care though not to have these on debug builds because they may play funky with gdb
+ if(CMAKE_BUILD_TYPE MATCHES "Release")
+ set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -mmmx -ftree-vectorize")
+ endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -lpthread")
Modified: branches/soc-2011-tomato/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/macros.cmake 2012-05-16 08:42:50 UTC (rev 46684)
+++ branches/soc-2011-tomato/build_files/cmake/macros.cmake 2012-05-16 09:12:18 UTC (rev 46685)
@@ -214,7 +214,8 @@
${OPENGL_glu_LIBRARY}
${PNG_LIBRARIES}
${ZLIB_LIBRARIES}
- ${FREETYPE_LIBRARY})
+ ${FREETYPE_LIBRARY}
+ ${LAPACK_LIBRARIES})
# since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
if(WITH_PYTHON) # AND NOT WITH_PYTHON_MODULE # WIN32 needs
Modified: branches/soc-2011-tomato/build_files/cmake/packaging.cmake
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/packaging.cmake 2012-05-16 08:42:50 UTC (rev 46684)
+++ branches/soc-2011-tomato/build_files/cmake/packaging.cmake 2012-05-16 09:12:18 UTC (rev 46685)
@@ -1,5 +1,5 @@
set(PROJECT_DESCRIPTION "Blender is a very fast and versatile 3D modeller/renderer.")
-set(PROJECT_COPYRIGHT "Copyright (C) 2001-2011 Blender Foundation")
+set(PROJECT_COPYRIGHT "Copyright (C) 2001-2012 Blender Foundation")
set(PROJECT_CONTACT "foundation at blender.org")
set(PROJECT_VENDOR "Blender Foundation")
set(ORG_WEBSITE "www.blender.org")
@@ -31,7 +31,7 @@
# Force Package Name
-set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME}-${BLENDER_VERSION}-r${BUILD_REV}-${CMAKE_SYSTEM_PROCESSOR})
+set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME}-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}-1.r${BUILD_REV}-${CMAKE_SYSTEM_PROCESSOR})
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
# RPM packages
Modified: branches/soc-2011-tomato/build_files/package_spec/rpm/blender.spec.in
===================================================================
--- branches/soc-2011-tomato/build_files/package_spec/rpm/blender.spec.in 2012-05-16 08:42:50 UTC (rev 46684)
+++ branches/soc-2011-tomato/build_files/package_spec/rpm/blender.spec.in 2012-05-16 09:12:18 UTC (rev 46685)
@@ -1,6 +1,12 @@
# -*- rpm-spec -*-
%global __python %{__python3}
+%global blender_api @CPACK_PACKAGE_VERSION_MAJOR at .@CPACK_PACKAGE_VERSION_MINOR@
+%define _rpmdir @CPACK_RPM_DIRECTORY@
+%define _rpmfilename @CPACK_RPM_FILE_NAME@
+%define _unpackaged_files_terminate_build 0
+%define _topdir @CPACK_RPM_DIRECTORY@
+
BuildRoot: @CPACK_RPM_DIRECTORY@/@CPACK_PACKAGE_FILE_NAME@@CPACK_RPM_PACKAGE_COMPONENT_PART_PATH@
Summary: @CPACK_RPM_PACKAGE_SUMMARY@
Name: @CPACK_RPM_PACKAGE_NAME@
@@ -9,13 +15,18 @@
License: @CPACK_RPM_PACKAGE_LICENSE@
Group: @CPACK_RPM_PACKAGE_GROUP@
Vendor: @CPACK_RPM_PACKAGE_VENDOR@
-Epoch: 1
+Epoch: 1
-%define _rpmdir @CPACK_RPM_DIRECTORY@
-%define _rpmfilename @CPACK_RPM_FILE_NAME@
-%define _unpackaged_files_terminate_build 0
-%define _topdir @CPACK_RPM_DIRECTORY@
+Requires(post): desktop-file-utils
+Requires(post): shared-mime-info
+Requires(postun): desktop-file-utils
+Requires(postun): shared-mime-info
+Provides: blender(ABI) = %{blender_api}
+Provides: blender-fonts = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes: blender-fonts <= 2.49a-9
+
%description
Blender is an integrated 3d suite for modelling, animation, rendering,
post-production, interactive creation and playback (games). Blender has its
@@ -40,6 +51,10 @@
fi
mv "@CPACK_TOPLEVEL_DIRECTORY@/tmpBBroot" ${RPM_BUILD_ROOT}
+rm -f ${RPM_BUILD_ROOT}%{_bindir}/blender-thumbnailer.py
+
+%find_lang %{name}
+
%clean
rm -rf ${RPM_BUILD_ROOT}
@@ -57,14 +72,15 @@
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
fi || :
-%files
+%files -f blender.lang
%defattr(-,root,root,-)
%{_bindir}/%{name}
-%{_datadir}/%{name}/@CPACK_PACKAGE_VERSION_MAJOR at .@CPACK_PACKAGE_VERSION_MINOR@
+%{_datadir}/%{name}/%{blender_api}/datafiles/fonts
+%{_datadir}/%{name}/%{blender_api}/scripts
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%{_datadir}/applications/%{name}.desktop
-%{_datadir}/doc/blender
-%{_mandir}/man1/blender.*
+%{_datadir}/doc/%{name}
+%{_mandir}/man1/%{name}.*
%changelog
@CPACK_RPM_SPEC_CHANGELOG@
Modified: branches/soc-2011-tomato/build_files/scons/config/win64-mingw-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/win64-mingw-config.py 2012-05-16 08:42:50 UTC (rev 46684)
+++ branches/soc-2011-tomato/build_files/scons/config/win64-mingw-config.py 2012-05-16 09:12:18 UTC (rev 46685)
@@ -167,7 +167,7 @@
#Ray trace optimization
WITH_BF_RAYOPTIMIZATION = True
-BF_RAYOPTIMIZATION_SSE_FLAGS = ['-mmmx', '-msse', '-msse2', '-ftree-vectorize']
+BF_RAYOPTIMIZATION_SSE_FLAGS = ['-mmmx', '-msse', '-msse2']
#Produces errors while rendering with subsurf/multires,
WITH_BF_OPENMP = False
@@ -182,7 +182,7 @@
CPPFLAGS = ['-DWIN32', '-DMS_WIN64', '-DFREE_WINDOWS', '-DFREE_WINDOWS64', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE64_SOURCE', '-DBOOST_ALL_NO_LIB', '-DBOOST_THREAD_USE_LIB', '-DGLEW_STATIC']
REL_CFLAGS = []
REL_CXXFLAGS = []
-REL_CCFLAGS = ['-DNDEBUG', '-O2', '-mmmx', '-msse', '-msse2', '-ftree-vectorize']
+REL_CCFLAGS = ['-DNDEBUG', '-O2', '-ftree-vectorize']
C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement', '-Wstrict-prototypes']
Modified: branches/soc-2011-tomato/extern/eltopo/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/extern/eltopo/CMakeLists.txt 2012-05-16 08:42:50 UTC (rev 46684)
+++ branches/soc-2011-tomato/extern/eltopo/CMakeLists.txt 2012-05-16 09:12:18 UTC (rev 46685)
@@ -50,15 +50,25 @@
common/makelevelset3.cpp
common/marching_triangles.cpp
common/predicates.cpp
+ common/runstats.cpp
common/sos_ccd_wrapper.cpp
common/wallclocktime.cpp
eltopo3d/accelerationgrid.cpp
eltopo3d/broadphasegrid.cpp
+ eltopo3d/collisionpipeline.cpp
eltopo3d/dynamicsurface.cpp
+ eltopo3d/edgecollapser.cpp
+ eltopo3d/edgeflipper.cpp
+ eltopo3d/edgesplitter.cpp
eltopo3d/eltopo.cpp
+ eltopo3d/impactzonesolver.cpp
+ eltopo3d/meshmerger.cpp
+ eltopo3d/meshsmoother.cpp
+ eltopo3d/meshpincher.cpp
eltopo3d/nondestructivetrimesh.cpp
eltopo3d/subdivisionscheme.cpp
eltopo3d/surftrack.cpp
+ eltopo3d/trianglequality.cpp
common/newsparse/dense_matrix.cpp
common/newsparse/krylov_solvers.cpp
common/newsparse/sparse_matrix.cpp
Modified: branches/soc-2011-tomato/extern/eltopo/common/ccd_defs.h
===================================================================
--- branches/soc-2011-tomato/extern/eltopo/common/ccd_defs.h 2012-05-16 08:42:50 UTC (rev 46684)
+++ branches/soc-2011-tomato/extern/eltopo/common/ccd_defs.h 2012-05-16 09:12:18 UTC (rev 46685)
@@ -11,7 +11,7 @@
// Uncomment one of the following (cubic solver version has been tested hardest):
//
-//#define USE_CUBIC_SOLVER_CCD
+// #define USE_CUBIC_SOLVER_CCD
#define USE_TUNICATE_CCD
#endif
Modified: branches/soc-2011-tomato/extern/eltopo/eltopo3d/collisionpipeline.cpp
===================================================================
--- branches/soc-2011-tomato/extern/eltopo/eltopo3d/collisionpipeline.cpp 2012-05-16 08:42:50 UTC (rev 46684)
+++ branches/soc-2011-tomato/extern/eltopo/eltopo3d/collisionpipeline.cpp 2012-05-16 09:12:18 UTC (rev 46685)
@@ -126,7 +126,7 @@
double s3 = alphas[3];
double i = impulse_magnitude / (s0*s0*inv_m0 + s1*s1*inv_m1 + s2*s2*inv_m2 + s3*s3*inv_m3);
-
+
if ( i > 100.0 / dt )
{
std::cout << "big impulse: " << i << std::endl;
@@ -732,7 +732,7 @@
g_stats.add_to_int( "CollisionPipeline::total_num_collisions", 1 );
- double relvel = collision.m_relative_displacement / dt;
+ double relvel = collision.m_relative_displacement * dt;
double desired_relative_velocity = 0.0;
double impulse = IMPULSE_MULTIPLIER * (desired_relative_velocity - relvel);
apply_edge_edge_impulse( collision, impulse, dt );
@@ -752,7 +752,8 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list