[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58268] branches/soc-2013-motion_track: Merging from trunk r58267 into soc-2013-motion_track
Joseph Mansfield
sftrabbit at gmail.com
Mon Jul 15 16:19:03 CEST 2013
Revision: 58268
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58268
Author: sftrabbit
Date: 2013-07-15 14:19:02 +0000 (Mon, 15 Jul 2013)
Log Message:
-----------
Merging from trunk r58267 into soc-2013-motion_track
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58267
Modified Paths:
--------------
branches/soc-2013-motion_track/CMakeLists.txt
branches/soc-2013-motion_track/SConstruct
branches/soc-2013-motion_track/build_files/build_environment/install_deps.sh
branches/soc-2013-motion_track/build_files/buildbot/config/user-config-cuda-glibc211-i686.py
branches/soc-2013-motion_track/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py
branches/soc-2013-motion_track/build_files/buildbot/config/user-config-glibc211-i686.py
branches/soc-2013-motion_track/build_files/buildbot/config/user-config-glibc211-x86_64.py
branches/soc-2013-motion_track/build_files/buildbot/config/user-config-mac-i386.py
branches/soc-2013-motion_track/build_files/buildbot/config/user-config-mac-x86_64.py
branches/soc-2013-motion_track/build_files/buildbot/config/user-config-player-glibc211-i686.py
branches/soc-2013-motion_track/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
branches/soc-2013-motion_track/build_files/buildbot/slave_compile.py
branches/soc-2013-motion_track/build_files/buildbot/slave_pack.py
branches/soc-2013-motion_track/build_files/buildbot/slave_test.py
branches/soc-2013-motion_track/build_files/cmake/Modules/FindPythonLibsUnix.cmake
branches/soc-2013-motion_track/build_files/cmake/macros.cmake
branches/soc-2013-motion_track/build_files/scons/config/darwin-config.py
branches/soc-2013-motion_track/build_files/scons/config/linux-config.py
branches/soc-2013-motion_track/build_files/scons/config/win32-mingw-config.py
branches/soc-2013-motion_track/build_files/scons/config/win32-vc-config.py
branches/soc-2013-motion_track/build_files/scons/config/win64-mingw-config.py
branches/soc-2013-motion_track/build_files/scons/config/win64-vc-config.py
branches/soc-2013-motion_track/build_files/scons/tools/Blender.py
branches/soc-2013-motion_track/build_files/scons/tools/btools.py
branches/soc-2013-motion_track/doc/doxygen/Doxyfile
branches/soc-2013-motion_track/doc/python_api/examples/bpy.app.translations.py
branches/soc-2013-motion_track/doc/python_api/examples/bpy.types.WindowManager.popup_menu.py
branches/soc-2013-motion_track/doc/python_api/examples/mathutils.Vector.py
branches/soc-2013-motion_track/extern/libredcode/codec.c
branches/soc-2013-motion_track/extern/libredcode/codec.h
branches/soc-2013-motion_track/extern/libredcode/debayer.c
branches/soc-2013-motion_track/extern/libredcode/debayer.h
branches/soc-2013-motion_track/extern/libredcode/format.c
branches/soc-2013-motion_track/extern/libredcode/format.h
branches/soc-2013-motion_track/intern/audaspace/intern/AUD_Sequencer.cpp
branches/soc-2013-motion_track/intern/audaspace/intern/AUD_SequencerReader.cpp
branches/soc-2013-motion_track/intern/audaspace/jack/AUD_JackLibrary.cpp
branches/soc-2013-motion_track/intern/audaspace/jack/AUD_JackLibrary.h
branches/soc-2013-motion_track/intern/bsp/CMakeLists.txt
branches/soc-2013-motion_track/intern/cycles/CMakeLists.txt
branches/soc-2013-motion_track/intern/cycles/SConscript
branches/soc-2013-motion_track/intern/cycles/blender/addon/__init__.py
branches/soc-2013-motion_track/intern/cycles/blender/addon/properties.py
branches/soc-2013-motion_track/intern/cycles/blender/addon/ui.py
branches/soc-2013-motion_track/intern/cycles/blender/blender_curves.cpp
branches/soc-2013-motion_track/intern/cycles/blender/blender_mesh.cpp
branches/soc-2013-motion_track/intern/cycles/blender/blender_object.cpp
branches/soc-2013-motion_track/intern/cycles/blender/blender_session.cpp
branches/soc-2013-motion_track/intern/cycles/blender/blender_shader.cpp
branches/soc-2013-motion_track/intern/cycles/blender/blender_sync.h
branches/soc-2013-motion_track/intern/cycles/bvh/bvh.cpp
branches/soc-2013-motion_track/intern/cycles/device/device_cuda.cpp
branches/soc-2013-motion_track/intern/cycles/device/device_opencl.cpp
branches/soc-2013-motion_track/intern/cycles/kernel/CMakeLists.txt
branches/soc-2013-motion_track/intern/cycles/kernel/SConscript
branches/soc-2013-motion_track/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
branches/soc-2013-motion_track/intern/cycles/kernel/closure/bsdf_phong_ramp.h
branches/soc-2013-motion_track/intern/cycles/kernel/kernel.cl
branches/soc-2013-motion_track/intern/cycles/kernel/kernel_bvh.h
branches/soc-2013-motion_track/intern/cycles/kernel/kernel_bvh_traversal.h
branches/soc-2013-motion_track/intern/cycles/kernel/kernel_camera.h
branches/soc-2013-motion_track/intern/cycles/kernel/kernel_compat_opencl.h
branches/soc-2013-motion_track/intern/cycles/kernel/kernel_displace.h
branches/soc-2013-motion_track/intern/cycles/kernel/kernel_emission.h
branches/soc-2013-motion_track/intern/cycles/kernel/kernel_jitter.h
branches/soc-2013-motion_track/intern/cycles/kernel/kernel_path.h
branches/soc-2013-motion_track/intern/cycles/kernel/kernel_random.h
branches/soc-2013-motion_track/intern/cycles/kernel/kernel_shader.h
branches/soc-2013-motion_track/intern/cycles/kernel/kernel_sse2.cpp
branches/soc-2013-motion_track/intern/cycles/kernel/kernel_sse3.cpp
branches/soc-2013-motion_track/intern/cycles/kernel/kernel_types.h
branches/soc-2013-motion_track/intern/cycles/kernel/osl/osl_services.cpp
branches/soc-2013-motion_track/intern/cycles/kernel/osl/osl_services.h
branches/soc-2013-motion_track/intern/cycles/kernel/osl/osl_shader.cpp
branches/soc-2013-motion_track/intern/cycles/kernel/shaders/CMakeLists.txt
branches/soc-2013-motion_track/intern/cycles/kernel/shaders/SConscript
branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_brick_texture.osl
branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_bump.osl
branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_color.h
branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_environment_texture.osl
branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_image_texture.osl
branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_texture.h
branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_toon_bsdf.osl
branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_wavelength.osl
branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_wireframe.osl
branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_brick.h
branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_wavelength.h
branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_wireframe.h
branches/soc-2013-motion_track/intern/cycles/render/background.cpp
branches/soc-2013-motion_track/intern/cycles/render/background.h
branches/soc-2013-motion_track/intern/cycles/render/buffers.cpp
branches/soc-2013-motion_track/intern/cycles/render/film.cpp
branches/soc-2013-motion_track/intern/cycles/render/graph.cpp
branches/soc-2013-motion_track/intern/cycles/render/graph.h
branches/soc-2013-motion_track/intern/cycles/render/light.cpp
branches/soc-2013-motion_track/intern/cycles/render/mesh.cpp
branches/soc-2013-motion_track/intern/cycles/render/mesh.h
branches/soc-2013-motion_track/intern/cycles/render/nodes.cpp
branches/soc-2013-motion_track/intern/cycles/render/nodes.h
branches/soc-2013-motion_track/intern/cycles/render/object.cpp
branches/soc-2013-motion_track/intern/cycles/render/osl.cpp
branches/soc-2013-motion_track/intern/cycles/render/scene.h
branches/soc-2013-motion_track/intern/cycles/render/session.cpp
branches/soc-2013-motion_track/intern/cycles/render/shader.cpp
branches/soc-2013-motion_track/intern/cycles/render/shader.h
branches/soc-2013-motion_track/intern/cycles/render/svm.cpp
branches/soc-2013-motion_track/intern/cycles/render/tables.cpp
branches/soc-2013-motion_track/intern/cycles/util/util_cuda.cpp
branches/soc-2013-motion_track/intern/cycles/util/util_cuda.h
branches/soc-2013-motion_track/intern/cycles/util/util_math.h
branches/soc-2013-motion_track/intern/cycles/util/util_system.cpp
branches/soc-2013-motion_track/intern/cycles/util/util_types.h
branches/soc-2013-motion_track/intern/cycles/util/util_vector.h
branches/soc-2013-motion_track/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2013-motion_track/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2013-motion_track/intern/iksolver/CMakeLists.txt
branches/soc-2013-motion_track/intern/locale/boost_locale_wrapper.cpp
branches/soc-2013-motion_track/release/datafiles/blender_icons.svg
branches/soc-2013-motion_track/release/datafiles/blender_icons16.png
branches/soc-2013-motion_track/release/datafiles/blender_icons32.png
branches/soc-2013-motion_track/release/datafiles/startup.blend
branches/soc-2013-motion_track/release/scripts/freestyle/style_modules/ChainingIterators.py
branches/soc-2013-motion_track/release/scripts/freestyle/style_modules/parameter_editor.py
branches/soc-2013-motion_track/release/scripts/modules/addon_utils.py
branches/soc-2013-motion_track/release/scripts/modules/bl_i18n_utils/settings.py
branches/soc-2013-motion_track/release/scripts/modules/bl_i18n_utils/utils_languages_menu.py
branches/soc-2013-motion_track/release/scripts/modules/bpy/utils.py
branches/soc-2013-motion_track/release/scripts/modules/bpy_extras/anim_utils.py
branches/soc-2013-motion_track/release/scripts/modules/console/complete_namespace.py
branches/soc-2013-motion_track/release/scripts/modules/nodeitems_utils.py
branches/soc-2013-motion_track/release/scripts/startup/bl_operators/anim.py
branches/soc-2013-motion_track/release/scripts/startup/bl_operators/node.py
branches/soc-2013-motion_track/release/scripts/startup/bl_operators/presets.py
branches/soc-2013-motion_track/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/soc-2013-motion_track/release/scripts/startup/bl_operators/view3d.py
branches/soc-2013-motion_track/release/scripts/startup/bl_operators/wm.py
branches/soc-2013-motion_track/release/scripts/startup/bl_ui/__init__.py
branches/soc-2013-motion_track/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2013-motion_track/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2013-motion_track/release/scripts/startup/bl_ui/properties_freestyle.py
branches/soc-2013-motion_track/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2013-motion_track/release/scripts/startup/bl_ui/properties_mask_common.py
branches/soc-2013-motion_track/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2013-motion_track/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2013-motion_track/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2013-motion_track/release/scripts/startup/bl_ui/space_image.py
branches/soc-2013-motion_track/release/scripts/startup/bl_ui/space_info.py
branches/soc-2013-motion_track/release/scripts/startup/bl_ui/space_node.py
branches/soc-2013-motion_track/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2013-motion_track/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-motion_track/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2013-motion_track/release/scripts/startup/nodeitems_builtins.py
branches/soc-2013-motion_track/release/scripts/templates_osl/ramp_closure.osl
branches/soc-2013-motion_track/release/scripts/templates_osl/temperature_to_rgb.osl
branches/soc-2013-motion_track/release/scripts/templates_osl/wavelength_to_rgb.osl
branches/soc-2013-motion_track/release/scripts/templates_osl/westin_closure.osl
branches/soc-2013-motion_track/release/text/readme.html
branches/soc-2013-motion_track/source/blender/blenfont/SConscript
branches/soc-2013-motion_track/source/blender/blenfont/intern/blf.c
branches/soc-2013-motion_track/source/blender/blenfont/intern/blf_dir.c
branches/soc-2013-motion_track/source/blender/blenfont/intern/blf_font.c
branches/soc-2013-motion_track/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2013-motion_track/source/blender/blenfont/intern/blf_internal_types.h
branches/soc-2013-motion_track/source/blender/blenfont/intern/blf_lang.c
branches/soc-2013-motion_track/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2013-motion_track/source/blender/blenkernel/BKE_blender.h
branches/soc-2013-motion_track/source/blender/blenkernel/BKE_bpath.h
branches/soc-2013-motion_track/source/blender/blenkernel/BKE_brush.h
branches/soc-2013-motion_track/source/blender/blenkernel/BKE_deform.h
branches/soc-2013-motion_track/source/blender/blenkernel/BKE_global.h
branches/soc-2013-motion_track/source/blender/blenkernel/BKE_idprop.h
branches/soc-2013-motion_track/source/blender/blenkernel/BKE_lattice.h
branches/soc-2013-motion_track/source/blender/blenkernel/BKE_mball.h
branches/soc-2013-motion_track/source/blender/blenkernel/BKE_mesh.h
branches/soc-2013-motion_track/source/blender/blenkernel/BKE_modifier.h
branches/soc-2013-motion_track/source/blender/blenkernel/BKE_object.h
branches/soc-2013-motion_track/source/blender/blenkernel/BKE_ocean.h
branches/soc-2013-motion_track/source/blender/blenkernel/BKE_particle.h
branches/soc-2013-motion_track/source/blender/blenkernel/BKE_report.h
branches/soc-2013-motion_track/source/blender/blenkernel/BKE_scene.h
branches/soc-2013-motion_track/source/blender/blenkernel/BKE_screen.h
branches/soc-2013-motion_track/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2013-motion_track/source/blender/blenkernel/BKE_speaker.h
branches/soc-2013-motion_track/source/blender/blenkernel/CMakeLists.txt
branches/soc-2013-motion_track/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/CCGSubSurf.h
branches/soc-2013-motion_track/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/anim.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/armature.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/blender.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/boids.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/bpath.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/brush.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/colortools.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/constraint.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/context.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/customdata.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/deform.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/displist.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/editmesh_bvh.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/effect.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/fcurve.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/font.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/image.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/image_gen.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/key.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/lattice.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/library.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/linestyle.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/mask_rasterize.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/material.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/mball.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/modifier.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/movieclip.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/node.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/object.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/packedFile.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/paint.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/particle.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/particle_system.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/rigidbody.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/scene.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/sequencer.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/speaker.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/text.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/tracking.c
branches/soc-2013-motion_track/source/blender/blenkernel/intern/unit.c
branches/soc-2013-motion_track/source/blender/blenlib/BLI_callbacks.h
branches/soc-2013-motion_track/source/blender/blenlib/BLI_edgehash.h
branches/soc-2013-motion_track/source/blender/blenlib/BLI_ghash.h
branches/soc-2013-motion_track/source/blender/blenlib/BLI_heap.h
branches/soc-2013-motion_track/source/blender/blenlib/BLI_kdtree.h
branches/soc-2013-motion_track/source/blender/blenlib/BLI_listbase.h
branches/soc-2013-motion_track/source/blender/blenlib/BLI_math_geom.h
branches/soc-2013-motion_track/source/blender/blenlib/BLI_math_rotation.h
branches/soc-2013-motion_track/source/blender/blenlib/BLI_math_vector.h
branches/soc-2013-motion_track/source/blender/blenlib/BLI_path_util.h
branches/soc-2013-motion_track/source/blender/blenlib/BLI_scanfill.h
branches/soc-2013-motion_track/source/blender/blenlib/BLI_smallhash.h
branches/soc-2013-motion_track/source/blender/blenlib/BLI_string.h
branches/soc-2013-motion_track/source/blender/blenlib/BLI_string_utf8.h
branches/soc-2013-motion_track/source/blender/blenlib/BLI_threads.h
branches/soc-2013-motion_track/source/blender/blenlib/BLI_utildefines.h
branches/soc-2013-motion_track/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2013-motion_track/source/blender/blenlib/intern/BLI_heap.c
branches/soc-2013-motion_track/source/blender/blenlib/intern/BLI_kdtree.c
branches/soc-2013-motion_track/source/blender/blenlib/intern/BLI_memarena.c
branches/soc-2013-motion_track/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2013-motion_track/source/blender/blenlib/intern/edgehash.c
branches/soc-2013-motion_track/source/blender/blenlib/intern/fileops.c
branches/soc-2013-motion_track/source/blender/blenlib/intern/graph.c
branches/soc-2013-motion_track/source/blender/blenlib/intern/listbase.c
branches/soc-2013-motion_track/source/blender/blenlib/intern/math_color_inline.c
branches/soc-2013-motion_track/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-motion_track/source/blender/blenlib/intern/math_matrix.c
branches/soc-2013-motion_track/source/blender/blenlib/intern/math_rotation.c
branches/soc-2013-motion_track/source/blender/blenlib/intern/math_vector.c
branches/soc-2013-motion_track/source/blender/blenlib/intern/path_util.c
branches/soc-2013-motion_track/source/blender/blenlib/intern/scanfill.c
branches/soc-2013-motion_track/source/blender/blenlib/intern/smallhash.c
branches/soc-2013-motion_track/source/blender/blenlib/intern/string.c
branches/soc-2013-motion_track/source/blender/blenlib/intern/string_utf8.c
branches/soc-2013-motion_track/source/blender/blenlib/intern/threads.c
branches/soc-2013-motion_track/source/blender/blenlib/intern/winstuff.c
branches/soc-2013-motion_track/source/blender/blenloader/intern/readfile.c
branches/soc-2013-motion_track/source/blender/blenloader/intern/versioning_250.c
branches/soc-2013-motion_track/source/blender/blenloader/intern/versioning_legacy.c
branches/soc-2013-motion_track/source/blender/blenloader/intern/writefile.c
branches/soc-2013-motion_track/source/blender/bmesh/CMakeLists.txt
branches/soc-2013-motion_track/source/blender/bmesh/bmesh_class.h
branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_construct.h
branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_core.h
branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_edgeloop.c
branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_interp.c
branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_iterators.h
branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_marking.c
branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_marking.h
branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_mesh.c
branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_mesh_conv.h
branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_mods.c
branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_operators_private.h
branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_polygon.h
branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_queries.h
branches/soc-2013-motion_track/source/blender/bmesh/intern/bmesh_walkers.c
branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_beautify.c
branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_bridge.c
branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_connect.c
branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_fill_edgeloop.c
branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_mirror.c
branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_poke.c
branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_subdivide.c
branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_wireframe.c
branches/soc-2013-motion_track/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2013-motion_track/source/blender/bmesh/tools/bmesh_decimate_collapse.c
branches/soc-2013-motion_track/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
branches/soc-2013-motion_track/source/blender/bmesh/tools/bmesh_path.c
branches/soc-2013-motion_track/source/blender/collada/AnimationExporter.cpp
branches/soc-2013-motion_track/source/blender/collada/AnimationExporter.h
branches/soc-2013-motion_track/source/blender/collada/AnimationImporter.cpp
branches/soc-2013-motion_track/source/blender/collada/ArmatureImporter.cpp
branches/soc-2013-motion_track/source/blender/collada/ArmatureImporter.h
branches/soc-2013-motion_track/source/blender/collada/DocumentImporter.cpp
branches/soc-2013-motion_track/source/blender/collada/SkinInfo.cpp
branches/soc-2013-motion_track/source/blender/collada/TransformWriter.cpp
branches/soc-2013-motion_track/source/blender/compositor/SConscript
branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_MixNode.cpp
branches/soc-2013-motion_track/source/blender/compositor/nodes/COM_ZCombineNode.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_KeyingScreenOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixBaseOperation.cpp
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_MixBaseOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_TrackPositionOperation.h
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_WrapOperation.cpp
branches/soc-2013-motion_track/source/blender/editors/animation/anim_markers.c
branches/soc-2013-motion_track/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2013-motion_track/source/blender/editors/animation/keyframing.c
branches/soc-2013-motion_track/source/blender/editors/armature/armature_add.c
branches/soc-2013-motion_track/source/blender/editors/armature/armature_relations.c
branches/soc-2013-motion_track/source/blender/editors/armature/armature_select.c
branches/soc-2013-motion_track/source/blender/editors/armature/armature_skinning.c
branches/soc-2013-motion_track/source/blender/editors/armature/armature_utils.c
branches/soc-2013-motion_track/source/blender/editors/armature/editarmature_generate.c
branches/soc-2013-motion_track/source/blender/editors/armature/meshlaplacian.c
branches/soc-2013-motion_track/source/blender/editors/armature/meshlaplacian.h
branches/soc-2013-motion_track/source/blender/editors/curve/curve_ops.c
branches/soc-2013-motion_track/source/blender/editors/curve/editcurve.c
branches/soc-2013-motion_track/source/blender/editors/curve/editfont.c
branches/soc-2013-motion_track/source/blender/editors/curve/lorem.c
branches/soc-2013-motion_track/source/blender/editors/include/ED_armature.h
branches/soc-2013-motion_track/source/blender/editors/include/ED_mesh.h
branches/soc-2013-motion_track/source/blender/editors/include/ED_object.h
branches/soc-2013-motion_track/source/blender/editors/include/ED_render.h
branches/soc-2013-motion_track/source/blender/editors/include/ED_screen.h
branches/soc-2013-motion_track/source/blender/editors/include/UI_interface.h
branches/soc-2013-motion_track/source/blender/editors/interface/interface.c
branches/soc-2013-motion_track/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-motion_track/source/blender/editors/interface/interface_intern.h
branches/soc-2013-motion_track/source/blender/editors/interface/interface_layout.c
branches/soc-2013-motion_track/source/blender/editors/interface/interface_panel.c
branches/soc-2013-motion_track/source/blender/editors/interface/interface_regions.c
branches/soc-2013-motion_track/source/blender/editors/interface/interface_style.c
branches/soc-2013-motion_track/source/blender/editors/interface/interface_templates.c
branches/soc-2013-motion_track/source/blender/editors/interface/interface_widgets.c
branches/soc-2013-motion_track/source/blender/editors/interface/resources.c
branches/soc-2013-motion_track/source/blender/editors/mask/mask_ops.c
branches/soc-2013-motion_track/source/blender/editors/mesh/editface.c
branches/soc-2013-motion_track/source/blender/editors/mesh/editmesh_add.c
branches/soc-2013-motion_track/source/blender/editors/mesh/editmesh_bevel.c
branches/soc-2013-motion_track/source/blender/editors/mesh/editmesh_inset.c
branches/soc-2013-motion_track/source/blender/editors/mesh/editmesh_loopcut.c
branches/soc-2013-motion_track/source/blender/editors/mesh/editmesh_path.c
branches/soc-2013-motion_track/source/blender/editors/mesh/editmesh_select.c
branches/soc-2013-motion_track/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-motion_track/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2013-motion_track/source/blender/editors/mesh/mesh_data.c
branches/soc-2013-motion_track/source/blender/editors/mesh/mesh_intern.h
branches/soc-2013-motion_track/source/blender/editors/mesh/mesh_navmesh.c
branches/soc-2013-motion_track/source/blender/editors/mesh/mesh_ops.c
branches/soc-2013-motion_track/source/blender/editors/mesh/meshtools.c
branches/soc-2013-motion_track/source/blender/editors/metaball/mball_ops.c
branches/soc-2013-motion_track/source/blender/editors/object/object_add.c
branches/soc-2013-motion_track/source/blender/editors/object/object_hook.c
branches/soc-2013-motion_track/source/blender/editors/object/object_intern.h
branches/soc-2013-motion_track/source/blender/editors/object/object_lattice.c
branches/soc-2013-motion_track/source/blender/editors/object/object_ops.c
branches/soc-2013-motion_track/source/blender/editors/object/object_relations.c
branches/soc-2013-motion_track/source/blender/editors/object/object_shapekey.c
branches/soc-2013-motion_track/source/blender/editors/object/object_transform.c
branches/soc-2013-motion_track/source/blender/editors/object/object_vgroup.c
branches/soc-2013-motion_track/source/blender/editors/physics/particle_edit.c
branches/soc-2013-motion_track/source/blender/editors/physics/physics_ops.c
branches/soc-2013-motion_track/source/blender/editors/render/render_intern.h
branches/soc-2013-motion_track/source/blender/editors/render/render_internal.c
branches/soc-2013-motion_track/source/blender/editors/render/render_opengl.c
branches/soc-2013-motion_track/source/blender/editors/render/render_preview.c
branches/soc-2013-motion_track/source/blender/editors/render/render_update.c
branches/soc-2013-motion_track/source/blender/editors/screen/area.c
branches/soc-2013-motion_track/source/blender/editors/screen/screen_edit.c
branches/soc-2013-motion_track/source/blender/editors/screen/screen_ops.c
branches/soc-2013-motion_track/source/blender/editors/screen/screendump.c
branches/soc-2013-motion_track/source/blender/editors/sculpt_paint/CMakeLists.txt
branches/soc-2013-motion_track/source/blender/editors/sculpt_paint/paint_hide.c
branches/soc-2013-motion_track/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2013-motion_track/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2013-motion_track/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2013-motion_track/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2013-motion_track/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2013-motion_track/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-motion_track/source/blender/editors/sound/sound_ops.c
branches/soc-2013-motion_track/source/blender/editors/space_action/space_action.c
branches/soc-2013-motion_track/source/blender/editors/space_api/spacetypes.c
branches/soc-2013-motion_track/source/blender/editors/space_buttons/CMakeLists.txt
branches/soc-2013-motion_track/source/blender/editors/space_buttons/buttons_intern.h
branches/soc-2013-motion_track/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2013-motion_track/source/blender/editors/space_clip/clip_buttons.c
branches/soc-2013-motion_track/source/blender/editors/space_clip/clip_dopesheet_draw.c
branches/soc-2013-motion_track/source/blender/editors/space_clip/clip_ops.c
branches/soc-2013-motion_track/source/blender/editors/space_clip/space_clip.c
branches/soc-2013-motion_track/source/blender/editors/space_console/space_console.c
branches/soc-2013-motion_track/source/blender/editors/space_file/file_intern.h
branches/soc-2013-motion_track/source/blender/editors/space_file/filelist.c
branches/soc-2013-motion_track/source/blender/editors/space_file/filesel.c
branches/soc-2013-motion_track/source/blender/editors/space_file/space_file.c
branches/soc-2013-motion_track/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2013-motion_track/source/blender/editors/space_graph/graph_draw.c
branches/soc-2013-motion_track/source/blender/editors/space_graph/space_graph.c
branches/soc-2013-motion_track/source/blender/editors/space_image/image_ops.c
branches/soc-2013-motion_track/source/blender/editors/space_image/space_image.c
branches/soc-2013-motion_track/source/blender/editors/space_info/info_ops.c
branches/soc-2013-motion_track/source/blender/editors/space_info/space_info.c
branches/soc-2013-motion_track/source/blender/editors/space_logic/logic_ops.c
branches/soc-2013-motion_track/source/blender/editors/space_logic/space_logic.c
branches/soc-2013-motion_track/source/blender/editors/space_nla/nla_channels.c
branches/soc-2013-motion_track/source/blender/editors/space_nla/nla_edit.c
branches/soc-2013-motion_track/source/blender/editors/space_nla/nla_intern.h
branches/soc-2013-motion_track/source/blender/editors/space_nla/nla_ops.c
branches/soc-2013-motion_track/source/blender/editors/space_nla/space_nla.c
branches/soc-2013-motion_track/source/blender/editors/space_node/drawnode.c
branches/soc-2013-motion_track/source/blender/editors/space_node/node_draw.c
branches/soc-2013-motion_track/source/blender/editors/space_node/node_edit.c
branches/soc-2013-motion_track/source/blender/editors/space_node/node_select.c
branches/soc-2013-motion_track/source/blender/editors/space_node/space_node.c
branches/soc-2013-motion_track/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2013-motion_track/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2013-motion_track/source/blender/editors/space_outliner/outliner_intern.h
branches/soc-2013-motion_track/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2013-motion_track/source/blender/editors/space_script/script_edit.c
branches/soc-2013-motion_track/source/blender/editors/space_script/space_script.c
branches/soc-2013-motion_track/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2013-motion_track/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2013-motion_track/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2013-motion_track/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2013-motion_track/source/blender/editors/space_text/space_text.c
branches/soc-2013-motion_track/source/blender/editors/space_text/text_autocomplete.c
branches/soc-2013-motion_track/source/blender/editors/space_text/text_format_lua.c
branches/soc-2013-motion_track/source/blender/editors/space_text/text_format_osl.c
branches/soc-2013-motion_track/source/blender/editors/space_text/text_format_py.c
branches/soc-2013-motion_track/source/blender/editors/space_text/text_ops.c
branches/soc-2013-motion_track/source/blender/editors/space_time/space_time.c
branches/soc-2013-motion_track/source/blender/editors/space_userpref/space_userpref.c
branches/soc-2013-motion_track/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2013-motion_track/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-motion_track/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2013-motion_track/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2013-motion_track/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2013-motion_track/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2013-motion_track/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2013-motion_track/source/blender/editors/space_view3d/view3d_iterators.c
branches/soc-2013-motion_track/source/blender/editors/space_view3d/view3d_project.c
branches/soc-2013-motion_track/source/blender/editors/space_view3d/view3d_ruler.c
branches/soc-2013-motion_track/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2013-motion_track/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2013-motion_track/source/blender/editors/transform/transform.c
branches/soc-2013-motion_track/source/blender/editors/transform/transform.h
branches/soc-2013-motion_track/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-motion_track/source/blender/editors/transform/transform_generics.c
branches/soc-2013-motion_track/source/blender/editors/transform/transform_manipulator.c
branches/soc-2013-motion_track/source/blender/editors/transform/transform_ops.c
branches/soc-2013-motion_track/source/blender/editors/transform/transform_orientations.c
branches/soc-2013-motion_track/source/blender/editors/transform/transform_snap.c
branches/soc-2013-motion_track/source/blender/editors/util/numinput.c
branches/soc-2013-motion_track/source/blender/editors/util/undo.c
branches/soc-2013-motion_track/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2013-motion_track/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2013-motion_track/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2013-motion_track/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2013-motion_track/source/blender/freestyle/SConscript
branches/soc-2013-motion_track/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
branches/soc-2013-motion_track/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
branches/soc-2013-motion_track/source/blender/freestyle/intern/python/BPy_ContextFunctions.cpp
branches/soc-2013-motion_track/source/blender/freestyle/intern/stroke/Canvas.h
branches/soc-2013-motion_track/source/blender/freestyle/intern/stroke/ContextFunctions.cpp
branches/soc-2013-motion_track/source/blender/freestyle/intern/stroke/ContextFunctions.h
branches/soc-2013-motion_track/source/blender/freestyle/intern/stroke/StrokeIterators.h
branches/soc-2013-motion_track/source/blender/freestyle/intern/stroke/StrokeRep.cpp
branches/soc-2013-motion_track/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.cpp
branches/soc-2013-motion_track/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.cpp
branches/soc-2013-motion_track/source/blender/freestyle/intern/view_map/BoxGrid.cpp
branches/soc-2013-motion_track/source/blender/freestyle/intern/view_map/GridDensityProvider.h
branches/soc-2013-motion_track/source/blender/freestyle/intern/view_map/Pow23GridDensityProvider.cpp
branches/soc-2013-motion_track/source/blender/freestyle/intern/view_map/SphericalGrid.cpp
branches/soc-2013-motion_track/source/blender/freestyle/intern/view_map/SteerableViewMap.h
branches/soc-2013-motion_track/source/blender/freestyle/intern/view_map/ViewMap.cpp
branches/soc-2013-motion_track/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
branches/soc-2013-motion_track/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2013-motion_track/source/blender/gpu/intern/gpu_draw.c
branches/soc-2013-motion_track/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/soc-2013-motion_track/source/blender/ikplugin/intern/ikplugin_api.c
branches/soc-2013-motion_track/source/blender/imbuf/IMB_imbuf_types.h
branches/soc-2013-motion_track/source/blender/imbuf/intern/colormanagement.c
branches/soc-2013-motion_track/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
branches/soc-2013-motion_track/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2013-motion_track/source/blender/imbuf/intern/thumbs.c
branches/soc-2013-motion_track/source/blender/imbuf/intern/tiff.c
branches/soc-2013-motion_track/source/blender/imbuf/intern/util.c
branches/soc-2013-motion_track/source/blender/makesdna/DNA_curve_types.h
branches/soc-2013-motion_track/source/blender/makesdna/DNA_key_types.h
branches/soc-2013-motion_track/source/blender/makesdna/DNA_lattice_types.h
branches/soc-2013-motion_track/source/blender/makesdna/DNA_particle_types.h
branches/soc-2013-motion_track/source/blender/makesdna/DNA_scene_types.h
branches/soc-2013-motion_track/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2013-motion_track/source/blender/makesdna/intern/makesdna.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2013-motion_track/source/blender/makesrna/intern/makesrna.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_access.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_armature.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_brush.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_curve.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_image.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_internal.h
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_key.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_lattice.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_material.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_mesh_utils.h
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_meta.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_object.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_particle.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_render.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_scene.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_space.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_wm.c
branches/soc-2013-motion_track/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2013-motion_track/source/blender/modifiers/intern/MOD_multires.c
branches/soc-2013-motion_track/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2013-motion_track/source/blender/modifiers/intern/MOD_skin.c
branches/soc-2013-motion_track/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2013-motion_track/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
branches/soc-2013-motion_track/source/blender/nodes/intern/node_socket.c
branches/soc-2013-motion_track/source/blender/nodes/shader/nodes/node_shader_bsdf_toon.c
branches/soc-2013-motion_track/source/blender/nodes/shader/nodes/node_shader_wavelength.c
branches/soc-2013-motion_track/source/blender/nodes/shader/nodes/node_shader_wireframe.c
branches/soc-2013-motion_track/source/blender/python/BPY_extern.h
branches/soc-2013-motion_track/source/blender/python/bmesh/bmesh_py_api.c
branches/soc-2013-motion_track/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2013-motion_track/source/blender/python/generic/bgl.c
branches/soc-2013-motion_track/source/blender/python/generic/bgl.h
branches/soc-2013-motion_track/source/blender/python/generic/bpy_internal_import.c
branches/soc-2013-motion_track/source/blender/python/generic/bpy_internal_import.h
branches/soc-2013-motion_track/source/blender/python/generic/idprop_py_api.c
branches/soc-2013-motion_track/source/blender/python/intern/bpy.c
branches/soc-2013-motion_track/source/blender/python/intern/bpy_rna_array.c
branches/soc-2013-motion_track/source/blender/python/mathutils/mathutils.c
branches/soc-2013-motion_track/source/blender/python/mathutils/mathutils.h
branches/soc-2013-motion_track/source/blender/python/mathutils/mathutils_Color.h
branches/soc-2013-motion_track/source/blender/python/mathutils/mathutils_Euler.c
branches/soc-2013-motion_track/source/blender/python/mathutils/mathutils_Euler.h
branches/soc-2013-motion_track/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2013-motion_track/source/blender/python/mathutils/mathutils_Matrix.h
branches/soc-2013-motion_track/source/blender/python/mathutils/mathutils_Quaternion.c
branches/soc-2013-motion_track/source/blender/python/mathutils/mathutils_Quaternion.h
branches/soc-2013-motion_track/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2013-motion_track/source/blender/python/mathutils/mathutils_Vector.h
branches/soc-2013-motion_track/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2013-motion_track/source/blender/python/mathutils/mathutils_geometry.h
branches/soc-2013-motion_track/source/blender/python/mathutils/mathutils_noise.c
branches/soc-2013-motion_track/source/blender/render/extern/include/RE_engine.h
branches/soc-2013-motion_track/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2013-motion_track/source/blender/render/intern/include/strand.h
branches/soc-2013-motion_track/source/blender/render/intern/source/bake.c
branches/soc-2013-motion_track/source/blender/render/intern/source/convertblender.c
branches/soc-2013-motion_track/source/blender/render/intern/source/envmap.c
branches/soc-2013-motion_track/source/blender/render/intern/source/external_engine.c
branches/soc-2013-motion_track/source/blender/render/intern/source/initrender.c
branches/soc-2013-motion_track/source/blender/render/intern/source/pipeline.c
branches/soc-2013-motion_track/source/blender/render/intern/source/render_texture.c
branches/soc-2013-motion_track/source/blender/render/intern/source/shadeinput.c
branches/soc-2013-motion_track/source/blender/render/intern/source/shadeoutput.c
branches/soc-2013-motion_track/source/blender/render/intern/source/strand.c
branches/soc-2013-motion_track/source/blender/render/intern/source/voxeldata.c
branches/soc-2013-motion_track/source/blender/render/intern/source/zbuf.c
branches/soc-2013-motion_track/source/blender/windowmanager/WM_api.h
branches/soc-2013-motion_track/source/blender/windowmanager/WM_types.h
branches/soc-2013-motion_track/source/blender/windowmanager/intern/wm_cursors.c
branches/soc-2013-motion_track/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2013-motion_track/source/blender/windowmanager/intern/wm_files.c
branches/soc-2013-motion_track/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2013-motion_track/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2013-motion_track/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2013-motion_track/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-motion_track/source/blender/windowmanager/intern/wm_playanim.c
branches/soc-2013-motion_track/source/blender/windowmanager/wm_event_types.h
branches/soc-2013-motion_track/source/creator/CMakeLists.txt
branches/soc-2013-motion_track/source/creator/creator.c
branches/soc-2013-motion_track/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/soc-2013-motion_track/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/soc-2013-motion_track/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2013-motion_track/source/gameengine/Converter/CMakeLists.txt
branches/soc-2013-motion_track/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2013-motion_track/source/gameengine/Expressions/CMakeLists.txt
branches/soc-2013-motion_track/source/gameengine/GameLogic/CMakeLists.txt
branches/soc-2013-motion_track/source/gameengine/GameLogic/SCA_IInputDevice.h
branches/soc-2013-motion_track/source/gameengine/GamePlayer/common/CMakeLists.txt
branches/soc-2013-motion_track/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
branches/soc-2013-motion_track/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/soc-2013-motion_track/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/soc-2013-motion_track/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2013-motion_track/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp
branches/soc-2013-motion_track/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2013-motion_track/source/gameengine/Ketsji/BL_Action.cpp
branches/soc-2013-motion_track/source/gameengine/Ketsji/BL_BlenderShader.cpp
branches/soc-2013-motion_track/source/gameengine/Ketsji/BL_Material.cpp
branches/soc-2013-motion_track/source/gameengine/Ketsji/BL_Shader.cpp
branches/soc-2013-motion_track/source/gameengine/Ketsji/BL_Texture.cpp
branches/soc-2013-motion_track/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2013-motion_track/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
branches/soc-2013-motion_track/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2013-motion_track/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/soc-2013-motion_track/source/gameengine/Ketsji/KX_CharacterWrapper.cpp
branches/soc-2013-motion_track/source/gameengine/Ketsji/KX_Dome.cpp
branches/soc-2013-motion_track/source/gameengine/Ketsji/KX_IPO_SGController.cpp
branches/soc-2013-motion_track/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2013-motion_track/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/soc-2013-motion_track/source/gameengine/Ketsji/KX_MaterialIpoController.cpp
branches/soc-2013-motion_track/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2013-motion_track/source/gameengine/Ketsji/KX_PythonSeq.cpp
branches/soc-2013-motion_track/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2013-motion_track/source/gameengine/Ketsji/KX_Scene.h
branches/soc-2013-motion_track/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
branches/soc-2013-motion_track/source/gameengine/Network/CMakeLists.txt
branches/soc-2013-motion_track/source/gameengine/Physics/Bullet/CMakeLists.txt
branches/soc-2013-motion_track/source/gameengine/Physics/Dummy/CMakeLists.txt
branches/soc-2013-motion_track/source/gameengine/Rasterizer/CMakeLists.txt
branches/soc-2013-motion_track/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
branches/soc-2013-motion_track/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
branches/soc-2013-motion_track/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/soc-2013-motion_track/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/soc-2013-motion_track/source/gameengine/SceneGraph/CMakeLists.txt
branches/soc-2013-motion_track/source/gameengine/VideoTexture/CMakeLists.txt
branches/soc-2013-motion_track/source/gameengine/VideoTexture/ImageRender.cpp
branches/soc-2013-motion_track/source/gameengine/VideoTexture/VideoFFmpeg.cpp
branches/soc-2013-motion_track/source/tests/bl_run_operators.py
branches/soc-2013-motion_track/source/tools/spell_check_source.py
Added Paths:
-----------
branches/soc-2013-motion_track/release/scripts/modules/rna_keymap_ui.py
branches/soc-2013-motion_track/release/scripts/startup/bl_ui/space_properties.py
branches/soc-2013-motion_track/source/blender/blenkernel/BKE_autoexec.h
branches/soc-2013-motion_track/source/blender/blenkernel/intern/autoexec.c
branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_connect_pair.c
branches/soc-2013-motion_track/source/blender/bmesh/operators/bmo_normals.c
branches/soc-2013-motion_track/source/blender/editors/sculpt_paint/paint_vertex_proj.c
Removed Paths:
-------------
branches/soc-2013-motion_track/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/soc-2013-motion_track/source/blender/blenkernel/BKE_script.h
branches/soc-2013-motion_track/source/blender/blenkernel/intern/script.c
branches/soc-2013-motion_track/source/blender/editors/space_buttons/buttons_header.c
Property Changed:
----------------
branches/soc-2013-motion_track/
branches/soc-2013-motion_track/extern/carve/include/carve/aabb.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/aabb_impl.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/carve.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/classification.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/collection/unordered/boost_impl.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/collection/unordered/fallback_impl.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/collection/unordered/libstdcpp_impl.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/collection/unordered/std_impl.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/collection/unordered/tr1_impl.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/collection/unordered/vcpp_impl.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/collection/unordered.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/collection.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/collection_types.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/colour.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/convex_hull.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/csg.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/csg_triangulator.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/debug_hooks.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/djset.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/edge_decl.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/edge_impl.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/exact.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/external/boost/random.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/face_decl.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/face_impl.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/faceloop.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/geom.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/geom2d.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/geom3d.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/geom_impl.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/heap.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/input.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/interpolator.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/intersection.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/iobj.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/kd_node.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/math.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/math_constants.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/matrix.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/mesh.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/mesh_impl.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/mesh_ops.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/mesh_simplify.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/octree_decl.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/octree_impl.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/pointset.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/pointset_decl.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/pointset_impl.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/pointset_iter.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/poly.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/poly_decl.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/poly_impl.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/polyhedron_base.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/polyhedron_decl.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/polyhedron_impl.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/polyline.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/polyline_decl.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/polyline_impl.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/polyline_iter.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/rescale.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/rtree.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/spacetree.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/tag.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/timing.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/tree.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/triangulator.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/triangulator_impl.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/util.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/vector.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/vertex_decl.hpp
branches/soc-2013-motion_track/extern/carve/include/carve/vertex_impl.hpp
branches/soc-2013-motion_track/extern/carve/lib/csg_collector.hpp
branches/soc-2013-motion_track/extern/carve/lib/csg_data.hpp
branches/soc-2013-motion_track/extern/carve/lib/csg_detail.hpp
branches/soc-2013-motion_track/extern/carve/lib/intersect_classify_common.hpp
branches/soc-2013-motion_track/extern/carve/lib/intersect_classify_common_impl.hpp
branches/soc-2013-motion_track/extern/carve/lib/intersect_common.hpp
branches/soc-2013-motion_track/extern/carve/lib/intersect_debug.hpp
branches/soc-2013-motion_track/extern/carve/patches/files/random.hpp
branches/soc-2013-motion_track/extern/libmv/libmv/simple_pipeline/keyframe_selection.cc
branches/soc-2013-motion_track/extern/libmv/libmv/simple_pipeline/keyframe_selection.h
branches/soc-2013-motion_track/extern/libmv/libmv/simple_pipeline/reconstruction_scale.cc
branches/soc-2013-motion_track/extern/libmv/libmv/simple_pipeline/reconstruction_scale.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/include/ceres/autodiff_local_parameterization.h
branches/soc-2013-motion_track/extern/libmv/third_party/ceres/include/ceres/internal/numeric_diff.h
branches/soc-2013-motion_track/intern/cycles/kernel/kernel.cl
branches/soc-2013-motion_track/intern/cycles/kernel/kernel.cu
branches/soc-2013-motion_track/intern/cycles/kernel/kernel_bvh_traversal.h
branches/soc-2013-motion_track/intern/cycles/kernel/kernel_jitter.h
branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_toon_bsdf.osl
branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_wavelength.osl
branches/soc-2013-motion_track/intern/cycles/kernel/shaders/node_wireframe.osl
branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_wavelength.h
branches/soc-2013-motion_track/intern/cycles/kernel/svm/svm_wireframe.h
branches/soc-2013-motion_track/release/scripts/modules/nodeitems_utils.py
branches/soc-2013-motion_track/release/scripts/startup/nodeitems_builtins.py
branches/soc-2013-motion_track/release/scripts/templates_osl/ramp_closure.osl
branches/soc-2013-motion_track/release/scripts/templates_osl/temperature_to_rgb.osl
branches/soc-2013-motion_track/release/scripts/templates_osl/wavelength_to_rgb.osl
branches/soc-2013-motion_track/release/scripts/templates_osl/westin_closure.osl
branches/soc-2013-motion_track/source/blender/blenlib/BLI_math_color_blend.h
branches/soc-2013-motion_track/source/blender/blenlib/intern/math_color_blend_inline.c
branches/soc-2013-motion_track/source/blender/compositor/operations/COM_OpenCLKernels.cl
branches/soc-2013-motion_track/source/blender/editors/include/ED_buttons.h
branches/soc-2013-motion_track/source/blender/editors/interface/interface.c
branches/soc-2013-motion_track/source/blender/editors/space_outliner/
branches/soc-2013-motion_track/source/blender/nodes/shader/nodes/node_shader_bsdf_toon.c
branches/soc-2013-motion_track/source/blender/nodes/shader/nodes/node_shader_wavelength.c
branches/soc-2013-motion_track/source/blender/nodes/shader/nodes/node_shader_wireframe.c
Property changes on: branches/soc-2013-motion_track
___________________________________________________________________
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,52854-52856,54573
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57391-57521
+ /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,52854-52856,54573
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57391-58267
Modified: branches/soc-2013-motion_track/CMakeLists.txt
===================================================================
--- branches/soc-2013-motion_track/CMakeLists.txt 2013-07-15 11:26:43 UTC (rev 58267)
+++ branches/soc-2013-motion_track/CMakeLists.txt 2013-07-15 14:19:02 UTC (rev 58268)
@@ -264,7 +264,7 @@
option(WITH_CYCLES_TEST "Build cycles test application" OFF)
option(WITH_CYCLES_OSL "Build Cycles with OSL support" OFF)
option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF)
-set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 CACHE STRING "CUDA architectures to build binaries for")
+set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 sm_35 CACHE STRING "CUDA architectures to build binaries for")
mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
unset(PLATFORM_DEFAULT)
@@ -562,12 +562,12 @@
if(UNIX AND NOT APPLE)
macro(find_package_wrapper)
string(TOUPPER ${ARGV0} _NAME_UPPER)
- if(${WITH_STATIC_LIBS})
+ 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})
+ if(WITH_STATIC_LIBS)
set(CMAKE_FIND_LIBRARY_SUFFIXES ${_cmake_find_library_suffixes_back})
unset(_cmake_find_library_suffixes_back)
endif()
@@ -707,7 +707,7 @@
if(WITH_BOOST)
# uses in build instructions to override include and library variables
if(NOT BOOST_CUSTOM)
- if(${WITH_STATIC_LIBS})
+ if(WITH_STATIC_LIBS)
set(Boost_USE_STATIC_LIBS ON)
endif()
set(Boost_USE_MULTITHREADED ON)
@@ -1124,26 +1124,22 @@
${OPENCOLLADA}/include/opencollada/COLLADASaxFrameworkLoader
${OPENCOLLADA}/include/opencollada/GeneratedSaxParser
)
- set_lib_path(OPENCOLLADA_LIBPATH "opencollada")
set(OPENCOLLADA_LIBRARIES
- ${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADASaxFrameworkLoader.lib
- ${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADAFramework.lib
- ${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADABaseUtils.lib
- ${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADAStreamWriter.lib
- ${OPENCOLLADA_LIBPATH}/lib/opencollada/MathMLSolver.lib
- ${OPENCOLLADA_LIBPATH}/lib/opencollada/GeneratedSaxParser.lib
- ${OPENCOLLADA_LIBPATH}/lib/opencollada/xml.lib
- ${OPENCOLLADA_LIBPATH}/lib/opencollada/buffer.lib
- ${OPENCOLLADA_LIBPATH}/lib/opencollada/ftoa.lib
- ${OPENCOLLADA_LIBPATH}/lib/opencollada/UTF.lib
+ ${OPENCOLLADA}/lib/opencollada/OpenCOLLADASaxFrameworkLoader.lib
+ ${OPENCOLLADA}/lib/opencollada/OpenCOLLADAFramework.lib
+ ${OPENCOLLADA}/lib/opencollada/OpenCOLLADABaseUtils.lib
+ ${OPENCOLLADA}/lib/opencollada/OpenCOLLADAStreamWriter.lib
+ ${OPENCOLLADA}/lib/opencollada/MathMLSolver.lib
+ ${OPENCOLLADA}/lib/opencollada/GeneratedSaxParser.lib
+ ${OPENCOLLADA}/lib/opencollada/xml.lib
+ ${OPENCOLLADA}/lib/opencollada/buffer.lib
+ ${OPENCOLLADA}/lib/opencollada/ftoa.lib
+ ${OPENCOLLADA}/lib/opencollada/UTF.lib
)
set(PCRE_LIBRARIES
- ${OPENCOLLADA_LIBPATH}/lib/opencollada/pcre.lib
+ ${OPENCOLLADA}/lib/opencollada/pcre.lib
)
-
- unset(OPENCOLLADA_LIBPATH)
-
endif()
if(WITH_CODEC_FFMPEG)
@@ -1172,7 +1168,7 @@
endif()
if(WITH_IMAGE_OPENEXR)
- set_lib_path(OPENEXR "openexr")
+ set(OPENEXR ${LIBDIR}/openexr)
set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
set(OPENEXR_LIBPATH ${OPENEXR}/lib)
@@ -1199,18 +1195,11 @@
endif()
if(WITH_PYTHON)
- # normally cached but not since we include them with blender
- if(MSVC10)
- set(PYTHON_VERSION 3.3) # CACHE STRING)
- else()
- set(PYTHON_VERSION 3.3) # CACHE STRING)
- endif()
+ set(PYTHON_VERSION 3.3) # CACHE STRING)
- set_lib_path(PYTHON "python")
string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
# Use shared libs for vc2008 and vc2010 until we actually have vc2010 libs
set(PYTHON_LIBRARY ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}.lib)
- # set(PYTHON_LIBRARY ${PYTHON}/lib/python${_PYTHON_VERSION_NO_DOTS}.lib) #CACHE FILEPATH
unset(_PYTHON_VERSION_NO_DOTS)
# Shared includes for both vc2008 and vc2010
@@ -1228,10 +1217,6 @@
set(BOOST_LIBPATH ${BOOST}/lib)
set(BOOST_POSTFIX "vc110-mt-s-1_53.lib")
set(BOOST_DEBUG_POSTFIX "vc110-mt-sgd-1_53.lib")
- elseif(MSVC10)
- set(BOOST_LIBPATH ${BOOST}/vc2010/lib)
- set(BOOST_POSTFIX "vc100-mt-s-1_49.lib")
- set(BOOST_DEBUG_POSTFIX "vc100-mt-sgd-1_49.lib")
else()
set(BOOST_LIBPATH ${BOOST}/lib)
set(BOOST_POSTFIX "vc90-mt-s-1_49.lib")
@@ -2068,6 +2053,20 @@
ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER -Wno-unused-parameter)
ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_MACROS -Wno-unused-macros)
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_VARIABLE_DECLARATIONS -Wno-missing-variable-declarations)
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_FUNCTION -Wno-unused-function)
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_INT_TO_VOID_POINTER_CAST -Wno-int-to-void-pointer-cast)
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_PROTOTYPES -Wno-missing-prototypes)
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_DUPLICATE_ENUM -Wno-duplicate-enum)
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNDEF -Wno-undef)
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_NORETURN -Wno-missing-noreturn)
+
+ ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_PRIVATE_FIELD -Wno-unused-private-field)
+ ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_CXX11_NARROWING -Wno-c++11-narrowing)
+ ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_NON_VIRTUAL_DTOR -Wno-non-virtual-dtor)
+ ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_MACROS -Wno-unused-macros)
+ ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_REORDER -Wno-reorder)
+
elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall)
@@ -2084,13 +2083,6 @@
endif()
-# MSVC2010 fails to links C++ libs right
-if(MSVC10)
- if(WITH_OPENCOLLADA)
- message(WARNING "MSVC 2010 does not support OpenCollada, disabling WITH_OPENCOLLADA. To enable support use Use MSVC 2008")
- endif()
-endif()
-
# ensure python header is found since detection can fail, this could happen
# with _any_ library but since we used a fixed python version this tends to
# be most problematic.
Modified: branches/soc-2013-motion_track/SConstruct
===================================================================
--- branches/soc-2013-motion_track/SConstruct 2013-07-15 11:26:43 UTC (rev 58267)
+++ branches/soc-2013-motion_track/SConstruct 2013-07-15 14:19:02 UTC (rev 58268)
@@ -137,6 +137,8 @@
B.quickie=[]
toolset = B.arguments.get('BF_TOOLSET', None)
+vcver = B.arguments.get('MSVS_VERSION', '9.0')
+
if toolset:
print "Using " + toolset
if toolset=='mstoolkit':
@@ -148,9 +150,9 @@
btools.SetupSpawn(env)
else:
if bitness==64 and platform=='win32':
- env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64', TARGET_ARCH='x86_64')
+ env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64', TARGET_ARCH='x86_64', MSVC_VERSION=vcver)
else:
- env = BlenderEnvironment(ENV = os.environ, TARGET_ARCH='x86')
+ env = BlenderEnvironment(ENV = os.environ, TARGET_ARCH='x86', MSVC_VERSION=vcver)
if not env:
print "Could not create a build environment"
@@ -384,6 +386,8 @@
env['CPPFLAGS'].append('-DWITH_AUDASPACE')
env['CPPFLAGS'].append('-DWITH_AVI')
env['CPPFLAGS'].append('-DWITH_BOOL_COMPAT')
+if env['OURPLATFORM'] in ('win32-vc', 'win64-vc') and env['MSVC_VERSION'] == '11.0':
+ env['CPPFLAGS'].append('-D_ALLOW_KEYWORD_MACROS')
if env['OURPLATFORM'] not in ('win32-vc', 'win64-vc'):
env['CPPFLAGS'].append('-DHAVE_STDBOOL_H')
@@ -940,7 +944,10 @@
if env['WITH_BF_OPENAL']:
dllsources.append('${LCGDIR}/openal/lib/OpenAL32.dll')
- dllsources.append('${LCGDIR}/openal/lib/wrap_oal.dll')
+ if env['OURPLATFORM'] in ('win32-vc', 'win64-vc') and env['MSVC_VERSION'] == '11.0':
+ pass
+ else:
+ dllsources.append('${LCGDIR}/openal/lib/wrap_oal.dll')
if env['WITH_BF_SNDFILE']:
dllsources.append('${LCGDIR}/sndfile/lib/libsndfile-1.dll')
Modified: branches/soc-2013-motion_track/build_files/build_environment/install_deps.sh
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list