[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15552] branches/soc-2008-jaguarandi: svn merge -r 15392:15551 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
André Pinto
andresusanopinto at gmail.com
Sun Jul 13 15:21:02 CEST 2008
Revision: 15552
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15552
Author: jaguarandi
Date: 2008-07-13 15:21:01 +0200 (Sun, 13 Jul 2008)
Log Message:
-----------
svn merge -r 15392:15551 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/soc-2008-jaguarandi/README
branches/soc-2008-jaguarandi/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2008-jaguarandi/intern/moto/include/GEN_Map.h
branches/soc-2008-jaguarandi/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj
branches/soc-2008-jaguarandi/projectfiles_vc7/blender/render/BRE_render.vcproj
branches/soc-2008-jaguarandi/projectfiles_vc7/blender/src/BL_src.vcproj
branches/soc-2008-jaguarandi/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj
branches/soc-2008-jaguarandi/projectfiles_vc7/gameengine/rasterizer/RAS_rasterizer.vcproj
branches/soc-2008-jaguarandi/release/scripts/animation_bake_constraints.py
branches/soc-2008-jaguarandi/release/scripts/c3d_import.py
branches/soc-2008-jaguarandi/release/windows/installer/00.sconsblender.nsi
branches/soc-2008-jaguarandi/source/blender/blenkernel/BKE_bmesh.h
branches/soc-2008-jaguarandi/source/blender/blenkernel/BKE_bmeshCustomData.h
branches/soc-2008-jaguarandi/source/blender/blenkernel/BKE_cloth.h
branches/soc-2008-jaguarandi/source/blender/blenkernel/BKE_customdata.h
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/BME_Customdata.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/BME_conversions.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/BME_eulers.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/BME_mesh.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/BME_structure.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/BME_tools.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/bmesh_private.h
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/cloth.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/collision.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/customdata.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/image.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/implicit.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/library.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/modifier.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/object.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/particle.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/pointcache.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/sca.c
branches/soc-2008-jaguarandi/source/blender/blenlib/BLI_arithb.h
branches/soc-2008-jaguarandi/source/blender/blenlib/BLI_winstuff.h
branches/soc-2008-jaguarandi/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2008-jaguarandi/source/blender/blenlib/intern/arithb.c
branches/soc-2008-jaguarandi/source/blender/blenlib/intern/util.c
branches/soc-2008-jaguarandi/source/blender/blenloader/intern/readfile.c
branches/soc-2008-jaguarandi/source/blender/blenloader/intern/writefile.c
branches/soc-2008-jaguarandi/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2008-jaguarandi/source/blender/include/BDR_drawobject.h
branches/soc-2008-jaguarandi/source/blender/include/BIF_editaction.h
branches/soc-2008-jaguarandi/source/blender/include/BIF_editarmature.h
branches/soc-2008-jaguarandi/source/blender/include/BIF_resources.h
branches/soc-2008-jaguarandi/source/blender/include/BSE_sequence.h
branches/soc-2008-jaguarandi/source/blender/include/blendef.h
branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_actuator_types.h
branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_customdata_types.h
branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_lamp_types.h
branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_sensor_types.h
branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_space_types.h
branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2008-jaguarandi/source/blender/nodes/intern/CMP_nodes/CMP_gamma.c
branches/soc-2008-jaguarandi/source/blender/python/BPY_interface.c
branches/soc-2008-jaguarandi/source/blender/python/api2_2x/matrix.c
branches/soc-2008-jaguarandi/source/blender/python/api2_2x/sceneSequence.c
branches/soc-2008-jaguarandi/source/blender/radiosity/intern/source/radrender.c
branches/soc-2008-jaguarandi/source/blender/render/intern/include/pixelshading.h
branches/soc-2008-jaguarandi/source/blender/render/intern/include/render_types.h
branches/soc-2008-jaguarandi/source/blender/render/intern/source/convertblender.c
branches/soc-2008-jaguarandi/source/blender/render/intern/source/pixelshading.c
branches/soc-2008-jaguarandi/source/blender/render/intern/source/rendercore.c
branches/soc-2008-jaguarandi/source/blender/src/buttons_editing.c
branches/soc-2008-jaguarandi/source/blender/src/buttons_logic.c
branches/soc-2008-jaguarandi/source/blender/src/buttons_object.c
branches/soc-2008-jaguarandi/source/blender/src/buttons_scene.c
branches/soc-2008-jaguarandi/source/blender/src/buttons_shading.c
branches/soc-2008-jaguarandi/source/blender/src/drawaction.c
branches/soc-2008-jaguarandi/source/blender/src/drawarmature.c
branches/soc-2008-jaguarandi/source/blender/src/drawimage.c
branches/soc-2008-jaguarandi/source/blender/src/drawobject.c
branches/soc-2008-jaguarandi/source/blender/src/drawview.c
branches/soc-2008-jaguarandi/source/blender/src/editaction.c
branches/soc-2008-jaguarandi/source/blender/src/editarmature.c
branches/soc-2008-jaguarandi/source/blender/src/editmesh_add.c
branches/soc-2008-jaguarandi/source/blender/src/editnla.c
branches/soc-2008-jaguarandi/source/blender/src/editseq.c
branches/soc-2008-jaguarandi/source/blender/src/editsima.c
branches/soc-2008-jaguarandi/source/blender/src/editsound.c
branches/soc-2008-jaguarandi/source/blender/src/edittime.c
branches/soc-2008-jaguarandi/source/blender/src/header_image.c
branches/soc-2008-jaguarandi/source/blender/src/header_view3d.c
branches/soc-2008-jaguarandi/source/blender/src/headerbuttons.c
branches/soc-2008-jaguarandi/source/blender/src/interface_draw.c
branches/soc-2008-jaguarandi/source/blender/src/poselib.c
branches/soc-2008-jaguarandi/source/blender/src/resources.c
branches/soc-2008-jaguarandi/source/blender/src/sequence.c
branches/soc-2008-jaguarandi/source/blender/src/space.c
branches/soc-2008-jaguarandi/source/blender/src/transform_conversions.c
branches/soc-2008-jaguarandi/source/blender/src/transform_snap.c
branches/soc-2008-jaguarandi/source/blender/src/usiblender.c
branches/soc-2008-jaguarandi/source/blender/src/view.c
branches/soc-2008-jaguarandi/source/blender/src/vpaint.c
branches/soc-2008-jaguarandi/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/soc-2008-jaguarandi/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/soc-2008-jaguarandi/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
branches/soc-2008-jaguarandi/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2008-jaguarandi/source/gameengine/Converter/BL_ActionActuator.h
branches/soc-2008-jaguarandi/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2008-jaguarandi/source/gameengine/Converter/BL_MeshDeformer.cpp
branches/soc-2008-jaguarandi/source/gameengine/Converter/BL_MeshDeformer.h
branches/soc-2008-jaguarandi/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/soc-2008-jaguarandi/source/gameengine/Converter/BL_ShapeDeformer.h
branches/soc-2008-jaguarandi/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/soc-2008-jaguarandi/source/gameengine/Converter/BL_SkinDeformer.h
branches/soc-2008-jaguarandi/source/gameengine/Converter/BL_SkinMeshObject.cpp
branches/soc-2008-jaguarandi/source/gameengine/Converter/BL_SkinMeshObject.h
branches/soc-2008-jaguarandi/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2008-jaguarandi/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/soc-2008-jaguarandi/source/gameengine/Expressions/PyObjectPlus.h
branches/soc-2008-jaguarandi/source/gameengine/Expressions/Value.cpp
branches/soc-2008-jaguarandi/source/gameengine/Expressions/Value.h
branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_2DFilterActuator.h
branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_EventManager.cpp
branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_EventManager.h
branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_IActuator.h
branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_IController.cpp
branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_ILogicBrick.h
branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_IObject.cpp
branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_IObject.h
branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_ISensor.h
branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_LogicManager.cpp
branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_MouseSensor.cpp
branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_PropertySensor.cpp
branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_PythonController.h
branches/soc-2008-jaguarandi/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/soc-2008-jaguarandi/source/gameengine/GamePlayer/common/GPC_RenderTools.h
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/BL_BlenderShader.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/BL_BlenderShader.h
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/BL_Material.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/BL_Material.h
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/BL_Shader.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_Camera.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_ConstraintActuator.h
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_IPO_SGController.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_IPO_SGController.h
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_IpoActuator.h
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_Light.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_Light.h
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_NearSensor.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_ObjectActuator.h
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_ParentActuator.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_RaySensor.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_Scene.h
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_TouchEventManager.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_TouchSensor.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_TrackToActuator.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
branches/soc-2008-jaguarandi/source/gameengine/PyDoc/BL_ActionActuator.py
branches/soc-2008-jaguarandi/source/gameengine/PyDoc/KX_GameObject.py
branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/CMakeLists.txt
branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_2DFilterManager.h
branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_BucketManager.cpp
branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_IRenderTools.h
branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_MaterialBucket.h
branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_MeshObject.cpp
branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_TexVert.cpp
branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_TexVert.h
branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/SConscript
branches/soc-2008-jaguarandi/source/gameengine/SceneGraph/SG_Controller.h
branches/soc-2008-jaguarandi/source/kernel/gen_system/GEN_HashedPtr.h
branches/soc-2008-jaguarandi/source/kernel/gen_system/GEN_Map.h
branches/soc-2008-jaguarandi/tools/Blender.py
Modified: branches/soc-2008-jaguarandi/README
===================================================================
--- branches/soc-2008-jaguarandi/README 2008-07-13 01:49:53 UTC (rev 15551)
+++ branches/soc-2008-jaguarandi/README 2008-07-13 13:21:01 UTC (rev 15552)
@@ -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-jaguarandi/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- branches/soc-2008-jaguarandi/intern/ghost/intern/GHOST_SystemWin32.cpp 2008-07-13 01:49:53 UTC (rev 15551)
+++ branches/soc-2008-jaguarandi/intern/ghost/intern/GHOST_SystemWin32.cpp 2008-07-13 13:21:01 UTC (rev 15552)
@@ -302,6 +302,15 @@
{
GHOST_TSuccess success = GHOST_System::init();
+ /* Disable scaling on high DPI displays on Vista */
+ HMODULE user32 = ::LoadLibraryA("user32.dll");
+ typedef BOOL (WINAPI * LPFNSETPROCESSDPIAWARE)();
+ LPFNSETPROCESSDPIAWARE SetProcessDPIAware =
+ (LPFNSETPROCESSDPIAWARE)GetProcAddress(user32, "SetProcessDPIAware");
+ if (SetProcessDPIAware)
+ SetProcessDPIAware();
+ FreeLibrary(user32);
+
// Determine whether this system has a high frequency performance counter. */
m_hasPerformanceCounter = ::QueryPerformanceFrequency((LARGE_INTEGER*)&m_freq) == TRUE;
if (m_hasPerformanceCounter) {
Modified: branches/soc-2008-jaguarandi/intern/moto/include/GEN_Map.h
===================================================================
--- branches/soc-2008-jaguarandi/intern/moto/include/GEN_Map.h 2008-07-13 01:49:53 UTC (rev 15551)
+++ branches/soc-2008-jaguarandi/intern/moto/include/GEN_Map.h 2008-07-13 13:21:01 UTC (rev 15552)
@@ -82,6 +82,24 @@
}
return 0;
}
+
+ Key* getKey(int index) {
+ int count=0;
+ for (int i=0;i<m_num_buckets;i++)
+ {
+ Entry* bucket = m_buckets[i];
+ while(bucket)
+ {
+ if (count==index)
+ {
+ return &bucket->m_key;
+ }
+ bucket = bucket->m_next;
+ count++;
+ }
+ }
+ return 0;
+ }
void clear() {
for (int i = 0; i < m_num_buckets; ++i) {
Modified: branches/soc-2008-jaguarandi/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj
===================================================================
--- branches/soc-2008-jaguarandi/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj 2008-07-13 01:49:53 UTC (rev 15551)
+++ branches/soc-2008-jaguarandi/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj 2008-07-13 13:21:01 UTC (rev 15552)
@@ -359,6 +359,9 @@
RelativePath="..\..\..\source\blender\blenlib\intern\BLI_memarena.c">
</File>
<File
+ RelativePath="..\..\..\source\blender\blenlib\intern\BLI_mempool.c">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\blenlib\intern\boxpack2d.c">
</File>
<File
@@ -474,6 +477,9 @@
RelativePath="..\..\..\source\blender\blenlib\BLI_memarena.h">
</File>
<File
+ RelativePath="..\..\..\source\blender\blenlib\BLI_mempool.h">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\blenlib\intern\BLI_scanfill.h">
</File>
<File
Modified: branches/soc-2008-jaguarandi/projectfiles_vc7/blender/render/BRE_render.vcproj
===================================================================
--- branches/soc-2008-jaguarandi/projectfiles_vc7/blender/render/BRE_render.vcproj 2008-07-13 01:49:53 UTC (rev 15551)
+++ branches/soc-2008-jaguarandi/projectfiles_vc7/blender/render/BRE_render.vcproj 2008-07-13 13:21:01 UTC (rev 15552)
@@ -74,7 +74,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\lib\windows\sdl\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\yafray;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenkernel;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\blender\render\intern\include;..\..\..\source\blender\render\extern\include;..\..\..\source\kernel;..\..\..\source\kernel\gen_messaging"
- PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_QUICKTIME;WITH_OPENEXR"
+ PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_QUICKTIME;WITH_OPENEXR;_USE_MATH_DEFINES"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
DefaultCharIsUnsigned="TRUE"
@@ -176,6 +176,9 @@
RelativePath="..\..\..\source\blender\render\intern\source\strand.c">
</File>
<File
+ RelativePath="..\..\..\source\blender\render\intern\source\sunsky.c">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\render\intern\source\texture.c">
</File>
<File
@@ -246,6 +249,9 @@
RelativePath="..\..\..\source\blender\render\intern\include\strand.h">
</File>
<File
+ RelativePath="..\..\..\source\blender\render\intern\include\sunsky.h">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\render\intern\include\texture.h">
</File>
<File
Modified: branches/soc-2008-jaguarandi/projectfiles_vc7/blender/src/BL_src.vcproj
===================================================================
--- branches/soc-2008-jaguarandi/projectfiles_vc7/blender/src/BL_src.vcproj 2008-07-13 01:49:53 UTC (rev 15551)
+++ branches/soc-2008-jaguarandi/projectfiles_vc7/blender/src/BL_src.vcproj 2008-07-13 13:21:01 UTC (rev 15552)
@@ -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"
+ 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;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\ffmpeg\include"
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_CONSOLE;GAMEBLENDER=1;WITH_QUICKTIME;INTERNATIONAL;WITH_VERSE;WITH_OPENEXR;WITH_DDS;WITH_BULLET=1;WITH_FFMPEG"
StringPooling="TRUE"
RuntimeLibrary="0"
@@ -73,7 +73,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list