[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15567] branches/harmonic-skeleton: merge with trunk (15330 -> 15566)

Martin Poirier theeth at yahoo.com
Mon Jul 14 16:09:40 CEST 2008 

Revision: 15567
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15567
Author:   theeth
Date:     2008-07-14 16:09:36 +0200 (Mon, 14 Jul 2008)

Log Message:
-----------
merge with trunk (15330 -> 15566)

Modified Paths:
--------------
    branches/harmonic-skeleton/CMakeLists.txt
    branches/harmonic-skeleton/README
    branches/harmonic-skeleton/intern/bsp/intern/BSP_CSGMesh.cpp
    branches/harmonic-skeleton/intern/container/CTR_TaggedIndex.h
    branches/harmonic-skeleton/intern/decimation/intern/LOD_ManMesh2.cpp
    branches/harmonic-skeleton/intern/elbeem/intern/solver_init.cpp
    branches/harmonic-skeleton/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/harmonic-skeleton/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/harmonic-skeleton/intern/iksolver/intern/IK_QTask.h
    branches/harmonic-skeleton/intern/moto/include/GEN_Map.h
    branches/harmonic-skeleton/intern/moto/include/MT_random.h
    branches/harmonic-skeleton/intern/moto/intern/MT_random.cpp
    branches/harmonic-skeleton/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj
    branches/harmonic-skeleton/projectfiles_vc7/blender/render/BRE_render.vcproj
    branches/harmonic-skeleton/projectfiles_vc7/blender/src/BL_src.vcproj
    branches/harmonic-skeleton/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj
    branches/harmonic-skeleton/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
    branches/harmonic-skeleton/projectfiles_vc7/gameengine/rasterizer/RAS_rasterizer.vcproj
    branches/harmonic-skeleton/release/scripts/animation_bake_constraints.py
    branches/harmonic-skeleton/release/scripts/c3d_import.py
    branches/harmonic-skeleton/release/windows/installer/00.sconsblender.nsi
    branches/harmonic-skeleton/source/blender/blenkernel/BKE_bmesh.h
    branches/harmonic-skeleton/source/blender/blenkernel/BKE_bmeshCustomData.h
    branches/harmonic-skeleton/source/blender/blenkernel/BKE_cloth.h
    branches/harmonic-skeleton/source/blender/blenkernel/BKE_customdata.h
    branches/harmonic-skeleton/source/blender/blenkernel/BKE_ipo.h
    branches/harmonic-skeleton/source/blender/blenkernel/intern/BME_Customdata.c
    branches/harmonic-skeleton/source/blender/blenkernel/intern/BME_conversions.c
    branches/harmonic-skeleton/source/blender/blenkernel/intern/BME_eulers.c
    branches/harmonic-skeleton/source/blender/blenkernel/intern/BME_mesh.c
    branches/harmonic-skeleton/source/blender/blenkernel/intern/BME_structure.c
    branches/harmonic-skeleton/source/blender/blenkernel/intern/BME_tools.c
    branches/harmonic-skeleton/source/blender/blenkernel/intern/DerivedMesh.c
    branches/harmonic-skeleton/source/blender/blenkernel/intern/action.c
    branches/harmonic-skeleton/source/blender/blenkernel/intern/bmesh_private.h
    branches/harmonic-skeleton/source/blender/blenkernel/intern/cloth.c
    branches/harmonic-skeleton/source/blender/blenkernel/intern/collision.c
    branches/harmonic-skeleton/source/blender/blenkernel/intern/customdata.c
    branches/harmonic-skeleton/source/blender/blenkernel/intern/image.c
    branches/harmonic-skeleton/source/blender/blenkernel/intern/implicit.c
    branches/harmonic-skeleton/source/blender/blenkernel/intern/ipo.c
    branches/harmonic-skeleton/source/blender/blenkernel/intern/library.c
    branches/harmonic-skeleton/source/blender/blenkernel/intern/modifier.c
    branches/harmonic-skeleton/source/blender/blenkernel/intern/object.c
    branches/harmonic-skeleton/source/blender/blenkernel/intern/particle.c
    branches/harmonic-skeleton/source/blender/blenkernel/intern/particle_system.c
    branches/harmonic-skeleton/source/blender/blenkernel/intern/pointcache.c
    branches/harmonic-skeleton/source/blender/blenkernel/intern/sca.c
    branches/harmonic-skeleton/source/blender/blenkernel/intern/text.c
    branches/harmonic-skeleton/source/blender/blenlib/BLI_arithb.h
    branches/harmonic-skeleton/source/blender/blenlib/BLI_winstuff.h
    branches/harmonic-skeleton/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/harmonic-skeleton/source/blender/blenlib/intern/arithb.c
    branches/harmonic-skeleton/source/blender/blenlib/intern/util.c
    branches/harmonic-skeleton/source/blender/blenloader/intern/readfile.c
    branches/harmonic-skeleton/source/blender/blenloader/intern/writefile.c
    branches/harmonic-skeleton/source/blender/imbuf/intern/IMB_anim.h
    branches/harmonic-skeleton/source/blender/imbuf/intern/anim.c
    branches/harmonic-skeleton/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/harmonic-skeleton/source/blender/include/BDR_drawobject.h
    branches/harmonic-skeleton/source/blender/include/BIF_editaction.h
    branches/harmonic-skeleton/source/blender/include/BIF_editarmature.h
    branches/harmonic-skeleton/source/blender/include/BIF_resources.h
    branches/harmonic-skeleton/source/blender/include/BSE_sequence.h
    branches/harmonic-skeleton/source/blender/include/blendef.h
    branches/harmonic-skeleton/source/blender/makesdna/DNA_actuator_types.h
    branches/harmonic-skeleton/source/blender/makesdna/DNA_controller_types.h
    branches/harmonic-skeleton/source/blender/makesdna/DNA_customdata_types.h
    branches/harmonic-skeleton/source/blender/makesdna/DNA_lamp_types.h
    branches/harmonic-skeleton/source/blender/makesdna/DNA_meshdata_types.h
    branches/harmonic-skeleton/source/blender/makesdna/DNA_sensor_types.h
    branches/harmonic-skeleton/source/blender/makesdna/DNA_space_types.h
    branches/harmonic-skeleton/source/blender/makesdna/DNA_userdef_types.h
    branches/harmonic-skeleton/source/blender/nodes/intern/CMP_nodes/CMP_gamma.c
    branches/harmonic-skeleton/source/blender/nodes/intern/CMP_nodes/CMP_math.c
    branches/harmonic-skeleton/source/blender/python/BPY_interface.c
    branches/harmonic-skeleton/source/blender/python/api2_2x/CurNurb.c
    branches/harmonic-skeleton/source/blender/python/api2_2x/Lamp.c
    branches/harmonic-skeleton/source/blender/python/api2_2x/doc/Curve.py
    branches/harmonic-skeleton/source/blender/python/api2_2x/matrix.c
    branches/harmonic-skeleton/source/blender/python/api2_2x/sceneSequence.c
    branches/harmonic-skeleton/source/blender/radiosity/intern/source/radrender.c
    branches/harmonic-skeleton/source/blender/render/intern/include/pixelshading.h
    branches/harmonic-skeleton/source/blender/render/intern/include/render_types.h
    branches/harmonic-skeleton/source/blender/render/intern/source/convertblender.c
    branches/harmonic-skeleton/source/blender/render/intern/source/pipeline.c
    branches/harmonic-skeleton/source/blender/render/intern/source/pixelshading.c
    branches/harmonic-skeleton/source/blender/render/intern/source/rendercore.c
    branches/harmonic-skeleton/source/blender/render/intern/source/zbuf.c
    branches/harmonic-skeleton/source/blender/src/buttons_editing.c
    branches/harmonic-skeleton/source/blender/src/buttons_logic.c
    branches/harmonic-skeleton/source/blender/src/buttons_object.c
    branches/harmonic-skeleton/source/blender/src/buttons_scene.c
    branches/harmonic-skeleton/source/blender/src/buttons_shading.c
    branches/harmonic-skeleton/source/blender/src/drawaction.c
    branches/harmonic-skeleton/source/blender/src/drawarmature.c
    branches/harmonic-skeleton/source/blender/src/drawimage.c
    branches/harmonic-skeleton/source/blender/src/drawobject.c
    branches/harmonic-skeleton/source/blender/src/drawview.c
    branches/harmonic-skeleton/source/blender/src/editaction.c
    branches/harmonic-skeleton/source/blender/src/editarmature.c
    branches/harmonic-skeleton/source/blender/src/editfont.c
    branches/harmonic-skeleton/source/blender/src/editmesh_add.c
    branches/harmonic-skeleton/source/blender/src/editmesh_mods.c
    branches/harmonic-skeleton/source/blender/src/editnla.c
    branches/harmonic-skeleton/source/blender/src/editseq.c
    branches/harmonic-skeleton/source/blender/src/editsima.c
    branches/harmonic-skeleton/source/blender/src/editsound.c
    branches/harmonic-skeleton/source/blender/src/edittime.c
    branches/harmonic-skeleton/source/blender/src/header_image.c
    branches/harmonic-skeleton/source/blender/src/header_view3d.c
    branches/harmonic-skeleton/source/blender/src/headerbuttons.c
    branches/harmonic-skeleton/source/blender/src/interface_draw.c
    branches/harmonic-skeleton/source/blender/src/poselib.c
    branches/harmonic-skeleton/source/blender/src/poseobject.c
    branches/harmonic-skeleton/source/blender/src/resources.c
    branches/harmonic-skeleton/source/blender/src/sequence.c
    branches/harmonic-skeleton/source/blender/src/space.c
    branches/harmonic-skeleton/source/blender/src/transform_conversions.c
    branches/harmonic-skeleton/source/blender/src/transform_snap.c
    branches/harmonic-skeleton/source/blender/src/usiblender.c
    branches/harmonic-skeleton/source/blender/src/view.c
    branches/harmonic-skeleton/source/blender/src/vpaint.c
    branches/harmonic-skeleton/source/creator/creator.c
    branches/harmonic-skeleton/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/harmonic-skeleton/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/harmonic-skeleton/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
    branches/harmonic-skeleton/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
    branches/harmonic-skeleton/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/harmonic-skeleton/source/gameengine/Converter/BL_ActionActuator.h
    branches/harmonic-skeleton/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/harmonic-skeleton/source/gameengine/Converter/BL_MeshDeformer.cpp
    branches/harmonic-skeleton/source/gameengine/Converter/BL_MeshDeformer.h
    branches/harmonic-skeleton/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/harmonic-skeleton/source/gameengine/Converter/BL_ShapeDeformer.cpp
    branches/harmonic-skeleton/source/gameengine/Converter/BL_ShapeDeformer.h
    branches/harmonic-skeleton/source/gameengine/Converter/BL_SkinDeformer.cpp
    branches/harmonic-skeleton/source/gameengine/Converter/BL_SkinDeformer.h
    branches/harmonic-skeleton/source/gameengine/Converter/BL_SkinMeshObject.cpp
    branches/harmonic-skeleton/source/gameengine/Converter/BL_SkinMeshObject.h
    branches/harmonic-skeleton/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/harmonic-skeleton/source/gameengine/Converter/KX_ConvertControllers.cpp
    branches/harmonic-skeleton/source/gameengine/Converter/KX_ConvertSensors.cpp
    branches/harmonic-skeleton/source/gameengine/Expressions/PyObjectPlus.h
    branches/harmonic-skeleton/source/gameengine/Expressions/Value.cpp
    branches/harmonic-skeleton/source/gameengine/Expressions/Value.h
    branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
    branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_2DFilterActuator.h
    branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_EventManager.cpp
    branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_EventManager.h
    branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_IActuator.h
    branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_IController.cpp
    branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
    branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_ILogicBrick.h
    branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_IObject.cpp
    branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_IObject.h
    branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_ISensor.cpp
    branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_ISensor.h
    branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
    branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_LogicManager.cpp
    branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_MouseSensor.cpp
    branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_PropertySensor.cpp
    branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_PythonController.h
    branches/harmonic-skeleton/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
    branches/harmonic-skeleton/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
    branches/harmonic-skeleton/source/gameengine/GamePlayer/common/GPC_RenderTools.h
    branches/harmonic-skeleton/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/harmonic-skeleton/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/harmonic-skeleton/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp
    branches/harmonic-skeleton/source/gameengine/Ketsji/BL_BlenderShader.cpp
    branches/harmonic-skeleton/source/gameengine/Ketsji/BL_BlenderShader.h
    branches/harmonic-skeleton/source/gameengine/Ketsji/BL_Material.cpp
    branches/harmonic-skeleton/source/gameengine/Ketsji/BL_Material.h
    branches/harmonic-skeleton/source/gameengine/Ketsji/BL_Shader.cpp
    branches/harmonic-skeleton/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
    branches/harmonic-skeleton/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_BlenderMaterial.h
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_BulletPhysicsController.h
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_Camera.cpp
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_ConstraintActuator.h
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_GameObject.h
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_IPO_SGController.cpp
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_IPO_SGController.h
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_IPhysicsController.h
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_IpoActuator.cpp
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_IpoActuator.h
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_Light.cpp
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_Light.h
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_MeshProxy.cpp
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_NearSensor.cpp
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_ObjectActuator.cpp
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_ObjectActuator.h
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_ParentActuator.cpp
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_PythonInit.h
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_RaySensor.cpp
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_Scene.cpp
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_Scene.h
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_SoundActuator.cpp
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_SumoPhysicsController.h
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_TouchEventManager.cpp
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_TouchSensor.cpp
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_TrackToActuator.cpp
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
    branches/harmonic-skeleton/source/gameengine/PyDoc/BL_ActionActuator.py
    branches/harmonic-skeleton/source/gameengine/PyDoc/KX_GameObject.py
    branches/harmonic-skeleton/source/gameengine/PyDoc/SCA_PythonController.py
    branches/harmonic-skeleton/source/gameengine/Rasterizer/CMakeLists.txt
    branches/harmonic-skeleton/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
    branches/harmonic-skeleton/source/gameengine/Rasterizer/RAS_2DFilterManager.h
    branches/harmonic-skeleton/source/gameengine/Rasterizer/RAS_BucketManager.cpp
    branches/harmonic-skeleton/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
    branches/harmonic-skeleton/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
    branches/harmonic-skeleton/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/harmonic-skeleton/source/gameengine/Rasterizer/RAS_IRenderTools.h
    branches/harmonic-skeleton/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
    branches/harmonic-skeleton/source/gameengine/Rasterizer/RAS_MaterialBucket.h
    branches/harmonic-skeleton/source/gameengine/Rasterizer/RAS_MeshObject.cpp
    branches/harmonic-skeleton/source/gameengine/Rasterizer/RAS_MeshObject.h
    branches/harmonic-skeleton/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
    branches/harmonic-skeleton/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
    branches/harmonic-skeleton/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/harmonic-skeleton/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/harmonic-skeleton/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
    branches/harmonic-skeleton/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
    branches/harmonic-skeleton/source/gameengine/Rasterizer/RAS_TexVert.cpp
    branches/harmonic-skeleton/source/gameengine/Rasterizer/RAS_TexVert.h
    branches/harmonic-skeleton/source/gameengine/Rasterizer/SConscript
    branches/harmonic-skeleton/source/gameengine/SceneGraph/SG_Controller.h
    branches/harmonic-skeleton/source/kernel/gen_system/GEN_HashedPtr.h
    branches/harmonic-skeleton/source/kernel/gen_system/GEN_Map.h
    branches/harmonic-skeleton/tools/Blender.py

Added Paths:
-----------
    branches/harmonic-skeleton/source/blender/blenlib/BLI_mempool.h
    branches/harmonic-skeleton/source/blender/blenlib/intern/BLI_mempool.c
    branches/harmonic-skeleton/source/blender/render/intern/include/sunsky.h
    branches/harmonic-skeleton/source/blender/render/intern/source/sunsky.c
    branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp
    branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
    branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
    branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_ActuatorSensor.h
    branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_NANDController.cpp
    branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_NANDController.h
    branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_NORController.cpp
    branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_NORController.h
    branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_XNORController.cpp
    branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_XNORController.h
    branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_XORController.cpp
    branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_XORController.h
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
    branches/harmonic-skeleton/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h

Modified: branches/harmonic-skeleton/CMakeLists.txt
===================================================================
--- branches/harmonic-skeleton/CMakeLists.txt	2008-07-14 13:39:48 UTC (rev 15566)
+++ branches/harmonic-skeleton/CMakeLists.txt	2008-07-14 14:09:36 UTC (rev 15567)
@@ -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/harmonic-skeleton/README
===================================================================
--- branches/harmonic-skeleton/README	2008-07-14 13:39:48 UTC (rev 15566)
+++ branches/harmonic-skeleton/README	2008-07-14 14:09:36 UTC (rev 15567)
@@ -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/harmonic-skeleton/intern/bsp/intern/BSP_CSGMesh.cpp
===================================================================
--- branches/harmonic-skeleton/intern/bsp/intern/BSP_CSGMesh.cpp	2008-07-14 13:39:48 UTC (rev 15566)
+++ branches/harmonic-skeleton/intern/bsp/intern/BSP_CSGMesh.cpp	2008-07-14 14:09:36 UTC (rev 15567)
@@ -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/harmonic-skeleton/intern/container/CTR_TaggedIndex.h
===================================================================
--- branches/harmonic-skeleton/intern/container/CTR_TaggedIndex.h	2008-07-14 13:39:48 UTC (rev 15566)
+++ branches/harmonic-skeleton/intern/container/CTR_TaggedIndex.h	2008-07-14 14:09:36 UTC (rev 15567)
@@ -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/harmonic-skeleton/intern/decimation/intern/LOD_ManMesh2.cpp
===================================================================
--- branches/harmonic-skeleton/intern/decimation/intern/LOD_ManMesh2.cpp	2008-07-14 13:39:48 UTC (rev 15566)
+++ branches/harmonic-skeleton/intern/decimation/intern/LOD_ManMesh2.cpp	2008-07-14 14:09:36 UTC (rev 15567)
@@ -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/harmonic-skeleton/intern/elbeem/intern/solver_init.cpp
===================================================================
--- branches/harmonic-skeleton/intern/elbeem/intern/solver_init.cpp	2008-07-14 13:39:48 UTC (rev 15566)
+++ branches/harmonic-skeleton/intern/elbeem/intern/solver_init.cpp	2008-07-14 14:09:36 UTC (rev 15567)
@@ -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/harmonic-skeleton/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- branches/harmonic-skeleton/intern/ghost/intern/GHOST_SystemWin32.cpp	2008-07-14 13:39:48 UTC (rev 15566)
+++ branches/harmonic-skeleton/intern/ghost/intern/GHOST_SystemWin32.cpp	2008-07-14 14:09:36 UTC (rev 15567)
@@ -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 
@@ -302,6 +310,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/harmonic-skeleton/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- branches/harmonic-skeleton/intern/ghost/intern/GHOST_WindowWin32.cpp	2008-07-14 13:39:48 UTC (rev 15566)
+++ branches/harmonic-skeleton/intern/ghost/intern/GHOST_WindowWin32.cpp	2008-07-14 14:09:36 UTC (rev 15567)
@@ -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/harmonic-skeleton/intern/iksolver/intern/IK_QTask.h
===================================================================
--- branches/harmonic-skeleton/intern/iksolver/intern/IK_QTask.h	2008-07-14 13:39:48 UTC (rev 15566)
+++ branches/harmonic-skeleton/intern/iksolver/intern/IK_QTask.h	2008-07-14 14:09:36 UTC (rev 15567)
@@ -74,7 +74,7 @@
 
 	virtual bool PositionTask() const { return false; }
 
-	virtual void Scale(float scale) {}
+	virtual void Scale(float) {}
 
 protected:
 	int m_id;

Modified: branches/harmonic-skeleton/intern/moto/include/GEN_Map.h
===================================================================
--- branches/harmonic-skeleton/intern/moto/include/GEN_Map.h	2008-07-14 13:39:48 UTC (rev 15566)
+++ branches/harmonic-skeleton/intern/moto/include/GEN_Map.h	2008-07-14 14:09:36 UTC (rev 15567)
@@ -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/harmonic-skeleton/intern/moto/include/MT_random.h
===================================================================
--- branches/harmonic-skeleton/intern/moto/include/MT_random.h	2008-07-14 13:39:48 UTC (rev 15566)
+++ branches/harmonic-skeleton/intern/moto/include/MT_random.h	2008-07-14 14:09:36 UTC (rev 15567)
@@ -31,10 +31,10 @@
 
 #include <limits.h>
 
-#define MT_RAND_MAX ULONG_MAX
+#define MT_RAND_MAX UINT_MAX
 
-extern void          MT_srand(unsigned long);
-extern unsigned long MT_rand();
+extern void          MT_srand(unsigned int);
+extern unsigned int  MT_rand();
 
 #endif
 

Modified: branches/harmonic-skeleton/intern/moto/intern/MT_random.cpp
===================================================================
--- branches/harmonic-skeleton/intern/moto/intern/MT_random.cpp	2008-07-14 13:39:48 UTC (rev 15566)

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list