[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37718] branches/soc-2011-pepper: Merged with trunk r37717.
Joerg Mueller
nexyon at gmail.com
Tue Jun 21 23:10:37 CEST 2011
Revision: 37718
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37718
Author: nexyon
Date: 2011-06-21 21:10:36 +0000 (Tue, 21 Jun 2011)
Log Message:
-----------
Merged with trunk r37717.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37717
Modified Paths:
--------------
branches/soc-2011-pepper/build_files/buildbot/master.cfg
branches/soc-2011-pepper/build_files/buildbot/master_unpack.py
branches/soc-2011-pepper/build_files/buildbot/slave_pack.py
branches/soc-2011-pepper/build_files/cmake/cmake_consistency_check.py
branches/soc-2011-pepper/build_files/scons/config/linux2-config.py
branches/soc-2011-pepper/doc/blender_file_format/BlendFileDnaExporter_25.py
branches/soc-2011-pepper/doc/blender_file_format/BlendFileReader.py
branches/soc-2011-pepper/doc/doxygen/Doxyfile
branches/soc-2011-pepper/doc/python_api/examples/bpy.props.4.py
branches/soc-2011-pepper/extern/bullet2/CMakeLists.txt
branches/soc-2011-pepper/release/datafiles/splash.png
branches/soc-2011-pepper/release/scripts/modules/bpy_extras/image_utils.py
branches/soc-2011-pepper/release/scripts/modules/bpy_extras/mesh_utils.py
branches/soc-2011-pepper/release/scripts/modules/bpy_extras/view3d_utils.py
branches/soc-2011-pepper/release/scripts/startup/bl_operators/mesh.py
branches/soc-2011-pepper/release/scripts/startup/bl_operators/nla.py
branches/soc-2011-pepper/release/scripts/startup/bl_operators/object_quick_effects.py
branches/soc-2011-pepper/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2011-pepper/release/scripts/startup/bl_ui/properties_data_curve.py
branches/soc-2011-pepper/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2011-pepper/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/soc-2011-pepper/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2011-pepper/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/soc-2011-pepper/release/text/GPL-license.txt
branches/soc-2011-pepper/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-pepper/source/blender/editors/datafiles/splash.png.c
branches/soc-2011-pepper/source/blender/editors/physics/particle_edit.c
branches/soc-2011-pepper/source/blender/editors/space_file/filesel.c
branches/soc-2011-pepper/source/blender/editors/space_outliner/outliner.c
branches/soc-2011-pepper/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2011-pepper/source/blender/editors/transform/transform_snap.c
branches/soc-2011-pepper/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-pepper/source/blender/python/generic/mathutils_Vector.c
branches/soc-2011-pepper/source/blender/python/intern/bpy_interface.c
branches/soc-2011-pepper/source/blender/python/intern/bpy_rna.c
branches/soc-2011-pepper/source/tools/CTS/FBlender.py
Property Changed:
----------------
branches/soc-2011-pepper/
Property changes on: branches/soc-2011-pepper
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:36830-37677
+ /trunk/blender:36830-37717
Modified: branches/soc-2011-pepper/build_files/buildbot/master.cfg
===================================================================
--- branches/soc-2011-pepper/build_files/buildbot/master.cfg 2011-06-21 20:39:41 UTC (rev 37717)
+++ branches/soc-2011-pepper/build_files/buildbot/master.cfg 2011-06-21 21:10:36 UTC (rev 37718)
@@ -74,6 +74,7 @@
else:
return SVN(baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/blender', mode='update', defaultBranch='trunk', workdir='blender')
+
def lib_svn_step(dir):
return SVN(name='lib svn', baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/lib/' + dir, mode='update', defaultBranch='trunk', workdir='lib/' + dir)
Modified: branches/soc-2011-pepper/build_files/buildbot/master_unpack.py
===================================================================
--- branches/soc-2011-pepper/build_files/buildbot/master_unpack.py 2011-06-21 20:39:41 UTC (rev 37717)
+++ branches/soc-2011-pepper/build_files/buildbot/master_unpack.py 2011-06-21 21:10:36 UTC (rev 37718)
@@ -64,10 +64,11 @@
return '-'.join(platform_tokens)
+
def get_branch(filename):
tokens = filename.split("-")
branch = ""
-
+
for token in tokens:
if branch == "":
branch = token
Modified: branches/soc-2011-pepper/build_files/buildbot/slave_pack.py
===================================================================
--- branches/soc-2011-pepper/build_files/buildbot/slave_pack.py 2011-06-21 20:39:41 UTC (rev 37717)
+++ branches/soc-2011-pepper/build_files/buildbot/slave_pack.py 2011-06-21 21:10:36 UTC (rev 37718)
@@ -36,7 +36,7 @@
branch = ''
if len(sys.argv) >= 3:
- branch = sys.argv[2]
+ branch = sys.argv[2]
# scons does own packaging
if builder.find('scons') != -1:
Modified: branches/soc-2011-pepper/build_files/cmake/cmake_consistency_check.py
===================================================================
--- branches/soc-2011-pepper/build_files/cmake/cmake_consistency_check.py 2011-06-21 20:39:41 UTC (rev 37717)
+++ branches/soc-2011-pepper/build_files/cmake/cmake_consistency_check.py 2011-06-21 21:10:36 UTC (rev 37718)
@@ -32,8 +32,41 @@
"/decimation/intern/future/",
"/TerraplayNetwork/",
"/ik_glut_test/",
+
+ # specific source files
+ "extern/Eigen2/Eigen/src/Cholesky/CholeskyInstantiations.cpp",
+ "extern/Eigen2/Eigen/src/Core/CoreInstantiations.cpp",
+ "extern/Eigen2/Eigen/src/QR/QrInstantiations.cpp",
+ "extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp",
+ "extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp",
+ "extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp",
+ "extern/bullet2/src/BulletCollision/CollisionShapes/btBox2dShape.cpp",
+ "extern/bullet2/src/BulletCollision/CollisionShapes/btConvex2dShape.cpp",
+ "extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp",
+ "extern/bullet2/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp",
+ "extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp",
+ "extern/eltopo/common/meshes/ObjLoader.cpp",
+ "extern/eltopo/common/meshes/meshloader.cpp",
+ "extern/eltopo/common/openglutils.cpp",
+ "extern/eltopo/eltopo3d/broadphase_blenderbvh.cpp",
+ "source/blender/imbuf/intern/imbuf_cocoa.m",
+
+ "extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h",
+ "extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h",
+ "extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h",
+ "extern/bullet2/src/BulletCollision/CollisionShapes/btBox2dShape.h",
+ "extern/bullet2/src/BulletCollision/CollisionShapes/btConvex2dShape.h",
+ "extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.h",
+ "extern/bullet2/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h",
+ "extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h",
+ "extern/eltopo/common/meshes/Edge.hpp",
+ "extern/eltopo/common/meshes/ObjLoader.hpp",
+ "extern/eltopo/common/meshes/TriangleIndex.hpp",
+ "extern/eltopo/common/meshes/meshloader.h",
+ "extern/eltopo/eltopo3d/broadphase_blenderbvh.h"
)
+
import os
from os.path import join, dirname, normpath, abspath, splitext
Modified: branches/soc-2011-pepper/build_files/scons/config/linux2-config.py
===================================================================
--- branches/soc-2011-pepper/build_files/scons/config/linux2-config.py 2011-06-21 20:39:41 UTC (rev 37717)
+++ branches/soc-2011-pepper/build_files/scons/config/linux2-config.py 2011-06-21 21:10:36 UTC (rev 37718)
@@ -93,7 +93,7 @@
#BF_GETTEXT_LIB_STATIC = '${BF_GETTEXT}/lib/libgettextlib.a'
WITH_BF_GAMEENGINE = True
-WITH_BF_PLAYER = False
+WITH_BF_PLAYER = True
WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
Modified: branches/soc-2011-pepper/doc/blender_file_format/BlendFileDnaExporter_25.py
===================================================================
--- branches/soc-2011-pepper/doc/blender_file_format/BlendFileDnaExporter_25.py 2011-06-21 20:39:41 UTC (rev 37717)
+++ branches/soc-2011-pepper/doc/blender_file_format/BlendFileDnaExporter_25.py 2011-06-21 21:10:36 UTC (rev 37718)
@@ -13,8 +13,8 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# ***** END GPL LICENCE BLOCK *****
Modified: branches/soc-2011-pepper/doc/blender_file_format/BlendFileReader.py
===================================================================
--- branches/soc-2011-pepper/doc/blender_file_format/BlendFileReader.py 2011-06-21 20:39:41 UTC (rev 37717)
+++ branches/soc-2011-pepper/doc/blender_file_format/BlendFileReader.py 2011-06-21 21:10:36 UTC (rev 37718)
@@ -13,8 +13,8 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# ***** END GPL LICENCE BLOCK *****
Modified: branches/soc-2011-pepper/doc/doxygen/Doxyfile
===================================================================
--- branches/soc-2011-pepper/doc/doxygen/Doxyfile 2011-06-21 20:39:41 UTC (rev 37717)
+++ branches/soc-2011-pepper/doc/doxygen/Doxyfile 2011-06-21 21:10:36 UTC (rev 37718)
@@ -31,7 +31,7 @@
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = "V2.57"
+PROJECT_NUMBER = "V2.58"
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer
Modified: branches/soc-2011-pepper/doc/python_api/examples/bpy.props.4.py
===================================================================
--- branches/soc-2011-pepper/doc/python_api/examples/bpy.props.4.py 2011-06-21 20:39:41 UTC (rev 37717)
+++ branches/soc-2011-pepper/doc/python_api/examples/bpy.props.4.py 2011-06-21 21:10:36 UTC (rev 37718)
@@ -10,6 +10,7 @@
import bpy
+
def update_func(self, context):
print("my test function", self)
Modified: branches/soc-2011-pepper/extern/bullet2/CMakeLists.txt
===================================================================
--- branches/soc-2011-pepper/extern/bullet2/CMakeLists.txt 2011-06-21 20:39:41 UTC (rev 37717)
+++ branches/soc-2011-pepper/extern/bullet2/CMakeLists.txt 2011-06-21 21:10:36 UTC (rev 37718)
@@ -149,6 +149,15 @@
src/LinearMath/btGeometryUtil.cpp
src/LinearMath/btQuickprof.cpp
src/LinearMath/btSerializer.cpp
+ # UNUSED
+ # src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp
+ # src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp
+ # 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
src/Bullet-C-Api.h
src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
@@ -217,6 +226,7 @@
src/BulletCollision/CollisionShapes/btTriangleCallback.h
src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h
src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h
+ src/BulletCollision/CollisionShapes/btTriangleInfoMap.h
src/BulletCollision/CollisionShapes/btTriangleMesh.h
src/BulletCollision/CollisionShapes/btTriangleMeshShape.h
src/BulletCollision/CollisionShapes/btTriangleShape.h
@@ -264,6 +274,7 @@
src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h
src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h
src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h
+ src/BulletDynamics/Character/btCharacterControllerInterface.h
src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
src/BulletDynamics/ConstraintSolver/btConstraintSolver.h
src/BulletDynamics/ConstraintSolver/btContactConstraint.h
@@ -291,9 +302,12 @@
src/BulletSoftBody/btDefaultSoftBodySolver.h
src/BulletSoftBody/btSoftBody.h
src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
+ src/BulletSoftBody/btSoftBodyData.h
src/BulletSoftBody/btSoftBodyHelpers.h
src/BulletSoftBody/btSoftBodyInternals.h
src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h
+ src/BulletSoftBody/btSoftBodySolverVertexBuffer.h
+ src/BulletSoftBody/btSoftBodySolvers.h
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list