[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29259] trunk/blender: - WITH_CXX_GUARDEDALLOC working again
Campbell Barton
ideasman42 at gmail.com
Sun Jun 6 03:15:46 CEST 2010
Revision: 29259
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29259
Author: campbellbarton
Date: 2010-06-06 03:15:44 +0200 (Sun, 06 Jun 2010)
Log Message:
-----------
- WITH_CXX_GUARDEDALLOC working again
- CMake building without python or fluidsim working again (broke in recent commit)
- remove BLI_short_filename(), it wasnt used anywhere.
Modified Paths:
--------------
trunk/blender/intern/string/STR_String.h
trunk/blender/source/blender/blenlib/BLI_fileops.h
trunk/blender/source/blender/blenlib/intern/fileops.c
trunk/blender/source/blender/blenlib/intern/path_util.c
trunk/blender/source/blender/editors/interface/CMakeLists.txt
trunk/blender/source/blender/editors/object/object_constraint.c
trunk/blender/source/blender/editors/physics/CMakeLists.txt
trunk/blender/source/blender/editors/space_script/script_edit.c
trunk/blender/source/blender/editors/space_script/space_script.c
trunk/blender/source/blender/makesrna/intern/rna_wm.c
trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderSystem.h
trunk/blender/source/gameengine/Converter/BL_DeformableGameObject.h
trunk/blender/source/gameengine/Converter/BL_MeshDeformer.h
trunk/blender/source/gameengine/Converter/BL_ModifierDeformer.h
trunk/blender/source/gameengine/Converter/BL_ShapeDeformer.h
trunk/blender/source/gameengine/Converter/BL_SkinDeformer.h
trunk/blender/source/gameengine/Converter/BlenderWorldInfo.h
trunk/blender/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.h
trunk/blender/source/gameengine/Converter/KX_SoftBodyDeformer.h
trunk/blender/source/gameengine/Expressions/BoolValue.h
trunk/blender/source/gameengine/Expressions/ConstExpr.h
trunk/blender/source/gameengine/Expressions/EmptyValue.h
trunk/blender/source/gameengine/Expressions/ErrorValue.h
trunk/blender/source/gameengine/Expressions/Expression.h
trunk/blender/source/gameengine/Expressions/FloatValue.h
trunk/blender/source/gameengine/Expressions/IdentifierExpr.h
trunk/blender/source/gameengine/Expressions/IfExpr.h
trunk/blender/source/gameengine/Expressions/InputParser.h
trunk/blender/source/gameengine/Expressions/IntValue.h
trunk/blender/source/gameengine/Expressions/KX_HashedPtr.h
trunk/blender/source/gameengine/Expressions/Operator1Expr.h
trunk/blender/source/gameengine/Expressions/Operator2Expr.h
trunk/blender/source/gameengine/Expressions/PyObjectPlus.h
trunk/blender/source/gameengine/Expressions/StringValue.h
trunk/blender/source/gameengine/Expressions/Value.h
trunk/blender/source/gameengine/Expressions/VectorValue.h
trunk/blender/source/gameengine/Expressions/VoidValue.h
trunk/blender/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
trunk/blender/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
trunk/blender/source/gameengine/GameLogic/SCA_BasicEventManager.h
trunk/blender/source/gameengine/GameLogic/SCA_EventManager.h
trunk/blender/source/gameengine/GameLogic/SCA_ExpressionController.h
trunk/blender/source/gameengine/GameLogic/SCA_IActuator.h
trunk/blender/source/gameengine/GameLogic/SCA_IInputDevice.h
trunk/blender/source/gameengine/GameLogic/SCA_IScene.h
trunk/blender/source/gameengine/GameLogic/SCA_JoystickManager.h
trunk/blender/source/gameengine/GameLogic/SCA_KeyboardManager.h
trunk/blender/source/gameengine/GameLogic/SCA_LogicManager.h
trunk/blender/source/gameengine/GameLogic/SCA_MouseManager.h
trunk/blender/source/gameengine/GameLogic/SCA_PropertyEventManager.h
trunk/blender/source/gameengine/GameLogic/SCA_RandomEventManager.h
trunk/blender/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h
trunk/blender/source/gameengine/GameLogic/SCA_TimeEventManager.h
trunk/blender/source/gameengine/Ketsji/BL_BlenderShader.h
trunk/blender/source/gameengine/Ketsji/BL_Material.h
trunk/blender/source/gameengine/Ketsji/BL_Shader.h
trunk/blender/source/gameengine/Ketsji/BL_Texture.h
trunk/blender/source/gameengine/Ketsji/KX_BulletPhysicsController.h
trunk/blender/source/gameengine/Ketsji/KX_CameraIpoSGController.h
trunk/blender/source/gameengine/Ketsji/KX_ClientObjectInfo.h
trunk/blender/source/gameengine/Ketsji/KX_Dome.h
trunk/blender/source/gameengine/Ketsji/KX_EmptyObject.h
trunk/blender/source/gameengine/Ketsji/KX_IInterpolator.h
trunk/blender/source/gameengine/Ketsji/KX_IPO_SGController.h
trunk/blender/source/gameengine/Ketsji/KX_IPhysicsController.h
trunk/blender/source/gameengine/Ketsji/KX_IScalarInterpolator.h
trunk/blender/source/gameengine/Ketsji/KX_ISceneConverter.h
trunk/blender/source/gameengine/Ketsji/KX_ISystem.h
trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.h
trunk/blender/source/gameengine/Ketsji/KX_LightIpoSGController.h
trunk/blender/source/gameengine/Ketsji/KX_MaterialIpoController.h
trunk/blender/source/gameengine/Ketsji/KX_MotionState.h
trunk/blender/source/gameengine/Ketsji/KX_ObColorIpoSGController.h
trunk/blender/source/gameengine/Ketsji/KX_OrientationInterpolator.h
trunk/blender/source/gameengine/Ketsji/KX_PolygonMaterial.h
trunk/blender/source/gameengine/Ketsji/KX_PositionInterpolator.h
trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
trunk/blender/source/gameengine/Ketsji/KX_RayCast.h
trunk/blender/source/gameengine/Ketsji/KX_RayEventManager.h
trunk/blender/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h
trunk/blender/source/gameengine/Ketsji/KX_SG_NodeRelationships.h
trunk/blender/source/gameengine/Ketsji/KX_ScalarInterpolator.h
trunk/blender/source/gameengine/Ketsji/KX_ScalingInterpolator.h
trunk/blender/source/gameengine/Ketsji/KX_Scene.h
trunk/blender/source/gameengine/Ketsji/KX_TimeCategoryLogger.h
trunk/blender/source/gameengine/Ketsji/KX_TimeLogger.h
trunk/blender/source/gameengine/Ketsji/KX_TouchEventManager.h
trunk/blender/source/gameengine/Ketsji/KX_WorldInfo.h
trunk/blender/source/gameengine/Ketsji/KX_WorldIpoController.h
trunk/blender/source/gameengine/Network/NG_NetworkDeviceInterface.h
trunk/blender/source/gameengine/Network/NG_NetworkMessage.h
trunk/blender/source/gameengine/Network/NG_NetworkObject.h
trunk/blender/source/gameengine/Network/NG_NetworkScene.h
trunk/blender/source/gameengine/Physics/Bullet/CcdGraphicController.h
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.h
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
trunk/blender/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
trunk/blender/source/gameengine/Physics/common/PHY_IController.h
trunk/blender/source/gameengine/Physics/common/PHY_IGraphicController.h
trunk/blender/source/gameengine/Physics/common/PHY_IMotionState.h
trunk/blender/source/gameengine/Physics/common/PHY_IPhysicsController.h
trunk/blender/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
trunk/blender/source/gameengine/Physics/common/PHY_IVehicle.h
trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.h
trunk/blender/source/gameengine/Rasterizer/RAS_BucketManager.h
trunk/blender/source/gameengine/Rasterizer/RAS_Deformer.h
trunk/blender/source/gameengine/Rasterizer/RAS_FramingManager.h
trunk/blender/source/gameengine/Rasterizer/RAS_ICanvas.h
trunk/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
trunk/blender/source/gameengine/Rasterizer/RAS_IRasterizer.h
trunk/blender/source/gameengine/Rasterizer/RAS_IRenderTools.h
trunk/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.h
trunk/blender/source/gameengine/Rasterizer/RAS_MeshObject.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
trunk/blender/source/gameengine/Rasterizer/RAS_Polygon.h
trunk/blender/source/gameengine/Rasterizer/RAS_Rect.h
trunk/blender/source/gameengine/Rasterizer/RAS_TexVert.h
trunk/blender/source/gameengine/SceneGraph/SG_BBox.h
trunk/blender/source/gameengine/SceneGraph/SG_Controller.h
trunk/blender/source/gameengine/SceneGraph/SG_DList.h
trunk/blender/source/gameengine/SceneGraph/SG_IObject.h
trunk/blender/source/gameengine/SceneGraph/SG_Node.h
trunk/blender/source/gameengine/SceneGraph/SG_ParentRelation.h
trunk/blender/source/gameengine/SceneGraph/SG_QList.h
trunk/blender/source/gameengine/SceneGraph/SG_Spatial.h
trunk/blender/source/gameengine/SceneGraph/SG_Tree.h
Modified: trunk/blender/intern/string/STR_String.h
===================================================================
--- trunk/blender/intern/string/STR_String.h 2010-06-06 00:58:58 UTC (rev 29258)
+++ trunk/blender/intern/string/STR_String.h 2010-06-06 01:15:44 UTC (rev 29259)
@@ -202,8 +202,8 @@
#ifdef WITH_CXX_GUARDEDALLOC
public:
- void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "CXX:STR_String"); }
- void operator delete( void *mem ) { MEM_freeN(mem); }
+ void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "CXX:STR_String"); }
+ void operator delete(void *mem) { MEM_freeN(mem); }
#endif
};
Modified: trunk/blender/source/blender/blenlib/BLI_fileops.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_fileops.h 2010-06-06 00:58:58 UTC (rev 29258)
+++ trunk/blender/source/blender/blenlib/BLI_fileops.h 2010-06-06 01:15:44 UTC (rev 29259)
@@ -54,7 +54,6 @@
int BLI_add_slash(char *string);
void BLI_del_slash(char *string);
char *first_slash(char *string);
-const char *BLI_short_filename(const char *string);
/* only for the sane unix world: direct calls to system functions :( */
#ifndef WIN32
Modified: trunk/blender/source/blender/blenlib/intern/fileops.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/fileops.c 2010-06-06 00:58:58 UTC (rev 29258)
+++ trunk/blender/source/blender/blenlib/intern/fileops.c 2010-06-06 01:15:44 UTC (rev 29259)
@@ -80,31 +80,6 @@
else return lfslash;
}
-static const char *last_slash_len(const char *string, int len) {
- int a;
-
- for(a=len-1; a>=0; a--)
- if(string[a] == '/' || string[a] == '\\')
- return &string[a];
-
- return NULL;
-}
-
-const char *BLI_short_filename(const char *string) {
- const char *ls, *lls;
-
- ls= last_slash_len(string, strlen(string));
- if(!ls)
- return string;
-
- lls= last_slash_len(string, ls-string);
-
- if(lls)
- return lls+1;
- else
- return ls+1;
-}
-
/* adds a slash if there isnt one there alredy */
int BLI_add_slash(char *string) {
int len = strlen(string);
Modified: trunk/blender/source/blender/blenlib/intern/path_util.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/path_util.c 2010-06-06 00:58:58 UTC (rev 29258)
+++ trunk/blender/source/blender/blenlib/intern/path_util.c 2010-06-06 01:15:44 UTC (rev 29259)
@@ -1175,7 +1175,7 @@
/* like pythons os.path.basename( ) */
char *BLI_path_basename(char *path)
{
- const char *filename= BLI_last_slash(path);
+ char *filename= BLI_last_slash(path);
return filename ? filename + 1 : path;
}
Modified: trunk/blender/source/blender/editors/interface/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/interface/CMakeLists.txt 2010-06-06 00:58:58 UTC (rev 29258)
+++ trunk/blender/source/blender/editors/interface/CMakeLists.txt 2010-06-06 01:15:44 UTC (rev 29259)
@@ -39,8 +39,8 @@
ADD_DEFINITIONS(-DINTERNATIONAL)
ENDIF(WITH_INTERNATIONAL)
-IF(WITH_PYTHON)
+IF(NOT WITH_PYTHON)
ADD_DEFINITIONS(-DDISABLE_PYTHON)
-ENDIF(WITH_PYTHON)
+ENDIF(NOT WITH_PYTHON)
BLENDERLIB(bf_editor_interface "${SRC}" "${INC}")
Modified: trunk/blender/source/blender/editors/object/object_constraint.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_constraint.c 2010-06-06 00:58:58 UTC (rev 29258)
+++ trunk/blender/source/blender/editors/object/object_constraint.c 2010-06-06 01:15:44 UTC (rev 29259)
@@ -199,9 +199,9 @@
/* this callback gets called when the 'refresh' button of a pyconstraint gets pressed */
void update_pyconstraint_cb (void *arg1, void *arg2)
{
+#ifndef DISABLE_PYTHON
Object *owner= (Object *)arg1;
bConstraint *con= (bConstraint *)arg2;
-#ifndef DISABLE_PYTHON
if (owner && con)
BPY_pyconstraint_update(owner, con);
#endif
@@ -1286,9 +1286,9 @@
case CONSTRAINT_TYPE_PYTHON: // FIXME: this code is not really valid anymore
{
+#ifndef DISABLE_PYTHON
char *menustr;
int scriptint= 0;
-#ifndef DISABLE_PYTHON
/* popup a list of usable scripts */
menustr = buildmenu_pyconstraints(NULL, &scriptint);
// XXX scriptint = pupmenu(menustr);
Modified: trunk/blender/source/blender/editors/physics/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/physics/CMakeLists.txt 2010-06-06 00:58:58 UTC (rev 29258)
+++ trunk/blender/source/blender/editors/physics/CMakeLists.txt 2010-06-06 01:15:44 UTC (rev 29259)
@@ -32,6 +32,10 @@
../../../../intern/guardedalloc
)
+IF(NOT WITH_ELBEEM)
+ ADD_DEFINITIONS(-DDISABLE_ELBEEM)
+ENDIF(NOT WITH_ELBEEM)
+
IF(WITH_OPENMP)
ADD_DEFINITIONS(-DPARALLEL=1)
ENDIF(WITH_OPENMP)
Modified: trunk/blender/source/blender/editors/space_script/script_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_script/script_edit.c 2010-06-06 00:58:58 UTC (rev 29258)
+++ trunk/blender/source/blender/editors/space_script/script_edit.c 2010-06-06 01:15:44 UTC (rev 29259)
@@ -50,18 +50,17 @@
#include "script_intern.h" // own include
-
+#ifndef DISABLE_PYTHON
#include "BPY_extern.h" /* BPY_run_python_script */
+#endif
static int run_pyfile_exec(bContext *C, wmOperator *op)
{
- ARegion *ar= CTX_wm_region(C);
-
-
char path[512];
RNA_string_get(op->ptr, "path", path);
#ifndef DISABLE_PYTHON
if(BPY_run_python_script(C, path, NULL, op->reports)) {
+ ARegion *ar= CTX_wm_region(C);
ED_region_tag_redraw(ar);
return OPERATOR_FINISHED;
}
Modified: trunk/blender/source/blender/editors/space_script/space_script.c
===================================================================
--- trunk/blender/source/blender/editors/space_script/space_script.c 2010-06-06 00:58:58 UTC (rev 29258)
+++ trunk/blender/source/blender/editors/space_script/space_script.c 2010-06-06 01:15:44 UTC (rev 29259)
@@ -50,8 +50,9 @@
#include "UI_resources.h"
#include "UI_view2d.h"
-
+#ifndef DISABLE_PYTHON
#include "BPY_extern.h"
+#endif
#include "script_intern.h" // own include
Modified: trunk/blender/source/blender/makesrna/intern/rna_wm.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_wm.c 2010-06-06 00:58:58 UTC (rev 29258)
+++ trunk/blender/source/blender/makesrna/intern/rna_wm.c 2010-06-06 01:15:44 UTC (rev 29259)
@@ -611,6 +611,7 @@
return 0;
}
+#ifndef DISABLE_PYTHON
static void rna_Operator_unregister(const bContext *C, StructRNA *type)
{
char *idname;
@@ -746,7 +747,6 @@
RNA_parameter_list_free(&list);
}
-#ifndef DISABLE_PYTHON
void operator_wrapper(wmOperatorType *ot, void *userdata);
void macro_wrapper(wmOperatorType *ot, void *userdata);
Modified: trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp 2010-06-06 00:58:58 UTC (rev 29258)
+++ trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp 2010-06-06 01:15:44 UTC (rev 29259)
@@ -166,7 +166,9 @@
bool frameRate = (SYS_GetCommandLineInt(syshandle, "show_framerate", 0) != 0);
bool animation_record = (SYS_GetCommandLineInt(syshandle, "animation_record", 0) != 0);
bool displaylists = (SYS_GetCommandLineInt(syshandle, "displaylists", 0) != 0);
+#ifndef DISABLE_PYTHON
bool nodepwarnings = (SYS_GetCommandLineInt(syshandle, "ignore_deprecation_warnings", 0) != 0);
+#endif
bool novertexarrays = (SYS_GetCommandLineInt(syshandle, "novertexarrays", 0) != 0);
if(animation_record) usefixed= true; /* override since you's always want fixed time for sim recording */
Modified: trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h 2010-06-06 00:58:58 UTC (rev 29258)
+++ trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h 2010-06-06 01:15:44 UTC (rev 29259)
@@ -192,7 +192,7 @@
#ifdef WITH_CXX_GUARDEDALLOC
public:
- void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderCanvas"); }
+ void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderCanvas"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
#endif
};
Modified: trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h 2010-06-06 00:58:58 UTC (rev 29258)
+++ trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h 2010-06-06 01:15:44 UTC (rev 29259)
@@ -234,8 +234,8 @@
#ifdef WITH_CXX_GUARDEDALLOC
public:
- void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_BlenderInputDevice"); }
- void operator delete( void *mem ) { MEM_freeN(mem); }
+ void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_BlenderInputDevice"); }
+ void operator delete(void *mem) { MEM_freeN(mem); }
#endif
};
#endif //__KX_BLENDERINPUTDEVICE
Modified: trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h 2010-06-06 00:58:58 UTC (rev 29258)
+++ trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h 2010-06-06 01:15:44 UTC (rev 29259)
@@ -51,8 +51,8 @@
#ifdef WITH_CXX_GUARDEDALLOC
public:
- void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderKeyboardDevice"); }
- void operator delete( void *mem ) { MEM_freeN(mem); }
+ void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderKeyboardDevice"); }
+ void operator delete(void *mem) { MEM_freeN(mem); }
#endif
};
Modified: trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list