[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47152] branches/soc-2011-tomato: svn merge ^/trunk/blender -r47103:47150
Campbell Barton
ideasman42 at gmail.com
Tue May 29 07:48:07 CEST 2012
Revision: 47152
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47152
Author: campbellbarton
Date: 2012-05-29 05:48:07 +0000 (Tue, 29 May 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r47103:47150
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47103
Modified Paths:
--------------
branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py
branches/soc-2011-tomato/extern/bullet2/CMakeLists.txt
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp
branches/soc-2011-tomato/extern/bullet2/src/SConscript
branches/soc-2011-tomato/intern/cycles/SConscript
branches/soc-2011-tomato/intern/cycles/blender/blender_mesh.cpp
branches/soc-2011-tomato/intern/cycles/blender/blender_sync.cpp
branches/soc-2011-tomato/intern/cycles/device/device_cuda.cpp
branches/soc-2011-tomato/intern/cycles/kernel/CMakeLists.txt
branches/soc-2011-tomato/intern/cycles/kernel/SConscript
branches/soc-2011-tomato/intern/cycles/kernel/kernel_bvh.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_compat_cuda.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_projection.h
branches/soc-2011-tomato/intern/cycles/util/util_transform.h
branches/soc-2011-tomato/release/scripts/modules/bpy/utils.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/customdata.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/effect.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/sequencer.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/smoke.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_ghash.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_utildefines.h
branches/soc-2011-tomato/source/blender/blenlib/PIL_time.h
branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/editors/curve/editcurve.c
branches/soc-2011-tomato/source/blender/editors/include/ED_sequencer.h
branches/soc-2011-tomato/source/blender/editors/interface/interface_panel.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_tools.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_intern.h
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_object_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-tomato/source/blender/python/generic/py_capi_utils.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-tomato/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_BulletPhysicsController.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_IPhysicsController.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_IPhysicsController.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/soc-2011-tomato/source/gameengine/Physics/common/PHY_Pro.h
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-47103
+ /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-47150
Modified: branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py 2012-05-29 05:46:54 UTC (rev 47151)
+++ branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py 2012-05-29 05:48:07 UTC (rev 47152)
@@ -166,7 +166,8 @@
#Ray trace optimization
WITH_BF_RAYOPTIMIZATION = True
-BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE','/arch:SSE2']
+# No need to manually specify SSE/SSE2 on x64 systems.
+BF_RAYOPTIMIZATION_SSE_FLAGS = ['']
WITH_BF_STATICOPENGL = False
BF_OPENGL_INC = '${BF_OPENGL}/include'
Modified: branches/soc-2011-tomato/extern/bullet2/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/extern/bullet2/CMakeLists.txt 2012-05-29 05:46:54 UTC (rev 47151)
+++ branches/soc-2011-tomato/extern/bullet2/CMakeLists.txt 2012-05-29 05:48:07 UTC (rev 47152)
@@ -118,6 +118,7 @@
src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp
src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp
src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
+ src/BulletDynamics/Character/btKinematicCharacterController.cpp
src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
@@ -154,7 +155,6 @@
# src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp
# src/BulletCollision/CollisionShapes/btBox2dShape.cpp
# src/BulletCollision/CollisionShapes/btConvex2dShape.cpp
- # src/BulletDynamics/Character/btKinematicCharacterController.cpp
# src/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp
# src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp
@@ -274,6 +274,7 @@
src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h
src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h
src/BulletDynamics/Character/btCharacterControllerInterface.h
+ src/BulletDynamics/Character/btKinematicCharacterController.h
src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
src/BulletDynamics/ConstraintSolver/btConstraintSolver.h
src/BulletDynamics/ConstraintSolver/btContactConstraint.h
@@ -343,7 +344,6 @@
# src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h
# src/BulletCollision/CollisionShapes/btBox2dShape.h
# src/BulletCollision/CollisionShapes/btConvex2dShape.h
- # src/BulletDynamics/Character/btKinematicCharacterController.h
# src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h
# src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h
)
Modified: branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
===================================================================
--- branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h 2012-05-29 05:46:54 UTC (rev 47151)
+++ branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h 2012-05-29 05:48:07 UTC (rev 47152)
@@ -339,7 +339,7 @@
///***************************************** expert/internal use only *************************
- void setQuantizationValues(const btVector3& bvhAabbMin,const btVector3& bvhAabbMax,btScalar quantizationMargin=btScalar(1.0));
+ void setQuantizationValues(const btVector3& bvhAabbMin,const btVector3& bvhAabbMax,btScalar quantizationMargin=btScalar(1.5));
QuantizedNodeArray& getLeafNodeArray() { return m_quantizedLeafNodes; }
///buildInternal is expert use only: assumes that setQuantizationValues and LeafNodeArray are initialized
void buildInternal();
Modified: branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp
===================================================================
--- branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp 2012-05-29 05:46:54 UTC (rev 47151)
+++ branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp 2012-05-29 05:48:07 UTC (rev 47152)
@@ -84,7 +84,7 @@
} else
{
///need to transform normal into worldspace
- hitNormalWorld = m_hitCollisionObject->getWorldTransform().getBasis()*convexResult.m_hitNormalLocal;
+ hitNormalWorld = convexResult.m_hitCollisionObject->getWorldTransform().getBasis()*convexResult.m_hitNormalLocal;
}
btScalar dotUp = m_up.dot(hitNormalWorld);
Modified: branches/soc-2011-tomato/extern/bullet2/src/SConscript
===================================================================
--- branches/soc-2011-tomato/extern/bullet2/src/SConscript 2012-05-29 05:46:54 UTC (rev 47151)
+++ branches/soc-2011-tomato/extern/bullet2/src/SConscript 2012-05-29 05:48:07 UTC (rev 47152)
@@ -23,7 +23,7 @@
linearmath_src = env.Glob("LinearMath/*.cpp")
-bulletdyn_src = env.Glob("BulletDynamics/Vehicle/*.cpp") + env.Glob("BulletDynamics/ConstraintSolver/*.cpp") + env.Glob("BulletDynamics/Dynamics/*.cpp")
+bulletdyn_src = env.Glob("BulletDynamics/Vehicle/*.cpp") + env.Glob("BulletDynamics/ConstraintSolver/*.cpp") + env.Glob("BulletDynamics/Dynamics/*.cpp") + env.Glob("BulletDynamics/Character/*.cpp")
collision_broadphase_src = env.Glob("BulletCollision/BroadphaseCollision/*.cpp")
collision_dispatch_src = env.Glob("BulletCollision/CollisionDispatch/*.cpp")
Modified: branches/soc-2011-tomato/intern/cycles/SConscript
===================================================================
--- branches/soc-2011-tomato/intern/cycles/SConscript 2012-05-29 05:46:54 UTC (rev 47151)
+++ branches/soc-2011-tomato/intern/cycles/SConscript 2012-05-29 05:48:07 UTC (rev 47152)
@@ -46,8 +46,10 @@
if env['WITH_BF_RAYOPTIMIZATION']:
optim_cxxflags = []
- if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
+ if env['OURPLATFORM'] == 'win32-vc':
optim_cxxflags.append('/arch:SSE2 -D_CRT_SECURE_NO_WARNINGS /fp:fast /EHsc'.split())
+ elif env['OURPLATFORM'] == 'win64-vc':
+ optim_cxxflags.append('-D_CRT_SECURE_NO_WARNINGS /fp:fast /EHsc'.split())
else:
optim_cxxflags.append('-ffast-math -msse -msse2 -msse3 -mfpmath=sse'.split())
Modified: branches/soc-2011-tomato/intern/cycles/blender/blender_mesh.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/blender_mesh.cpp 2012-05-29 05:46:54 UTC (rev 47151)
+++ branches/soc-2011-tomato/intern/cycles/blender/blender_mesh.cpp 2012-05-29 05:48:07 UTC (rev 47152)
@@ -304,7 +304,6 @@
void BlenderSync::sync_mesh_motion(BL::Object b_ob, Mesh *mesh, int motion)
{
/* todo: displacement, subdivision */
- BL::ID b_ob_data = b_ob.data();
size_t size = mesh->verts.size();
/* skip objects without deforming modifiers. this is not a totally reliable,
Modified: branches/soc-2011-tomato/intern/cycles/blender/blender_sync.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/blender_sync.cpp 2012-05-29 05:46:54 UTC (rev 47151)
+++ branches/soc-2011-tomato/intern/cycles/blender/blender_sync.cpp 2012-05-29 05:48:07 UTC (rev 47152)
@@ -135,7 +135,6 @@
void BlenderSync::sync_integrator()
{
- BL::RenderSettings r = b_scene.render();
PointerRNA cscene = RNA_pointer_get(&b_scene.ptr, "cycles");
experimental = (RNA_enum_get(&cscene, "feature_set") != 0);
Modified: branches/soc-2011-tomato/intern/cycles/device/device_cuda.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/device/device_cuda.cpp 2012-05-29 05:46:54 UTC (rev 47151)
+++ branches/soc-2011-tomato/intern/cycles/device/device_cuda.cpp 2012-05-29 05:48:07 UTC (rev 47152)
@@ -259,7 +259,7 @@
path_create_directories(cubin);
- string command = string_printf("\"%s\" -arch=sm_%d%d -m%d --cubin \"%s\" --use_fast_math "
+ string command = string_printf("\"%s\" -arch=sm_%d%d -m%d --cubin \"%s\" "
"-o \"%s\" --ptxas-options=\"-v\" --maxrregcount=%d --opencc-options -OPT:Olimit=0 -I\"%s\" -DNVCC",
nvcc.c_str(), major, minor, machine, kernel.c_str(), cubin.c_str(), maxreg, include.c_str());
Modified: branches/soc-2011-tomato/intern/cycles/kernel/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/intern/cycles/kernel/CMakeLists.txt 2012-05-29 05:46:54 UTC (rev 47151)
+++ branches/soc-2011-tomato/intern/cycles/kernel/CMakeLists.txt 2012-05-29 05:48:07 UTC (rev 47152)
@@ -114,7 +114,7 @@
add_custom_command(
OUTPUT ${cuda_cubin}
- COMMAND ${CUDA_NVCC_EXECUTABLE} -arch=${arch} -m${CUDA_BITS} --cubin ${CMAKE_CURRENT_SOURCE_DIR}/kernel.cu --use_fast_math -o ${CMAKE_CURRENT_BINARY_DIR}/${cuda_cubin} --ptxas-options="-v" --maxrregcount=24 --opencc-options -OPT:Olimit=0 -I${CMAKE_CURRENT_SOURCE_DIR}/../util -I${CMAKE_CURRENT_SOURCE_DIR}/svm -DCCL_NAMESPACE_BEGIN= -DCCL_NAMESPACE_END= -DNVCC
+ COMMAND ${CUDA_NVCC_EXECUTABLE} -arch=${arch} -m${CUDA_BITS} --cubin ${CMAKE_CURRENT_SOURCE_DIR}/kernel.cu -o ${CMAKE_CURRENT_BINARY_DIR}/${cuda_cubin} --ptxas-options="-v" --maxrregcount=24 --opencc-options -OPT:Olimit=0 -I${CMAKE_CURRENT_SOURCE_DIR}/../util -I${CMAKE_CURRENT_SOURCE_DIR}/svm -DCCL_NAMESPACE_BEGIN= -DCCL_NAMESPACE_END= -DNVCC
DEPENDS ${cuda_sources})
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list