[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52591] branches/soc-2012-swiss_cheese: Merge w/ trunk: r52086-r52534 (As with last time, the game engine was not merged)
Jason Wilkins
Jason.A.Wilkins at gmail.com
Tue Nov 27 02:18:57 CET 2012
Revision: 52591
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52591
Author: jwilkins
Date: 2012-11-27 01:18:54 +0000 (Tue, 27 Nov 2012)
Log Message:
-----------
Merge w/ trunk: r52086-r52534 (As with last time, the game engine was not merged)
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52086
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52534
Modified Paths:
--------------
branches/soc-2012-swiss_cheese/CMakeLists.txt
branches/soc-2012-swiss_cheese/GNUmakefile
branches/soc-2012-swiss_cheese/SConstruct
branches/soc-2012-swiss_cheese/build_files/buildbot/config/user-config-glibc211-i686.py
branches/soc-2012-swiss_cheese/build_files/buildbot/config/user-config-glibc211-x86_64.py
branches/soc-2012-swiss_cheese/build_files/buildbot/config/user-config-glibc27-i686.py
branches/soc-2012-swiss_cheese/build_files/buildbot/config/user-config-glibc27-x86_64.py
branches/soc-2012-swiss_cheese/build_files/buildbot/config/user-config-player-glibc211-i686.py
branches/soc-2012-swiss_cheese/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
branches/soc-2012-swiss_cheese/build_files/buildbot/config/user-config-player-glibc27-i686.py
branches/soc-2012-swiss_cheese/build_files/buildbot/config/user-config-player-glibc27-x86_64.py
branches/soc-2012-swiss_cheese/build_files/buildbot/master.cfg
branches/soc-2012-swiss_cheese/build_files/cmake/Modules/FindOpenColorIO.cmake
branches/soc-2012-swiss_cheese/build_files/cmake/Modules/FindOpenImageIO.cmake
branches/soc-2012-swiss_cheese/build_files/cmake/Modules/FindPythonLibsUnix.cmake
branches/soc-2012-swiss_cheese/build_files/cmake/cmake_consistency_check.py
branches/soc-2012-swiss_cheese/build_files/cmake/macros.cmake
branches/soc-2012-swiss_cheese/build_files/scons/config/darwin-config.py
branches/soc-2012-swiss_cheese/build_files/scons/config/freebsd7-config.py
branches/soc-2012-swiss_cheese/build_files/scons/config/freebsd8-config.py
branches/soc-2012-swiss_cheese/build_files/scons/config/freebsd9-config.py
branches/soc-2012-swiss_cheese/build_files/scons/config/linux-config.py
branches/soc-2012-swiss_cheese/build_files/scons/config/linuxcross-config.py
branches/soc-2012-swiss_cheese/build_files/scons/config/win32-mingw-config.py
branches/soc-2012-swiss_cheese/build_files/scons/config/win32-vc-config.py
branches/soc-2012-swiss_cheese/build_files/scons/config/win64-mingw-config.py
branches/soc-2012-swiss_cheese/build_files/scons/config/win64-vc-config.py
branches/soc-2012-swiss_cheese/build_files/scons/tools/Blender.py
branches/soc-2012-swiss_cheese/build_files/scons/tools/btools.py
branches/soc-2012-swiss_cheese/doc/python_api/rst/bge.logic.rst
branches/soc-2012-swiss_cheese/doc/python_api/rst/bge.types.rst
branches/soc-2012-swiss_cheese/doc/python_api/rst/bgl.rst
branches/soc-2012-swiss_cheese/doc/python_api/rst/gpu.rst
branches/soc-2012-swiss_cheese/doc/python_api/rst/info_gotcha.rst
branches/soc-2012-swiss_cheese/doc/python_api/sphinx_doc_gen.py
branches/soc-2012-swiss_cheese/extern/eltopo/eltopo3d/nondestructivetrimesh.h
branches/soc-2012-swiss_cheese/extern/libmv/libmv-capi.cpp
branches/soc-2012-swiss_cheese/extern/xdnd/xdnd.c
branches/soc-2012-swiss_cheese/intern/CMakeLists.txt
branches/soc-2012-swiss_cheese/intern/SConscript
branches/soc-2012-swiss_cheese/intern/audaspace/intern/AUD_FileWriter.h
branches/soc-2012-swiss_cheese/intern/cycles/CMakeLists.txt
branches/soc-2012-swiss_cheese/intern/cycles/SConscript
branches/soc-2012-swiss_cheese/intern/cycles/blender/addon/osl.py
branches/soc-2012-swiss_cheese/intern/cycles/blender/blender_camera.cpp
branches/soc-2012-swiss_cheese/intern/cycles/blender/blender_session.cpp
branches/soc-2012-swiss_cheese/intern/cycles/blender/blender_shader.cpp
branches/soc-2012-swiss_cheese/intern/cycles/blender/blender_sync.cpp
branches/soc-2012-swiss_cheese/intern/cycles/blender/blender_sync.h
branches/soc-2012-swiss_cheese/intern/cycles/device/device.cpp
branches/soc-2012-swiss_cheese/intern/cycles/device/device_cuda.cpp
branches/soc-2012-swiss_cheese/intern/cycles/kernel/kernel_accumulate.h
branches/soc-2012-swiss_cheese/intern/cycles/kernel/kernel_camera.h
branches/soc-2012-swiss_cheese/intern/cycles/kernel/kernel_passes.h
branches/soc-2012-swiss_cheese/intern/cycles/kernel/kernel_path.h
branches/soc-2012-swiss_cheese/intern/cycles/kernel/kernel_shader.h
branches/soc-2012-swiss_cheese/intern/cycles/kernel/kernel_types.h
branches/soc-2012-swiss_cheese/intern/cycles/kernel/osl/osl_closures.h
branches/soc-2012-swiss_cheese/intern/cycles/kernel/osl/osl_globals.h
branches/soc-2012-swiss_cheese/intern/cycles/kernel/osl/osl_services.cpp
branches/soc-2012-swiss_cheese/intern/cycles/kernel/osl/osl_services.h
branches/soc-2012-swiss_cheese/intern/cycles/kernel/shaders/CMakeLists.txt
branches/soc-2012-swiss_cheese/intern/cycles/kernel/shaders/node_ambient_occlusion.osl
branches/soc-2012-swiss_cheese/intern/cycles/kernel/shaders/node_brick_texture.osl
branches/soc-2012-swiss_cheese/intern/cycles/kernel/shaders/node_brightness.osl
branches/soc-2012-swiss_cheese/intern/cycles/kernel/shaders/node_checker_texture.osl
branches/soc-2012-swiss_cheese/intern/cycles/kernel/shaders/node_environment_texture.osl
branches/soc-2012-swiss_cheese/intern/cycles/kernel/shaders/node_gradient_texture.osl
branches/soc-2012-swiss_cheese/intern/cycles/kernel/shaders/node_hsv.osl
branches/soc-2012-swiss_cheese/intern/cycles/kernel/shaders/node_image_texture.osl
branches/soc-2012-swiss_cheese/intern/cycles/kernel/shaders/node_magic_texture.osl
branches/soc-2012-swiss_cheese/intern/cycles/kernel/shaders/node_musgrave_texture.osl
branches/soc-2012-swiss_cheese/intern/cycles/kernel/shaders/node_noise_texture.osl
branches/soc-2012-swiss_cheese/intern/cycles/kernel/shaders/node_sky_texture.osl
branches/soc-2012-swiss_cheese/intern/cycles/kernel/shaders/node_texture_coordinate.osl
branches/soc-2012-swiss_cheese/intern/cycles/kernel/shaders/node_voronoi_texture.osl
branches/soc-2012-swiss_cheese/intern/cycles/kernel/shaders/node_ward_bsdf.osl
branches/soc-2012-swiss_cheese/intern/cycles/kernel/shaders/node_wave_texture.osl
branches/soc-2012-swiss_cheese/intern/cycles/kernel/svm/svm_bsdf.h
branches/soc-2012-swiss_cheese/intern/cycles/kernel/svm/svm_closure.h
branches/soc-2012-swiss_cheese/intern/cycles/kernel/svm/svm_hsv.h
branches/soc-2012-swiss_cheese/intern/cycles/kernel/svm/svm_math.h
branches/soc-2012-swiss_cheese/intern/cycles/kernel/svm/svm_tex_coord.h
branches/soc-2012-swiss_cheese/intern/cycles/render/camera.cpp
branches/soc-2012-swiss_cheese/intern/cycles/render/camera.h
branches/soc-2012-swiss_cheese/intern/cycles/render/image.cpp
branches/soc-2012-swiss_cheese/intern/cycles/render/image.h
branches/soc-2012-swiss_cheese/intern/cycles/render/nodes.cpp
branches/soc-2012-swiss_cheese/intern/cycles/render/nodes.h
branches/soc-2012-swiss_cheese/intern/cycles/render/osl.cpp
branches/soc-2012-swiss_cheese/intern/cycles/render/osl.h
branches/soc-2012-swiss_cheese/intern/cycles/render/session.cpp
branches/soc-2012-swiss_cheese/intern/cycles/render/svm.cpp
branches/soc-2012-swiss_cheese/intern/cycles/render/svm.h
branches/soc-2012-swiss_cheese/intern/cycles/util/util_boundbox.h
branches/soc-2012-swiss_cheese/intern/cycles/util/util_thread.h
branches/soc-2012-swiss_cheese/intern/cycles/util/util_transform.cpp
branches/soc-2012-swiss_cheese/intern/cycles/util/util_transform.h
branches/soc-2012-swiss_cheese/intern/elbeem/intern/ntl_geometryobject.cpp
branches/soc-2012-swiss_cheese/intern/elbeem/intern/ntl_world.cpp
branches/soc-2012-swiss_cheese/intern/elbeem/intern/ntl_world.h
branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_SystemCocoa.h
branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2012-swiss_cheese/intern/iksolver/intern/IK_QJacobianSolver.cpp
branches/soc-2012-swiss_cheese/intern/memutil/MEM_CacheLimiter.h
branches/soc-2012-swiss_cheese/intern/memutil/MEM_SmartPtr.h
branches/soc-2012-swiss_cheese/intern/opencolorio/ocio_impl.cc
branches/soc-2012-swiss_cheese/intern/opennl/CMakeLists.txt
branches/soc-2012-swiss_cheese/release/datafiles/blender_icons.png
branches/soc-2012-swiss_cheese/release/datafiles/startup.blend
branches/soc-2012-swiss_cheese/release/scripts/modules/addon_utils.py
branches/soc-2012-swiss_cheese/release/scripts/modules/bl_i18n_utils/settings.py
branches/soc-2012-swiss_cheese/release/scripts/modules/bl_i18n_utils/update_languages_menu.py
branches/soc-2012-swiss_cheese/release/scripts/modules/bl_i18n_utils/update_pot.py
branches/soc-2012-swiss_cheese/release/scripts/modules/bpy/utils.py
branches/soc-2012-swiss_cheese/release/scripts/modules/bpy_extras/mesh_utils.py
branches/soc-2012-swiss_cheese/release/scripts/startup/bl_operators/object.py
branches/soc-2012-swiss_cheese/release/scripts/startup/bl_operators/presets.py
branches/soc-2012-swiss_cheese/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
branches/soc-2012-swiss_cheese/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2012-swiss_cheese/release/scripts/startup/bl_operators/wm.py
branches/soc-2012-swiss_cheese/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2012-swiss_cheese/release/scripts/startup/bl_ui/properties_data_bone.py
branches/soc-2012-swiss_cheese/release/scripts/startup/bl_ui/properties_data_camera.py
branches/soc-2012-swiss_cheese/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2012-swiss_cheese/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/soc-2012-swiss_cheese/release/scripts/startup/bl_ui/space_dopesheet.py
branches/soc-2012-swiss_cheese/release/scripts/startup/bl_ui/space_graph.py
branches/soc-2012-swiss_cheese/release/scripts/startup/bl_ui/space_image.py
branches/soc-2012-swiss_cheese/release/scripts/startup/bl_ui/space_info.py
branches/soc-2012-swiss_cheese/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2012-swiss_cheese/release/scripts/startup/bl_ui/space_text.py
branches/soc-2012-swiss_cheese/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2012-swiss_cheese/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2012-swiss_cheese/release/scripts/templates/script_stub.py
branches/soc-2012-swiss_cheese/release/text/readme.html
branches/soc-2012-swiss_cheese/source/blender/avi/intern/avi_rgb.c
branches/soc-2012-swiss_cheese/source/blender/blenfont/BLF_translation.h
branches/soc-2012-swiss_cheese/source/blender/blenfont/CMakeLists.txt
branches/soc-2012-swiss_cheese/source/blender/blenfont/SConscript
branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf.c
branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_lang.c
branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf_translation.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_image.h
branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_modifier.h
branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_node.h
branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_text.h
branches/soc-2012-swiss_cheese/source/blender/blenkernel/SConscript
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/action.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/armature.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/blender.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/brush.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/collision.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/colortools.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/context.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/curve.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/customdata.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/idcode.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/image.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/library.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/mask_evaluate.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/mesh.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/modifier.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/node.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/object.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/particle.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/pointcache.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/scene.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/sequencer.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/suggestions.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/text.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/tracking.c
branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_endian_switch_inline.h
branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_ghash.h
branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_math_base.h
branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_math_color.h
branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_math_geom.h
branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_math_inline.h
branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_math_interp.h
branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_math_vector.h
branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_threads.h
branches/soc-2012-swiss_cheese/source/blender/blenlib/BLI_utildefines.h
branches/soc-2012-swiss_cheese/source/blender/blenlib/CMakeLists.txt
branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/math_base_inline.c
branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/math_geom.c
branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/math_geom_inline.c
branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/math_interp.c
branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/math_rotation.c
branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/math_vector.c
branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/noise.c
branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/pbvh.c
branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/scanfill.c
branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/string.c
branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/string_utf8.c
branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/threads.c
branches/soc-2012-swiss_cheese/source/blender/blenloader/intern/readfile.c
branches/soc-2012-swiss_cheese/source/blender/blenloader/intern/versioning_250.c
branches/soc-2012-swiss_cheese/source/blender/blenloader/intern/writefile.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/CMakeLists.txt
branches/soc-2012-swiss_cheese/source/blender/bmesh/bmesh.h
branches/soc-2012-swiss_cheese/source/blender/bmesh/bmesh_class.h
branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_interp.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_iterators.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_iterators.h
branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_mesh.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_mesh.h
branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_operator_api.h
branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_operator_api_inline.h
branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_operators.h
branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_private.h
branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_queries.h
branches/soc-2012-swiss_cheese/source/blender/bmesh/operators/bmo_connect.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/operators/bmo_create.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/operators/bmo_dissolve.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/operators/bmo_edgesplit.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/operators/bmo_extrude.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/operators/bmo_hull.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/operators/bmo_inset.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/operators/bmo_join_triangles.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/operators/bmo_mesh_conv.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/operators/bmo_mirror.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/operators/bmo_primitive.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/operators/bmo_removedoubles.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/operators/bmo_similar.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/operators/bmo_slide.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/operators/bmo_smooth_laplacian.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/operators/bmo_subdivide.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/operators/bmo_subdivide.h
branches/soc-2012-swiss_cheese/source/blender/bmesh/operators/bmo_symmetrize.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/operators/bmo_triangulate.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/operators/bmo_unsubdivide.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/operators/bmo_wireframe.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/tools/BME_bevel.c
branches/soc-2012-swiss_cheese/source/blender/collada/AnimationImporter.cpp
branches/soc-2012-swiss_cheese/source/blender/collada/DocumentImporter.cpp
branches/soc-2012-swiss_cheese/source/blender/collada/DocumentImporter.h
branches/soc-2012-swiss_cheese/source/blender/collada/ImageExporter.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/CMakeLists.txt
branches/soc-2012-swiss_cheese/source/blender/compositor/intern/COM_Converter.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/intern/COM_ExecutionSystem.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_BlurNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_ImageNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_MuteNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_NormalNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_OutputFileNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_GammaCorrectOperation.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_ImageOperation.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_PixelateOperation.h
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
branches/soc-2012-swiss_cheese/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2012-swiss_cheese/source/blender/editors/armature/editarmature.c
branches/soc-2012-swiss_cheese/source/blender/editors/curve/editcurve.c
branches/soc-2012-swiss_cheese/source/blender/editors/curve/editfont.c
branches/soc-2012-swiss_cheese/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2012-swiss_cheese/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2012-swiss_cheese/source/blender/editors/include/ED_gpencil.h
branches/soc-2012-swiss_cheese/source/blender/editors/include/ED_image.h
branches/soc-2012-swiss_cheese/source/blender/editors/include/ED_mesh.h
branches/soc-2012-swiss_cheese/source/blender/editors/include/UI_icons.h
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface.c
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface_intern.h
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface_layout.c
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface_regions.c
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface_templates.c
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface_widgets.c
branches/soc-2012-swiss_cheese/source/blender/editors/mesh/editmesh_add.c
branches/soc-2012-swiss_cheese/source/blender/editors/mesh/editmesh_bvh.c
branches/soc-2012-swiss_cheese/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2012-swiss_cheese/source/blender/editors/mesh/editmesh_loopcut.c
branches/soc-2012-swiss_cheese/source/blender/editors/mesh/editmesh_rip.c
branches/soc-2012-swiss_cheese/source/blender/editors/mesh/editmesh_select.c
branches/soc-2012-swiss_cheese/source/blender/editors/mesh/editmesh_slide.c
branches/soc-2012-swiss_cheese/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2012-swiss_cheese/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2012-swiss_cheese/source/blender/editors/mesh/mesh_intern.h
branches/soc-2012-swiss_cheese/source/blender/editors/mesh/mesh_ops.c
branches/soc-2012-swiss_cheese/source/blender/editors/object/object_bake.c
branches/soc-2012-swiss_cheese/source/blender/editors/object/object_edit.c
branches/soc-2012-swiss_cheese/source/blender/editors/object/object_modifier.c
branches/soc-2012-swiss_cheese/source/blender/editors/object/object_relations.c
branches/soc-2012-swiss_cheese/source/blender/editors/object/object_vgroup.c
branches/soc-2012-swiss_cheese/source/blender/editors/physics/particle_edit.c
branches/soc-2012-swiss_cheese/source/blender/editors/physics/physics_fluid.c
branches/soc-2012-swiss_cheese/source/blender/editors/render/render_internal.c
branches/soc-2012-swiss_cheese/source/blender/editors/render/render_opengl.c
branches/soc-2012-swiss_cheese/source/blender/editors/render/render_preview.c
branches/soc-2012-swiss_cheese/source/blender/editors/render/render_update.c
branches/soc-2012-swiss_cheese/source/blender/editors/screen/screen_ops.c
branches/soc-2012-swiss_cheese/source/blender/editors/screen/screendump.c
branches/soc-2012-swiss_cheese/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_buttons/buttons_texture.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_clip/clip_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_clip/clip_editor.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_clip/space_clip.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_console/console_ops.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_image/image_buttons.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_image/image_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_image/image_edit.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_image/image_ops.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_image/space_image.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_info/info_ops.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_node/drawnode.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_node/node_group.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_node/node_view.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_sequencer/SConscript
branches/soc-2012-swiss_cheese/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_text/space_text.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_text/text_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_text/text_intern.h
branches/soc-2012-swiss_cheese/source/blender/editors/space_text/text_ops.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_text/text_python.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/drawobject.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2012-swiss_cheese/source/blender/editors/transform/transform.c
branches/soc-2012-swiss_cheese/source/blender/editors/transform/transform_constraints.c
branches/soc-2012-swiss_cheese/source/blender/editors/transform/transform_conversions.c
branches/soc-2012-swiss_cheese/source/blender/editors/uvedit/uvedit_buttons.c
branches/soc-2012-swiss_cheese/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2012-swiss_cheese/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2012-swiss_cheese/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/soc-2012-swiss_cheese/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2012-swiss_cheese/source/blender/gpu/SConscript
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_draw.c
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_material.c
branches/soc-2012-swiss_cheese/source/blender/gpu/shaders/gpu_shader_vertex.glsl
branches/soc-2012-swiss_cheese/source/blender/ikplugin/intern/ikplugin_api.c
branches/soc-2012-swiss_cheese/source/blender/ikplugin/intern/iksolver_plugin.c
branches/soc-2012-swiss_cheese/source/blender/imbuf/intern/cineon/cineon_dpx.c
branches/soc-2012-swiss_cheese/source/blender/imbuf/intern/cineon/cineonlib.c
branches/soc-2012-swiss_cheese/source/blender/imbuf/intern/cineon/dpxlib.c
branches/soc-2012-swiss_cheese/source/blender/imbuf/intern/colormanagement.c
branches/soc-2012-swiss_cheese/source/blender/imbuf/intern/dds/BlockDXT.h
branches/soc-2012-swiss_cheese/source/blender/imbuf/intern/dds/SConscript
branches/soc-2012-swiss_cheese/source/blender/imbuf/intern/imageprocess.c
branches/soc-2012-swiss_cheese/source/blender/imbuf/intern/jp2.c
branches/soc-2012-swiss_cheese/source/blender/imbuf/intern/jpeg.c
branches/soc-2012-swiss_cheese/source/blender/imbuf/intern/openexr/CMakeLists.txt
branches/soc-2012-swiss_cheese/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2012-swiss_cheese/source/blender/imbuf/intern/openexr/openexr_multi.h
branches/soc-2012-swiss_cheese/source/blender/imbuf/intern/scaling.c
branches/soc-2012-swiss_cheese/source/blender/imbuf/intern/util.c
branches/soc-2012-swiss_cheese/source/blender/makesdna/DNA_action_types.h
branches/soc-2012-swiss_cheese/source/blender/makesdna/DNA_gpencil_types.h
branches/soc-2012-swiss_cheese/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2012-swiss_cheese/source/blender/makesdna/DNA_scene_types.h
branches/soc-2012-swiss_cheese/source/blender/makesdna/DNA_text_types.h
branches/soc-2012-swiss_cheese/source/blender/makesdna/DNA_tracking_types.h
branches/soc-2012-swiss_cheese/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2012-swiss_cheese/source/blender/makesrna/RNA_access.h
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/makesrna.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_access.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_curve.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_image.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_nodetree_types.h
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_object.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_pose.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_scene.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_space.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_speaker.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_text.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_texture.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_wm.c
branches/soc-2012-swiss_cheese/source/blender/modifiers/CMakeLists.txt
branches/soc-2012-swiss_cheese/source/blender/modifiers/MOD_modifiertypes.h
branches/soc-2012-swiss_cheese/source/blender/modifiers/intern/MOD_armature.c
branches/soc-2012-swiss_cheese/source/blender/modifiers/intern/MOD_array.c
branches/soc-2012-swiss_cheese/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2012-swiss_cheese/source/blender/modifiers/intern/MOD_decimate.c
branches/soc-2012-swiss_cheese/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2012-swiss_cheese/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/soc-2012-swiss_cheese/source/blender/modifiers/intern/MOD_laplaciansmooth.c
branches/soc-2012-swiss_cheese/source/blender/modifiers/intern/MOD_skin.c
branches/soc-2012-swiss_cheese/source/blender/modifiers/intern/MOD_util.c
branches/soc-2012-swiss_cheese/source/blender/nodes/CMakeLists.txt
branches/soc-2012-swiss_cheese/source/blender/nodes/NOD_composite.h
branches/soc-2012-swiss_cheese/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
branches/soc-2012-swiss_cheese/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2012-swiss_cheese/source/blender/nodes/composite/nodes/node_composite_normal.c
branches/soc-2012-swiss_cheese/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
branches/soc-2012-swiss_cheese/source/blender/nodes/composite/nodes/node_composite_viewer.c
branches/soc-2012-swiss_cheese/source/blender/nodes/shader/nodes/node_shader_normal_map.c
branches/soc-2012-swiss_cheese/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
branches/soc-2012-swiss_cheese/source/blender/nodes/shader/nodes/node_shader_tex_image.c
branches/soc-2012-swiss_cheese/source/blender/nodes/shader/nodes/node_shader_texture.c
branches/soc-2012-swiss_cheese/source/blender/nodes/texture/nodes/node_texture_image.c
branches/soc-2012-swiss_cheese/source/blender/python/bmesh/bmesh_py_ops.c
branches/soc-2012-swiss_cheese/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2012-swiss_cheese/source/blender/python/bmesh/bmesh_py_types_customdata.c
branches/soc-2012-swiss_cheese/source/blender/python/bmesh/bmesh_py_types_meshdata.c
branches/soc-2012-swiss_cheese/source/blender/python/generic/bgl.c
branches/soc-2012-swiss_cheese/source/blender/python/generic/bpy_internal_import.c
branches/soc-2012-swiss_cheese/source/blender/python/generic/idprop_py_api.c
branches/soc-2012-swiss_cheese/source/blender/python/generic/py_capi_utils.c
branches/soc-2012-swiss_cheese/source/blender/python/intern/bpy_app.c
branches/soc-2012-swiss_cheese/source/blender/python/intern/bpy_intern_string.c
branches/soc-2012-swiss_cheese/source/blender/python/intern/bpy_intern_string.h
branches/soc-2012-swiss_cheese/source/blender/python/intern/bpy_rna.c
branches/soc-2012-swiss_cheese/source/blender/python/intern/bpy_rna_array.c
branches/soc-2012-swiss_cheese/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2012-swiss_cheese/source/blender/render/extern/include/RE_engine.h
branches/soc-2012-swiss_cheese/source/blender/render/intern/include/initrender.h
branches/soc-2012-swiss_cheese/source/blender/render/intern/raytrace/rayobject_internal.h
branches/soc-2012-swiss_cheese/source/blender/render/intern/raytrace/rayobject_octree.cpp
branches/soc-2012-swiss_cheese/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
branches/soc-2012-swiss_cheese/source/blender/render/intern/source/convertblender.c
branches/soc-2012-swiss_cheese/source/blender/render/intern/source/envmap.c
branches/soc-2012-swiss_cheese/source/blender/render/intern/source/external_engine.c
branches/soc-2012-swiss_cheese/source/blender/render/intern/source/imagetexture.c
branches/soc-2012-swiss_cheese/source/blender/render/intern/source/initrender.c
branches/soc-2012-swiss_cheese/source/blender/render/intern/source/pipeline.c
branches/soc-2012-swiss_cheese/source/blender/render/intern/source/render_texture.c
branches/soc-2012-swiss_cheese/source/blender/render/intern/source/rendercore.c
branches/soc-2012-swiss_cheese/source/blender/render/intern/source/renderdatabase.c
branches/soc-2012-swiss_cheese/source/blender/render/intern/source/shadeoutput.c
branches/soc-2012-swiss_cheese/source/blender/render/intern/source/sunsky.c
branches/soc-2012-swiss_cheese/source/blender/render/intern/source/voxeldata.c
branches/soc-2012-swiss_cheese/source/blender/render/intern/source/zbuf.c
branches/soc-2012-swiss_cheese/source/blender/windowmanager/WM_api.h
branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_playanim.c
branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_window.c
branches/soc-2012-swiss_cheese/source/blender/windowmanager/wm_event_types.h
branches/soc-2012-swiss_cheese/source/blenderplayer/CMakeLists.txt
branches/soc-2012-swiss_cheese/source/creator/CMakeLists.txt
branches/soc-2012-swiss_cheese/source/creator/creator.c
branches/soc-2012-swiss_cheese/source/tools/check_style_c.py
branches/soc-2012-swiss_cheese/source/tools/spell_check_source.py
branches/soc-2012-swiss_cheese/source/tools/spell_check_source_config.py
Added Paths:
-----------
branches/soc-2012-swiss_cheese/build_files/build_environment/install_deps.sh
branches/soc-2012-swiss_cheese/build_files/buildbot/slave_rsync.py
branches/soc-2012-swiss_cheese/build_files/cmake/Modules/FindIcuLinux.cmake
branches/soc-2012-swiss_cheese/intern/cycles/kernel/osl/SConscript
branches/soc-2012-swiss_cheese/intern/cycles/kernel/shaders/SConscript
branches/soc-2012-swiss_cheese/intern/locale/
branches/soc-2012-swiss_cheese/release/darwin/
branches/soc-2012-swiss_cheese/source/blender/bmesh/operators/bmo_bevel.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/tools/bmesh_bevel.h
branches/soc-2012-swiss_cheese/source/blender/bmesh/tools/bmesh_decimate.h
branches/soc-2012-swiss_cheese/source/blender/bmesh/tools/bmesh_decimate_collapse.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_MapRangeNode.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_MapRangeNode.h
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_MapRangeOperation.cpp
branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_MapRangeOperation.h
branches/soc-2012-swiss_cheese/source/blender/modifiers/intern/MOD_triangulate.c
branches/soc-2012-swiss_cheese/source/blender/nodes/composite/nodes/node_composite_mapRange.c
branches/soc-2012-swiss_cheese/source/creator/blender.map
branches/soc-2012-swiss_cheese/source/tests/bl_rst_completeness.py
branches/soc-2012-swiss_cheese/source/tests/rst_to_doctree_mini.py
Removed Paths:
-------------
branches/soc-2012-swiss_cheese/intern/cycles/kernel/osl/nodes/
branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_decimate.h
branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_decimate_collapse.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_decimate_dissolve.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_decimate_unsubdivide.c
branches/soc-2012-swiss_cheese/source/blender/bmesh/operators/bmo_bevel.c
branches/soc-2012-swiss_cheese/source/darwin/
Property Changed:
----------------
branches/soc-2012-swiss_cheese/
branches/soc-2012-swiss_cheese/source/blender/editors/interface/interface.c
branches/soc-2012-swiss_cheese/source/blender/editors/space_outliner/
Property changes on: branches/soc-2012-swiss_cheese
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender:46806-48425,48428-52085
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender:46806-48425,48428-52534
Modified: branches/soc-2012-swiss_cheese/CMakeLists.txt
===================================================================
--- branches/soc-2012-swiss_cheese/CMakeLists.txt 2012-11-27 01:07:22 UTC (rev 52590)
+++ branches/soc-2012-swiss_cheese/CMakeLists.txt 2012-11-27 01:18:54 UTC (rev 52591)
@@ -237,6 +237,7 @@
option(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" ON)
if(UNIX AND NOT APPLE)
option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
+ option(WITH_STATIC_LIBS "Try to link with static libraries, as much as possible, to make blender more portable across distributions" OFF)
endif()
option(WITH_PYTHON_INSTALL "Copy system python into the blender install folder" ON)
option(WITH_PYTHON_INSTALL_NUMPY "Copy system numpy into the blender install folder" ON)
@@ -303,18 +304,14 @@
set(OSX_SYSTEM unsupported)
endif()
message(STATUS "Detected system-version: " ${OSX_SYSTEM})
-
- if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
- set(CMAKE_OSX_DEPLOYMENT_TARGET "10.6" CACHE STRING "" FORCE) # 10.6 is our min. target, if you use higher sdk, weak linking happens - with 10.5 we have still not solved problems, build those with 10.5.sdk for now !!!
- endif()
if(${CMAKE_GENERATOR} MATCHES "Xcode")
- ##### workaround for actual official cmake incompatibility with xcode 4.3 #####
+ ##### cmake incompatibility with xcode 4.3 and higher #####
if(${XCODE_VERSION} MATCHES '') # cmake fails due looking for xcode in the wrong path, thus will be empty var
- message("Official cmake does not yet support Xcode 4.3, get a patched version here: http://www.jensverwiebe.de/Blender/CMake%202.8-7patched.zip")
+ message(FATAL_ERROR "Xcode 4.3 and higher must be used with cmake 2.8-8 or higher")
endif()
- ### end workaround for actual official cmake incompatibility with xcode 4.3 ###
+ ### end cmake incompatibility with xcode 4.3 and higher ###
if(${XCODE_VERSION} VERSION_EQUAL 4 OR ${XCODE_VERSION} VERSION_GREATER 4 AND ${XCODE_VERSION} VERSION_LESS 4.3)
# Xcode 4 defaults to the Apple LLVM Compiler.
@@ -326,14 +323,31 @@
execute_process(COMMAND xcodebuild -version OUTPUT_VARIABLE XCODE_VERS_BUILD_NR)
string(SUBSTRING "${XCODE_VERS_BUILD_NR}" 6 3 XCODE_VERSION) # truncate away build-nr
unset(XCODE_VERS_BUILD_NR)
+ endif()
+
+ message(STATUS "Detected Xcode-version: " ${XCODE_VERSION})
+
+ if(${XCODE_VERSION} VERSION_LESS 4.3)
+ set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk CACHE PATH "" FORCE) # use guaranteed existing sdk
+ else()
+ # note: i don't use xcode-select path on purpose, cause also /Applications/Xcode.app would be allowed
+ # absolute pathes are more foolproof here !
+ set(OSX_SYSROOT_PREFIX /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform)
+ set(OSX_DEVELOPER_PREFIX /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk) # use guaranteed existing sdk
+ set(CMAKE_OSX_SYSROOT ${OSX_SYSROOT_PREFIX}/${OSX_DEVELOPER_PREFIX} CACHE PATH "" FORCE)
+ endif()
+
+ if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
+ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING "" FORCE) # 10.5 is our min. target, if you use higher sdk, weak linking happens
+ endif()
+
+ if(NOT ${CMAKE_GENERATOR} MATCHES "Xcode")
# force CMAKE_OSX_DEPLOYMENT_TARGET for makefiles, will not work else ( cmake bug ? )
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
add_definitions ("-DMACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}")
endif()
-
- message(STATUS "Detected Xcode-version: " ${XCODE_VERSION})
-
+
option(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" ON)
option(USE_QTKIT "Use QtKit instead of Carbon quicktime (needed for having partial quicktime for 64bit)" OFF)
option(WITH_LIBS10.5 "Use 10.5 libs (needed for 64bit builds)" OFF)
@@ -354,12 +368,20 @@
message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
endif()
-if(NOT WITH_AUDASPACE AND (WITH_OPENAL OR WITH_JACK OR WITH_GAMEENGINE))
- message(FATAL_ERROR "WITH_OPENAL/WITH_JACK/WITH_CODEC_FFMPEG/WITH_GAMEENGINE require WITH_AUDASPACE")
+if(NOT WITH_AUDASPACE)
+ if(WITH_OPENAL)
+ message(FATAL_ERROR "WITH_OPENAL requires WITH_AUDASPACE")
+ endif()
+ if(WITH_JACK)
+ message(FATAL_ERROR "WITH_JACK requires WITH_AUDASPACE")
+ endif()
+ if(WITH_GAMEENGINE)
+ message(FATAL_ERROR "WITH_GAMEENGINE requires WITH_AUDASPACE")
+ endif()
endif()
if(NOT WITH_SDL AND WITH_GHOST_SDL)
- message(FATAL_ERROR "WITH_GHOST_SDL requires WITH_SDL to be ON")
+ message(FATAL_ERROR "WITH_GHOST_SDL requires WITH_SDL")
endif()
if(WITH_IMAGE_REDCODE AND ((NOT WITH_IMAGE_OPENJPEG) OR (NOT WITH_CODEC_FFMPEG)))
@@ -390,8 +412,8 @@
set(WITH_OPENIMAGEIO ON)
endif()
-# auto enable boost for cycles, booleans or audaspace
-if(WITH_CYCLES OR WITH_MOD_BOOLEAN OR WITH_AUDASPACE)
+# auto enable boost for cycles, booleans, audaspace or i18n
+if(WITH_CYCLES OR WITH_MOD_BOOLEAN OR WITH_AUDASPACE OR WITH_INTERNATIONAL)
set(WITH_BOOST ON)
endif()
@@ -520,8 +542,6 @@
if(UNIX AND NOT APPLE)
-
- # set lib directory if it exists
if(WITH_ANDROID)
set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/android/${ANDROID_TARGET})
@@ -533,28 +553,13 @@
else()
set(ANDROID_PROJ ${LIBDIR}/aghosty-sdl CACHE STRING "Android Project Path")
endif()
- elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
- set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/linux64)
- else()
- set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/linux)
- endif()
-
- if(NOT EXISTS ${LIBDIR})
- unset(LIBDIR)
- endif()
- endif()
-
-
- if(WITH_ANDROID)
-
+
+ set(JPEG "${LIBDIR}/jpeg")
+ set(JPEG_INCLUDE_DIR "${JPEG}/include")
+ set(JPEG_LIBPATH ${JPEG}/lib)
+ set(JPEG_LIBRARIES ${JPEG_LIBPATH}/libjpeg.so)
- set(JPEG "${LIBDIR}/jpeg")
- set(JPEG_INCLUDE_DIR "${JPEG}/include")
- set(JPEG_LIBPATH ${JPEG}/lib)
- set(JPEG_LIBRARIES ${JPEG_LIBPATH}/libjpeg.so)
-
set(PNG "${LIBDIR}/png")
set(PNG_INCLUDE_DIR "${PNG}/include")
@@ -592,10 +597,25 @@
else()
- find_package(JPEG REQUIRED)
- find_package(PNG REQUIRED)
- find_package(ZLIB REQUIRED)
- find_package(Freetype REQUIRED)
+ macro(find_package_wrapper)
+ STRING(TOUPPER ${ARGV0} _NAME_UPPER)
+ if(${WITH_STATIC_LIBS})
+ set(_cmake_find_library_suffixes_back ${CMAKE_FIND_LIBRARY_SUFFIXES})
+ set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
+
+
+ endif()
+ find_package(${ARGV})
+ if(${WITH_STATIC_LIBS})
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ${_cmake_find_library_suffixes_back})
+ unset(_cmake_find_library_suffixes_back)
+ endif()
+ endmacro()
+
+ find_package_wrapper(JPEG REQUIRED)
+ find_package_wrapper(PNG REQUIRED)
+ find_package_wrapper(ZLIB REQUIRED)
+ find_package_wrapper(Freetype REQUIRED)
endif()
if(WITH_PYTHON AND NOT WITH_ANDROID)
@@ -604,25 +624,28 @@
# Use our own instead, since wothout py is such a rare case,
# require this package
+ # XXX Linking errors with debian static python :/
+# find_package_wrapper(PythonLibsUnix REQUIRED)
find_package(PythonLibsUnix REQUIRED)
endif()
-
if(WITH_IMAGE_OPENEXR)
- find_package(OpenEXR) # our own module
+ find_package_wrapper(OpenEXR) # our own module
if(NOT OPENEXR_FOUND)
set(WITH_IMAGE_OPENEXR OFF)
endif()
endif()
if(WITH_IMAGE_OPENJPEG)
- find_package(OpenJPEG)
+ find_package_wrapper(OpenJPEG)
if(NOT OPENJPEG_FOUND)
set(WITH_IMAGE_OPENJPEG OFF)
endif()
endif()
if(WITH_IMAGE_TIFF)
+ # XXX Linking errors with debian static tiff :/
+# find_package_wrapper(TIFF)
find_package(TIFF)
if(NOT TIFF_FOUND)
set(WITH_IMAGE_TIFF OFF)
@@ -631,14 +654,14 @@
# Audio IO
if(WITH_OPENAL)
- find_package(OpenAL)
+ find_package_wrapper(OpenAL)
if(NOT OPENAL_FOUND)
set(WITH_OPENAL OFF)
endif()
endif()
if(WITH_SDL AND NOT WITH_ANDROID)
- find_package(SDL)
+ find_package_wrapper(SDL)
mark_as_advanced(
SDLMAIN_LIBRARY
SDL_INCLUDE_DIR
@@ -652,7 +675,7 @@
endif()
if(WITH_JACK)
- find_package(Jack)
+ find_package_wrapper(Jack)
if(NOT JACK_FOUND)
set(WITH_JACK OFF)
endif()
@@ -660,22 +683,15 @@
# Codecs
if(WITH_CODEC_SNDFILE)
- find_package(SndFile)
+ find_package_wrapper(SndFile)
if(NOT SNDFILE_FOUND)
set(WITH_CODEC_SNDFILE OFF)
endif()
endif()
if(WITH_CODEC_FFMPEG)
- # use lib dir if available and nothing else specified
- if(LIBDIR AND NOT FFMPEG)
- set(FFMPEG ${LIBDIR}/ffmpeg CACHE PATH "FFMPEG Directory")
- # XXX, some distros might need 'theoraenc theoradec' too
- set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale dirac_encoder mp3lame ogg orc-0.4 schroedinger-1.0 theora vorbis vorbisenc vpx x264 xvidcore faad asound CACHE STRING "FFMPEG Libraries")
- else()
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list