[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13584] branches/pynodes: * merge from trunk:

Nathan Letwory jesterking at letwory.net
Tue Feb 5 22:02:17 CET 2008 

Revision: 13584
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13584
Author:   jesterking
Date:     2008-02-05 22:02:16 +0100 (Tue, 05 Feb 2008)

Log Message:
-----------
* merge from trunk:
  svn merge r12977:13579 https://svn.blender.org/svnroot/bf-blender/trunk/blender .

  5 conflicts (fixed), 48 added, 1 deleted, 357 updated.

  It still compiles -> commit before it breaks again! :]

Modified Paths:
--------------
    branches/pynodes/CMakeLists.txt
    branches/pynodes/SConstruct
    branches/pynodes/config/linux2-config.py
    branches/pynodes/config/win32-mingw-config.py
    branches/pynodes/config/win32-vc-config.py
    branches/pynodes/extern/CMakeLists.txt
    branches/pynodes/extern/Makefile
    branches/pynodes/extern/SConscript
    branches/pynodes/extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj
    branches/pynodes/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp
    branches/pynodes/extern/bullet2/src/BulletDynamics/CMakeLists.txt
    branches/pynodes/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
    branches/pynodes/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
    branches/pynodes/extern/bullet2/src/SConscript
    branches/pynodes/intern/bmfont/BMF_Api.h
    branches/pynodes/intern/bmfont/intern/BMF_Api.cpp
    branches/pynodes/intern/bmfont/intern/BMF_BitmapFont.cpp
    branches/pynodes/intern/bmfont/intern/BMF_BitmapFont.h
    branches/pynodes/intern/elbeem/CMakeLists.txt
    branches/pynodes/intern/elbeem/SConscript
    branches/pynodes/intern/elbeem/intern/isosurface.cpp
    branches/pynodes/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/pynodes/intern/guardedalloc/MEM_guardedalloc.h
    branches/pynodes/intern/guardedalloc/intern/mallocn.c
    branches/pynodes/intern/opennl/SConscript
    branches/pynodes/intern/string/STR_String.h
    branches/pynodes/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
    branches/pynodes/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj
    branches/pynodes/projectfiles_vc7/blender/makesdna/DNA_makesdna.vcproj
    branches/pynodes/projectfiles_vc7/blender/nodes/nodes.vcproj
    branches/pynodes/projectfiles_vc7/blender/render/BRE_render.vcproj
    branches/pynodes/projectfiles_vc7/blender/src/BL_src.vcproj
    branches/pynodes/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj
    branches/pynodes/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj
    branches/pynodes/projectfiles_vc7/gameengine/rasterizer/RAS_rasterizer.vcproj
    branches/pynodes/projectfiles_vc7/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj
    branches/pynodes/release/Makefile
    branches/pynodes/release/datafiles/blenderbuttons
    branches/pynodes/release/scripts/add_mesh_torus.py
    branches/pynodes/release/scripts/export_m3g.py
    branches/pynodes/release/scripts/export_mdd.py
    branches/pynodes/release/scripts/flt_export.py
    branches/pynodes/release/scripts/flt_import.py
    branches/pynodes/release/scripts/flt_toolbar.py
    branches/pynodes/release/scripts/import_dxf.py
    branches/pynodes/release/scripts/import_mdd.py
    branches/pynodes/release/scripts/lightwave_import.py
    branches/pynodes/release/scripts/object_drop.py
    branches/pynodes/release/scripts/wizard_curve2tree.py
    branches/pynodes/release/scripts/x3d_export.py
    branches/pynodes/source/Makefile
    branches/pynodes/source/blender/avi/intern/avi.c
    branches/pynodes/source/blender/avi/intern/endian.c
    branches/pynodes/source/blender/blenkernel/BKE_action.h
    branches/pynodes/source/blender/blenkernel/BKE_anim.h
    branches/pynodes/source/blender/blenkernel/BKE_armature.h
    branches/pynodes/source/blender/blenkernel/BKE_bad_level_calls.h
    branches/pynodes/source/blender/blenkernel/BKE_blender.h
    branches/pynodes/source/blender/blenkernel/BKE_constraint.h
    branches/pynodes/source/blender/blenkernel/BKE_global.h
    branches/pynodes/source/blender/blenkernel/BKE_group.h
    branches/pynodes/source/blender/blenkernel/BKE_image.h
    branches/pynodes/source/blender/blenkernel/BKE_ipo.h
    branches/pynodes/source/blender/blenkernel/BKE_mesh.h
    branches/pynodes/source/blender/blenkernel/BKE_modifier.h
    branches/pynodes/source/blender/blenkernel/BKE_node.h
    branches/pynodes/source/blender/blenkernel/BKE_object.h
    branches/pynodes/source/blender/blenkernel/BKE_particle.h
    branches/pynodes/source/blender/blenkernel/BKE_scene.h
    branches/pynodes/source/blender/blenkernel/BKE_softbody.h
    branches/pynodes/source/blender/blenkernel/BKE_utildefines.h
    branches/pynodes/source/blender/blenkernel/CMakeLists.txt
    branches/pynodes/source/blender/blenkernel/SConscript
    branches/pynodes/source/blender/blenkernel/bad_level_call_stubs/stubs.c
    branches/pynodes/source/blender/blenkernel/intern/DerivedMesh.c
    branches/pynodes/source/blender/blenkernel/intern/Makefile
    branches/pynodes/source/blender/blenkernel/intern/action.c
    branches/pynodes/source/blender/blenkernel/intern/anim.c
    branches/pynodes/source/blender/blenkernel/intern/armature.c
    branches/pynodes/source/blender/blenkernel/intern/blender.c
    branches/pynodes/source/blender/blenkernel/intern/colortools.c
    branches/pynodes/source/blender/blenkernel/intern/constraint.c
    branches/pynodes/source/blender/blenkernel/intern/curve.c
    branches/pynodes/source/blender/blenkernel/intern/depsgraph.c
    branches/pynodes/source/blender/blenkernel/intern/effect.c
    branches/pynodes/source/blender/blenkernel/intern/group.c
    branches/pynodes/source/blender/blenkernel/intern/image.c
    branches/pynodes/source/blender/blenkernel/intern/ipo.c
    branches/pynodes/source/blender/blenkernel/intern/mesh.c
    branches/pynodes/source/blender/blenkernel/intern/modifier.c
    branches/pynodes/source/blender/blenkernel/intern/node.c
    branches/pynodes/source/blender/blenkernel/intern/object.c
    branches/pynodes/source/blender/blenkernel/intern/particle.c
    branches/pynodes/source/blender/blenkernel/intern/particle_system.c
    branches/pynodes/source/blender/blenkernel/intern/sca.c
    branches/pynodes/source/blender/blenkernel/intern/scene.c
    branches/pynodes/source/blender/blenkernel/intern/softbody.c
    branches/pynodes/source/blender/blenkernel/intern/world.c
    branches/pynodes/source/blender/blenlib/BLI_blenlib.h
    branches/pynodes/source/blender/blenlib/BLI_bpath.h
    branches/pynodes/source/blender/blenlib/CMakeLists.txt
    branches/pynodes/source/blender/blenlib/SConscript
    branches/pynodes/source/blender/blenlib/intern/BLI_ghash.c
    branches/pynodes/source/blender/blenlib/intern/BLI_kdtree.c
    branches/pynodes/source/blender/blenlib/intern/Makefile
    branches/pynodes/source/blender/blenlib/intern/arithb.c
    branches/pynodes/source/blender/blenlib/intern/bpath.c
    branches/pynodes/source/blender/blenlib/intern/fileops.c
    branches/pynodes/source/blender/blenlib/intern/psfont.c
    branches/pynodes/source/blender/blenlib/intern/storage.c
    branches/pynodes/source/blender/blenlib/intern/util.c
    branches/pynodes/source/blender/blenloader/intern/readfile.c
    branches/pynodes/source/blender/blenloader/intern/readfile.h
    branches/pynodes/source/blender/blenloader/intern/writefile.c
    branches/pynodes/source/blender/imbuf/intern/allocimbuf.c
    branches/pynodes/source/blender/imbuf/intern/anim.c
    branches/pynodes/source/blender/imbuf/intern/dds/BlockDXT.cpp
    branches/pynodes/source/blender/imbuf/intern/dds/BlockDXT.h
    branches/pynodes/source/blender/imbuf/intern/dds/ColorBlock.cpp
    branches/pynodes/source/blender/imbuf/intern/dds/ColorBlock.h
    branches/pynodes/source/blender/imbuf/intern/dds/Common.h
    branches/pynodes/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
    branches/pynodes/source/blender/imbuf/intern/dds/DirectDrawSurface.h
    branches/pynodes/source/blender/imbuf/intern/dds/Image.cpp
    branches/pynodes/source/blender/imbuf/intern/dds/Image.h
    branches/pynodes/source/blender/imbuf/intern/filter.c
    branches/pynodes/source/blender/imbuf/intern/imageprocess.c
    branches/pynodes/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/pynodes/source/blender/imbuf/intern/rotate.c
    branches/pynodes/source/blender/imbuf/intern/scaling.c
    branches/pynodes/source/blender/imbuf/intern/thumbs.c
    branches/pynodes/source/blender/include/BDR_drawaction.h
    branches/pynodes/source/blender/include/BDR_editobject.h
    branches/pynodes/source/blender/include/BDR_sculptmode.h
    branches/pynodes/source/blender/include/BIF_butspace.h
    branches/pynodes/source/blender/include/BIF_editaction.h
    branches/pynodes/source/blender/include/BIF_editarmature.h
    branches/pynodes/source/blender/include/BIF_editconstraint.h
    branches/pynodes/source/blender/include/BIF_editdeform.h
    branches/pynodes/source/blender/include/BIF_editparticle.h
    branches/pynodes/source/blender/include/BIF_editseq.h
    branches/pynodes/source/blender/include/BIF_editsima.h
    branches/pynodes/source/blender/include/BIF_editview.h
    branches/pynodes/source/blender/include/BIF_gl.h
    branches/pynodes/source/blender/include/BIF_outliner.h
    branches/pynodes/source/blender/include/BIF_poseobject.h
    branches/pynodes/source/blender/include/BIF_resources.h
    branches/pynodes/source/blender/include/BIF_space.h
    branches/pynodes/source/blender/include/BIF_transform.h
    branches/pynodes/source/blender/include/BSE_drawipo.h
    branches/pynodes/source/blender/include/BSE_editaction_types.h
    branches/pynodes/source/blender/include/BSE_editipo.h
    branches/pynodes/source/blender/include/BSE_node.h
    branches/pynodes/source/blender/include/BSE_seqeffects.h
    branches/pynodes/source/blender/include/BSE_seqscopes.h
    branches/pynodes/source/blender/include/BSE_sequence.h
    branches/pynodes/source/blender/include/BSE_time.h
    branches/pynodes/source/blender/include/blendef.h
    branches/pynodes/source/blender/include/butspace.h
    branches/pynodes/source/blender/include/multires.h
    branches/pynodes/source/blender/include/transform.h
    branches/pynodes/source/blender/makesdna/DNA_action_types.h
    branches/pynodes/source/blender/makesdna/DNA_actuator_types.h
    branches/pynodes/source/blender/makesdna/DNA_armature_types.h
    branches/pynodes/source/blender/makesdna/DNA_color_types.h
    branches/pynodes/source/blender/makesdna/DNA_constraint_types.h
    branches/pynodes/source/blender/makesdna/DNA_material_types.h
    branches/pynodes/source/blender/makesdna/DNA_modifier_types.h
    branches/pynodes/source/blender/makesdna/DNA_node_types.h
    branches/pynodes/source/blender/makesdna/DNA_object_force.h
    branches/pynodes/source/blender/makesdna/DNA_object_types.h
    branches/pynodes/source/blender/makesdna/DNA_particle_types.h
    branches/pynodes/source/blender/makesdna/DNA_scene_types.h
    branches/pynodes/source/blender/makesdna/DNA_sequence_types.h
    branches/pynodes/source/blender/makesdna/DNA_space_types.h
    branches/pynodes/source/blender/makesdna/DNA_texture_types.h
    branches/pynodes/source/blender/makesdna/DNA_userdef_types.h
    branches/pynodes/source/blender/makesdna/DNA_view3d_types.h
    branches/pynodes/source/blender/makesdna/DNA_world_types.h
    branches/pynodes/source/blender/makesdna/intern/makesdna.c
    branches/pynodes/source/blender/nodes/CMP_node.h
    branches/pynodes/source/blender/nodes/intern/CMP_nodes/CMP_alphaOver.c
    branches/pynodes/source/blender/nodes/intern/CMP_nodes/CMP_blur.c
    branches/pynodes/source/blender/nodes/intern/CMP_nodes/CMP_curves.c
    branches/pynodes/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
    branches/pynodes/source/blender/nodes/intern/CMP_nodes/CMP_idMask.c
    branches/pynodes/source/blender/nodes/intern/CMP_nodes/CMP_image.c
    branches/pynodes/source/blender/nodes/intern/CMP_nodes/CMP_zcombine.c
    branches/pynodes/source/blender/python/BPY_interface.c
    branches/pynodes/source/blender/python/api2_2x/Blender.c
    branches/pynodes/source/blender/python/api2_2x/Effect.c
    branches/pynodes/source/blender/python/api2_2x/Group.c
    branches/pynodes/source/blender/python/api2_2x/IDProp.c
    branches/pynodes/source/blender/python/api2_2x/Image.c
    branches/pynodes/source/blender/python/api2_2x/Makefile
    branches/pynodes/source/blender/python/api2_2x/Mathutils.c
    branches/pynodes/source/blender/python/api2_2x/Mesh.c
    branches/pynodes/source/blender/python/api2_2x/NLA.c
    branches/pynodes/source/blender/python/api2_2x/Node.c
    branches/pynodes/source/blender/python/api2_2x/Object.c
    branches/pynodes/source/blender/python/api2_2x/Scene.c
    branches/pynodes/source/blender/python/api2_2x/Texture.c
    branches/pynodes/source/blender/python/api2_2x/bpy_data.c
    branches/pynodes/source/blender/python/api2_2x/doc/Blender.py
    branches/pynodes/source/blender/python/api2_2x/doc/Font.py
    branches/pynodes/source/blender/python/api2_2x/doc/Ipo.py
    branches/pynodes/source/blender/python/api2_2x/doc/LibData.py
    branches/pynodes/source/blender/python/api2_2x/doc/Mathutils.py
    branches/pynodes/source/blender/python/api2_2x/doc/Mesh.py
    branches/pynodes/source/blender/python/api2_2x/doc/NLA.py
    branches/pynodes/source/blender/python/api2_2x/doc/Object.py
    branches/pynodes/source/blender/python/api2_2x/doc/Render.py
    branches/pynodes/source/blender/python/api2_2x/doc/Scene.py
    branches/pynodes/source/blender/python/api2_2x/quat.c
    branches/pynodes/source/blender/python/api2_2x/sceneRender.c
    branches/pynodes/source/blender/python/api2_2x/sceneRender.h
    branches/pynodes/source/blender/radiosity/intern/source/radfactors.c
    branches/pynodes/source/blender/radiosity/intern/source/radrender.c
    branches/pynodes/source/blender/render/extern/include/RE_pipeline.h
    branches/pynodes/source/blender/render/extern/include/RE_raytrace.h
    branches/pynodes/source/blender/render/extern/include/RE_shader_ext.h
    branches/pynodes/source/blender/render/intern/include/render_types.h
    branches/pynodes/source/blender/render/intern/include/rendercore.h
    branches/pynodes/source/blender/render/intern/include/renderdatabase.h
    branches/pynodes/source/blender/render/intern/include/shadbuf.h
    branches/pynodes/source/blender/render/intern/include/shading.h
    branches/pynodes/source/blender/render/intern/include/strand.h
    branches/pynodes/source/blender/render/intern/include/zbuf.h
    branches/pynodes/source/blender/render/intern/source/convertblender.c
    branches/pynodes/source/blender/render/intern/source/envmap.c
    branches/pynodes/source/blender/render/intern/source/imagetexture.c
    branches/pynodes/source/blender/render/intern/source/pipeline.c
    branches/pynodes/source/blender/render/intern/source/pixelblending.c
    branches/pynodes/source/blender/render/intern/source/pixelshading.c
    branches/pynodes/source/blender/render/intern/source/rayshade.c
    branches/pynodes/source/blender/render/intern/source/raytrace.c
    branches/pynodes/source/blender/render/intern/source/rendercore.c
    branches/pynodes/source/blender/render/intern/source/renderdatabase.c
    branches/pynodes/source/blender/render/intern/source/shadbuf.c
    branches/pynodes/source/blender/render/intern/source/shadeinput.c
    branches/pynodes/source/blender/render/intern/source/shadeoutput.c
    branches/pynodes/source/blender/render/intern/source/sss.c
    branches/pynodes/source/blender/render/intern/source/strand.c
    branches/pynodes/source/blender/render/intern/source/texture.c
    branches/pynodes/source/blender/render/intern/source/zbuf.c
    branches/pynodes/source/blender/src/blenderbuttons.c
    branches/pynodes/source/blender/src/butspace.c
    branches/pynodes/source/blender/src/buttons_editing.c
    branches/pynodes/source/blender/src/buttons_logic.c
    branches/pynodes/source/blender/src/buttons_object.c
    branches/pynodes/source/blender/src/buttons_scene.c
    branches/pynodes/source/blender/src/buttons_shading.c
    branches/pynodes/source/blender/src/drawaction.c
    branches/pynodes/source/blender/src/drawarmature.c
    branches/pynodes/source/blender/src/drawipo.c
    branches/pynodes/source/blender/src/drawnla.c
    branches/pynodes/source/blender/src/drawnode.c
    branches/pynodes/source/blender/src/drawobject.c
    branches/pynodes/source/blender/src/drawseq.c
    branches/pynodes/source/blender/src/drawsound.c
    branches/pynodes/source/blender/src/drawtime.c
    branches/pynodes/source/blender/src/drawview.c
    branches/pynodes/source/blender/src/edit.c
    branches/pynodes/source/blender/src/editaction.c
    branches/pynodes/source/blender/src/editarmature.c
    branches/pynodes/source/blender/src/editconstraint.c
    branches/pynodes/source/blender/src/editdeform.c
    branches/pynodes/source/blender/src/editface.c
    branches/pynodes/source/blender/src/editgroup.c
    branches/pynodes/source/blender/src/editimasel.c
    branches/pynodes/source/blender/src/editipo.c
    branches/pynodes/source/blender/src/editmesh.c
    branches/pynodes/source/blender/src/editmesh_loop.c
    branches/pynodes/source/blender/src/editmesh_tools.c
    branches/pynodes/source/blender/src/editnla.c
    branches/pynodes/source/blender/src/editnode.c
    branches/pynodes/source/blender/src/editobject.c
    branches/pynodes/source/blender/src/editparticle.c
    branches/pynodes/source/blender/src/editscreen.c
    branches/pynodes/source/blender/src/editseq.c
    branches/pynodes/source/blender/src/editsima.c
    branches/pynodes/source/blender/src/editsound.c
    branches/pynodes/source/blender/src/edittime.c
    branches/pynodes/source/blender/src/editview.c
    branches/pynodes/source/blender/src/filelist.c
    branches/pynodes/source/blender/src/filesel.c
    branches/pynodes/source/blender/src/ghostwinlay.c
    branches/pynodes/source/blender/src/header_action.c
    branches/pynodes/source/blender/src/header_buttonswin.c
    branches/pynodes/source/blender/src/header_filesel.c
    branches/pynodes/source/blender/src/header_image.c
    branches/pynodes/source/blender/src/header_imasel.c
    branches/pynodes/source/blender/src/header_info.c
    branches/pynodes/source/blender/src/header_nla.c
    branches/pynodes/source/blender/src/header_node.c
    branches/pynodes/source/blender/src/header_seq.c
    branches/pynodes/source/blender/src/header_time.c
    branches/pynodes/source/blender/src/header_view3d.c
    branches/pynodes/source/blender/src/headerbuttons.c
    branches/pynodes/source/blender/src/interface_draw.c
    branches/pynodes/source/blender/src/meshlaplacian.c
    branches/pynodes/source/blender/src/meshtools.c
    branches/pynodes/source/blender/src/multires.c
    branches/pynodes/source/blender/src/outliner.c
    branches/pynodes/source/blender/src/playanim.c
    branches/pynodes/source/blender/src/poseobject.c
    branches/pynodes/source/blender/src/previewrender.c
    branches/pynodes/source/blender/src/renderwin.c
    branches/pynodes/source/blender/src/resources.c
    branches/pynodes/source/blender/src/sculptmode-stroke.c
    branches/pynodes/source/blender/src/sculptmode.c
    branches/pynodes/source/blender/src/seqaudio.c
    branches/pynodes/source/blender/src/seqeffects.c
    branches/pynodes/source/blender/src/seqscopes.c
    branches/pynodes/source/blender/src/sequence.c
    branches/pynodes/source/blender/src/space.c
    branches/pynodes/source/blender/src/toets.c
    branches/pynodes/source/blender/src/toolbox.c
    branches/pynodes/source/blender/src/transform.c
    branches/pynodes/source/blender/src/transform_constraints.c
    branches/pynodes/source/blender/src/transform_conversions.c
    branches/pynodes/source/blender/src/transform_generics.c
    branches/pynodes/source/blender/src/transform_manipulator.c
    branches/pynodes/source/blender/src/transform_snap.c
    branches/pynodes/source/blender/src/usiblender.c
    branches/pynodes/source/blender/src/verse_object.c
    branches/pynodes/source/blender/src/view.c
    branches/pynodes/source/blender/src/vpaint.c
    branches/pynodes/source/blender/yafray/intern/export_File.cpp
    branches/pynodes/source/blender/yafray/intern/export_File.h
    branches/pynodes/source/blender/yafray/intern/export_Plugin.cpp
    branches/pynodes/source/blender/yafray/intern/export_Plugin.h
    branches/pynodes/source/blender/yafray/intern/yafray_Render.cpp
    branches/pynodes/source/blender/yafray/intern/yafray_Render.h
    branches/pynodes/source/creator/CMakeLists.txt
    branches/pynodes/source/creator/Makefile
    branches/pynodes/source/creator/SConscript
    branches/pynodes/source/creator/creator.c
    branches/pynodes/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/pynodes/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
    branches/pynodes/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
    branches/pynodes/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/pynodes/source/gameengine/GameLogic/CMakeLists.txt
    branches/pynodes/source/gameengine/GameLogic/Makefile
    branches/pynodes/source/gameengine/GameLogic/SConscript
    branches/pynodes/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp
    branches/pynodes/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
    branches/pynodes/source/gameengine/GamePlayer/common/GPC_RenderTools.h
    branches/pynodes/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/pynodes/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/pynodes/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/pynodes/source/gameengine/Ketsji/KX_RaySensor.cpp
    branches/pynodes/source/gameengine/Ketsji/KX_Scene.cpp
    branches/pynodes/source/gameengine/Rasterizer/RAS_IRenderTools.h
    branches/pynodes/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
    branches/pynodes/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
    branches/pynodes/source/nan_compile.mk
    branches/pynodes/source/nan_definitions.mk
    branches/pynodes/source/nan_link.mk
    branches/pynodes/tools/Blender.py
    branches/pynodes/tools/btools.py

Added Paths:
-----------
    branches/pynodes/extern/binreloc/
    branches/pynodes/extern/binreloc/CMakeLists.txt
    branches/pynodes/extern/binreloc/Makefile
    branches/pynodes/extern/binreloc/SConscript
    branches/pynodes/extern/binreloc/binreloc.c
    branches/pynodes/extern/binreloc/include/
    branches/pynodes/extern/binreloc/include/binreloc.h
    branches/pynodes/extern/bullet2/src/Bullet-C-Api.h
    branches/pynodes/extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp
    branches/pynodes/release/getversion.py
    branches/pynodes/release/scripts/bpymodules/blend2renderinfo.py
    branches/pynodes/release/scripts/object_timeofs_follow_act.py
    branches/pynodes/release/scripts/render_save_layers.py
    branches/pynodes/source/blender/blenkernel/BKE_cloth.h
    branches/pynodes/source/blender/blenkernel/BKE_collision.h
    branches/pynodes/source/blender/blenkernel/BKE_multires.h
    branches/pynodes/source/blender/blenkernel/BKE_sculpt.h
    branches/pynodes/source/blender/blenkernel/intern/cloth.c
    branches/pynodes/source/blender/blenkernel/intern/collision.c
    branches/pynodes/source/blender/blenkernel/intern/implicit.c
    branches/pynodes/source/blender/blenkernel/intern/kdop.c
    branches/pynodes/source/blender/blenkernel/intern/multires-firstlevel.c
    branches/pynodes/source/blender/blenkernel/intern/multires.c
    branches/pynodes/source/blender/imbuf/intern/dds/PixelFormat.h
    branches/pynodes/source/blender/include/BIF_poselib.h
    branches/pynodes/source/blender/include/BIF_radialcontrol.h
    branches/pynodes/source/blender/makesdna/DNA_cloth_types.h
    branches/pynodes/source/blender/nodes/intern/CMP_nodes/CMP_bilateralblur.c
    branches/pynodes/source/blender/nodes/intern/CMP_nodes/CMP_directionalblur.c
    branches/pynodes/source/blender/render/intern/include/occlusion.h
    branches/pynodes/source/blender/render/intern/source/occlusion.c
    branches/pynodes/source/blender/src/poselib.c
    branches/pynodes/source/blender/src/radialcontrol.c
    branches/pynodes/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
    branches/pynodes/source/gameengine/GameLogic/SCA_2DFilterActuator.h
    branches/pynodes/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
    branches/pynodes/source/gameengine/Rasterizer/RAS_2DFilterManager.h
    branches/pynodes/source/gameengine/Rasterizer/RAS_OpenGLFilters/
    branches/pynodes/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Blur2DFilter.h
    branches/pynodes/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Dilation2DFilter.h
    branches/pynodes/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Erosion2DFilter.h
    branches/pynodes/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_GrayScale2DFilter.h
    branches/pynodes/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Invert2DFilter.h
    branches/pynodes/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Laplacian2DFilter.h
    branches/pynodes/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Prewitt2DFilter.h
    branches/pynodes/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sepia2DFilter.h
    branches/pynodes/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sharpen2DFilter.h
    branches/pynodes/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sobel2DFilter.h

Removed Paths:
-------------
    branches/pynodes/extern/binreloc/CMakeLists.txt
    branches/pynodes/extern/binreloc/Makefile
    branches/pynodes/extern/binreloc/SConscript
    branches/pynodes/extern/binreloc/binreloc.c
    branches/pynodes/extern/binreloc/include/
    branches/pynodes/extern/binreloc/include/binreloc.h
    branches/pynodes/source/blender/src/multires-firstlevel.c
    branches/pynodes/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Blur2DFilter.h
    branches/pynodes/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Dilation2DFilter.h
    branches/pynodes/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Erosion2DFilter.h
    branches/pynodes/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_GrayScale2DFilter.h
    branches/pynodes/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Invert2DFilter.h
    branches/pynodes/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Laplacian2DFilter.h
    branches/pynodes/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Prewitt2DFilter.h
    branches/pynodes/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sepia2DFilter.h
    branches/pynodes/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sharpen2DFilter.h
    branches/pynodes/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sobel2DFilter.h

Modified: branches/pynodes/CMakeLists.txt
===================================================================
--- branches/pynodes/CMakeLists.txt	2008-02-05 20:53:43 UTC (rev 13583)
+++ branches/pynodes/CMakeLists.txt	2008-02-05 21:02:16 UTC (rev 13584)
@@ -65,8 +65,9 @@
 OPTION(WITH_QUICKTIME		"Enable Quicktime Support"				OFF)
 OPTION(WITH_OPENEXR		"Enable OpenEXR Support (http://www.openexr.com)"	OFF)
 OPTION(WITH_FFMPEG		"Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)"	OFF)
-OPTION(WITH_OPENAL		"Enable OpenAL Support (http://www.openal.org)"	ON)
-OPTION(YESIAMSTUPID		"Enable execution on 64-bit platforms"					OFF)
+OPTION(WITH_OPENAL		"Enable OpenAL Support (http://www.openal.org)"		ON)
+OPTION(YESIAMSTUPID		"Enable execution on 64-bit platforms"			OFF)
+OPTION(WITH_OPENMP		"Enable OpenMP (has to be supported by the compiler)"	OFF)
 
 IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
   MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
@@ -184,6 +185,13 @@
 
   SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++")
 
+  IF(WITH_OPENMP)
+    SET(LLIBS "${LLIBS} -lgomp ")
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp ")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp ")
+  ENDIF(WITH_OPENMP)
+
+
   SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -DXP_UNIX -Wno-char-subscripts")
 
   SET(PLATFORM_LINKFLAGS "-pthread")
@@ -270,6 +278,11 @@
   SET(CMAKE_C_FLAGS_MINSIZEREL "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
   SET(CMAKE_C_FLAGS_RELWITHDEBINFO "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
 
+  IF(WITH_OPENMP)
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /openmp ")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /openmp ")
+  ENDIF(WITH_OPENMP)
+
   SET(SDL ${LIBDIR}/sdl)
   SET(SDL_INC ${SDL}/include)
   SET(SDL_LIB SDL)
@@ -347,6 +360,12 @@
   SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
   SET(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime")
 
+  IF(WITH_OPENMP)
+    SET(LLIBS "${LLIBS} -lgomp ")
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp ")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp ")
+  ENDIF(WITH_OPENMP)
+
   SET(SDL ${LIBDIR}/sdl)
   SET(SDL_INC ${SDL}/include)
   SET(SDL_LIB SDL)
@@ -366,6 +385,11 @@
   SET(EXETYPE MACOSX_BUNDLE)
 ENDIF(APPLE)
 
+IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+  SET(BINRELOC ${CMAKE_SOURCE_DIR}/extern/binreloc)
+  SET(BINRELOC_INC ${BINRELOC}/include)
+ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+
 #-----------------------------------------------------------------------------
 # Common.
 SET(VERSE_INC ${CMAKE_SOURCE_DIR}/extern/verse/dist)
@@ -384,6 +408,9 @@
 IF(WITH_GAMEENGINE)
   SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -DGAMEBLENDER ")
 ENDIF(WITH_GAMEENGINE)
+IF(WITH_BULLET)
+  SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -DWITH_BULLET ")
+ENDIF(WITH_BULLET)
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${PLATFORM_CFLAGS} ")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PLATFORM_CFLAGS} ")
 

Modified: branches/pynodes/SConstruct
===================================================================
--- branches/pynodes/SConstruct	2008-02-05 20:53:43 UTC (rev 13583)
+++ branches/pynodes/SConstruct	2008-02-05 21:02:16 UTC (rev 13584)
@@ -179,6 +179,18 @@
     env['CXXFLAGS'].append('-DDISABLE_ELBEEM')
     env['CCFLAGS'].append('-DDISABLE_ELBEEM')
 
+if env['WITH_BF_OPENMP'] == 1:
+	if env['OURPLATFORM']=='win32-vc':
+		env.Append(LINKFLAGS=['/openmp'])
+		env['CCFLAGS'].append('/openmp')
+		env['CPPFLAGS'].append('/openmp')
+		env['CXXFLAGS'].append('/openmp')
+	else:
+		env.Append(LINKFLAGS=['-lgomp'])
+		env['CCFLAGS'].append('-fopenmp')
+		env['CPPFLAGS'].append('-fopenmp')
+		env['CXXFLAGS'].append('-fopenmp')
+
 #check for additional debug libnames
 
 if env.has_key('BF_DEBUG_LIBS'):
@@ -401,7 +413,7 @@
                         '${LCGDIR}/zlib/lib/zlib.dll',
                         '${LCGDIR}/tiff/lib/libtiff.dll']
     if env['BF_DEBUG']:
-        dllsources.append('${LCGDIR}/python/lib/${BF_PYTHON_LIB}.dll')
+        dllsources.append('${LCGDIR}/python/lib/${BF_PYTHON_LIB}_d.dll')
     else:
         dllsources.append('${LCGDIR}/python/lib/${BF_PYTHON_LIB}.dll')
     if env['OURPLATFORM'] == 'win32-mingw':
@@ -410,10 +422,10 @@
         dllsources += ['${LCGDIR}/pthreads/lib/pthreadVC2.dll']
     if env['WITH_BF_ICONV']:
         dllsources += ['${LCGDIR}/iconv/lib/iconv.dll']
-    if env['WITH_BF_FFMPEG']:
-        dllsources += ['${LCGDIR}/ffmpeg/lib/avcodec-51.dll',
-                        '${LCGDIR}/ffmpeg/lib/avformat-51.dll',
-                        '${LCGDIR}/ffmpeg/lib/avutil-49.dll']
+#    if env['WITH_BF_FFMPEG']:
+#        dllsources += ['${LCGDIR}/ffmpeg/lib/avcodec-51.dll',
+#                        '${LCGDIR}/ffmpeg/lib/avformat-51.dll',
+#                        '${LCGDIR}/ffmpeg/lib/avutil-49.dll']
     windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
     allinstall += windlls
 

Modified: branches/pynodes/config/linux2-config.py
===================================================================
--- branches/pynodes/config/linux2-config.py	2008-02-05 20:53:43 UTC (rev 13583)
+++ branches/pynodes/config/linux2-config.py	2008-02-05 21:02:16 UTC (rev 13584)
@@ -29,8 +29,12 @@
 
 WITH_BF_OPENEXR = 'true'
 BF_OPENEXR = '/usr'
+# when compiling with your own openexr lib you might need to set...
+# BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
+
 BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
 BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
+# BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
 
 WITH_BF_DDS = 'true'
 
@@ -114,6 +118,8 @@
 BF_ICONV_LIB = 'iconv'
 BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
 
+WITH_BF_BINRELOC = 'true'
+
 # enable ffmpeg  support
 WITH_BF_FFMPEG = 'true'  # -DWITH_FFMPEG
 BF_FFMPEG = '#extern/ffmpeg'

Modified: branches/pynodes/config/win32-mingw-config.py
===================================================================
--- branches/pynodes/config/win32-mingw-config.py	2008-02-05 20:53:43 UTC (rev 13583)
+++ branches/pynodes/config/win32-mingw-config.py	2008-02-05 21:02:16 UTC (rev 13584)
@@ -18,7 +18,7 @@
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
 WITH_BF_FFMPEG = 'false'
-BF_FFMPEG_LIB = 'avformat avutil avcodec'
+BF_FFMPEG_LIB = 'avformat swscale avcodec avutil xvidcore x264'
 BF_FFMPEG_LIBPATH = LIBDIR + '/gcc/ffmpeg/lib'
 BF_FFMPEG_INC =  LIBDIR + '/gcc/ffmpeg/include'
 

Modified: branches/pynodes/config/win32-vc-config.py
===================================================================
--- branches/pynodes/config/win32-vc-config.py	2008-02-05 20:53:43 UTC (rev 13583)
+++ branches/pynodes/config/win32-vc-config.py	2008-02-05 21:02:16 UTC (rev 13584)
@@ -106,6 +106,8 @@
 
 WITH_BF_YAFRAY = 'true'
 
+WITH_BF_BINRELOC = 'false'
+
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr

Modified: branches/pynodes/extern/CMakeLists.txt
===================================================================
--- branches/pynodes/extern/CMakeLists.txt	2008-02-05 20:53:43 UTC (rev 13583)
+++ branches/pynodes/extern/CMakeLists.txt	2008-02-05 21:02:16 UTC (rev 13584)
@@ -29,11 +29,11 @@
 
 IF(WITH_GAMEENGINE)
   SUBDIRS(qhull solid)
+ENDIF(WITH_GAMEENGINE)
 
-  IF(WITH_BULLET)
+IF(WITH_BULLET)
     SUBDIRS(bullet2)
-  ENDIF(WITH_BULLET)
-ENDIF(WITH_GAMEENGINE)
+ENDIF(WITH_BULLET)
 
 IF(WITH_INTERNATIONAL)
   SUBDIRS(bFTGL)
@@ -43,3 +43,6 @@
   SUBDIRS(verse)
 ENDIF(WITH_VERSE)
 
+IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+  SUBDIRS(binreloc)
+ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")

Modified: branches/pynodes/extern/Makefile
===================================================================
--- branches/pynodes/extern/Makefile	2008-02-05 20:53:43 UTC (rev 13583)
+++ branches/pynodes/extern/Makefile	2008-02-05 21:02:16 UTC (rev 13584)
@@ -56,6 +56,10 @@
     DIRS += bullet2
 endif
 
+ifeq ($(WITH_BINRELOC), true)
+    DIRS += binreloc
+endif
+
 TARGET =
 ifneq ($(OS),irix)
   TARGET=solid

Modified: branches/pynodes/extern/SConscript
===================================================================
--- branches/pynodes/extern/SConscript	2008-02-05 20:53:43 UTC (rev 13583)
+++ branches/pynodes/extern/SConscript	2008-02-05 21:02:16 UTC (rev 13584)
@@ -5,9 +5,10 @@
 if env['WITH_BF_GAMEENGINE']:
     SConscript(['qhull/SConscript',
             'solid/SConscript'])
-    if env['WITH_BF_BULLET']:
-        SConscript(['bullet2/src/SConscript'])
 
+if env['WITH_BF_BULLET']:
+    SConscript(['bullet2/src/SConscript'])
+
 if env['WITH_BF_INTERNATIONAL']:
     SConscript(['bFTGL/SConscript'])
 
@@ -19,3 +20,6 @@
 
 if env['WITH_BF_FFMPEG'] and env['BF_FFMPEG_LIB'] == '':
     SConscript(['ffmpeg/SConscript']);
+
+if env['OURPLATFORM'] == 'linux2':
+    SConscript(['binreloc/SConscript']);
\ No newline at end of file

Copied: branches/pynodes/extern/binreloc (from rev 13579, trunk/blender/extern/binreloc)

Deleted: branches/pynodes/extern/binreloc/CMakeLists.txt
===================================================================
--- trunk/blender/extern/binreloc/CMakeLists.txt	2008-02-05 18:11:16 UTC (rev 13579)
+++ branches/pynodes/extern/binreloc/CMakeLists.txt	2008-02-05 21:02:16 UTC (rev 13584)
@@ -1,26 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# The Original Code is Copyright (C) 2008 by The Blender Foundation

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list