[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13092] branches/blender2.5/blender/source : removed some more header files, made the game engine compile with removed header files, added includes to SConstruct files.
Campbell Barton
ideasman42 at gmail.com
Tue Jan 1 20:20:49 CET 2008
Revision: 13092
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13092
Author: campbellbarton
Date: 2008-01-01 20:20:49 +0100 (Tue, 01 Jan 2008)
Log Message:
-----------
removed some more header files, made the game engine compile with removed header files, added includes to SConstruct files.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenkernel/intern/DerivedMesh.c
branches/blender2.5/blender/source/blender/blenkernel/intern/action.c
branches/blender2.5/blender/source/blender/blenkernel/intern/armature.c
branches/blender2.5/blender/source/blender/blenkernel/intern/constraint.c
branches/blender2.5/blender/source/blender/blenkernel/intern/effect.c
branches/blender2.5/blender/source/blender/blenkernel/intern/library.c
branches/blender2.5/blender/source/blender/blenkernel/intern/modifier.c
branches/blender2.5/blender/source/blender/blenkernel/intern/multires.c
branches/blender2.5/blender/source/blender/blenkernel/intern/sca.c
branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c
branches/blender2.5/blender/source/blender/blenkernel/intern/script.c
branches/blender2.5/blender/source/blender/blenlib/intern/freetypefont.c
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
branches/blender2.5/blender/source/blender/editors/screen/SConscript
branches/blender2.5/blender/source/blender/ftfont/intern/FTF_Api.cpp
branches/blender2.5/blender/source/blender/nodes/intern/CMP_util.h
branches/blender2.5/blender/source/blender/nodes/intern/SHD_util.h
branches/blender2.5/blender/source/blender/render/intern/source/convertblender.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
branches/blender2.5/blender/source/blender/windowmanager/wm_event_types.h
branches/blender2.5/blender/source/creator/creator.c
branches/blender2.5/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/blender2.5/blender/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
branches/blender2.5/blender/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/blender2.5/blender/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
branches/blender2.5/blender/source/gameengine/BlenderRoutines/Makefile
branches/blender2.5/blender/source/gameengine/BlenderRoutines/SConscript
branches/blender2.5/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/blender2.5/blender/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/blender2.5/blender/source/gameengine/Converter/Makefile
branches/blender2.5/blender/source/gameengine/Converter/SConscript
branches/blender2.5/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
Removed Paths:
-------------
branches/blender2.5/blender/source/blender/editors/include/BPI_script.h
branches/blender2.5/blender/source/blender/editors/include/LOD_DependKludge.h
branches/blender2.5/blender/source/blender/editors/include/butspace.h
branches/blender2.5/blender/source/blender/editors/include/datatoc.h
branches/blender2.5/blender/source/blender/editors/include/editlattice_ext.h
branches/blender2.5/blender/source/blender/editors/include/editmesh.h
branches/blender2.5/blender/source/blender/editors/include/interface.h
branches/blender2.5/blender/source/blender/editors/include/keyed_functions.h
branches/blender2.5/blender/source/blender/editors/include/license_key.h
branches/blender2.5/blender/source/blender/editors/include/multires.h
branches/blender2.5/blender/source/blender/editors/include/mydevice.h
branches/blender2.5/blender/source/blender/editors/include/nla.h
branches/blender2.5/blender/source/blender/editors/include/objfnt.h
branches/blender2.5/blender/source/blender/editors/include/particle_effect.h
branches/blender2.5/blender/source/blender/editors/include/playanim_ext.h
branches/blender2.5/blender/source/blender/editors/include/transform.h
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/DerivedMesh.c 2008-01-01 18:38:41 UTC (rev 13091)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/DerivedMesh.c 2008-01-01 19:20:49 UTC (rev 13092)
@@ -87,7 +87,7 @@
#include "BIF_gl.h"
#include "BIF_glutil.h"
-#include "multires.h"
+//XXX #include "multires.h"
// headers for fluidsim bobj meshes
#include <stdlib.h>
@@ -2580,18 +2580,18 @@
int i;
/* Make sure all mesh edits are properly stored in the multires data*/
- multires_update_levels(me, 1);
+ //XXX multires_update_levels(me, 1);
/* Copy the highest level of multires verts */
*orig_lvl= me->mr->current;
- lvl= multires_level_n(me->mr, BLI_countlist(&me->mr->levels));
+ //XXX lvl= multires_level_n(me->mr, BLI_countlist(&me->mr->levels));
vert_copy= MEM_callocN(sizeof(float)*3*lvl->totvert, "multires vert_copy");
for(i=0; i<lvl->totvert; ++i)
VecCopyf(&vert_copy[i*3], me->mr->verts[i].co);
/* Goto the pin level for multires */
me->mr->newlvl= me->mr->pinlvl;
- multires_set_level(ob, me, 1);
+ //XXX multires_set_level(ob, me, 1);
}
return vert_copy;
@@ -2604,7 +2604,7 @@
if(me->mr) {
if((*dm)->getNumVerts(*dm) == me->totvert &&
(*dm)->getNumFaces(*dm) == me->totface) {
- MultiresLevel *lvl= multires_level_n(me->mr, BLI_countlist(&me->mr->levels));
+ //XXX MultiresLevel *lvl= multires_level_n(me->mr, BLI_countlist(&me->mr->levels));
DerivedMesh *old= NULL;
int i;
@@ -2612,7 +2612,7 @@
(*dm)->release(*dm);
me->mr->newlvl= me->mr->renderlvl;
- multires_set_level(ob, me, 1);
+ //XXX multires_set_level(ob, me, 1);
(*dm)= getMeshDerivedMesh(me, ob, NULL);
/* Some of the data in dm is referenced externally, so make a copy */
@@ -2625,16 +2625,16 @@
/* Restore the original verts */
me->mr->newlvl= BLI_countlist(&me->mr->levels);
- multires_set_level(ob, me, 1);
- for(i=0; i<lvl->totvert; ++i)
- VecCopyf(me->mvert[i].co, &vert_copy[i*3]);
+ //XXX multires_set_level(ob, me, 1);
+ //XXX for(i=0; i<lvl->totvert; ++i)
+ //XXX VecCopyf(me->mvert[i].co, &vert_copy[i*3]);
}
if(vert_copy)
MEM_freeN(vert_copy);
me->mr->newlvl= orig_lvl;
- multires_set_level(ob, me, 1);
+ //XXX multires_set_level(ob, me, 1);
}
}
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/action.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/action.c 2008-01-01 18:38:41 UTC (rev 13091)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/action.c 2008-01-01 19:20:49 UTC (rev 13092)
@@ -66,7 +66,7 @@
#include "BLI_arithb.h"
#include "BLI_blenlib.h"
-#include "nla.h"
+//XXX #include "nla.h"
/* *********************** NOTE ON POSE AND ACTION **********************
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/armature.c 2008-01-01 18:38:41 UTC (rev 13091)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/armature.c 2008-01-01 19:20:49 UTC (rev 13092)
@@ -32,7 +32,7 @@
#include <stdio.h>
#include "MEM_guardedalloc.h"
-#include "nla.h"
+//XXX #include "nla.h"
#include "BLI_arithb.h"
#include "BLI_blenlib.h"
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/constraint.c 2008-01-01 18:38:41 UTC (rev 13091)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/constraint.c 2008-01-01 19:20:49 UTC (rev 13092)
@@ -35,7 +35,7 @@
#include <math.h>
#include "MEM_guardedalloc.h"
-#include "nla.h"
+//XXX #include "nla.h"
#include "BLI_blenlib.h"
#include "BLI_arithb.h"
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/effect.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/effect.c 2008-01-01 18:38:41 UTC (rev 13091)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/effect.c 2008-01-01 19:20:49 UTC (rev 13092)
@@ -2107,6 +2107,6 @@
disable_speed_curve(0);
- if(waitcursor_set) waitcursor(0);
+ //XXX if(waitcursor_set) waitcursor(0);
}
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/library.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/library.c 2008-01-01 18:38:41 UTC (rev 13091)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/library.c 2008-01-01 19:20:49 UTC (rev 13092)
@@ -114,7 +114,7 @@
#include "BKE_idprop.h"
#include "BKE_particle.h"
-#include "BPI_script.h"
+//XXX #include "BPI_script.h"
#define MAX_IDPUP 60 /* was 24 */
@@ -347,7 +347,7 @@
id= MEM_callocN(sizeof(Text), "text");
break;
case ID_SCRIPT:
- id= MEM_callocN(sizeof(Script), "script");
+ //XXX id= MEM_callocN(sizeof(Script), "script");
break;
case ID_SO:
id= MEM_callocN(sizeof(bSound), "sound");
@@ -504,7 +504,7 @@
free_text((Text *)id);
break;
case ID_SCRIPT:
- free_script((Script *)id);
+ //XXX free_script((Script *)id);
break;
case ID_SO:
sound_free_sound((bSound *)id);
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/modifier.c 2008-01-01 18:38:41 UTC (rev 13091)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/modifier.c 2008-01-01 19:20:49 UTC (rev 13092)
@@ -93,7 +93,7 @@
#include "BKE_utildefines.h"
#include "depsgraph_private.h"
-#include "LOD_DependKludge.h"
+//XXX #include "LOD_DependKludge.h"
#include "LOD_decimation.h"
#include "CCGSubSurf.h"
@@ -3318,6 +3318,8 @@
tdmd->percent = dmd->percent;
}
+//XXX
+#if 0
static DerivedMesh *decimateModifier_applyModifier(
ModifierData *md, Object *ob, DerivedMesh *derivedData,
int useRenderParams, int isFinalCalc)
@@ -3436,6 +3438,7 @@
exit:
return result;
}
+#endif
/* Smooth */
@@ -6385,7 +6388,7 @@
/* bind weights if needed */
if(!mmd->bindcos)
- harmonic_coordinates_bind(mmd, vertexCos, numVerts, cagemat);
+ //XXX harmonic_coordinates_bind(mmd, vertexCos, numVerts, cagemat);
/* verify we have compatible weights */
totvert= numVerts;
@@ -6677,7 +6680,7 @@
mti->flags = eModifierTypeFlag_AcceptsMesh;
mti->initData = decimateModifier_initData;
mti->copyData = decimateModifier_copyData;
- mti->applyModifier = decimateModifier_applyModifier;
+ //XXX mti->applyModifier = decimateModifier_applyModifier;
mti = INIT_TYPE(Smooth);
mti->type = eModifierTypeType_OnlyDeform;
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/multires.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/multires.c 2008-01-01 18:38:41 UTC (rev 13091)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/multires.c 2008-01-01 19:20:49 UTC (rev 13092)
@@ -44,7 +44,7 @@
#include "BKE_global.h"
#include "BKE_multires.h"
-#include "editmesh.h"
+//XXX #include "editmesh.h"
#include <math.h>
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/sca.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/sca.c 2008-01-01 18:38:41 UTC (rev 13091)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/sca.c 2008-01-01 19:20:49 UTC (rev 13092)
@@ -53,7 +53,7 @@
#include "BKE_blender.h"
#include "BKE_sca.h"
-#include "mydevice.h"
+//#include "wm_event_types.h"
void free_text_controllers(Text *txt)
{
@@ -155,7 +155,7 @@
break;
case SENS_MOUSE:
ms=sens->data= MEM_callocN(sizeof(bMouseSensor), "mousesens");
- ms->type= LEFTMOUSE;
+ //XXX ms->type= LEFTMOUSE;
break;
case SENS_COLLISION:
sens->data= MEM_callocN(sizeof(bCollisionSensor), "colsens");
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c 2008-01-01 18:38:41 UTC (rev 13091)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c 2008-01-01 19:20:49 UTC (rev 13092)
@@ -86,7 +86,7 @@
#include "BLI_arithb.h"
#include "BLI_blenlib.h"
-#include "nla.h"
+//XXX #include "nla.h"
#ifdef WIN32
#else
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/script.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/script.c 2008-01-01 18:38:41 UTC (rev 13091)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/script.c 2008-01-01 19:20:49 UTC (rev 13092)
@@ -35,7 +35,7 @@
*/
#include "BKE_script.h"
-#include "BPI_script.h"
+//XXX #include "BPI_script.h"
#include "MEM_guardedalloc.h"
@@ -51,6 +51,9 @@
/* XXX this function and so also the file should not be needed anymore,
* since we have to force clearing all Python related data before freeing
* Blender's library. Still testing, will decide later (Willian). */
+
+//XXX
+#if 0
void free_script (Script *script)
{
if (!script) return;
@@ -63,3 +66,4 @@
return;
}
+#endif
Modified: branches/blender2.5/blender/source/blender/blenlib/intern/freetypefont.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenlib/intern/freetypefont.c 2008-01-01 18:38:41 UTC (rev 13091)
+++ branches/blender2.5/blender/source/blender/blenlib/intern/freetypefont.c 2008-01-01 19:20:49 UTC (rev 13092)
@@ -477,7 +477,7 @@
//init Freetype
err = FT_Init_FreeType( &library);
if(err) {
- error("Failed to load the Freetype font library");
+ //XXX error("Failed to load the Freetype font library");
return 0;
}
@@ -502,7 +502,7 @@
// Init Freetype
err = FT_Init_FreeType(&library);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list