[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37701] trunk/blender: update cmake checker to ignore file list and add some headers to the source list .

Campbell Barton ideasman42 at gmail.com
Tue Jun 21 19:00:34 CEST 2011


Revision: 37701
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37701
Author:   campbellbarton
Date:     2011-06-21 17:00:34 +0000 (Tue, 21 Jun 2011)
Log Message:
-----------
update cmake checker to ignore file list and add some headers to the source list.

Modified Paths:
--------------
    trunk/blender/build_files/cmake/cmake_consistency_check.py
    trunk/blender/extern/bullet2/CMakeLists.txt
    trunk/blender/source/blender/python/intern/bpy_rna.c

Modified: trunk/blender/build_files/cmake/cmake_consistency_check.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_consistency_check.py	2011-06-21 16:59:48 UTC (rev 37700)
+++ trunk/blender/build_files/cmake/cmake_consistency_check.py	2011-06-21 17:00:34 UTC (rev 37701)
@@ -32,8 +32,44 @@
     "/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: trunk/blender/extern/bullet2/CMakeLists.txt
===================================================================
--- trunk/blender/extern/bullet2/CMakeLists.txt	2011-06-21 16:59:48 UTC (rev 37700)
+++ trunk/blender/extern/bullet2/CMakeLists.txt	2011-06-21 17:00:34 UTC (rev 37701)
@@ -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
 	src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
 	src/BulletSoftBody/btSoftRigidDynamicsWorld.h
 	src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
@@ -323,9 +337,16 @@
 	src/LinearMath/btTransform.h
 	src/LinearMath/btTransformUtil.h
 	src/LinearMath/btVector3.h
-	
 	src/btBulletCollisionCommon.h
 	src/btBulletDynamicsCommon.h
+	# src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h
+	# src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h
+	# 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
 )
 
 if(CMAKE_COMPILER_IS_GNUCXX)

Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.c	2011-06-21 16:59:48 UTC (rev 37700)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c	2011-06-21 17:00:34 UTC (rev 37701)
@@ -1473,7 +1473,7 @@
 				param= _PyUnicode_AsString(value);
 			}
 #else // USE_STRING_COERCE
-			param= _PyUnicode_AsStringSize(value);
+			param= _PyUnicode_AsString(value);
 #endif // USE_STRING_COERCE
 
 			if (param==NULL) {




More information about the Bf-blender-cvs mailing list