[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15411] branches/fluidcontrol: svn merge -r 14676:15409 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Daniel Genrich
daniel.genrich at gmx.net
Wed Jul 2 23:55:52 CEST 2008
Revision: 15411
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15411
Author: genscher
Date: 2008-07-02 23:55:25 +0200 (Wed, 02 Jul 2008)
Log Message:
-----------
svn merge -r 14676:15409 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/fluidcontrol/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
branches/fluidcontrol/blenderplayer/CMakeLists.txt
branches/fluidcontrol/config/linux2-config.py
branches/fluidcontrol/config/win32-vc-config.py
branches/fluidcontrol/extern/CMakeLists.txt
branches/fluidcontrol/extern/Makefile
branches/fluidcontrol/extern/SConscript
branches/fluidcontrol/extern/bFTGL/SConscript
branches/fluidcontrol/extern/make/msvc_7_0/extern.sln
branches/fluidcontrol/intern/bsp/SConscript
branches/fluidcontrol/intern/ghost/intern/GHOST_NDOFManager.cpp
branches/fluidcontrol/intern/ghost/intern/GHOST_System.cpp
branches/fluidcontrol/intern/ghost/intern/GHOST_SystemX11.cpp
branches/fluidcontrol/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/fluidcontrol/intern/guardedalloc/intern/mmap_win.c
branches/fluidcontrol/intern/iksolver/intern/IK_QTask.h
branches/fluidcontrol/intern/moto/include/MT_random.h
branches/fluidcontrol/intern/moto/intern/MT_random.cpp
branches/fluidcontrol/po/fr.po
branches/fluidcontrol/projectfiles_vc7/blender/blender.vcproj
branches/fluidcontrol/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
branches/fluidcontrol/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj
branches/fluidcontrol/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj
branches/fluidcontrol/projectfiles_vc7/gameengine/converter/KX_converter.vcproj
branches/fluidcontrol/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj
branches/fluidcontrol/projectfiles_vc7/gameengine/gameplayer/common/GP_common.vcproj
branches/fluidcontrol/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj
branches/fluidcontrol/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
branches/fluidcontrol/projectfiles_vc7/gameengine/rasterizer/RAS_rasterizer.vcproj
branches/fluidcontrol/projectfiles_vc7/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj
branches/fluidcontrol/release/Makefile
branches/fluidcontrol/release/VERSION
branches/fluidcontrol/release/datafiles/blenderbuttons
branches/fluidcontrol/release/datafiles/splash.jpg
branches/fluidcontrol/release/scripts/3ds_export.py
branches/fluidcontrol/release/scripts/3ds_import.py
branches/fluidcontrol/release/scripts/DirectX8Exporter.py
branches/fluidcontrol/release/scripts/bevel_center.py
branches/fluidcontrol/release/scripts/blenderLipSynchro.py
branches/fluidcontrol/release/scripts/bpymodules/BPyAddMesh.py
branches/fluidcontrol/release/scripts/bpymodules/BPyArmature.py
branches/fluidcontrol/release/scripts/bpymodules/colladaImEx/collada.py
branches/fluidcontrol/release/scripts/bpymodules/colladaImEx/cstartup.py
branches/fluidcontrol/release/scripts/bpymodules/colladaImEx/cutils.py
branches/fluidcontrol/release/scripts/bpymodules/colladaImEx/translator.py
branches/fluidcontrol/release/scripts/bpymodules/dxfReader.py
branches/fluidcontrol/release/scripts/colladaImport14.py
branches/fluidcontrol/release/scripts/export_fbx.py
branches/fluidcontrol/release/scripts/export_m3g.py
branches/fluidcontrol/release/scripts/flt_export.py
branches/fluidcontrol/release/scripts/flt_import.py
branches/fluidcontrol/release/scripts/hotkeys.py
branches/fluidcontrol/release/scripts/import_dxf.py
branches/fluidcontrol/release/scripts/ms3d_import.py
branches/fluidcontrol/release/scripts/object_apply_def.py
branches/fluidcontrol/release/scripts/paths_import.py
branches/fluidcontrol/release/scripts/render_save_layers.py
branches/fluidcontrol/release/scripts/rvk1_torvk2.py
branches/fluidcontrol/release/scripts/uv_seams_from_islands.py
branches/fluidcontrol/release/scripts/uvcalc_lightmap.py
branches/fluidcontrol/release/scripts/vrml97_export.py
branches/fluidcontrol/release/scripts/x3d_export.py
branches/fluidcontrol/release/windows/installer/00.sconsblender.nsi
branches/fluidcontrol/source/Makefile
branches/fluidcontrol/source/blender/blenkernel/BKE_action.h
branches/fluidcontrol/source/blender/blenkernel/BKE_blender.h
branches/fluidcontrol/source/blender/blenkernel/BKE_bmesh.h
branches/fluidcontrol/source/blender/blenkernel/BKE_cloth.h
branches/fluidcontrol/source/blender/blenkernel/BKE_collision.h
branches/fluidcontrol/source/blender/blenkernel/BKE_curve.h
branches/fluidcontrol/source/blender/blenkernel/BKE_idprop.h
branches/fluidcontrol/source/blender/blenkernel/BKE_ipo.h
branches/fluidcontrol/source/blender/blenkernel/BKE_key.h
branches/fluidcontrol/source/blender/blenkernel/BKE_mball.h
branches/fluidcontrol/source/blender/blenkernel/BKE_object.h
branches/fluidcontrol/source/blender/blenkernel/BKE_scene.h
branches/fluidcontrol/source/blender/blenkernel/BKE_writeffmpeg.h
branches/fluidcontrol/source/blender/blenkernel/bad_level_call_stubs/stubs.c
branches/fluidcontrol/source/blender/blenkernel/intern/BME_conversions.c
branches/fluidcontrol/source/blender/blenkernel/intern/BME_mesh.c
branches/fluidcontrol/source/blender/blenkernel/intern/BME_structure.c
branches/fluidcontrol/source/blender/blenkernel/intern/BME_tools.c
branches/fluidcontrol/source/blender/blenkernel/intern/DerivedMesh.c
branches/fluidcontrol/source/blender/blenkernel/intern/action.c
branches/fluidcontrol/source/blender/blenkernel/intern/anim.c
branches/fluidcontrol/source/blender/blenkernel/intern/armature.c
branches/fluidcontrol/source/blender/blenkernel/intern/blender.c
branches/fluidcontrol/source/blender/blenkernel/intern/bmesh_private.h
branches/fluidcontrol/source/blender/blenkernel/intern/cdderivedmesh.c
branches/fluidcontrol/source/blender/blenkernel/intern/cloth.c
branches/fluidcontrol/source/blender/blenkernel/intern/collision.c
branches/fluidcontrol/source/blender/blenkernel/intern/constraint.c
branches/fluidcontrol/source/blender/blenkernel/intern/curve.c
branches/fluidcontrol/source/blender/blenkernel/intern/customdata.c
branches/fluidcontrol/source/blender/blenkernel/intern/depsgraph.c
branches/fluidcontrol/source/blender/blenkernel/intern/displist.c
branches/fluidcontrol/source/blender/blenkernel/intern/font.c
branches/fluidcontrol/source/blender/blenkernel/intern/image.c
branches/fluidcontrol/source/blender/blenkernel/intern/implicit.c
branches/fluidcontrol/source/blender/blenkernel/intern/ipo.c
branches/fluidcontrol/source/blender/blenkernel/intern/key.c
branches/fluidcontrol/source/blender/blenkernel/intern/library.c
branches/fluidcontrol/source/blender/blenkernel/intern/mball.c
branches/fluidcontrol/source/blender/blenkernel/intern/modifier.c
branches/fluidcontrol/source/blender/blenkernel/intern/node.c
branches/fluidcontrol/source/blender/blenkernel/intern/object.c
branches/fluidcontrol/source/blender/blenkernel/intern/particle.c
branches/fluidcontrol/source/blender/blenkernel/intern/particle_system.c
branches/fluidcontrol/source/blender/blenkernel/intern/pointcache.c
branches/fluidcontrol/source/blender/blenkernel/intern/sca.c
branches/fluidcontrol/source/blender/blenkernel/intern/scene.c
branches/fluidcontrol/source/blender/blenkernel/intern/softbody.c
branches/fluidcontrol/source/blender/blenkernel/intern/text.c
branches/fluidcontrol/source/blender/blenkernel/intern/writeffmpeg.c
branches/fluidcontrol/source/blender/blenlib/BLI_arithb.h
branches/fluidcontrol/source/blender/blenlib/BLI_edgehash.h
branches/fluidcontrol/source/blender/blenlib/intern/arithb.c
branches/fluidcontrol/source/blender/blenlib/intern/boxpack2d.c
branches/fluidcontrol/source/blender/blenlib/intern/bpath.c
branches/fluidcontrol/source/blender/blenlib/intern/edgehash.c
branches/fluidcontrol/source/blender/blenlib/intern/freetypefont.c
branches/fluidcontrol/source/blender/blenlib/intern/psfont.c
branches/fluidcontrol/source/blender/blenlib/intern/util.c
branches/fluidcontrol/source/blender/blenloader/intern/readfile.c
branches/fluidcontrol/source/blender/blenloader/intern/writefile.c
branches/fluidcontrol/source/blender/imbuf/IMB_imbuf_types.h
branches/fluidcontrol/source/blender/imbuf/SConscript
branches/fluidcontrol/source/blender/imbuf/intern/IMB_anim.h
branches/fluidcontrol/source/blender/imbuf/intern/anim.c
branches/fluidcontrol/source/blender/imbuf/intern/cineon/dpxlib.c
branches/fluidcontrol/source/blender/imbuf/intern/util.c
branches/fluidcontrol/source/blender/include/BDR_editcurve.h
branches/fluidcontrol/source/blender/include/BDR_editface.h
branches/fluidcontrol/source/blender/include/BIF_butspace.h
branches/fluidcontrol/source/blender/include/BIF_drawseq.h
branches/fluidcontrol/source/blender/include/BIF_editmesh.h
branches/fluidcontrol/source/blender/include/BIF_editseq.h
branches/fluidcontrol/source/blender/include/BIF_imasel.h
branches/fluidcontrol/source/blender/include/BIF_interface.h
branches/fluidcontrol/source/blender/include/BIF_oops.h
branches/fluidcontrol/source/blender/include/BIF_resources.h
branches/fluidcontrol/source/blender/include/BSE_drawview.h
branches/fluidcontrol/source/blender/include/BSE_filesel.h
branches/fluidcontrol/source/blender/include/BSE_view.h
branches/fluidcontrol/source/blender/include/butspace.h
branches/fluidcontrol/source/blender/include/transform.h
branches/fluidcontrol/source/blender/makesdna/DNA_actuator_types.h
branches/fluidcontrol/source/blender/makesdna/DNA_controller_types.h
branches/fluidcontrol/source/blender/makesdna/DNA_meshdata_types.h
branches/fluidcontrol/source/blender/makesdna/DNA_modifier_types.h
branches/fluidcontrol/source/blender/makesdna/DNA_object_types.h
branches/fluidcontrol/source/blender/makesdna/DNA_particle_types.h
branches/fluidcontrol/source/blender/makesdna/DNA_scene_types.h
branches/fluidcontrol/source/blender/makesdna/DNA_sensor_types.h
branches/fluidcontrol/source/blender/makesdna/DNA_space_types.h
branches/fluidcontrol/source/blender/makesdna/DNA_userdef_types.h
branches/fluidcontrol/source/blender/makesdna/intern/SConscript
branches/fluidcontrol/source/blender/makesdna/intern/makesdna.c
branches/fluidcontrol/source/blender/nodes/intern/CMP_nodes/CMP_displace.c
branches/fluidcontrol/source/blender/nodes/intern/CMP_nodes/CMP_gamma.c
branches/fluidcontrol/source/blender/nodes/intern/CMP_nodes/CMP_hueSatVal.c
branches/fluidcontrol/source/blender/nodes/intern/CMP_nodes/CMP_math.c
branches/fluidcontrol/source/blender/nodes/intern/Makefile
branches/fluidcontrol/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c
branches/fluidcontrol/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c
branches/fluidcontrol/source/blender/nodes/intern/SHD_nodes/SHD_math.c
branches/fluidcontrol/source/blender/python/BPY_interface.c
branches/fluidcontrol/source/blender/python/api2_2x/Blender.c
branches/fluidcontrol/source/blender/python/api2_2x/CurNurb.c
branches/fluidcontrol/source/blender/python/api2_2x/Draw.c
branches/fluidcontrol/source/blender/python/api2_2x/Lamp.c
branches/fluidcontrol/source/blender/python/api2_2x/Material.c
branches/fluidcontrol/source/blender/python/api2_2x/Mathutils.c
branches/fluidcontrol/source/blender/python/api2_2x/NLA.c
branches/fluidcontrol/source/blender/python/api2_2x/Node.c
branches/fluidcontrol/source/blender/python/api2_2x/Object.c
branches/fluidcontrol/source/blender/python/api2_2x/Particle.c
branches/fluidcontrol/source/blender/python/api2_2x/Particle.h
branches/fluidcontrol/source/blender/python/api2_2x/Scene.c
branches/fluidcontrol/source/blender/python/api2_2x/Sys.c
branches/fluidcontrol/source/blender/python/api2_2x/Window.c
branches/fluidcontrol/source/blender/python/api2_2x/doc/API_intro.py
branches/fluidcontrol/source/blender/python/api2_2x/doc/Blender.py
branches/fluidcontrol/source/blender/python/api2_2x/doc/Curve.py
branches/fluidcontrol/source/blender/python/api2_2x/doc/Image.py
branches/fluidcontrol/source/blender/python/api2_2x/doc/Material.py
branches/fluidcontrol/source/blender/python/api2_2x/doc/Mesh.py
branches/fluidcontrol/source/blender/python/api2_2x/doc/NLA.py
branches/fluidcontrol/source/blender/python/api2_2x/doc/Object.py
branches/fluidcontrol/source/blender/python/api2_2x/doc/Render.py
branches/fluidcontrol/source/blender/python/api2_2x/doc/Sys.py
branches/fluidcontrol/source/blender/python/api2_2x/doc/Texture.py
branches/fluidcontrol/source/blender/python/api2_2x/doc/epy_docgen.sh
branches/fluidcontrol/source/blender/python/api2_2x/sceneRender.c
branches/fluidcontrol/source/blender/quicktime/apple/quicktime_export.c
branches/fluidcontrol/source/blender/render/extern/include/RE_pipeline.h
branches/fluidcontrol/source/blender/render/extern/include/RE_raytrace.h
branches/fluidcontrol/source/blender/render/intern/include/render_types.h
branches/fluidcontrol/source/blender/render/intern/source/convertblender.c
branches/fluidcontrol/source/blender/render/intern/source/envmap.c
branches/fluidcontrol/source/blender/render/intern/source/imagetexture.c
branches/fluidcontrol/source/blender/render/intern/source/initrender.c
branches/fluidcontrol/source/blender/render/intern/source/pipeline.c
branches/fluidcontrol/source/blender/render/intern/source/rayshade.c
branches/fluidcontrol/source/blender/render/intern/source/rendercore.c
branches/fluidcontrol/source/blender/render/intern/source/renderdatabase.c
branches/fluidcontrol/source/blender/render/intern/source/shadbuf.c
branches/fluidcontrol/source/blender/render/intern/source/shadeinput.c
branches/fluidcontrol/source/blender/render/intern/source/shadeoutput.c
branches/fluidcontrol/source/blender/render/intern/source/texture.c
branches/fluidcontrol/source/blender/src/CMakeLists.txt
branches/fluidcontrol/source/blender/src/Makefile
branches/fluidcontrol/source/blender/src/SConscript
branches/fluidcontrol/source/blender/src/blenderbuttons.c
branches/fluidcontrol/source/blender/src/buttons_editing.c
branches/fluidcontrol/source/blender/src/buttons_logic.c
branches/fluidcontrol/source/blender/src/buttons_object.c
branches/fluidcontrol/source/blender/src/buttons_scene.c
branches/fluidcontrol/source/blender/src/buttons_shading.c
branches/fluidcontrol/source/blender/src/drawaction.c
branches/fluidcontrol/source/blender/src/drawarmature.c
branches/fluidcontrol/source/blender/src/drawimage.c
branches/fluidcontrol/source/blender/src/drawimasel.c
branches/fluidcontrol/source/blender/src/drawipo.c
branches/fluidcontrol/source/blender/src/drawmesh.c
branches/fluidcontrol/source/blender/src/drawnla.c
branches/fluidcontrol/source/blender/src/drawnode.c
branches/fluidcontrol/source/blender/src/drawobject.c
branches/fluidcontrol/source/blender/src/drawoops.c
branches/fluidcontrol/source/blender/src/drawseq.c
branches/fluidcontrol/source/blender/src/drawview.c
branches/fluidcontrol/source/blender/src/edit.c
branches/fluidcontrol/source/blender/src/editaction.c
branches/fluidcontrol/source/blender/src/editarmature.c
branches/fluidcontrol/source/blender/src/editconstraint.c
branches/fluidcontrol/source/blender/src/editcurve.c
branches/fluidcontrol/source/blender/src/editdeform.c
branches/fluidcontrol/source/blender/src/editface.c
branches/fluidcontrol/source/blender/src/editfont.c
branches/fluidcontrol/source/blender/src/editipo.c
branches/fluidcontrol/source/blender/src/editmesh_lib.c
branches/fluidcontrol/source/blender/src/editmesh_mods.c
branches/fluidcontrol/source/blender/src/editmesh_tools.c
branches/fluidcontrol/source/blender/src/editnla.c
branches/fluidcontrol/source/blender/src/editnode.c
branches/fluidcontrol/source/blender/src/editobject.c
branches/fluidcontrol/source/blender/src/editparticle.c
branches/fluidcontrol/source/blender/src/editseq.c
branches/fluidcontrol/source/blender/src/editsima.c
branches/fluidcontrol/source/blender/src/editview.c
branches/fluidcontrol/source/blender/src/filesel.c
branches/fluidcontrol/source/blender/src/fluidsim.c
branches/fluidcontrol/source/blender/src/header_image.c
branches/fluidcontrol/source/blender/src/header_ipo.c
branches/fluidcontrol/source/blender/src/header_nla.c
branches/fluidcontrol/source/blender/src/header_oops.c
branches/fluidcontrol/source/blender/src/header_seq.c
branches/fluidcontrol/source/blender/src/header_view3d.c
branches/fluidcontrol/source/blender/src/headerbuttons.c
branches/fluidcontrol/source/blender/src/imasel.c
branches/fluidcontrol/source/blender/src/interface.c
branches/fluidcontrol/source/blender/src/interface_draw.c
branches/fluidcontrol/source/blender/src/interface_icons.c
branches/fluidcontrol/source/blender/src/meshtools.c
branches/fluidcontrol/source/blender/src/oops.c
branches/fluidcontrol/source/blender/src/parametrizer.c
branches/fluidcontrol/source/blender/src/parametrizer.h
branches/fluidcontrol/source/blender/src/parametrizer_intern.h
branches/fluidcontrol/source/blender/src/poselib.c
branches/fluidcontrol/source/blender/src/poseobject.c
branches/fluidcontrol/source/blender/src/renderwin.c
branches/fluidcontrol/source/blender/src/sculptmode.c
branches/fluidcontrol/source/blender/src/sequence.c
branches/fluidcontrol/source/blender/src/space.c
branches/fluidcontrol/source/blender/src/splash.jpg.c
branches/fluidcontrol/source/blender/src/toets.c
branches/fluidcontrol/source/blender/src/toolbox.c
branches/fluidcontrol/source/blender/src/transform.c
branches/fluidcontrol/source/blender/src/transform_constraints.c
branches/fluidcontrol/source/blender/src/transform_conversions.c
branches/fluidcontrol/source/blender/src/transform_generics.c
branches/fluidcontrol/source/blender/src/transform_manipulator.c
branches/fluidcontrol/source/blender/src/transform_orientations.c
branches/fluidcontrol/source/blender/src/transform_snap.c
branches/fluidcontrol/source/blender/src/unwrapper.c
branches/fluidcontrol/source/blender/src/usiblender.c
branches/fluidcontrol/source/blender/src/view.c
branches/fluidcontrol/source/blender/src/writemovie.c
branches/fluidcontrol/source/creator/CMakeLists.txt
branches/fluidcontrol/source/creator/creator.c
branches/fluidcontrol/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/fluidcontrol/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/fluidcontrol/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
branches/fluidcontrol/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/fluidcontrol/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/fluidcontrol/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
branches/fluidcontrol/source/gameengine/BlenderRoutines/Makefile
branches/fluidcontrol/source/gameengine/BlenderRoutines/SConscript
branches/fluidcontrol/source/gameengine/Converter/BL_ActionActuator.cpp
branches/fluidcontrol/source/gameengine/Converter/BL_ActionActuator.h
branches/fluidcontrol/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/fluidcontrol/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/fluidcontrol/source/gameengine/Converter/BL_DeformableGameObject.cpp
branches/fluidcontrol/source/gameengine/Converter/BL_DeformableGameObject.h
branches/fluidcontrol/source/gameengine/Converter/BL_MeshDeformer.cpp
branches/fluidcontrol/source/gameengine/Converter/BL_MeshDeformer.h
branches/fluidcontrol/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/fluidcontrol/source/gameengine/Converter/BL_SkinDeformer.h
branches/fluidcontrol/source/gameengine/Converter/BL_SkinMeshObject.cpp
branches/fluidcontrol/source/gameengine/Converter/BL_SkinMeshObject.h
branches/fluidcontrol/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/fluidcontrol/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/fluidcontrol/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/fluidcontrol/source/gameengine/Converter/KX_ConvertControllers.cpp
branches/fluidcontrol/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/fluidcontrol/source/gameengine/Expressions/Value.cpp
branches/fluidcontrol/source/gameengine/Expressions/Value.h
branches/fluidcontrol/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
branches/fluidcontrol/source/gameengine/GameLogic/SCA_2DFilterActuator.h
branches/fluidcontrol/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
branches/fluidcontrol/source/gameengine/GameLogic/SCA_AlwaysSensor.h
branches/fluidcontrol/source/gameengine/GameLogic/SCA_IActuator.cpp
branches/fluidcontrol/source/gameengine/GameLogic/SCA_IActuator.h
branches/fluidcontrol/source/gameengine/GameLogic/SCA_IController.cpp
branches/fluidcontrol/source/gameengine/GameLogic/SCA_IController.h
branches/fluidcontrol/source/gameengine/GameLogic/SCA_IObject.cpp
branches/fluidcontrol/source/gameengine/GameLogic/SCA_IObject.h
branches/fluidcontrol/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/fluidcontrol/source/gameengine/GameLogic/SCA_ISensor.h
branches/fluidcontrol/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
branches/fluidcontrol/source/gameengine/GameLogic/SCA_JoystickSensor.h
branches/fluidcontrol/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
branches/fluidcontrol/source/gameengine/GameLogic/SCA_KeyboardSensor.h
branches/fluidcontrol/source/gameengine/GameLogic/SCA_LogicManager.cpp
branches/fluidcontrol/source/gameengine/GameLogic/SCA_MouseSensor.cpp
branches/fluidcontrol/source/gameengine/GameLogic/SCA_MouseSensor.h
branches/fluidcontrol/source/gameengine/GameLogic/SCA_PropertySensor.cpp
branches/fluidcontrol/source/gameengine/GameLogic/SCA_PropertySensor.h
branches/fluidcontrol/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/fluidcontrol/source/gameengine/GameLogic/SCA_PythonController.h
branches/fluidcontrol/source/gameengine/GameLogic/SCA_RandomSensor.cpp
branches/fluidcontrol/source/gameengine/GameLogic/SCA_RandomSensor.h
branches/fluidcontrol/source/gameengine/GamePlayer/Makefile
branches/fluidcontrol/source/gameengine/GamePlayer/common/CMakeLists.txt
branches/fluidcontrol/source/gameengine/GamePlayer/common/GPC_Canvas.h
branches/fluidcontrol/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp
branches/fluidcontrol/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/fluidcontrol/source/gameengine/GamePlayer/common/GPC_RenderTools.h
branches/fluidcontrol/source/gameengine/GamePlayer/common/Makefile
branches/fluidcontrol/source/gameengine/GamePlayer/common/SConscript
branches/fluidcontrol/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/fluidcontrol/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/fluidcontrol/source/gameengine/GamePlayer/ghost/GPG_Application.h
branches/fluidcontrol/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/fluidcontrol/source/gameengine/GamePlayer/ghost/Makefile
branches/fluidcontrol/source/gameengine/GamePlayer/ghost/SConscript
branches/fluidcontrol/source/gameengine/Ketsji/BL_Material.cpp
branches/fluidcontrol/source/gameengine/Ketsji/BL_Material.h
branches/fluidcontrol/source/gameengine/Ketsji/BL_Shader.cpp
branches/fluidcontrol/source/gameengine/Ketsji/BL_Texture.cpp
branches/fluidcontrol/source/gameengine/Ketsji/CMakeLists.txt
branches/fluidcontrol/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_BulletPhysicsController.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_Camera.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_Camera.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_GameObject.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_GameObject.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_IPhysicsController.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_ISceneConverter.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_Light.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_MouseFocusSensor.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_ObjectActuator.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_RadarSensor.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_RayCast.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_RaySensor.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_RaySensor.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_SG_NodeRelationships.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_Scene.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_SumoPhysicsController.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_TouchSensor.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_TouchSensor.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_TrackToActuator.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
branches/fluidcontrol/source/gameengine/Ketsji/Makefile
branches/fluidcontrol/source/gameengine/Ketsji/SConscript
branches/fluidcontrol/source/gameengine/PyDoc/GameLogic.py
branches/fluidcontrol/source/gameengine/PyDoc/KX_GameObject.py
branches/fluidcontrol/source/gameengine/PyDoc/SCA_PythonController.py
branches/fluidcontrol/source/gameengine/Rasterizer/CMakeLists.txt
branches/fluidcontrol/source/gameengine/Rasterizer/Makefile
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_2DFilterManager.h
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_CameraData.h
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_Deformer.h
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_IRenderTools.h
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_MeshObject.cpp
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
branches/fluidcontrol/source/gameengine/Rasterizer/SConscript
branches/fluidcontrol/source/gameengine/SceneGraph/SG_Node.cpp
branches/fluidcontrol/source/gameengine/SceneGraph/SG_Node.h
branches/fluidcontrol/source/gameengine/SceneGraph/SG_ParentRelation.h
branches/fluidcontrol/source/gameengine/SceneGraph/SG_Spatial.cpp
branches/fluidcontrol/source/gameengine/SceneGraph/SG_Spatial.h
branches/fluidcontrol/source/nan_definitions.mk
branches/fluidcontrol/tools/btools.py
Added Paths:
-----------
branches/fluidcontrol/extern/glew/
branches/fluidcontrol/extern/glew/CMakeLists.txt
branches/fluidcontrol/extern/glew/ChangeLog
branches/fluidcontrol/extern/glew/README.txt
branches/fluidcontrol/extern/glew/SConscript
branches/fluidcontrol/extern/glew/doc/
branches/fluidcontrol/extern/glew/doc/advanced.html
branches/fluidcontrol/extern/glew/doc/basic.html
branches/fluidcontrol/extern/glew/doc/credits.html
branches/fluidcontrol/extern/glew/doc/glew.css
branches/fluidcontrol/extern/glew/doc/glew.html
branches/fluidcontrol/extern/glew/doc/glx.txt
branches/fluidcontrol/extern/glew/doc/glxew.html
branches/fluidcontrol/extern/glew/doc/gpl.txt
branches/fluidcontrol/extern/glew/doc/index.html
branches/fluidcontrol/extern/glew/doc/install.html
branches/fluidcontrol/extern/glew/doc/log.html
branches/fluidcontrol/extern/glew/doc/sgi.txt
branches/fluidcontrol/extern/glew/doc/wglew.html
branches/fluidcontrol/extern/glew/include/
branches/fluidcontrol/extern/glew/include/GL/
branches/fluidcontrol/extern/glew/include/GL/glew.h
branches/fluidcontrol/extern/glew/include/GL/glxew.h
branches/fluidcontrol/extern/glew/include/GL/wglew.h
branches/fluidcontrol/extern/glew/make/
branches/fluidcontrol/extern/glew/make/msvc_7_0/
branches/fluidcontrol/extern/glew/make/msvc_7_0/glew_vc7.vcproj
branches/fluidcontrol/extern/glew/src/
branches/fluidcontrol/extern/glew/src/Makefile
branches/fluidcontrol/extern/glew/src/glew.c
branches/fluidcontrol/extern/libopenjpeg/
branches/fluidcontrol/extern/libopenjpeg/SConscript
branches/fluidcontrol/extern/libopenjpeg/bio.c
branches/fluidcontrol/extern/libopenjpeg/bio.h
branches/fluidcontrol/extern/libopenjpeg/cio.c
branches/fluidcontrol/extern/libopenjpeg/cio.h
branches/fluidcontrol/extern/libopenjpeg/dwt.c
branches/fluidcontrol/extern/libopenjpeg/dwt.h
branches/fluidcontrol/extern/libopenjpeg/event.c
branches/fluidcontrol/extern/libopenjpeg/event.h
branches/fluidcontrol/extern/libopenjpeg/fix.h
branches/fluidcontrol/extern/libopenjpeg/image.c
branches/fluidcontrol/extern/libopenjpeg/image.h
branches/fluidcontrol/extern/libopenjpeg/int.h
branches/fluidcontrol/extern/libopenjpeg/j2k.c
branches/fluidcontrol/extern/libopenjpeg/j2k.h
branches/fluidcontrol/extern/libopenjpeg/j2k_lib.c
branches/fluidcontrol/extern/libopenjpeg/j2k_lib.h
branches/fluidcontrol/extern/libopenjpeg/jp2.c
branches/fluidcontrol/extern/libopenjpeg/jp2.h
branches/fluidcontrol/extern/libopenjpeg/jpt.c
branches/fluidcontrol/extern/libopenjpeg/jpt.h
branches/fluidcontrol/extern/libopenjpeg/license.txt
branches/fluidcontrol/extern/libopenjpeg/mct.c
branches/fluidcontrol/extern/libopenjpeg/mct.h
branches/fluidcontrol/extern/libopenjpeg/mqc.c
branches/fluidcontrol/extern/libopenjpeg/mqc.h
branches/fluidcontrol/extern/libopenjpeg/openjpeg.c
branches/fluidcontrol/extern/libopenjpeg/openjpeg.h
branches/fluidcontrol/extern/libopenjpeg/opj_includes.h
branches/fluidcontrol/extern/libopenjpeg/opj_malloc.h
branches/fluidcontrol/extern/libopenjpeg/patches/
branches/fluidcontrol/extern/libopenjpeg/patches/osx.patch
branches/fluidcontrol/extern/libopenjpeg/pi.c
branches/fluidcontrol/extern/libopenjpeg/pi.h
branches/fluidcontrol/extern/libopenjpeg/raw.c
branches/fluidcontrol/extern/libopenjpeg/raw.h
branches/fluidcontrol/extern/libopenjpeg/t1.c
branches/fluidcontrol/extern/libopenjpeg/t1.h
branches/fluidcontrol/extern/libopenjpeg/t1_generate_luts.c
branches/fluidcontrol/extern/libopenjpeg/t1_luts.h
branches/fluidcontrol/extern/libopenjpeg/t2.c
branches/fluidcontrol/extern/libopenjpeg/t2.h
branches/fluidcontrol/extern/libopenjpeg/tcd.c
branches/fluidcontrol/extern/libopenjpeg/tcd.h
branches/fluidcontrol/extern/libopenjpeg/tgt.c
branches/fluidcontrol/extern/libopenjpeg/tgt.h
branches/fluidcontrol/extern/libredcode/
branches/fluidcontrol/extern/libredcode/AUTHOR
branches/fluidcontrol/extern/libredcode/LICENSE
branches/fluidcontrol/extern/libredcode/NOTES
branches/fluidcontrol/extern/libredcode/SConscript
branches/fluidcontrol/extern/libredcode/codec.c
branches/fluidcontrol/extern/libredcode/codec.h
branches/fluidcontrol/extern/libredcode/debayer.c
branches/fluidcontrol/extern/libredcode/debayer.h
branches/fluidcontrol/extern/libredcode/format.c
branches/fluidcontrol/extern/libredcode/format.h
branches/fluidcontrol/release/scripts/animation_bake_constraints.py
branches/fluidcontrol/release/scripts/c3d_import.py
branches/fluidcontrol/release/text/release_246.txt
branches/fluidcontrol/source/blender/blenkernel/BKE_bmeshCustomData.h
branches/fluidcontrol/source/blender/blenkernel/intern/BME_Customdata.c
branches/fluidcontrol/source/blender/blenlib/BLI_kdopbvh.h
branches/fluidcontrol/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/fluidcontrol/source/blender/python/api2_2x/doc/Particle.py
branches/fluidcontrol/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/fluidcontrol/source/gameengine/Converter/BL_ShapeActionActuator.h
branches/fluidcontrol/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/fluidcontrol/source/gameengine/Converter/BL_ShapeDeformer.h
branches/fluidcontrol/source/gameengine/GameLogic/SCA_NANDController.cpp
branches/fluidcontrol/source/gameengine/GameLogic/SCA_NANDController.h
branches/fluidcontrol/source/gameengine/GameLogic/SCA_NORController.cpp
branches/fluidcontrol/source/gameengine/GameLogic/SCA_NORController.h
branches/fluidcontrol/source/gameengine/GameLogic/SCA_XNORController.cpp
branches/fluidcontrol/source/gameengine/GameLogic/SCA_XNORController.h
branches/fluidcontrol/source/gameengine/GameLogic/SCA_XORController.cpp
branches/fluidcontrol/source/gameengine/GameLogic/SCA_XORController.h
branches/fluidcontrol/source/gameengine/Ketsji/BL_BlenderShader.cpp
branches/fluidcontrol/source/gameengine/Ketsji/BL_BlenderShader.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_StateActuator.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_StateActuator.h
branches/fluidcontrol/source/gameengine/PyDoc/epy_docgen.sh
Removed Paths:
-------------
branches/fluidcontrol/extern/glew/CMakeLists.txt
branches/fluidcontrol/extern/glew/ChangeLog
branches/fluidcontrol/extern/glew/README.txt
branches/fluidcontrol/extern/glew/SConscript
branches/fluidcontrol/extern/glew/doc/
branches/fluidcontrol/extern/glew/doc/advanced.html
branches/fluidcontrol/extern/glew/doc/basic.html
branches/fluidcontrol/extern/glew/doc/credits.html
branches/fluidcontrol/extern/glew/doc/glew.css
branches/fluidcontrol/extern/glew/doc/glew.html
branches/fluidcontrol/extern/glew/doc/glx.txt
branches/fluidcontrol/extern/glew/doc/glxew.html
branches/fluidcontrol/extern/glew/doc/gpl.txt
branches/fluidcontrol/extern/glew/doc/index.html
branches/fluidcontrol/extern/glew/doc/install.html
branches/fluidcontrol/extern/glew/doc/log.html
branches/fluidcontrol/extern/glew/doc/sgi.txt
branches/fluidcontrol/extern/glew/doc/wglew.html
branches/fluidcontrol/extern/glew/include/
branches/fluidcontrol/extern/glew/include/GL/
branches/fluidcontrol/extern/glew/include/GL/glew.h
branches/fluidcontrol/extern/glew/include/GL/glxew.h
branches/fluidcontrol/extern/glew/include/GL/wglew.h
branches/fluidcontrol/extern/glew/make/
branches/fluidcontrol/extern/glew/make/msvc_7_0/
branches/fluidcontrol/extern/glew/make/msvc_7_0/glew_vc7.vcproj
branches/fluidcontrol/extern/glew/src/
branches/fluidcontrol/extern/glew/src/Makefile
branches/fluidcontrol/extern/glew/src/glew.c
branches/fluidcontrol/extern/libopenjpeg/SConscript
branches/fluidcontrol/extern/libopenjpeg/bio.c
branches/fluidcontrol/extern/libopenjpeg/bio.h
branches/fluidcontrol/extern/libopenjpeg/cio.c
branches/fluidcontrol/extern/libopenjpeg/cio.h
branches/fluidcontrol/extern/libopenjpeg/dwt.c
branches/fluidcontrol/extern/libopenjpeg/dwt.h
branches/fluidcontrol/extern/libopenjpeg/event.c
branches/fluidcontrol/extern/libopenjpeg/event.h
branches/fluidcontrol/extern/libopenjpeg/fix.h
branches/fluidcontrol/extern/libopenjpeg/image.c
branches/fluidcontrol/extern/libopenjpeg/image.h
branches/fluidcontrol/extern/libopenjpeg/int.h
branches/fluidcontrol/extern/libopenjpeg/j2k.c
branches/fluidcontrol/extern/libopenjpeg/j2k.h
branches/fluidcontrol/extern/libopenjpeg/j2k_lib.c
branches/fluidcontrol/extern/libopenjpeg/j2k_lib.h
branches/fluidcontrol/extern/libopenjpeg/jp2.c
branches/fluidcontrol/extern/libopenjpeg/jp2.h
branches/fluidcontrol/extern/libopenjpeg/jpt.c
branches/fluidcontrol/extern/libopenjpeg/jpt.h
branches/fluidcontrol/extern/libopenjpeg/license.txt
branches/fluidcontrol/extern/libopenjpeg/mct.c
branches/fluidcontrol/extern/libopenjpeg/mct.h
branches/fluidcontrol/extern/libopenjpeg/mqc.c
branches/fluidcontrol/extern/libopenjpeg/mqc.h
branches/fluidcontrol/extern/libopenjpeg/openjpeg.c
branches/fluidcontrol/extern/libopenjpeg/openjpeg.h
branches/fluidcontrol/extern/libopenjpeg/opj_includes.h
branches/fluidcontrol/extern/libopenjpeg/opj_malloc.h
branches/fluidcontrol/extern/libopenjpeg/patches/
branches/fluidcontrol/extern/libopenjpeg/patches/osx.patch
branches/fluidcontrol/extern/libopenjpeg/pi.c
branches/fluidcontrol/extern/libopenjpeg/pi.h
branches/fluidcontrol/extern/libopenjpeg/raw.c
branches/fluidcontrol/extern/libopenjpeg/raw.h
branches/fluidcontrol/extern/libopenjpeg/t1.c
branches/fluidcontrol/extern/libopenjpeg/t1.h
branches/fluidcontrol/extern/libopenjpeg/t1_generate_luts.c
branches/fluidcontrol/extern/libopenjpeg/t1_luts.h
branches/fluidcontrol/extern/libopenjpeg/t2.c
branches/fluidcontrol/extern/libopenjpeg/t2.h
branches/fluidcontrol/extern/libopenjpeg/tcd.c
branches/fluidcontrol/extern/libopenjpeg/tcd.h
branches/fluidcontrol/extern/libopenjpeg/tgt.c
branches/fluidcontrol/extern/libopenjpeg/tgt.h
branches/fluidcontrol/extern/libredcode/AUTHOR
branches/fluidcontrol/extern/libredcode/LICENSE
branches/fluidcontrol/extern/libredcode/NOTES
branches/fluidcontrol/extern/libredcode/SConscript
branches/fluidcontrol/extern/libredcode/codec.c
branches/fluidcontrol/extern/libredcode/codec.h
branches/fluidcontrol/extern/libredcode/debayer.c
branches/fluidcontrol/extern/libredcode/debayer.h
branches/fluidcontrol/extern/libredcode/format.c
branches/fluidcontrol/extern/libredcode/format.h
branches/fluidcontrol/release/scripts/bpymodules/dxfImportObjects.py
branches/fluidcontrol/release/scripts/uv_from_adjacent.py
branches/fluidcontrol/release/text/release_244.txt
branches/fluidcontrol/source/blender/blenkernel/intern/kdop.c
branches/fluidcontrol/source/blender/python/api2_2x/doc/epy_docgen-3.sh
branches/fluidcontrol/source/gameengine/BlenderRoutines/mac_compat_glext.h
branches/fluidcontrol/source/gameengine/PyDoc/Makefile
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/ARB_multitexture.h
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/EXT_separate_specular_color.h
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/mkglext.py
Modified: branches/fluidcontrol/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/fluidcontrol/blenderplayer/CMakeLists.txt
===================================================================
--- branches/fluidcontrol/blenderplayer/CMakeLists.txt 2008-07-02 21:36:45 UTC (rev 15410)
+++ branches/fluidcontrol/blenderplayer/CMakeLists.txt 2008-07-02 21:55:25 UTC (rev 15411)
@@ -108,6 +108,7 @@
blenkernel_blc
bf_quicktime
extern_binreloc
+ extern_glew
)
FOREACH(SORTLIB ${BLENDER_SORTED_LIBS})
Modified: branches/fluidcontrol/config/linux2-config.py
===================================================================
--- branches/fluidcontrol/config/linux2-config.py 2008-07-02 21:36:45 UTC (rev 15410)
+++ branches/fluidcontrol/config/linux2-config.py 2008-07-02 21:55:25 UTC (rev 15411)
@@ -130,6 +130,24 @@
BF_FFMPEG_INC = '${BF_FFMPEG}/include'
BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
+WITH_BF_OPENJPEG = 'true'
+BF_OPENJPEG = '#extern/libopenjpeg'
+BF_OPENJPEG_LIB = ''
+# Uncomment the following two lines to use system's ffmpeg
+# BF_FFMPEG = '/usr'
+# BF_FFMPEG_LIB = 'avformat avcodec swscale avutil'
+BF_OPENJPEG_INC = '${BF_OPENJPEG}/include'
+BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
+
+WITH_BF_REDCODE = 'true'
+BF_REDCODE = '#extern/libredcode'
+BF_REDCODE_LIB = ''
+# Uncomment the following two lines to use system's ffmpeg
+# BF_FFMPEG = '/usr'
+# BF_FFMPEG_LIB = 'avformat avcodec swscale avutil'
+BF_REDCODE_INC = '${BF_REDCODE}/include'
+BF_REDCODE_LIBPATH='${BF_REDCODE}/lib'
+
# Mesa Libs should go here if your using them as well....
WITH_BF_STATICOPENGL = 'false'
BF_OPENGL = '/usr'
Modified: branches/fluidcontrol/config/win32-vc-config.py
===================================================================
--- branches/fluidcontrol/config/win32-vc-config.py 2008-07-02 21:36:45 UTC (rev 15410)
+++ branches/fluidcontrol/config/win32-vc-config.py 2008-07-02 21:55:25 UTC (rev 15411)
@@ -157,7 +157,7 @@
C_WARN = []
CC_WARN = []
-LLIBS = 'ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid'
+LLIBS = 'ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid'
PLATFORM_LINKFLAGS = '''
/SUBSYSTEM:CONSOLE
Modified: branches/fluidcontrol/extern/CMakeLists.txt
===================================================================
--- branches/fluidcontrol/extern/CMakeLists.txt 2008-07-02 21:36:45 UTC (rev 15410)
+++ branches/fluidcontrol/extern/CMakeLists.txt 2008-07-02 21:55:25 UTC (rev 15411)
@@ -43,3 +43,6 @@
IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
SUBDIRS(binreloc)
ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+
+SUBDIRS(glew)
+
Modified: branches/fluidcontrol/extern/Makefile
===================================================================
--- branches/fluidcontrol/extern/Makefile 2008-07-02 21:36:45 UTC (rev 15410)
+++ branches/fluidcontrol/extern/Makefile 2008-07-02 21:55:25 UTC (rev 15411)
@@ -30,7 +30,7 @@
SOURCEDIR = extern
DIR = $(OCGDIR)/extern
-DIRS = qhull/src solid
+DIRS = qhull/src solid glew/src
ifeq ($(WITH_FREETYPE2), true)
DIRS += bFTGL/src
Modified: branches/fluidcontrol/extern/SConscript
===================================================================
--- branches/fluidcontrol/extern/SConscript 2008-07-02 21:36:45 UTC (rev 15410)
+++ branches/fluidcontrol/extern/SConscript 2008-07-02 21:55:25 UTC (rev 15411)
@@ -2,6 +2,8 @@
Import('env')
+SConscript(['glew/SConscript'])
+
if env['WITH_BF_GAMEENGINE']:
SConscript(['qhull/SConscript',
'solid/SConscript'])
@@ -21,5 +23,11 @@
SConscript(['xvidcore/SConscript'])
SConscript(['ffmpeg/SConscript'])
+if env['WITH_BF_OPENJPEG'] and env['BF_OPENJPEG_LIB'] == '':
+ SConscript(['libopenjpeg/SConscript'])
+
+if env['WITH_BF_REDCODE'] and env['BF_REDCODE_LIB'] == '':
+ SConscript(['libredcode/SConscript'])
+
if env['OURPLATFORM'] == 'linux2':
SConscript(['binreloc/SConscript']);
Modified: branches/fluidcontrol/extern/bFTGL/SConscript
===================================================================
--- branches/fluidcontrol/extern/bFTGL/SConscript 2008-07-02 21:36:45 UTC (rev 15410)
+++ branches/fluidcontrol/extern/bFTGL/SConscript 2008-07-02 21:55:25 UTC (rev 15411)
@@ -22,7 +22,7 @@
#ftgl_env.Append (CPPDEFINES = defines)
-incs = 'include src ' + env['BF_FREETYPE_INC']
+incs = 'include src ' + env['BF_FREETYPE_INC'] + ' ' + env['BF_OPENGL_INC']
defs = ''
sources = env.Glob('src/*.cpp')
Copied: branches/fluidcontrol/extern/glew (from rev 15409, trunk/blender/extern/glew)
Deleted: branches/fluidcontrol/extern/glew/CMakeLists.txt
===================================================================
--- trunk/blender/extern/glew/CMakeLists.txt 2008-07-02 21:01:59 UTC (rev 15409)
+++ branches/fluidcontrol/extern/glew/CMakeLists.txt 2008-07-02 21:55:25 UTC (rev 15411)
@@ -1,33 +0,0 @@
-# $Id$
-# ***** 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) 2006, Blender Foundation
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): Jacques Beaurain.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-SET(INC include src)
-
-SET(SRC
- src/glew.c
-)
-
-BLENDERLIB(extern_glew "${SRC}" "${INC}")
Copied: branches/fluidcontrol/extern/glew/CMakeLists.txt (from rev 15409, trunk/blender/extern/glew/CMakeLists.txt)
===================================================================
--- branches/fluidcontrol/extern/glew/CMakeLists.txt (rev 0)
+++ branches/fluidcontrol/extern/glew/CMakeLists.txt 2008-07-02 21:55:25 UTC (rev 15411)
@@ -0,0 +1,33 @@
+# $Id$
+# ***** 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) 2006, Blender Foundation
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): Jacques Beaurain.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+SET(INC include src)
+
+SET(SRC
+ src/glew.c
+)
+
+BLENDERLIB(extern_glew "${SRC}" "${INC}")
Deleted: branches/fluidcontrol/extern/glew/ChangeLog
===================================================================
--- trunk/blender/extern/glew/ChangeLog 2008-07-02 21:01:59 UTC (rev 15409)
+++ branches/fluidcontrol/extern/glew/ChangeLog 2008-07-02 21:55:25 UTC (rev 15411)
@@ -1,1703 +0,0 @@
-2005-05-16 00:35 ikits
-
- * auto/src/template.html, doc/advanced.html, doc/basic.html,
- doc/credits.html, doc/index.html, doc/install.html, doc/log.html:
- getting ready for the release
-
-2005-05-16 00:14 ikits
-
- * auto/Makefile: Added option for splitting the source into
- multiple files
-
-2005-05-16 00:13 ikits
-
- * auto/bin/update_ext.sh: Fixed GL_ARB_transpose_matrix bug
-
-2005-04-22 18:47 ikits
-
- * auto/: bin/update_ext.sh, core/GL_VERSION_2_0: fixed bugs 1185517
- and 1182116
-
-2005-04-04 23:49 ikits
-
- * auto/src/: glew_head.c, glew_init_gl.c: fix for OGL 2.0 problem
-
-2005-03-16 21:49 ikits
-
- * config/version: bump version number
-
-2005-03-16 21:48 ikits
-
- * auto/src/glew_init_gl.c: minor issue
-
-2005-03-16 21:04 ikits
-
- * doc/advanced.html, doc/basic.html, doc/credits.html,
- doc/index.html, doc/install.html, doc/log.html,
- auto/src/template.html: getting ready for the release
-
-2005-03-16 20:49 ikits
-
- * ChangeLog: it's that time again
-
-2005-03-16 20:48 ikits
-
- * TODO.txt: fix it when there is time
-
-2005-03-16 20:45 ikits
-
- * auto/src/glew_init_gl.c: added check for crippled hardware
-
-2005-03-14 23:50 ikits
-
- * auto/src/template.html: documentation update
-
-2005-03-14 23:38 ikits
-
- * doc/log.html: update log
-
-2005-03-14 23:24 ikits
-
- * TODO.txt: done
-
-2005-03-14 23:21 ikits
-
- * doc/: advanced.html, basic.html, credits.html, index.html,
- install.html, log.html, glew.css: changes for html 4.01
- compliance
-
-2005-03-14 00:13 ikits
-
- * TODO.txt: oops
-
-2005-03-14 00:10 ikits
-
- * TODO.txt: some more
-
-2005-03-14 00:08 ikits
-
- * TODO.txt: the road ahead
-
-2005-03-14 00:00 ikits
-
- * config/: Makefile.mingw, Makefile.mingw32: fixed bug #1161790
-
-2005-03-13 23:09 ikits
-
- * auto/core/: GL_APPLE_pixel_buffer, GL_EXT_framebuffer_object,
- GL_SGIX_shadow: cleanup and bug fixes; thanks to Stephane for
- these
-
-2005-02-05 02:17 ikits
-
- * auto/core/GL_VERSION_2_0: fixed bug 1116569
-
-2005-02-03 00:25 ikits
-
- * ChangeLog: version bump
-
-2005-02-03 00:21 ikits
-
- * config/version: version bump
-
-2005-02-03 00:13 ikits
-
- * doc/log.html: oops
-
-2005-02-02 23:28 ikits
-
- * doc/index.html: added reference
-
-2005-02-02 22:49 ikits
-
- * doc/install.html: ready for release
-
-2005-02-02 22:34 ikits
-
- * auto/Makefile, auto/src/template.html, doc/advanced.html,
- doc/basic.html, doc/credits.html, doc/glew.css, doc/index.html,
- doc/install.html, doc/log.html: prepare for release
-
-2005-01-30 17:26 ikits
-
- * doc/advanced.html, doc/basic.html, doc/credits.html,
- doc/index.html, doc/install.html, doc/log.html,
- auto/src/template.html: ,
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list