[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15706] branches/soc-2008-mxcurioni: soc-2008-mxcurioni: merged changes to revision 15705
Maxime Curioni
maxime.curioni at gmail.com
Wed Jul 23 08:02:19 CEST 2008
Revision: 15706
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15706
Author: mxcurioni
Date: 2008-07-23 08:02:18 +0200 (Wed, 23 Jul 2008)
Log Message:
-----------
soc-2008-mxcurioni: merged changes to revision 15705
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15705
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/README
branches/soc-2008-mxcurioni/intern/bsp/intern/BSP_CSGMesh.cpp
branches/soc-2008-mxcurioni/intern/container/CTR_TaggedIndex.h
branches/soc-2008-mxcurioni/intern/decimation/intern/LOD_ManMesh2.cpp
branches/soc-2008-mxcurioni/intern/elbeem/intern/solver_init.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2008-mxcurioni/projectfiles_vc7/blender/makesdna/DNA_makesdna.vcproj
branches/soc-2008-mxcurioni/projectfiles_vc7/blender/src/BL_src.vcproj
branches/soc-2008-mxcurioni/projectfiles_vc7/gameengine/rasterizer/RAS_rasterizer.vcproj
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_global.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/collision.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/lattice.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/arithb.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/storage.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2008-mxcurioni/source/blender/include/BDR_drawaction.h
branches/soc-2008-mxcurioni/source/blender/include/BIF_editaction.h
branches/soc-2008-mxcurioni/source/blender/include/BIF_resources.h
branches/soc-2008-mxcurioni/source/blender/include/BIF_space.h
branches/soc-2008-mxcurioni/source/blender/include/BSE_editaction_types.h
branches/soc-2008-mxcurioni/source/blender/include/blendef.h
branches/soc-2008-mxcurioni/source/blender/include/transform.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_action_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_actuator_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/intern/makesdna.c
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Blender.c
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Library.c
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Particle.c
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/doc/Ipo.py
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/doc/LibData.py
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/doc/Particle.py
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/doc/Render.py
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/sceneRender.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rendercore.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeoutput.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/zbuf.c
branches/soc-2008-mxcurioni/source/blender/src/buttons_editing.c
branches/soc-2008-mxcurioni/source/blender/src/buttons_logic.c
branches/soc-2008-mxcurioni/source/blender/src/buttons_scene.c
branches/soc-2008-mxcurioni/source/blender/src/drawaction.c
branches/soc-2008-mxcurioni/source/blender/src/drawnode.c
branches/soc-2008-mxcurioni/source/blender/src/drawobject.c
branches/soc-2008-mxcurioni/source/blender/src/drawseq.c
branches/soc-2008-mxcurioni/source/blender/src/drawview.c
branches/soc-2008-mxcurioni/source/blender/src/editaction.c
branches/soc-2008-mxcurioni/source/blender/src/editmesh.c
branches/soc-2008-mxcurioni/source/blender/src/editnode.c
branches/soc-2008-mxcurioni/source/blender/src/editobject.c
branches/soc-2008-mxcurioni/source/blender/src/editsound.c
branches/soc-2008-mxcurioni/source/blender/src/header_action.c
branches/soc-2008-mxcurioni/source/blender/src/header_node.c
branches/soc-2008-mxcurioni/source/blender/src/header_seq.c
branches/soc-2008-mxcurioni/source/blender/src/header_view3d.c
branches/soc-2008-mxcurioni/source/blender/src/interface.c
branches/soc-2008-mxcurioni/source/blender/src/poselib.c
branches/soc-2008-mxcurioni/source/blender/src/resources.c
branches/soc-2008-mxcurioni/source/blender/src/space.c
branches/soc-2008-mxcurioni/source/blender/src/transform_conversions.c
branches/soc-2008-mxcurioni/source/blender/src/transform_generics.c
branches/soc-2008-mxcurioni/source/blender/src/usiblender.c
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_DeformableGameObject.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_SkinDeformer.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2008-mxcurioni/source/gameengine/Expressions/Value.cpp
branches/soc-2008-mxcurioni/source/gameengine/Expressions/Value.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_2DFilterActuator.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_ILogicBrick.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_IObject.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PropertyActuator.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_Canvas.h
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_RenderTools.h
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_BulletPhysicsController.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_CameraActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ConstraintActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_IPhysicsController.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_NearSensor.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_OdePhysicsController.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_OdePhysicsController.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ParentActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ParentActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_RadarSensor.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SceneActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SceneActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SumoPhysicsController.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SumoPhysicsController.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_TrackToActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_TrackToActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/soc-2008-mxcurioni/source/gameengine/PyDoc/KX_GameObject.py
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/Makefile
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_2DFilterManager.h
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_ICanvas.h
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_IRenderTools.h
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/SConscript
branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_IObject.cpp
branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_IObject.h
branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_Node.cpp
branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_Node.h
Added Paths:
-----------
branches/soc-2008-mxcurioni/source/blender/include/BDR_gpencil.h
branches/soc-2008-mxcurioni/source/blender/include/BIF_drawgpencil.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_gpencil_types.h
branches/soc-2008-mxcurioni/source/blender/src/drawgpencil.c
branches/soc-2008-mxcurioni/source/blender/src/editaction_gpencil.c
branches/soc-2008-mxcurioni/source/blender/src/gpencil.c
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2008-07-23 05:54:34 UTC (rev 15705)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2008-07-23 06:02:18 UTC (rev 15706)
@@ -197,10 +197,17 @@
ENDIF(UNIX)
IF(WIN32)
+
INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
-
+
SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows)
+ # Setup 64bit and 64bit windows systems
+ IF(CMAKE_CL_64)
+ message("64 bit compiler detected.")
+ SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64)
+ ENDIF(CMAKE_CL_64)
+
SET(PYTHON ${LIBDIR}/python)
SET(PYTHON_VERSION 2.5)
SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
@@ -214,12 +221,20 @@
SET(OPENAL_LIB openal_static)
SET(OPENAL_LIBPATH ${OPENAL}/lib)
- SET(PNG_LIB libpng_st)
+ IF(CMAKE_CL_64)
+ SET(PNG_LIB libpng)
+ ELSE(CMAKE_CL_64)
+ SET(PNG_LIB libpng_st)
+ ENDIF(CMAKE_CL_64)
SET(JPEG_LIB libjpeg)
SET(ZLIB ${LIBDIR}/zlib)
SET(ZLIB_INC ${ZLIB}/include)
- SET(ZLIB_LIB libz)
+ IF(CMAKE_CL_64)
+ SET(ZLIB_LIB zlib)
+ ELSE(CMAKE_CL_64)
+ SET(ZLIB_LIB libz)
+ ENDIF(CMAKE_CL_64)
SET(ZLIB_LIBPATH ${ZLIB}/lib)
SET(PTHREADS ${LIBDIR}/pthreads)
@@ -302,7 +317,11 @@
SET(WINTAB_INC ${LIBDIR}/wintab/include)
- SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib")
+ IF(CMAKE_CL_64)
+ SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib;MSVCRT.lib ")
+ ELSE(CMAKE_CL_64)
+ SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib ")
+ ENDIF(CMAKE_CL_64)
SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt.lib;libc.lib ")
ENDIF(WIN32)
Modified: branches/soc-2008-mxcurioni/README
===================================================================
--- branches/soc-2008-mxcurioni/README 2008-07-23 05:54:34 UTC (rev 15705)
+++ branches/soc-2008-mxcurioni/README 2008-07-23 06:02:18 UTC (rev 15706)
@@ -24,22 +24,22 @@
-------------------------------------Links--------------------------------------
Getting Involved:
-http://www.blender.org/docs/get_involved.html
+http://www.blender.org/community/get-involved
Community:
-http://www.blender3d.org/Community/
+http://www.blender.org/Community
Main blender development site:
-http://www.blender.org/
+http://www.blender.org
The Blender project homepage:
-http://projects.blender.org/projects/bf-blender/
+http://projects.blender.org/projects/bf-blender
Documentation:
-http://www.blender.org/modules.php?op=modload&name=documentation&file=index
+http://www.blender.org/education-help
Bug tracker:
-http://projects.blender.org/tracker/?atid=125&group_id=9&func=browse
+http://www.blender.org/development/report-a-bug
Feature request tracker:
-http://projects.blender.org/tracker/?atid=128&group_id=9&func=browse
+http://wiki.blender.org/index.php/Requests
Modified: branches/soc-2008-mxcurioni/intern/bsp/intern/BSP_CSGMesh.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/bsp/intern/BSP_CSGMesh.cpp 2008-07-23 05:54:34 UTC (rev 15705)
+++ branches/soc-2008-mxcurioni/intern/bsp/intern/BSP_CSGMesh.cpp 2008-07-23 06:02:18 UTC (rev 15706)
@@ -197,7 +197,7 @@
for (int vert = 0; vert < vertex_num; ++vert) {
- BSP_FaceInd fi(f_it - f_it_begin);
+ BSP_FaceInd fi(size_t (f_it - f_it_begin));
InsertEdge(prev_vi,face.m_verts[vert],fi,dummy);
prev_vi = face.m_verts[vert];
}
Modified: branches/soc-2008-mxcurioni/intern/container/CTR_TaggedIndex.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/container/CTR_TaggedIndex.h 2008-07-23 05:54:34 UTC (rev 15705)
+++ branches/soc-2008-mxcurioni/intern/container/CTR_TaggedIndex.h 2008-07-23 06:02:18 UTC (rev 15706)
@@ -93,7 +93,17 @@
}
+#if defined(_WIN64)
CTR_TaggedIndex(
+ const unsigned __int64 val
+ ) :
+ m_val ( ((unsigned __int64)val & index_mask)
+ | ( (empty_tag << tag_shift)
+ & (~index_mask) ) ) {
+ }
+#endif
+
+ CTR_TaggedIndex(
const CTR_TaggedIndex &my_index
):
m_val(my_index.m_val)
@@ -124,6 +134,12 @@
return (long int)(m_val & index_mask);
}
+#if defined(_WIN64)
+ operator unsigned __int64 () const {
+ return (unsigned __int64)(m_val & index_mask);
+ }
+#endif
+
bool
IsEmpty(
) const {
Modified: branches/soc-2008-mxcurioni/intern/decimation/intern/LOD_ManMesh2.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/decimation/intern/LOD_ManMesh2.cpp 2008-07-23 05:54:34 UTC (rev 15705)
+++ branches/soc-2008-mxcurioni/intern/decimation/intern/LOD_ManMesh2.cpp 2008-07-23 06:02:18 UTC (rev 15706)
@@ -477,7 +477,7 @@
return;
}
- LOD_VertexInd last = LOD_VertexInd(verts.end() - verts.begin() - 1);
+ LOD_VertexInd last = LOD_VertexInd(size_t(verts.end() - verts.begin() - 1));
if (!(last == v)) {
@@ -533,7 +533,7 @@
return;
}
- LOD_EdgeInd last = LOD_EdgeInd(edges.end() - edges.begin() - 1);
+ LOD_EdgeInd last = LOD_EdgeInd(size_t(edges.end() - edges.begin() - 1));
if (!(last == e)) {
vector<LOD_EdgeInd> e_verts;
@@ -573,7 +573,7 @@
return;
}
- LOD_FaceInd last = LOD_FaceInd(faces.end() - faces.begin() - 1);
+ LOD_FaceInd last = LOD_FaceInd(size_t (faces.end() - faces.begin() - 1));
if (!(last == f)) {
Modified: branches/soc-2008-mxcurioni/intern/elbeem/intern/solver_init.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/elbeem/intern/solver_init.cpp 2008-07-23 05:54:34 UTC (rev 15705)
+++ branches/soc-2008-mxcurioni/intern/elbeem/intern/solver_init.cpp 2008-07-23 06:02:18 UTC (rev 15706)
@@ -694,7 +694,7 @@
double maxDefaultMemChunk = 2.*1024.*1024.*1024.;
//std::cerr<<" memEstFine "<< memEstFine <<" maxWin:" <<maxWinMemChunk <<" maxMac:" <<maxMacMemChunk ; // DEBUG
#ifdef WIN32
- if(memEstFine> maxWinMemChunk) {
+ if(sizeof(void *)==4 && memEstFine>maxWinMemChunk) {
memBlockAllocProblem = true;
}
#endif // WIN32
Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp 2008-07-23 05:54:34 UTC (rev 15705)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp 2008-07-23 06:02:18 UTC (rev 15706)
@@ -42,6 +42,14 @@
#include "GHOST_SystemWin32.h"
+// win64 doesn't define GWL_USERDATA
+#ifdef WIN32
+#ifndef GWL_USERDATA
+#define GWL_USERDATA GWLP_USERDATA
+#define GWL_WNDPROC GWLP_WNDPROC
+#endif
+#endif
+
/*
* According to the docs the mouse wheel message is supported from windows 98
* upwards. Leaving WINVER at default value, the WM_MOUSEWHEEL message and the
Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.cpp 2008-07-23 05:54:34 UTC (rev 15705)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.cpp 2008-07-23 06:02:18 UTC (rev 15706)
@@ -48,6 +48,14 @@
#define M_PI 3.1415926536
#endif
+// win64 doesn't define GWL_USERDATA
+#ifdef WIN32
+#ifndef GWL_USERDATA
+#define GWL_USERDATA GWLP_USERDATA
+#define GWL_WNDPROC GWLP_WNDPROC
+#endif
+#endif
+
LPCSTR GHOST_WindowWin32::s_windowClassName = "GHOST_WindowClass";
const int GHOST_WindowWin32::s_maxTitleLength = 128;
HGLRC GHOST_WindowWin32::s_firsthGLRc = NULL;
Modified: branches/soc-2008-mxcurioni/projectfiles_vc7/blender/makesdna/DNA_makesdna.vcproj
===================================================================
--- branches/soc-2008-mxcurioni/projectfiles_vc7/blender/makesdna/DNA_makesdna.vcproj 2008-07-23 05:54:34 UTC (rev 15705)
+++ branches/soc-2008-mxcurioni/projectfiles_vc7/blender/makesdna/DNA_makesdna.vcproj 2008-07-23 06:02:18 UTC (rev 15706)
@@ -472,6 +472,9 @@
RelativePath="..\..\..\source\blender\makesdna\DNA_fileglobal_types.h">
</File>
<File
+ RelativePath="..\..\..\source\blender\makesdna\DNA_gpencil_types.h">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\makesdna\DNA_group_types.h">
</File>
<File
Modified: branches/soc-2008-mxcurioni/projectfiles_vc7/blender/src/BL_src.vcproj
===================================================================
--- branches/soc-2008-mxcurioni/projectfiles_vc7/blender/src/BL_src.vcproj 2008-07-23 05:54:34 UTC (rev 15705)
+++ branches/soc-2008-mxcurioni/projectfiles_vc7/blender/src/BL_src.vcproj 2008-07-23 06:02:18 UTC (rev 15706)
@@ -21,7 +21,7 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\ghost\include;..\..\..\..\build\msvc_7\intern\elbeem\include;..\..\..\..\build\msvc_7\intern\opennl\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\blenkey\include;..\..\..\..\build\msvc_7\intern\decimation\include;..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\source\blender;..\..\..\source\blender\img;..\..\..\source\blender\verify;..\..\..\source\blender\ftfont;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\renderui;..\..\..\source\blender\blenloader;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenpluginapi;..\..\..\source\blender\renderconverter;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\network;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\..\build\msvc_7\extern\verse\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\ffmpeg\include"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list