Merge from trunk
authorAndre Susano Pinto <andresusanopinto@gmail.com>
Mon, 5 May 2008 17:30:33 +0000 (17:30 +0000)
committerAndre Susano Pinto <andresusanopinto@gmail.com>
Mon, 5 May 2008 17:30:33 +0000 (17:30 +0000)
commit0b7ab2f8ec1405b60262a13cf5d1ed671579dd69
tree0fef0df071ba8b8fd933b3a9531c13a0bc07c464
parent2b5432e6bb78ac10779b5f2d4206cb155c2daee9
Merge from trunk
svn merge -r 14626:14692 https://svn.blender.org/svnroot/bf-blender/trunk/blender
96 files changed:
CMakeLists.txt
SConstruct
config/darwin-config.py
config/win32-vc-config.py
extern/verse/dist/v_bignum.c
intern/ghost/intern/GHOST_SystemCarbon.cpp
projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj
projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
projectfiles_vc7/gameengine/rasterizer/RAS_rasterizer.vcproj
projectfiles_vc7/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj
release/scripts/console.py
release/scripts/wizard_curve2tree.py
release/scripts/x3d_export.py
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/mball.c
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/packedFile.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenkernel/intern/sound.c
source/blender/blenkernel/intern/text.c
source/blender/blenkernel/intern/writeavi.c
source/blender/blenkernel/intern/writeffmpeg.c
source/blender/blenlib/BLI_blenlib.h
source/blender/blenlib/intern/bpath.c
source/blender/blenlib/intern/util.c
source/blender/blenloader/intern/genfile.c
source/blender/include/BIF_screen.h
source/blender/include/butspace.h
source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c
source/blender/python/BPY_interface.c
source/blender/python/BPY_menus.c
source/blender/python/api2_2x/Blender.c
source/blender/python/api2_2x/Library.c
source/blender/python/api2_2x/Library.h
source/blender/python/api2_2x/Node.c
source/blender/python/api2_2x/Sys.c
source/blender/python/api2_2x/doc/LibData.py
source/blender/python/api2_2x/sceneRender.c
source/blender/quicktime/apple/quicktime_export.c
source/blender/render/intern/source/pipeline.c
source/blender/src/buttons_editing.c
source/blender/src/buttons_object.c
source/blender/src/buttons_scene.c
source/blender/src/buttons_shading.c
source/blender/src/drawimage.c
source/blender/src/drawobject.c
source/blender/src/drawview.c
source/blender/src/editcurve.c
source/blender/src/editdeform.c
source/blender/src/editimasel.c
source/blender/src/editipo.c
source/blender/src/editobject.c
source/blender/src/editscreen.c
source/blender/src/editsima.c
source/blender/src/editsound.c
source/blender/src/filesel.c
source/blender/src/fluidsim.c
source/blender/src/ghostwinlay.c
source/blender/src/header_action.c
source/blender/src/header_ipo.c
source/blender/src/header_nla.c
source/blender/src/interface_draw.c
source/blender/src/outliner.c
source/blender/src/screendump.c
source/blender/src/seqaudio.c
source/blender/src/sequence.c
source/blender/src/space.c
source/blender/src/view.c
source/blender/src/writeimage.c
source/blender/src/writemovie.c
source/blender/yafray/intern/export_File.cpp
source/blender/yafray/intern/export_Plugin.cpp
source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Converter/KX_ConvertActuators.cpp
source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
source/gameengine/GameLogic/SCA_MouseSensor.cpp
source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
source/gameengine/Ketsji/KX_BlenderMaterial.cpp
source/gameengine/Ketsji/KX_BlenderMaterial.h
source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
source/gameengine/Ketsji/KX_GameObject.cpp
source/gameengine/Ketsji/KX_GameObject.h
source/gameengine/Ketsji/KX_Scene.cpp
source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
source/gameengine/Physics/Bullet/CcdPhysicsController.h
source/gameengine/Rasterizer/RAS_BucketManager.cpp
source/gameengine/Rasterizer/RAS_IRenderTools.h
source/gameengine/Rasterizer/RAS_MaterialBucket.cpp