[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37041] branches/cycles: Cycles: svn merge -r36777:37040 https://svn.blender.org/svnroot/bf-blender/trunk/ blender/

Brecht Van Lommel brechtvanlommel at pandora.be
Tue May 31 11:51:46 CEST 2011


Revision: 37041
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37041
Author:   blendix
Date:     2011-05-31 09:51:46 +0000 (Tue, 31 May 2011)
Log Message:
-----------
Cycles: svn merge -r36777:37040 https://svn.blender.org/svnroot/bf-blender/trunk/blender/

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36777

Modified Paths:
--------------
    branches/cycles/CMakeLists.txt
    branches/cycles/build_files/buildbot/config/user-config-i686.py
    branches/cycles/build_files/buildbot/config/user-config-x86_64.py
    branches/cycles/build_files/cmake/cmake_netbeans_project.py
    branches/cycles/build_files/cmake/cmake_qtcreator_project.py
    branches/cycles/build_files/cmake/macros.cmake
    branches/cycles/build_files/cmake/project_info.py
    branches/cycles/build_files/scons/tools/Blender.py
    branches/cycles/build_files/scons/tools/btools.py
    branches/cycles/doc/python_api/examples/bpy.types.BlendDataLibraries.load.py
    branches/cycles/doc/python_api/sphinx_doc_gen.py
    branches/cycles/extern/binreloc/CMakeLists.txt
    branches/cycles/extern/bullet2/CMakeLists.txt
    branches/cycles/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
    branches/cycles/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
    branches/cycles/extern/eltopo/CMakeLists.txt
    branches/cycles/extern/glew/CMakeLists.txt
    branches/cycles/extern/libopenjpeg/CMakeLists.txt
    branches/cycles/extern/libredcode/CMakeLists.txt
    branches/cycles/extern/lzma/CMakeLists.txt
    branches/cycles/extern/lzo/CMakeLists.txt
    branches/cycles/intern/audaspace/CMakeLists.txt
    branches/cycles/intern/audaspace/SConscript
    branches/cycles/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
    branches/cycles/intern/boolop/CMakeLists.txt
    branches/cycles/intern/bsp/CMakeLists.txt
    branches/cycles/intern/bsp/SConscript
    branches/cycles/intern/container/CMakeLists.txt
    branches/cycles/intern/container/CTR_TaggedIndex.h
    branches/cycles/intern/decimation/CMakeLists.txt
    branches/cycles/intern/decimation/SConscript
    branches/cycles/intern/elbeem/CMakeLists.txt
    branches/cycles/intern/ghost/CMakeLists.txt
    branches/cycles/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/cycles/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/cycles/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/cycles/intern/ghost/intern/GHOST_WindowX11.h
    branches/cycles/intern/guardedalloc/CMakeLists.txt
    branches/cycles/intern/iksolver/CMakeLists.txt
    branches/cycles/intern/itasc/CMakeLists.txt
    branches/cycles/intern/memutil/CMakeLists.txt
    branches/cycles/intern/mikktspace/CMakeLists.txt
    branches/cycles/intern/moto/CMakeLists.txt
    branches/cycles/intern/opennl/CMakeLists.txt
    branches/cycles/intern/smoke/CMakeLists.txt
    branches/cycles/intern/string/CMakeLists.txt
    branches/cycles/release/scripts/modules/bpy/utils.py
    branches/cycles/release/scripts/modules/bpy_extras/__init__.py
    branches/cycles/release/scripts/modules/bpy_extras/image_utils.py
    branches/cycles/release/scripts/modules/bpy_extras/io_utils.py
    branches/cycles/release/scripts/modules/bpy_extras/mesh_utils.py
    branches/cycles/release/scripts/modules/bpy_extras/object_utils.py
    branches/cycles/release/scripts/modules/bpy_extras/view3d_utils.py
    branches/cycles/release/scripts/modules/bpy_types.py
    branches/cycles/release/scripts/startup/bl_operators/mesh.py
    branches/cycles/release/scripts/startup/bl_operators/uvcalc_follow_active.py
    branches/cycles/release/scripts/startup/bl_operators/wm.py
    branches/cycles/release/scripts/startup/bl_ui/__init__.py
    branches/cycles/release/scripts/startup/bl_ui/properties_data_empty.py
    branches/cycles/release/scripts/startup/bl_ui/properties_object_constraint.py
    branches/cycles/release/scripts/startup/bl_ui/properties_particle.py
    branches/cycles/release/scripts/startup/bl_ui/space_image.py
    branches/cycles/release/scripts/startup/bl_ui/space_userpref.py
    branches/cycles/release/scripts/startup/bl_ui/space_view3d.py
    branches/cycles/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/cycles/release/windows/installer/00.sconsblender.nsi
    branches/cycles/source/blender/avi/CMakeLists.txt
    branches/cycles/source/blender/blenfont/CMakeLists.txt
    branches/cycles/source/blender/blenkernel/BKE_blender.h
    branches/cycles/source/blender/blenkernel/BKE_screen.h
    branches/cycles/source/blender/blenkernel/BKE_sequencer.h
    branches/cycles/source/blender/blenkernel/BKE_text.h
    branches/cycles/source/blender/blenkernel/CMakeLists.txt
    branches/cycles/source/blender/blenkernel/SConscript
    branches/cycles/source/blender/blenkernel/intern/anim.c
    branches/cycles/source/blender/blenkernel/intern/anim_sys.c
    branches/cycles/source/blender/blenkernel/intern/brush.c
    branches/cycles/source/blender/blenkernel/intern/curve.c
    branches/cycles/source/blender/blenkernel/intern/depsgraph.c
    branches/cycles/source/blender/blenkernel/intern/displist.c
    branches/cycles/source/blender/blenkernel/intern/fcurve.c
    branches/cycles/source/blender/blenkernel/intern/image.c
    branches/cycles/source/blender/blenkernel/intern/lattice.c
    branches/cycles/source/blender/blenkernel/intern/object.c
    branches/cycles/source/blender/blenkernel/intern/particle.c
    branches/cycles/source/blender/blenkernel/intern/particle_system.c
    branches/cycles/source/blender/blenkernel/intern/scene.c
    branches/cycles/source/blender/blenkernel/intern/screen.c
    branches/cycles/source/blender/blenkernel/intern/sequencer.c
    branches/cycles/source/blender/blenkernel/intern/softbody.c
    branches/cycles/source/blender/blenkernel/intern/text.c
    branches/cycles/source/blender/blenkernel/intern/writeffmpeg.c
    branches/cycles/source/blender/blenlib/BLI_math_matrix.h
    branches/cycles/source/blender/blenlib/BLI_path_util.h
    branches/cycles/source/blender/blenlib/BLI_string.h
    branches/cycles/source/blender/blenlib/CMakeLists.txt
    branches/cycles/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/cycles/source/blender/blenlib/intern/bpath.c
    branches/cycles/source/blender/blenlib/intern/edgehash.c
    branches/cycles/source/blender/blenlib/intern/math_base.c
    branches/cycles/source/blender/blenlib/intern/math_color.c
    branches/cycles/source/blender/blenlib/intern/math_matrix.c
    branches/cycles/source/blender/blenlib/intern/path_util.c
    branches/cycles/source/blender/blenlib/intern/pbvh.c
    branches/cycles/source/blender/blenlib/intern/rct.c
    branches/cycles/source/blender/blenlib/intern/string.c
    branches/cycles/source/blender/blenloader/BLO_readfile.h
    branches/cycles/source/blender/blenloader/CMakeLists.txt
    branches/cycles/source/blender/blenloader/intern/readfile.c
    branches/cycles/source/blender/blenloader/intern/writefile.c
    branches/cycles/source/blender/blenpluginapi/CMakeLists.txt
    branches/cycles/source/blender/collada/CMakeLists.txt
    branches/cycles/source/blender/editors/animation/CMakeLists.txt
    branches/cycles/source/blender/editors/animation/anim_channels_edit.c
    branches/cycles/source/blender/editors/animation/anim_ops.c
    branches/cycles/source/blender/editors/animation/keyframes_draw.c
    branches/cycles/source/blender/editors/animation/keyingsets.c
    branches/cycles/source/blender/editors/armature/CMakeLists.txt
    branches/cycles/source/blender/editors/armature/editarmature.c
    branches/cycles/source/blender/editors/armature/editarmature_sketch.c
    branches/cycles/source/blender/editors/armature/poselib.c
    branches/cycles/source/blender/editors/armature/poseobject.c
    branches/cycles/source/blender/editors/curve/CMakeLists.txt
    branches/cycles/source/blender/editors/curve/editcurve.c
    branches/cycles/source/blender/editors/datafiles/CMakeLists.txt
    branches/cycles/source/blender/editors/gpencil/CMakeLists.txt
    branches/cycles/source/blender/editors/gpencil/drawgpencil.c
    branches/cycles/source/blender/editors/gpencil/gpencil_edit.c
    branches/cycles/source/blender/editors/gpencil/gpencil_paint.c
    branches/cycles/source/blender/editors/include/ED_keyframing.h
    branches/cycles/source/blender/editors/include/ED_view3d.h
    branches/cycles/source/blender/editors/interface/CMakeLists.txt
    branches/cycles/source/blender/editors/interface/interface.c
    branches/cycles/source/blender/editors/interface/interface_handlers.c
    branches/cycles/source/blender/editors/interface/interface_layout.c
    branches/cycles/source/blender/editors/interface/view2d.c
    branches/cycles/source/blender/editors/interface/view2d_ops.c
    branches/cycles/source/blender/editors/mesh/CMakeLists.txt
    branches/cycles/source/blender/editors/mesh/editmesh_mods.c
    branches/cycles/source/blender/editors/mesh/editmesh_tools.c
    branches/cycles/source/blender/editors/metaball/CMakeLists.txt
    branches/cycles/source/blender/editors/object/CMakeLists.txt
    branches/cycles/source/blender/editors/object/object_edit.c
    branches/cycles/source/blender/editors/object/object_hook.c
    branches/cycles/source/blender/editors/object/object_modifier.c
    branches/cycles/source/blender/editors/object/object_relations.c
    branches/cycles/source/blender/editors/object/object_vgroup.c
    branches/cycles/source/blender/editors/physics/CMakeLists.txt
    branches/cycles/source/blender/editors/physics/particle_edit.c
    branches/cycles/source/blender/editors/render/CMakeLists.txt
    branches/cycles/source/blender/editors/render/render_opengl.c
    branches/cycles/source/blender/editors/screen/CMakeLists.txt
    branches/cycles/source/blender/editors/screen/area.c
    branches/cycles/source/blender/editors/screen/screen_edit.c
    branches/cycles/source/blender/editors/screen/screen_ops.c
    branches/cycles/source/blender/editors/sculpt_paint/CMakeLists.txt
    branches/cycles/source/blender/editors/sculpt_paint/paint_image.c
    branches/cycles/source/blender/editors/sculpt_paint/paint_intern.h
    branches/cycles/source/blender/editors/sculpt_paint/paint_ops.c
    branches/cycles/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/cycles/source/blender/editors/sculpt_paint/paint_utils.c
    branches/cycles/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/cycles/source/blender/editors/sculpt_paint/sculpt.c
    branches/cycles/source/blender/editors/sound/CMakeLists.txt
    branches/cycles/source/blender/editors/space_action/CMakeLists.txt
    branches/cycles/source/blender/editors/space_action/action_select.c
    branches/cycles/source/blender/editors/space_api/CMakeLists.txt
    branches/cycles/source/blender/editors/space_buttons/CMakeLists.txt
    branches/cycles/source/blender/editors/space_buttons/buttons_ops.c
    branches/cycles/source/blender/editors/space_console/CMakeLists.txt
    branches/cycles/source/blender/editors/space_file/CMakeLists.txt
    branches/cycles/source/blender/editors/space_file/file_ops.c
    branches/cycles/source/blender/editors/space_file/space_file.c
    branches/cycles/source/blender/editors/space_graph/CMakeLists.txt
    branches/cycles/source/blender/editors/space_graph/graph_draw.c
    branches/cycles/source/blender/editors/space_graph/graph_ops.c
    branches/cycles/source/blender/editors/space_graph/graph_select.c
    branches/cycles/source/blender/editors/space_graph/space_graph.c
    branches/cycles/source/blender/editors/space_image/CMakeLists.txt
    branches/cycles/source/blender/editors/space_image/image_ops.c
    branches/cycles/source/blender/editors/space_image/space_image.c
    branches/cycles/source/blender/editors/space_info/CMakeLists.txt
    branches/cycles/source/blender/editors/space_logic/CMakeLists.txt
    branches/cycles/source/blender/editors/space_logic/space_logic.c
    branches/cycles/source/blender/editors/space_nla/CMakeLists.txt
    branches/cycles/source/blender/editors/space_nla/nla_channels.c
    branches/cycles/source/blender/editors/space_nla/nla_select.c
    branches/cycles/source/blender/editors/space_nla/space_nla.c
    branches/cycles/source/blender/editors/space_node/CMakeLists.txt
    branches/cycles/source/blender/editors/space_node/drawnode.c
    branches/cycles/source/blender/editors/space_node/node_edit.c
    branches/cycles/source/blender/editors/space_node/node_select.c
    branches/cycles/source/blender/editors/space_node/node_state.c
    branches/cycles/source/blender/editors/space_node/space_node.c
    branches/cycles/source/blender/editors/space_outliner/CMakeLists.txt
    branches/cycles/source/blender/editors/space_outliner/outliner.c
    branches/cycles/source/blender/editors/space_script/CMakeLists.txt
    branches/cycles/source/blender/editors/space_sequencer/CMakeLists.txt
    branches/cycles/source/blender/editors/space_sequencer/sequencer_add.c
    branches/cycles/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/cycles/source/blender/editors/space_sequencer/sequencer_select.c
    branches/cycles/source/blender/editors/space_sequencer/space_sequencer.c
    branches/cycles/source/blender/editors/space_sound/CMakeLists.txt
    branches/cycles/source/blender/editors/space_text/CMakeLists.txt
    branches/cycles/source/blender/editors/space_text/text_header.c
    branches/cycles/source/blender/editors/space_text/text_ops.c
    branches/cycles/source/blender/editors/space_time/CMakeLists.txt
    branches/cycles/source/blender/editors/space_time/space_time.c
    branches/cycles/source/blender/editors/space_userpref/CMakeLists.txt
    branches/cycles/source/blender/editors/space_view3d/CMakeLists.txt
    branches/cycles/source/blender/editors/space_view3d/drawobject.c
    branches/cycles/source/blender/editors/space_view3d/space_view3d.c
    branches/cycles/source/blender/editors/space_view3d/view3d_draw.c
    branches/cycles/source/blender/editors/space_view3d/view3d_edit.c
    branches/cycles/source/blender/editors/space_view3d/view3d_fly.c
    branches/cycles/source/blender/editors/space_view3d/view3d_intern.h
    branches/cycles/source/blender/editors/space_view3d/view3d_ops.c
    branches/cycles/source/blender/editors/space_view3d/view3d_select.c
    branches/cycles/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/cycles/source/blender/editors/space_view3d/view3d_view.c
    branches/cycles/source/blender/editors/transform/CMakeLists.txt
    branches/cycles/source/blender/editors/transform/transform.c
    branches/cycles/source/blender/editors/transform/transform.h
    branches/cycles/source/blender/editors/transform/transform_conversions.c
    branches/cycles/source/blender/editors/transform/transform_generics.c
    branches/cycles/source/blender/editors/transform/transform_input.c
    branches/cycles/source/blender/editors/transform/transform_manipulator.c
    branches/cycles/source/blender/editors/transform/transform_snap.c
    branches/cycles/source/blender/editors/util/CMakeLists.txt
    branches/cycles/source/blender/editors/util/undo.c
    branches/cycles/source/blender/editors/uvedit/CMakeLists.txt
    branches/cycles/source/blender/editors/uvedit/uvedit_ops.c
    branches/cycles/source/blender/gpu/CMakeLists.txt
    branches/cycles/source/blender/gpu/intern/gpu_material.c
    branches/cycles/source/blender/ikplugin/CMakeLists.txt
    branches/cycles/source/blender/imbuf/CMakeLists.txt
    branches/cycles/source/blender/imbuf/SConscript
    branches/cycles/source/blender/imbuf/intern/IMB_anim.h
    branches/cycles/source/blender/imbuf/intern/anim_movie.c
    branches/cycles/source/blender/imbuf/intern/cineon/CMakeLists.txt
    branches/cycles/source/blender/imbuf/intern/dds/CMakeLists.txt
    branches/cycles/source/blender/imbuf/intern/imageprocess.c
    branches/cycles/source/blender/imbuf/intern/md5.h
    branches/cycles/source/blender/imbuf/intern/openexr/CMakeLists.txt
    branches/cycles/source/blender/imbuf/intern/scaling.c
    branches/cycles/source/blender/imbuf/intern/targa.c
    branches/cycles/source/blender/imbuf/intern/util.c
    branches/cycles/source/blender/makesdna/DNA_userdef_types.h
    branches/cycles/source/blender/makesdna/DNA_view3d_types.h
    branches/cycles/source/blender/makesdna/intern/CMakeLists.txt
    branches/cycles/source/blender/makesdna/intern/makesdna.c
    branches/cycles/source/blender/makesrna/RNA_access.h
    branches/cycles/source/blender/makesrna/RNA_define.h
    branches/cycles/source/blender/makesrna/RNA_enum_types.h
    branches/cycles/source/blender/makesrna/RNA_types.h
    branches/cycles/source/blender/makesrna/intern/CMakeLists.txt
    branches/cycles/source/blender/makesrna/intern/makesrna.c
    branches/cycles/source/blender/makesrna/intern/rna_ID.c
    branches/cycles/source/blender/makesrna/intern/rna_access.c
    branches/cycles/source/blender/makesrna/intern/rna_actuator.c
    branches/cycles/source/blender/makesrna/intern/rna_armature.c
    branches/cycles/source/blender/makesrna/intern/rna_brush.c
    branches/cycles/source/blender/makesrna/intern/rna_cloth.c
    branches/cycles/source/blender/makesrna/intern/rna_color.c
    branches/cycles/source/blender/makesrna/intern/rna_constraint.c
    branches/cycles/source/blender/makesrna/intern/rna_curve.c
    branches/cycles/source/blender/makesrna/intern/rna_define.c
    branches/cycles/source/blender/makesrna/intern/rna_fcurve.c
    branches/cycles/source/blender/makesrna/intern/rna_image.c
    branches/cycles/source/blender/makesrna/intern/rna_internal_types.h
    branches/cycles/source/blender/makesrna/intern/rna_lamp.c
    branches/cycles/source/blender/makesrna/intern/rna_lattice.c
    branches/cycles/source/blender/makesrna/intern/rna_main.c
    branches/cycles/source/blender/makesrna/intern/rna_main_api.c
    branches/cycles/source/blender/makesrna/intern/rna_material.c
    branches/cycles/source/blender/makesrna/intern/rna_mesh.c
    branches/cycles/source/blender/makesrna/intern/rna_modifier.c
    branches/cycles/source/blender/makesrna/intern/rna_nla.c
    branches/cycles/source/blender/makesrna/intern/rna_nodetree.c
    branches/cycles/source/blender/makesrna/intern/rna_object.c
    branches/cycles/source/blender/makesrna/intern/rna_object_force.c
    branches/cycles/source/blender/makesrna/intern/rna_particle.c
    branches/cycles/source/blender/makesrna/intern/rna_pose.c
    branches/cycles/source/blender/makesrna/intern/rna_render.c
    branches/cycles/source/blender/makesrna/intern/rna_rna.c
    branches/cycles/source/blender/makesrna/intern/rna_scene.c
    branches/cycles/source/blender/makesrna/intern/rna_screen.c
    branches/cycles/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/cycles/source/blender/makesrna/intern/rna_sensor.c
    branches/cycles/source/blender/makesrna/intern/rna_sequencer.c
    branches/cycles/source/blender/makesrna/intern/rna_sequencer_api.c
    branches/cycles/source/blender/makesrna/intern/rna_smoke.c
    branches/cycles/source/blender/makesrna/intern/rna_space.c
    branches/cycles/source/blender/makesrna/intern/rna_texture.c
    branches/cycles/source/blender/makesrna/intern/rna_ui.c
    branches/cycles/source/blender/makesrna/intern/rna_userdef.c
    branches/cycles/source/blender/makesrna/intern/rna_wm.c
    branches/cycles/source/blender/makesrna/intern/rna_world.c
    branches/cycles/source/blender/modifiers/CMakeLists.txt
    branches/cycles/source/blender/modifiers/intern/MOD_armature.c
    branches/cycles/source/blender/modifiers/intern/MOD_boolean.c
    branches/cycles/source/blender/modifiers/intern/MOD_displace.c
    branches/cycles/source/blender/modifiers/intern/MOD_uvproject.c
    branches/cycles/source/blender/nodes/CMakeLists.txt
    branches/cycles/source/blender/python/generic/CMakeLists.txt
    branches/cycles/source/blender/python/generic/IDProp.c
    branches/cycles/source/blender/python/generic/bgl.c
    branches/cycles/source/blender/python/generic/blf_py_api.c
    branches/cycles/source/blender/python/generic/bpy_internal_import.c
    branches/cycles/source/blender/python/generic/bpy_internal_import.h
    branches/cycles/source/blender/python/generic/mathutils.c
    branches/cycles/source/blender/python/generic/mathutils_Color.c
    branches/cycles/source/blender/python/generic/mathutils_Euler.c
    branches/cycles/source/blender/python/generic/mathutils_Matrix.c
    branches/cycles/source/blender/python/generic/mathutils_Quaternion.c
    branches/cycles/source/blender/python/generic/mathutils_Vector.c
    branches/cycles/source/blender/python/generic/mathutils_geometry.c
    branches/cycles/source/blender/python/generic/noise_py_api.c
    branches/cycles/source/blender/python/intern/CMakeLists.txt
    branches/cycles/source/blender/python/intern/bpy.c
    branches/cycles/source/blender/python/intern/bpy_interface.c
    branches/cycles/source/blender/python/intern/bpy_library.c
    branches/cycles/source/blender/python/intern/bpy_props.c
    branches/cycles/source/blender/python/intern/bpy_rna.c
    branches/cycles/source/blender/python/intern/bpy_rna.h
    branches/cycles/source/blender/quicktime/CMakeLists.txt
    branches/cycles/source/blender/render/CMakeLists.txt
    branches/cycles/source/blender/render/intern/source/shadeinput.c
    branches/cycles/source/blender/windowmanager/CMakeLists.txt
    branches/cycles/source/blender/windowmanager/SConscript
    branches/cycles/source/blender/windowmanager/WM_api.h
    branches/cycles/source/blender/windowmanager/intern/wm_apple.c
    branches/cycles/source/blender/windowmanager/intern/wm_event_system.c
    branches/cycles/source/blender/windowmanager/intern/wm_files.c
    branches/cycles/source/blender/windowmanager/intern/wm_init_exit.c
    branches/cycles/source/blender/windowmanager/intern/wm_keymap.c
    branches/cycles/source/blender/windowmanager/intern/wm_operators.c
    branches/cycles/source/blender/windowmanager/intern/wm_window.c
    branches/cycles/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
    branches/cycles/source/creator/CMakeLists.txt
    branches/cycles/source/creator/creator.c
    branches/cycles/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/cycles/source/gameengine/BlenderRoutines/CMakeLists.txt
    branches/cycles/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/cycles/source/gameengine/Converter/CMakeLists.txt
    branches/cycles/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/cycles/source/gameengine/Expressions/CMakeLists.txt
    branches/cycles/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/cycles/source/gameengine/GameLogic/CMakeLists.txt
    branches/cycles/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/cycles/source/gameengine/GamePlayer/common/CMakeLists.txt
    branches/cycles/source/gameengine/GamePlayer/ghost/CMakeLists.txt
    branches/cycles/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/cycles/source/gameengine/Ketsji/CMakeLists.txt
    branches/cycles/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
    branches/cycles/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
    branches/cycles/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/cycles/source/gameengine/Network/CMakeLists.txt
    branches/cycles/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
    branches/cycles/source/gameengine/Physics/Bullet/CMakeLists.txt
    branches/cycles/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/cycles/source/gameengine/Physics/Dummy/CMakeLists.txt
    branches/cycles/source/gameengine/Physics/common/CMakeLists.txt
    branches/cycles/source/gameengine/Rasterizer/CMakeLists.txt
    branches/cycles/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
    branches/cycles/source/gameengine/SceneGraph/CMakeLists.txt
    branches/cycles/source/gameengine/VideoTexture/CMakeLists.txt
    branches/cycles/source/gameengine/VideoTexture/SConscript
    branches/cycles/source/gameengine/VideoTexture/VideoFFmpeg.cpp
    branches/cycles/source/gameengine/VideoTexture/VideoFFmpeg.h

Added Paths:
-----------
    branches/cycles/intern/ffmpeg/
    branches/cycles/intern/ffmpeg/ffmpeg_compat.h
    branches/cycles/intern/tools/ui_snapshot.py

Removed Paths:
-------------
    branches/cycles/intern/ffmpeg/ffmpeg_compat.h

Property Changed:
----------------
    branches/cycles/
    branches/cycles/source/blender/editors/datafiles/startup.blend.c
    branches/cycles/source/blender/editors/render/render_shading.c
    branches/cycles/source/blender/editors/render/render_update.c
    branches/cycles/source/blender/editors/uvedit/uvedit_buttons.c


Property changes on: branches/cycles
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:36353-36777
   + /trunk/blender:36353-37040

Modified: branches/cycles/CMakeLists.txt
===================================================================
--- branches/cycles/CMakeLists.txt	2011-05-31 09:47:19 UTC (rev 37040)
+++ branches/cycles/CMakeLists.txt	2011-05-31 09:51:46 UTC (rev 37041)
@@ -55,33 +55,19 @@
 # quiet output for Makefiles, 'make -s' helps too
 # set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
 
-# ignore system set flag, use our own
-# must be before project(...)
-# if the user wants to add their own its ok after first run.
-if(DEFINED CMAKE_C_STANDARD_LIBRARIES)
-	set(_reset_standard_libraries OFF)
-else()
-	set(_reset_standard_libraries ON)
-endif()
+#-----------------------------------------------------------------------------
+# Load some macros.
+include(build_files/cmake/macros.cmake)
 
 
-project(Blender)
+#-----------------------------------------------------------------------------
+# Initialize project.
 
+blender_project_hack_pre()
 
-if (_reset_standard_libraries)
-	# Must come after project(...)
-	#
-	# MINGW workaround for -ladvapi32 being included which surprisingly causes
-	# string formatting of floats, eg: printf("%.*f", 3, value). to crash blender
-	# with a meaningless stack trace. by overriding this flag we ensure we only
-	# have libs we define and that cmake & scons builds match.
-	set(CMAKE_C_STANDARD_LIBRARIES "" CACHE STRING "" FORCE)
-	set(CMAKE_CXX_STANDARD_LIBRARIES "" CACHE STRING "" FORCE)
-	mark_as_advanced(CMAKE_C_STANDARD_LIBRARIES)
-	mark_as_advanced(CMAKE_CXX_STANDARD_LIBRARIES)
-endif()
-unset(_reset_standard_libraries)
+project(Blender)
 
+blender_project_hack_post()
 
 enable_testing()
 
@@ -93,10 +79,6 @@
 set(INCLUDE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/include CACHE INTERNAL "" FORCE )
 
 #-----------------------------------------------------------------------------
-# Load some macros.
-include(build_files/cmake/macros.cmake)
-
-#-----------------------------------------------------------------------------
 # Set default config options
 
 get_blender_version()
@@ -107,7 +89,7 @@
 option(WITH_PYTHON        "Enable Embedded Python API  (only disable for development)" ON)
 option(WITH_PYTHON_SECURITY "Disables execution of scripts within blend files by default (recommend to leave off)" OFF)
 mark_as_advanced(WITH_PYTHON)  # dont want people disabling this unless they really know what they are doing.
-mark_as_advanced(WITH_PYTHON_SECURITY)  # some distrobutions see this as a security issue, rather then have them patch it, make a build option.
+mark_as_advanced(WITH_PYTHON_SECURITY)  # some distrobutions see this as a security issue, rather than have them patch it, make a build option.
 
 option(WITH_PYTHON_SAFETY "Enable internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency, only enable for development)." OFF)
 option(WITH_PYTHON_MODULE "Enable building as a python module (experemental, only enable for development)" OFF)
@@ -989,6 +971,12 @@
 #-----------------------------------------------------------------------------
 # Common.
 
+if(APPLE OR WIN32)
+	if(NOT IS_DIRECTORY "${LIBDIR}")
+		message(FATAL_ERROR "Apple and Windows require pre-compiled libs at: '${LIBDIR}'")
+	endif()
+endif()
+
 if(WITH_RAYOPTIMIZATION)
 	if(CMAKE_COMPILER_IS_GNUCC)
 		if(SUPPORT_SSE_BUILD)
@@ -1149,9 +1137,9 @@
 #-------------------------------------------------------------------------------
 # Global Defines
 
-# better not define flags here but this is a debugging option thats off by default.
+# better not set includes here but this debugging option is off by default.
 if(WITH_CXX_GUARDEDALLOC)
-	set(CMAKE_CXX_FLAGS " -DWITH_CXX_GUARDEDALLOC -I${CMAKE_SOURCE_DIR}/intern/guardedalloc ${CMAKE_CXX_FLAGS}")
+	include_directories(${CMAKE_SOURCE_DIR}/intern/guardedalloc)
 endif()
 
 if(WITH_ASSERT_ABORT)

Modified: branches/cycles/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/cycles/build_files/buildbot/config/user-config-i686.py	2011-05-31 09:47:19 UTC (rev 37040)
+++ branches/cycles/build_files/buildbot/config/user-config-i686.py	2011-05-31 09:51:46 UTC (rev 37041)
@@ -29,7 +29,8 @@
     '${BF_FFMPEG_LIBPATH}/libxvidcore.a ${BF_FFMPEG_LIBPATH}/libx264.a ${BF_FFMPEG_LIBPATH}/libmp3lame.a ' + \
     '${BF_FFMPEG_LIBPATH}/libvpx.a ${BF_FFMPEG_LIBPATH}/libvorbis.a ${BF_FFMPEG_LIBPATH}/libogg.a ' + \
     '${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a'
+    '${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libfaad.a'
 
 # Don't depend on system's libstdc++
 WITH_BF_STATICCXX = True

Modified: branches/cycles/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- branches/cycles/build_files/buildbot/config/user-config-x86_64.py	2011-05-31 09:47:19 UTC (rev 37040)
+++ branches/cycles/build_files/buildbot/config/user-config-x86_64.py	2011-05-31 09:51:46 UTC (rev 37041)
@@ -29,7 +29,8 @@
     '${BF_FFMPEG_LIBPATH}/libxvidcore.a ${BF_FFMPEG_LIBPATH}/libx264.a ${BF_FFMPEG_LIBPATH}/libmp3lame.a ' + \
     '${BF_FFMPEG_LIBPATH}/libvpx.a ${BF_FFMPEG_LIBPATH}/libvorbis.a ${BF_FFMPEG_LIBPATH}/libogg.a ' + \
     '${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a'
+    '${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libfaad.a'
 
 # Don't depend on system's libstdc++
 WITH_BF_STATICCXX = True

Modified: branches/cycles/build_files/cmake/cmake_netbeans_project.py
===================================================================
--- branches/cycles/build_files/cmake/cmake_netbeans_project.py	2011-05-31 09:47:19 UTC (rev 37040)
+++ branches/cycles/build_files/cmake/cmake_netbeans_project.py	2011-05-31 09:51:46 UTC (rev 37041)
@@ -33,7 +33,7 @@
 from project_info import *
 
 import os
-from os.path import join, dirname, normpath, abspath, splitext, relpath, exists
+from os.path import join, dirname, normpath, relpath, exists
 
 
 def create_nb_project_main():
@@ -50,7 +50,6 @@
         includes.sort()
 
         PROJECT_NAME = "Blender"
-        FILE_NAME = PROJECT_NAME.lower()
 
         # --------------- NB spesific
         defines = [("%s=%s" % cdef) if cdef[1] else cdef[0] for cdef in defines]
@@ -76,7 +75,7 @@
         if not exists(PROJECT_DIR_NB):
             os.mkdir(PROJECT_DIR_NB)
 
-        SOURCE_DIR_REL = relpath(SOURCE_DIR, PROJECT_DIR)
+        # SOURCE_DIR_REL = relpath(SOURCE_DIR, PROJECT_DIR)
 
         f = open(join(PROJECT_DIR_NB, "project.xml"), 'w')
 

Modified: branches/cycles/build_files/cmake/cmake_qtcreator_project.py
===================================================================
--- branches/cycles/build_files/cmake/cmake_qtcreator_project.py	2011-05-31 09:47:19 UTC (rev 37040)
+++ branches/cycles/build_files/cmake/cmake_qtcreator_project.py	2011-05-31 09:51:46 UTC (rev 37041)
@@ -34,54 +34,52 @@
 from project_info import *
 
 import os
-from os.path import join, dirname, normpath, abspath, splitext, relpath, exists
-
 import sys
 
 
 def create_qtc_project_main():
     files = list(source_list(SOURCE_DIR, filename_check=is_project_file))
-    files_rel = [relpath(f, start=PROJECT_DIR) for f in files]
+    files_rel = [os.path.relpath(f, start=PROJECT_DIR) for f in files]
     files_rel.sort()
 
     # --- qtcreator specific, simple format
     if SIMPLE_PROJECTFILE:
         # --- qtcreator specific, simple format
         PROJECT_NAME = "Blender"
-        f = open(join(PROJECT_DIR, "%s.files" % PROJECT_NAME), 'w')
+        f = open(os.path.join(PROJECT_DIR, "%s.files" % PROJECT_NAME), 'w')
         f.write("\n".join(files_rel))
 
-        f = open(join(PROJECT_DIR, "%s.includes" % PROJECT_NAME), 'w')
-        f.write("\n".join(sorted(list(set(dirname(f) for f in files_rel if is_c_header(f))))))
+        f = open(os.path.join(PROJECT_DIR, "%s.includes" % PROJECT_NAME), 'w')
+        f.write("\n".join(sorted(list(set(os.path.dirname(f) for f in files_rel if is_c_header(f))))))
 
-        qtc_prj = join(PROJECT_DIR, "%s.creator" % PROJECT_NAME)
+        qtc_prj = os.path.join(PROJECT_DIR, "%s.creator" % PROJECT_NAME)
         f = open(qtc_prj, 'w')
         f.write("[General]\n")
 
-        qtc_cfg = join(PROJECT_DIR, "%s.config" % PROJECT_NAME)
-        if not exists(qtc_cfg):
+        qtc_cfg = os.path.join(PROJECT_DIR, "%s.config" % PROJECT_NAME)
+        if not os.path.exists(qtc_cfg):
             f = open(qtc_cfg, 'w')
             f.write("// ADD PREDEFINED MACROS HERE!\n")
     else:
         includes, defines = cmake_advanced_info()
 
         # for some reason it doesnt give all internal includes
-        includes = list(set(includes) | set(dirname(f) for f in files_rel if is_c_header(f)))
+        includes = list(set(includes) | set(os.path.dirname(f) for f in files_rel if is_c_header(f)))
         includes.sort()
 
         PROJECT_NAME = "Blender"
         FILE_NAME = PROJECT_NAME.lower()
-        f = open(join(PROJECT_DIR, "%s.files" % FILE_NAME), 'w')
+        f = open(os.path.join(PROJECT_DIR, "%s.files" % FILE_NAME), 'w')
         f.write("\n".join(files_rel))
 
-        f = open(join(PROJECT_DIR, "%s.includes" % FILE_NAME), 'w')
+        f = open(os.path.join(PROJECT_DIR, "%s.includes" % FILE_NAME), 'w')
         f.write("\n".join(sorted(includes)))
 
-        qtc_prj = join(PROJECT_DIR, "%s.creator" % FILE_NAME)
+        qtc_prj = os.path.join(PROJECT_DIR, "%s.creator" % FILE_NAME)
         f = open(qtc_prj, 'w')
         f.write("[General]\n")
 
-        qtc_cfg = join(PROJECT_DIR, "%s.config" % FILE_NAME)
+        qtc_cfg = os.path.join(PROJECT_DIR, "%s.config" % FILE_NAME)
         f = open(qtc_cfg, 'w')
         f.write("// ADD PREDEFINED MACROS HERE!\n")
         defines_final = [("#define %s %s" % item) for item in defines]
@@ -95,21 +93,21 @@
 

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list