[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51090] branches/cloth-eltopo: Merging revisions r50449-r51086 from trunk.

[Daniel Genrich]

Revision: 51090
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51090
Author:   genscher
Date:     2012-10-05 15:34:31 +0000 (Fri, 05 Oct 2012)
Log Message:
-----------
Merging revisions r50449-r51086 from trunk.

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

Modified Paths:
--------------
    branches/cloth-eltopo/CMakeLists.txt
    branches/cloth-eltopo/GNUmakefile
    branches/cloth-eltopo/SConstruct
    branches/cloth-eltopo/build_files/buildbot/config/user-config-i686.py
    branches/cloth-eltopo/build_files/buildbot/config/user-config-player-i686.py
    branches/cloth-eltopo/build_files/buildbot/config/user-config-player-x86_64.py
    branches/cloth-eltopo/build_files/buildbot/config/user-config-x86_64.py
    branches/cloth-eltopo/build_files/cmake/config/blender_lite.cmake
    branches/cloth-eltopo/build_files/cmake/macros.cmake
    branches/cloth-eltopo/build_files/package_spec/rpm/blender.spec.in
    branches/cloth-eltopo/build_files/scons/config/darwin-config.py
    branches/cloth-eltopo/build_files/scons/config/linux-config.py
    branches/cloth-eltopo/build_files/scons/config/win32-mingw-config.py
    branches/cloth-eltopo/build_files/scons/config/win32-vc-config.py
    branches/cloth-eltopo/build_files/scons/config/win64-mingw-config.py
    branches/cloth-eltopo/build_files/scons/config/win64-vc-config.py
    branches/cloth-eltopo/build_files/scons/tools/Blender.py
    branches/cloth-eltopo/build_files/scons/tools/btools.py
    branches/cloth-eltopo/doc/manpage/blender.1
    branches/cloth-eltopo/doc/python_api/rst/bge.logic.rst
    branches/cloth-eltopo/doc/python_api/rst/bge.types.rst
    branches/cloth-eltopo/extern/carve/CMakeLists.txt
    branches/cloth-eltopo/extern/libmv/CMakeLists.txt
    branches/cloth-eltopo/extern/libmv/libmv/multiview/euclidean_resection.cc
    branches/cloth-eltopo/extern/libmv/libmv/multiview/euclidean_resection.h
    branches/cloth-eltopo/extern/libmv/libmv/multiview/fundamental.cc
    branches/cloth-eltopo/extern/libmv/libmv/multiview/homography.cc
    branches/cloth-eltopo/extern/libmv/libmv/numeric/levenberg_marquardt.h
    branches/cloth-eltopo/extern/libmv/libmv/simple_pipeline/detect.cc
    branches/cloth-eltopo/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc
    branches/cloth-eltopo/extern/libmv/libmv/simple_pipeline/intersect.cc
    branches/cloth-eltopo/extern/libmv/libmv/simple_pipeline/pipeline.cc
    branches/cloth-eltopo/extern/libmv/libmv/simple_pipeline/resect.cc
    branches/cloth-eltopo/extern/libmv/libmv/tracking/track_region.cc
    branches/cloth-eltopo/extern/libmv/libmv/tracking/track_region.h
    branches/cloth-eltopo/extern/libmv/libmv-capi.cpp
    branches/cloth-eltopo/extern/libmv/libmv-capi.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/CMakeLists.txt
    branches/cloth-eltopo/extern/libmv/third_party/ceres/ChangeLog
    branches/cloth-eltopo/extern/libmv/third_party/ceres/SConscript
    branches/cloth-eltopo/extern/libmv/third_party/ceres/bundle.sh
    branches/cloth-eltopo/extern/libmv/third_party/ceres/files.txt
    branches/cloth-eltopo/extern/libmv/third_party/ceres/include/ceres/autodiff_cost_function.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/include/ceres/cost_function.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/include/ceres/internal/fixed_array.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/include/ceres/internal/macros.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/include/ceres/internal/manual_constructor.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/include/ceres/internal/port.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/include/ceres/iteration_callback.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/include/ceres/jet.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/include/ceres/loss_function.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/include/ceres/numeric_diff_cost_function.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/include/ceres/problem.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/include/ceres/rotation.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/include/ceres/solver.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/include/ceres/types.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/block_evaluate_preparer.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/block_evaluate_preparer.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/block_jacobi_preconditioner.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/block_jacobian_writer.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/block_random_access_dense_matrix.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/block_random_access_dense_matrix.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/block_random_access_matrix.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/block_random_access_sparse_matrix.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/block_random_access_sparse_matrix.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/block_sparse_matrix.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/block_sparse_matrix.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/block_structure.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/canonical_views_clustering.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/cgnr_solver.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/collections_port.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/compressed_row_jacobian_writer.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/compressed_row_sparse_matrix.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/compressed_row_sparse_matrix.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/conditioned_cost_function.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/conjugate_gradients_solver.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/conjugate_gradients_solver.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/corrector.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/dense_qr_solver.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/dense_qr_solver.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/detect_structure.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/detect_structure.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/evaluator.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/evaluator.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/file.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/gradient_checking_cost_function.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/graph.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/implicit_schur_complement.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/implicit_schur_complement.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/iterative_schur_complement_solver.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/linear_least_squares_problems.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/linear_solver.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/linear_solver.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/local_parameterization.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/loss_function.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/matrix_proto.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/minimizer.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/mutex.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/normal_prior.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/parameter_block.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/partitioned_matrix_view.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/problem_impl.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/problem_impl.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/program.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/program.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/program_evaluator.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/random.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/residual_block.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/residual_block_utils.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/residual_block_utils.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/runtime_numeric_diff_cost_function.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator_impl.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/schur_ordering.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/solver.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/solver_impl.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/solver_impl.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/sparse_matrix.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/split.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/stringprintf.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/stringprintf.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/suitesparse.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/suitesparse.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/triplet_sparse_matrix.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/triplet_sparse_matrix.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/types.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/visibility.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/patches/collections_port.h.mingw.patch
    branches/cloth-eltopo/extern/libmv/third_party/ceres/patches/series
    branches/cloth-eltopo/intern/CMakeLists.txt
    branches/cloth-eltopo/intern/SConscript
    branches/cloth-eltopo/intern/audaspace/FX/AUD_IIRFilterReader.cpp
    branches/cloth-eltopo/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
    branches/cloth-eltopo/intern/audaspace/Python/AUD_PyAPI.cpp
    branches/cloth-eltopo/intern/audaspace/Python/AUD_PyAPI.h
    branches/cloth-eltopo/intern/audaspace/fftw/AUD_BandPassFactory.h
    branches/cloth-eltopo/intern/audaspace/intern/AUD_C-API.cpp
    branches/cloth-eltopo/intern/audaspace/intern/AUD_C-API.h
    branches/cloth-eltopo/intern/audaspace/intern/AUD_IFactory.h
    branches/cloth-eltopo/intern/audaspace/intern/AUD_IReader.h
    branches/cloth-eltopo/intern/audaspace/intern/AUD_IWriter.h
    branches/cloth-eltopo/intern/audaspace/intern/AUD_PyInit.h
    branches/cloth-eltopo/intern/bsp/CMakeLists.txt
    branches/cloth-eltopo/intern/bsp/intern/BOP_CarveInterface.cpp
    branches/cloth-eltopo/intern/cycles/CMakeLists.txt
    branches/cloth-eltopo/intern/cycles/app/CMakeLists.txt
    branches/cloth-eltopo/intern/cycles/app/cycles_test.cpp
    branches/cloth-eltopo/intern/cycles/blender/addon/__init__.py
    branches/cloth-eltopo/intern/cycles/blender/addon/properties.py
    branches/cloth-eltopo/intern/cycles/blender/addon/ui.py
    branches/cloth-eltopo/intern/cycles/blender/blender_camera.cpp
    branches/cloth-eltopo/intern/cycles/blender/blender_object.cpp
    branches/cloth-eltopo/intern/cycles/blender/blender_python.cpp
    branches/cloth-eltopo/intern/cycles/blender/blender_shader.cpp
    branches/cloth-eltopo/intern/cycles/blender/blender_sync.cpp
    branches/cloth-eltopo/intern/cycles/blender/blender_sync.h
    branches/cloth-eltopo/intern/cycles/blender/blender_util.h
    branches/cloth-eltopo/intern/cycles/bvh/CMakeLists.txt
    branches/cloth-eltopo/intern/cycles/cmake/external_libs.cmake
    branches/cloth-eltopo/intern/cycles/device/CMakeLists.txt
    branches/cloth-eltopo/intern/cycles/device/device_opencl.cpp
    branches/cloth-eltopo/intern/cycles/kernel/CMakeLists.txt
    branches/cloth-eltopo/intern/cycles/kernel/kernel_camera.h
    branches/cloth-eltopo/intern/cycles/kernel/kernel_montecarlo.h
    branches/cloth-eltopo/intern/cycles/kernel/kernel_object.h
    branches/cloth-eltopo/intern/cycles/kernel/kernel_passes.h
    branches/cloth-eltopo/intern/cycles/kernel/kernel_triangle.h
    branches/cloth-eltopo/intern/cycles/kernel/kernel_types.h
    branches/cloth-eltopo/intern/cycles/kernel/osl/CMakeLists.txt
    branches/cloth-eltopo/intern/cycles/kernel/osl/bsdf_ashikhmin_velvet.cpp
    branches/cloth-eltopo/intern/cycles/kernel/osl/nodes/CMakeLists.txt
    branches/cloth-eltopo/intern/cycles/kernel/osl/nodes/node_gradient_texture.osl
    branches/cloth-eltopo/intern/cycles/kernel/osl/nodes/node_magic_texture.osl
    branches/cloth-eltopo/intern/cycles/kernel/osl/nodes/node_mix.osl
    branches/cloth-eltopo/intern/cycles/kernel/osl/nodes/node_musgrave_texture.osl
    branches/cloth-eltopo/intern/cycles/kernel/osl/nodes/node_texture.h
    branches/cloth-eltopo/intern/cycles/kernel/osl/nodes/node_voronoi_texture.osl
    branches/cloth-eltopo/intern/cycles/kernel/osl/nodes/oslutil.h
    branches/cloth-eltopo/intern/cycles/kernel/osl/osl_globals.h
    branches/cloth-eltopo/intern/cycles/kernel/osl/osl_services.cpp
    branches/cloth-eltopo/intern/cycles/kernel/osl/osl_services.h
    branches/cloth-eltopo/intern/cycles/kernel/svm/bsdf.h
    branches/cloth-eltopo/intern/cycles/kernel/svm/bsdf_diffuse.h
    branches/cloth-eltopo/intern/cycles/kernel/svm/bsdf_microfacet.h
    branches/cloth-eltopo/intern/cycles/kernel/svm/bsdf_ward.h
    branches/cloth-eltopo/intern/cycles/kernel/svm/bsdf_westin.h
    branches/cloth-eltopo/intern/cycles/kernel/svm/svm_hsv.h
    branches/cloth-eltopo/intern/cycles/kernel/svm/svm_noise.h
    branches/cloth-eltopo/intern/cycles/kernel/svm/svm_tex_coord.h
    branches/cloth-eltopo/intern/cycles/kernel/svm/svm_types.h
    branches/cloth-eltopo/intern/cycles/render/CMakeLists.txt
    branches/cloth-eltopo/intern/cycles/render/attribute.h
    branches/cloth-eltopo/intern/cycles/render/buffers.cpp
    branches/cloth-eltopo/intern/cycles/render/camera.cpp
    branches/cloth-eltopo/intern/cycles/render/graph.cpp
    branches/cloth-eltopo/intern/cycles/render/image.cpp
    branches/cloth-eltopo/intern/cycles/render/image.h
    branches/cloth-eltopo/intern/cycles/render/integrator.cpp
    branches/cloth-eltopo/intern/cycles/render/light.cpp
    branches/cloth-eltopo/intern/cycles/render/mesh.cpp
    branches/cloth-eltopo/intern/cycles/render/nodes.cpp
    branches/cloth-eltopo/intern/cycles/render/nodes.h
    branches/cloth-eltopo/intern/cycles/render/object.cpp
    branches/cloth-eltopo/intern/cycles/render/object.h
    branches/cloth-eltopo/intern/cycles/render/osl.cpp
    branches/cloth-eltopo/intern/cycles/render/osl.h
    branches/cloth-eltopo/intern/cycles/render/scene.h
    branches/cloth-eltopo/intern/cycles/render/session.cpp
    branches/cloth-eltopo/intern/cycles/render/session.h
    branches/cloth-eltopo/intern/cycles/render/svm.cpp
    branches/cloth-eltopo/intern/cycles/render/tile.cpp
    branches/cloth-eltopo/intern/cycles/render/tile.h
    branches/cloth-eltopo/intern/cycles/subd/CMakeLists.txt
    branches/cloth-eltopo/intern/cycles/util/CMakeLists.txt
    branches/cloth-eltopo/intern/cycles/util/util_math.h
    branches/cloth-eltopo/intern/cycles/util/util_opencl.cpp
    branches/cloth-eltopo/intern/cycles/util/util_progress.h
    branches/cloth-eltopo/intern/cycles/util/util_types.h
    branches/cloth-eltopo/intern/dualcon/intern/Projections.cpp
    branches/cloth-eltopo/intern/dualcon/intern/dualcon_c_api.cpp
    branches/cloth-eltopo/intern/dualcon/intern/octree.cpp
    branches/cloth-eltopo/intern/ghost/GHOST_C-api.h
    branches/cloth-eltopo/intern/ghost/GHOST_IWindow.h
    branches/cloth-eltopo/intern/ghost/GHOST_Rect.h
    branches/cloth-eltopo/intern/ghost/intern/GHOST_C-api.cpp
    branches/cloth-eltopo/intern/ghost/intern/GHOST_EventManager.cpp
    branches/cloth-eltopo/intern/ghost/intern/GHOST_NDOFManager.h
    branches/cloth-eltopo/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/cloth-eltopo/intern/ghost/intern/GHOST_SystemPaths.h
    branches/cloth-eltopo/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/cloth-eltopo/intern/ghost/intern/GHOST_SystemX11.h
    branches/cloth-eltopo/intern/ghost/intern/GHOST_TimerManager.cpp
    branches/cloth-eltopo/intern/ghost/intern/GHOST_Window.cpp
    branches/cloth-eltopo/intern/ghost/intern/GHOST_Window.h
    branches/cloth-eltopo/intern/ghost/intern/GHOST_WindowCarbon.cpp
    branches/cloth-eltopo/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/cloth-eltopo/intern/ghost/intern/GHOST_WindowManager.cpp
    branches/cloth-eltopo/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/cloth-eltopo/intern/ghost/intern/GHOST_WindowWin32.h
    branches/cloth-eltopo/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/cloth-eltopo/intern/ghost/test/multitest/EventToBuf.c
    branches/cloth-eltopo/intern/ghost/test/multitest/MultiTest.c
    branches/cloth-eltopo/intern/guardedalloc/test/simpletest/memtest.c
    branches/cloth-eltopo/intern/iksolver/intern/IK_QJacobianSolver.h
    branches/cloth-eltopo/intern/iksolver/intern/IK_QSegment.h
    branches/cloth-eltopo/intern/iksolver/intern/IK_QTask.h
    branches/cloth-eltopo/intern/iksolver/intern/IK_Solver.cpp
    branches/cloth-eltopo/intern/iksolver/intern/MT_ExpMap.h
    branches/cloth-eltopo/intern/iksolver/intern/TNT/cmat.h
    branches/cloth-eltopo/intern/iksolver/intern/TNT/vec.h
    branches/cloth-eltopo/intern/itasc/kdl/utilities/utility_io.cpp
    branches/cloth-eltopo/intern/memutil/MEM_CacheLimiter.h
    branches/cloth-eltopo/intern/memutil/MEM_SmartPtr.h
    branches/cloth-eltopo/intern/mikktspace/mikktspace.c
    branches/cloth-eltopo/intern/opennl/intern/opennl.c
    branches/cloth-eltopo/intern/opennl/superlu/get_perm_c.c
    branches/cloth-eltopo/intern/raskter/CMakeLists.txt
    branches/cloth-eltopo/intern/raskter/raskter.c
    branches/cloth-eltopo/intern/raskter/raskter.h
    branches/cloth-eltopo/intern/smoke/intern/smoke_API.cpp
    branches/cloth-eltopo/intern/string/STR_String.h
    branches/cloth-eltopo/intern/string/intern/STR_String.cpp
    branches/cloth-eltopo/intern/tools/bpy_introspect_ui.py
    branches/cloth-eltopo/intern/tools/credits_svn_gen.py
    branches/cloth-eltopo/intern/utfconv/utf_winfunc.c
    branches/cloth-eltopo/intern/utfconv/utfconv.c
    branches/cloth-eltopo/release/datafiles/fonts/droidsans.ttf.gz
    branches/cloth-eltopo/release/datafiles/splash.png
    branches/cloth-eltopo/release/datafiles/startup.blend
    branches/cloth-eltopo/release/scripts/modules/addon_utils.py
    branches/cloth-eltopo/release/scripts/modules/bl_i18n_utils/bl_process_msg.py
    branches/cloth-eltopo/release/scripts/modules/bl_i18n_utils/check_po.py
    branches/cloth-eltopo/release/scripts/modules/bl_i18n_utils/rtl_preprocess.py
    branches/cloth-eltopo/release/scripts/modules/bl_i18n_utils/utils.py
    branches/cloth-eltopo/release/scripts/modules/bpy/utils.py
    branches/cloth-eltopo/release/scripts/modules/console_python.py
    branches/cloth-eltopo/release/scripts/modules/rna_xml.py
    branches/cloth-eltopo/release/scripts/presets/interface_theme/back_to_black.xml
    branches/cloth-eltopo/release/scripts/presets/interface_theme/blender_24x.xml
    branches/cloth-eltopo/release/scripts/presets/interface_theme/elsyiun.xml
    branches/cloth-eltopo/release/scripts/presets/interface_theme/hexagon.xml
    branches/cloth-eltopo/release/scripts/presets/interface_theme/ubuntu_ambiance.xml
    branches/cloth-eltopo/release/scripts/presets/tracking_settings/blurry_footage.py
    branches/cloth-eltopo/release/scripts/presets/tracking_settings/default.py
    branches/cloth-eltopo/release/scripts/presets/tracking_settings/fast_motion.py
    branches/cloth-eltopo/release/scripts/presets/tracking_settings/planar.py
    branches/cloth-eltopo/release/scripts/startup/bl_operators/anim.py
    branches/cloth-eltopo/release/scripts/startup/bl_operators/node.py
    branches/cloth-eltopo/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
    branches/cloth-eltopo/release/scripts/startup/bl_operators/wm.py
    branches/cloth-eltopo/release/scripts/startup/bl_ui/properties_animviz.py
    branches/cloth-eltopo/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/cloth-eltopo/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/cloth-eltopo/release/scripts/startup/bl_ui/properties_material.py
    branches/cloth-eltopo/release/scripts/startup/bl_ui/properties_object.py
    branches/cloth-eltopo/release/scripts/startup/bl_ui/properties_render.py
    branches/cloth-eltopo/release/scripts/startup/bl_ui/properties_scene.py
    branches/cloth-eltopo/release/scripts/startup/bl_ui/space_clip.py
    branches/cloth-eltopo/release/scripts/startup/bl_ui/space_image.py
    branches/cloth-eltopo/release/scripts/startup/bl_ui/space_info.py
    branches/cloth-eltopo/release/scripts/startup/bl_ui/space_sequencer.py
    branches/cloth-eltopo/release/scripts/startup/bl_ui/space_userpref.py
    branches/cloth-eltopo/release/scripts/startup/bl_ui/space_view3d.py
    branches/cloth-eltopo/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/cloth-eltopo/release/scripts/templates/addon_add_object.py
    branches/cloth-eltopo/release/scripts/templates/ui_panel.py
    branches/cloth-eltopo/release/scripts/templates/ui_panel_simple.py
    branches/cloth-eltopo/release/text/readme.html
    branches/cloth-eltopo/release/windows/contrib/vfapi/vfapi-plugin.c
    branches/cloth-eltopo/source/blender/avi/intern/avi.c
    branches/cloth-eltopo/source/blender/blenfont/BLF_api.h
    branches/cloth-eltopo/source/blender/blenfont/BLF_translation.h
    branches/cloth-eltopo/source/blender/blenfont/CMakeLists.txt
    branches/cloth-eltopo/source/blender/blenfont/SConscript
    branches/cloth-eltopo/source/blender/blenfont/intern/blf.c
    branches/cloth-eltopo/source/blender/blenfont/intern/blf_font.c
    branches/cloth-eltopo/source/blender/blenfont/intern/blf_glyph.c
    branches/cloth-eltopo/source/blender/blenfont/intern/blf_internal.h
    branches/cloth-eltopo/source/blender/blenfont/intern/blf_internal_types.h
    branches/cloth-eltopo/source/blender/blenfont/intern/blf_lang.c
    branches/cloth-eltopo/source/blender/blenkernel/BKE_action.h
    branches/cloth-eltopo/source/blender/blenkernel/BKE_anim.h
    branches/cloth-eltopo/source/blender/blenkernel/BKE_armature.h
    branches/cloth-eltopo/source/blender/blenkernel/BKE_blender.h
    branches/cloth-eltopo/source/blender/blenkernel/BKE_colortools.h
    branches/cloth-eltopo/source/blender/blenkernel/BKE_curve.h
    branches/cloth-eltopo/source/blender/blenkernel/BKE_customdata.h
    branches/cloth-eltopo/source/blender/blenkernel/BKE_group.h
    branches/cloth-eltopo/source/blender/blenkernel/BKE_image.h
    branches/cloth-eltopo/source/blender/blenkernel/BKE_key.h
    branches/cloth-eltopo/source/blender/blenkernel/BKE_main.h
    branches/cloth-eltopo/source/blender/blenkernel/BKE_mask.h
    branches/cloth-eltopo/source/blender/blenkernel/BKE_mesh.h
    branches/cloth-eltopo/source/blender/blenkernel/BKE_movieclip.h
    branches/cloth-eltopo/source/blender/blenkernel/BKE_node.h
    branches/cloth-eltopo/source/blender/blenkernel/BKE_object.h
    branches/cloth-eltopo/source/blender/blenkernel/BKE_pointcache.h
    branches/cloth-eltopo/source/blender/blenkernel/BKE_property.h
    branches/cloth-eltopo/source/blender/blenkernel/BKE_sca.h
    branches/cloth-eltopo/source/blender/blenkernel/BKE_scene.h
    branches/cloth-eltopo/source/blender/blenkernel/BKE_sequencer.h
    branches/cloth-eltopo/source/blender/blenkernel/BKE_tessmesh.h
    branches/cloth-eltopo/source/blender/blenkernel/CMakeLists.txt
    branches/cloth-eltopo/source/blender/blenkernel/SConscript
    branches/cloth-eltopo/source/blender/blenkernel/intern/CCGSubSurf.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/DerivedMesh.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/action.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/anim.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/anim_sys.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/blender.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/bmfont.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/brush.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/cloth.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/collision.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/colortools.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/constraint.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/curve.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/customdata.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/depsgraph.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/dynamicpaint.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/editderivedmesh.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/fcurve.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/fmodifier.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/group.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/icons.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/idprop.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/image.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/image_gen.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/implicit.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/ipo.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/key.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/lattice.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/library.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/mask.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/mask_rasterize.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/material.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/mball.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/mesh.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/modifier.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/modifiers_bmesh.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/movieclip.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/multires.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/node.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/object.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/ocean.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/paint.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/particle.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/particle_system.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/pointcache.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/property.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/sca.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/scene.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/seqeffects.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/seqmodifier.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/sequencer.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/smoke.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/softbody.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/sound.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/text.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/texture.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/tracking.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/unit.c
    branches/cloth-eltopo/source/blender/blenkernel/intern/writeffmpeg.c
    branches/cloth-eltopo/source/blender/blenlib/BLI_dynstr.h
    branches/cloth-eltopo/source/blender/blenlib/BLI_endian_switch.h
    branches/cloth-eltopo/source/blender/blenlib/BLI_fileops_types.h
    branches/cloth-eltopo/source/blender/blenlib/BLI_math_base.h
    branches/cloth-eltopo/source/blender/blenlib/BLI_math_color.h
    branches/cloth-eltopo/source/blender/blenlib/BLI_math_rotation.h
    branches/cloth-eltopo/source/blender/blenlib/BLI_math_vector.h
    branches/cloth-eltopo/source/blender/blenlib/BLI_pbvh.h
    branches/cloth-eltopo/source/blender/blenlib/BLI_rect.h
    branches/cloth-eltopo/source/blender/blenlib/BLI_string.h
    branches/cloth-eltopo/source/blender/blenlib/BLI_threads.h
    branches/cloth-eltopo/source/blender/blenlib/BLI_utildefines.h
    branches/cloth-eltopo/source/blender/blenlib/intern/BLI_heap.c
    branches/cloth-eltopo/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/cloth-eltopo/source/blender/blenlib/intern/DLRB_tree.c
    branches/cloth-eltopo/source/blender/blenlib/intern/boxpack2d.c
    branches/cloth-eltopo/source/blender/blenlib/intern/bpath.c
    branches/cloth-eltopo/source/blender/blenlib/intern/fileops.c
    branches/cloth-eltopo/source/blender/blenlib/intern/freetypefont.c
    branches/cloth-eltopo/source/blender/blenlib/intern/math_color.c
    branches/cloth-eltopo/source/blender/blenlib/intern/math_color_inline.c
    branches/cloth-eltopo/source/blender/blenlib/intern/math_geom.c
    branches/cloth-eltopo/source/blender/blenlib/intern/math_matrix.c
    branches/cloth-eltopo/source/blender/blenlib/intern/math_rotation.c
    branches/cloth-eltopo/source/blender/blenlib/intern/math_vector_inline.c
    branches/cloth-eltopo/source/blender/blenlib/intern/md5.c
    branches/cloth-eltopo/source/blender/blenlib/intern/noise.c
    branches/cloth-eltopo/source/blender/blenlib/intern/path_util.c
    branches/cloth-eltopo/source/blender/blenlib/intern/pbvh.c
    branches/cloth-eltopo/source/blender/blenlib/intern/rct.c
    branches/cloth-eltopo/source/blender/blenlib/intern/scanfill.c
    branches/cloth-eltopo/source/blender/blenlib/intern/storage.c
    branches/cloth-eltopo/source/blender/blenlib/intern/string_cursor_utf8.c
    branches/cloth-eltopo/source/blender/blenlib/intern/string_utf8.c
    branches/cloth-eltopo/source/blender/blenlib/intern/threads.c
    branches/cloth-eltopo/source/blender/blenlib/intern/uvproject.c
    branches/cloth-eltopo/source/blender/blenlib/intern/voronoi.c
    branches/cloth-eltopo/source/blender/blenlib/intern/winstuff.c
    branches/cloth-eltopo/source/blender/blenloader/BLO_readfile.h
    branches/cloth-eltopo/source/blender/blenloader/intern/readfile.c
    branches/cloth-eltopo/source/blender/blenloader/intern/versioning_250.c
    branches/cloth-eltopo/source/blender/blenloader/intern/versioning_legacy.c
    branches/cloth-eltopo/source/blender/blenloader/intern/writefile.c
    branches/cloth-eltopo/source/blender/bmesh/intern/bmesh_construct.c
    branches/cloth-eltopo/source/blender/bmesh/intern/bmesh_core.c
    branches/cloth-eltopo/source/blender/bmesh/intern/bmesh_interp.c
    branches/cloth-eltopo/source/blender/bmesh/intern/bmesh_iterators.c
    branches/cloth-eltopo/source/blender/bmesh/intern/bmesh_iterators.h
    branches/cloth-eltopo/source/blender/bmesh/intern/bmesh_marking.c
    branches/cloth-eltopo/source/blender/bmesh/intern/bmesh_mesh.c
    branches/cloth-eltopo/source/blender/bmesh/intern/bmesh_mesh_conv.c
    branches/cloth-eltopo/source/blender/bmesh/intern/bmesh_mods.c
    branches/cloth-eltopo/source/blender/bmesh/intern/bmesh_operators.c
    branches/cloth-eltopo/source/blender/bmesh/intern/bmesh_private.h
    branches/cloth-eltopo/source/blender/bmesh/intern/bmesh_queries.c
    branches/cloth-eltopo/source/blender/bmesh/intern/bmesh_structure.c
    branches/cloth-eltopo/source/blender/bmesh/operators/bmo_bevel.c
    branches/cloth-eltopo/source/blender/bmesh/operators/bmo_connect.c
    branches/cloth-eltopo/source/blender/bmesh/operators/bmo_create.c
    branches/cloth-eltopo/source/blender/bmesh/operators/bmo_dissolve.c
    branches/cloth-eltopo/source/blender/bmesh/operators/bmo_dupe.c
    branches/cloth-eltopo/source/blender/bmesh/operators/bmo_extrude.c
    branches/cloth-eltopo/source/blender/bmesh/operators/bmo_hull.c
    branches/cloth-eltopo/source/blender/bmesh/operators/bmo_join_triangles.c
    branches/cloth-eltopo/source/blender/bmesh/operators/bmo_primitive.c
    branches/cloth-eltopo/source/blender/bmesh/operators/bmo_removedoubles.c
    branches/cloth-eltopo/source/blender/bmesh/operators/bmo_subdivide.c
    branches/cloth-eltopo/source/blender/bmesh/operators/bmo_wireframe.c
    branches/cloth-eltopo/source/blender/bmesh/tools/BME_bevel.c
    branches/cloth-eltopo/source/blender/collada/DocumentExporter.cpp
    branches/cloth-eltopo/source/blender/collada/DocumentImporter.cpp
    branches/cloth-eltopo/source/blender/collada/DocumentImporter.h
    branches/cloth-eltopo/source/blender/collada/GeometryExporter.cpp
    branches/cloth-eltopo/source/blender/collada/ImageExporter.cpp
    branches/cloth-eltopo/source/blender/collada/MeshImporter.cpp
    branches/cloth-eltopo/source/blender/collada/MeshImporter.h
    branches/cloth-eltopo/source/blender/collada/collada.cpp
    branches/cloth-eltopo/source/blender/compositor/COM_compositor.h
    branches/cloth-eltopo/source/blender/compositor/intern/COM_CompositorContext.cpp
    branches/cloth-eltopo/source/blender/compositor/intern/COM_CompositorContext.h
    branches/cloth-eltopo/source/blender/compositor/intern/COM_ExecutionSystem.cpp
    branches/cloth-eltopo/source/blender/compositor/intern/COM_ExecutionSystem.h
    branches/cloth-eltopo/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
    branches/cloth-eltopo/source/blender/compositor/intern/COM_MemoryBuffer.cpp
    branches/cloth-eltopo/source/blender/compositor/intern/COM_Node.cpp
    branches/cloth-eltopo/source/blender/compositor/intern/COM_Node.h
    branches/cloth-eltopo/source/blender/compositor/intern/COM_NodeBase.h
    branches/cloth-eltopo/source/blender/compositor/intern/COM_NodeOperation.cpp
    branches/cloth-eltopo/source/blender/compositor/intern/COM_NodeOperation.h
    branches/cloth-eltopo/source/blender/compositor/intern/COM_OpenCLDevice.cpp
    branches/cloth-eltopo/source/blender/compositor/intern/COM_OutputSocket.h
    branches/cloth-eltopo/source/blender/compositor/intern/COM_WorkScheduler.cpp
    branches/cloth-eltopo/source/blender/compositor/intern/COM_compositor.cpp
    branches/cloth-eltopo/source/blender/compositor/nodes/COM_BlurNode.cpp
    branches/cloth-eltopo/source/blender/compositor/nodes/COM_BokehImageNode.cpp
    branches/cloth-eltopo/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
    branches/cloth-eltopo/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
    branches/cloth-eltopo/source/blender/compositor/nodes/COM_ColorMatteNode.cpp
    branches/cloth-eltopo/source/blender/compositor/nodes/COM_CompositorNode.cpp
    branches/cloth-eltopo/source/blender/compositor/nodes/COM_DespeckleNode.cpp
    branches/cloth-eltopo/source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp
    branches/cloth-eltopo/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
    branches/cloth-eltopo/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
    branches/cloth-eltopo/source/blender/compositor/nodes/COM_FilterNode.cpp
    branches/cloth-eltopo/source/blender/compositor/nodes/COM_ImageNode.cpp
    branches/cloth-eltopo/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp
    branches/cloth-eltopo/source/blender/compositor/nodes/COM_MixNode.cpp
    branches/cloth-eltopo/source/blender/compositor/nodes/COM_MovieClipNode.cpp
    branches/cloth-eltopo/source/blender/compositor/nodes/COM_MuteNode.cpp
    branches/cloth-eltopo/source/blender/compositor/nodes/COM_OutputFileNode.cpp
    branches/cloth-eltopo/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
    branches/cloth-eltopo/source/blender/compositor/nodes/COM_RenderLayersNode.h
    branches/cloth-eltopo/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
    branches/cloth-eltopo/source/blender/compositor/nodes/COM_TextureNode.cpp
    branches/cloth-eltopo/source/blender/compositor/nodes/COM_ViewerNode.cpp
    branches/cloth-eltopo/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
    branches/cloth-eltopo/source/blender/compositor/operations/COM_CombineChannelsOperation.h
    branches/cloth-eltopo/source/blender/compositor/operations/COM_DespeckleOperation.h
    branches/cloth-eltopo/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
    branches/cloth-eltopo/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp
    branches/cloth-eltopo/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
    branches/cloth-eltopo/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
    branches/cloth-eltopo/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp
    branches/cloth-eltopo/source/blender/compositor/operations/COM_ImageOperation.cpp
    branches/cloth-eltopo/source/blender/compositor/operations/COM_MapUVOperation.cpp
    branches/cloth-eltopo/source/blender/compositor/operations/COM_MaskOperation.cpp
    branches/cloth-eltopo/source/blender/compositor/operations/COM_MixColorOperation.cpp
    branches/cloth-eltopo/source/blender/compositor/operations/COM_MixGlareOperation.cpp
    branches/cloth-eltopo/source/blender/compositor/operations/COM_MovieDistortionOperation.h
    branches/cloth-eltopo/source/blender/compositor/operations/COM_OutputFileOperation.cpp
    branches/cloth-eltopo/source/blender/compositor/operations/COM_OutputFileOperation.h
    branches/cloth-eltopo/source/blender/compositor/operations/COM_PreviewOperation.cpp
    branches/cloth-eltopo/source/blender/compositor/operations/COM_PreviewOperation.h
    branches/cloth-eltopo/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
    branches/cloth-eltopo/source/blender/compositor/operations/COM_TrackPositionOperation.h
    branches/cloth-eltopo/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
    branches/cloth-eltopo/source/blender/compositor/operations/COM_ViewerBaseOperation.h
    branches/cloth-eltopo/source/blender/compositor/operations/COM_ViewerOperation.cpp
    branches/cloth-eltopo/source/blender/compositor/operations/COM_ZCombineOperation.cpp
    branches/cloth-eltopo/source/blender/editors/animation/anim_channels_defines.c
    branches/cloth-eltopo/source/blender/editors/animation/anim_deps.c
    branches/cloth-eltopo/source/blender/editors/animation/anim_filter.c
    branches/cloth-eltopo/source/blender/editors/animation/anim_intern.h
    branches/cloth-eltopo/source/blender/editors/animation/anim_markers.c
    branches/cloth-eltopo/source/blender/editors/animation/anim_ops.c
    branches/cloth-eltopo/source/blender/editors/animation/fmodifier_ui.c
    branches/cloth-eltopo/source/blender/editors/animation/keyframes_draw.c
    branches/cloth-eltopo/source/blender/editors/animation/keyframing.c
    branches/cloth-eltopo/source/blender/editors/armature/editarmature.c
    branches/cloth-eltopo/source/blender/editors/armature/editarmature_sketch.c
    branches/cloth-eltopo/source/blender/editors/armature/meshlaplacian.c
    branches/cloth-eltopo/source/blender/editors/armature/poselib.c
    branches/cloth-eltopo/source/blender/editors/armature/poseobject.c
    branches/cloth-eltopo/source/blender/editors/curve/editcurve.c
    branches/cloth-eltopo/source/blender/editors/gpencil/drawgpencil.c
    branches/cloth-eltopo/source/blender/editors/gpencil/gpencil_edit.c
    branches/cloth-eltopo/source/blender/editors/gpencil/gpencil_paint.c
    branches/cloth-eltopo/source/blender/editors/gpencil/gpencil_undo.c
    branches/cloth-eltopo/source/blender/editors/include/ED_armature.h
    branches/cloth-eltopo/source/blender/editors/include/ED_clip.h
    branches/cloth-eltopo/source/blender/editors/include/ED_curve.h
    branches/cloth-eltopo/source/blender/editors/include/ED_image.h
    branches/cloth-eltopo/source/blender/editors/include/ED_mask.h
    branches/cloth-eltopo/source/blender/editors/include/ED_mball.h
    branches/cloth-eltopo/source/blender/editors/include/ED_mesh.h
    branches/cloth-eltopo/source/blender/editors/include/ED_object.h
    branches/cloth-eltopo/source/blender/editors/include/ED_screen.h
    branches/cloth-eltopo/source/blender/editors/include/ED_sculpt.h
    branches/cloth-eltopo/source/blender/editors/include/ED_sequencer.h
    branches/cloth-eltopo/source/blender/editors/include/ED_util.h
    branches/cloth-eltopo/source/blender/editors/include/ED_view3d.h
    branches/cloth-eltopo/source/blender/editors/include/UI_interface.h
    branches/cloth-eltopo/source/blender/editors/include/UI_view2d.h
    branches/cloth-eltopo/source/blender/editors/interface/interface.c
    branches/cloth-eltopo/source/blender/editors/interface/interface_draw.c
    branches/cloth-eltopo/source/blender/editors/interface/interface_handlers.c
    branches/cloth-eltopo/source/blender/editors/interface/interface_icons.c
    branches/cloth-eltopo/source/blender/editors/interface/interface_intern.h
    branches/cloth-eltopo/source/blender/editors/interface/interface_layout.c
    branches/cloth-eltopo/source/blender/editors/interface/interface_ops.c
    branches/cloth-eltopo/source/blender/editors/interface/interface_panel.c
    branches/cloth-eltopo/source/blender/editors/interface/interface_regions.c
    branches/cloth-eltopo/source/blender/editors/interface/interface_style.c
    branches/cloth-eltopo/source/blender/editors/interface/interface_templates.c
    branches/cloth-eltopo/source/blender/editors/interface/interface_utils.c
    branches/cloth-eltopo/source/blender/editors/interface/interface_widgets.c
    branches/cloth-eltopo/source/blender/editors/interface/resources.c
    branches/cloth-eltopo/source/blender/editors/interface/view2d.c
    branches/cloth-eltopo/source/blender/editors/interface/view2d_ops.c
    branches/cloth-eltopo/source/blender/editors/io/io_collada.c
    branches/cloth-eltopo/source/blender/editors/io/io_ops.c
    branches/cloth-eltopo/source/blender/editors/mask/CMakeLists.txt
    branches/cloth-eltopo/source/blender/editors/mask/mask_add.c
    branches/cloth-eltopo/source/blender/editors/mask/mask_draw.c
    branches/cloth-eltopo/source/blender/editors/mask/mask_edit.c
    branches/cloth-eltopo/source/blender/editors/mask/mask_editaction.c
    branches/cloth-eltopo/source/blender/editors/mask/mask_ops.c
    branches/cloth-eltopo/source/blender/editors/mask/mask_select.c
    branches/cloth-eltopo/source/blender/editors/mesh/editface.c
    branches/cloth-eltopo/source/blender/editors/mesh/editmesh_add.c
    branches/cloth-eltopo/source/blender/editors/mesh/editmesh_bvh.c
    branches/cloth-eltopo/source/blender/editors/mesh/editmesh_knife.c
    branches/cloth-eltopo/source/blender/editors/mesh/editmesh_loopcut.c
    branches/cloth-eltopo/source/blender/editors/mesh/editmesh_rip.c
    branches/cloth-eltopo/source/blender/editors/mesh/editmesh_select.c
    branches/cloth-eltopo/source/blender/editors/mesh/editmesh_slide.c
    branches/cloth-eltopo/source/blender/editors/mesh/editmesh_tools.c
    branches/cloth-eltopo/source/blender/editors/mesh/editmesh_utils.c
    branches/cloth-eltopo/source/blender/editors/mesh/mesh_data.c
    branches/cloth-eltopo/source/blender/editors/mesh/mesh_intern.h
    branches/cloth-eltopo/source/blender/editors/mesh/mesh_ops.c
    branches/cloth-eltopo/source/blender/editors/mesh/meshtools.c
    branches/cloth-eltopo/source/blender/editors/metaball/mball_edit.c
    branches/cloth-eltopo/source/blender/editors/object/object_add.c
    branches/cloth-eltopo/source/blender/editors/object/object_bake.c
    branches/cloth-eltopo/source/blender/editors/object/object_constraint.c
    branches/cloth-eltopo/source/blender/editors/object/object_edit.c
    branches/cloth-eltopo/source/blender/editors/object/object_hook.c
    branches/cloth-eltopo/source/blender/editors/object/object_intern.h
    branches/cloth-eltopo/source/blender/editors/object/object_lattice.c
    branches/cloth-eltopo/source/blender/editors/object/object_modifier.c
    branches/cloth-eltopo/source/blender/editors/object/object_ops.c
    branches/cloth-eltopo/source/blender/editors/object/object_relations.c
    branches/cloth-eltopo/source/blender/editors/object/object_select.c
    branches/cloth-eltopo/source/blender/editors/object/object_shapekey.c
    branches/cloth-eltopo/source/blender/editors/object/object_vgroup.c
    branches/cloth-eltopo/source/blender/editors/physics/particle_edit.c
    branches/cloth-eltopo/source/blender/editors/physics/particle_object.c
    branches/cloth-eltopo/source/blender/editors/physics/physics_fluid.c
    branches/cloth-eltopo/source/blender/editors/render/render_internal.c
    branches/cloth-eltopo/source/blender/editors/render/render_opengl.c
    branches/cloth-eltopo/source/blender/editors/render/render_preview.c
    branches/cloth-eltopo/source/blender/editors/screen/area.c
    branches/cloth-eltopo/source/blender/editors/screen/glutil.c
    branches/cloth-eltopo/source/blender/editors/screen/screen_edit.c
    branches/cloth-eltopo/source/blender/editors/screen/screen_ops.c
    branches/cloth-eltopo/source/blender/editors/screen/screendump.c
    branches/cloth-eltopo/source/blender/editors/sculpt_paint/CMakeLists.txt
    branches/cloth-eltopo/source/blender/editors/sculpt_paint/paint_cursor.c
    branches/cloth-eltopo/source/blender/editors/sculpt_paint/paint_hide.c
    branches/cloth-eltopo/source/blender/editors/sculpt_paint/paint_image.c
    branches/cloth-eltopo/source/blender/editors/sculpt_paint/paint_mask.c
    branches/cloth-eltopo/source/blender/editors/sculpt_paint/paint_ops.c
    branches/cloth-eltopo/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/cloth-eltopo/source/blender/editors/sculpt_paint/paint_undo.c
    branches/cloth-eltopo/source/blender/editors/sculpt_paint/paint_utils.c
    branches/cloth-eltopo/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/cloth-eltopo/source/blender/editors/sculpt_paint/sculpt.c
    branches/cloth-eltopo/source/blender/editors/sculpt_paint/sculpt_intern.h
    branches/cloth-eltopo/source/blender/editors/sculpt_paint/sculpt_undo.c
    branches/cloth-eltopo/source/blender/editors/sculpt_paint/sculpt_uv.c
    branches/cloth-eltopo/source/blender/editors/space_action/action_draw.c
    branches/cloth-eltopo/source/blender/editors/space_action/action_edit.c
    branches/cloth-eltopo/source/blender/editors/space_action/action_select.c
    branches/cloth-eltopo/source/blender/editors/space_action/space_action.c
    branches/cloth-eltopo/source/blender/editors/space_buttons/buttons_header.c
    branches/cloth-eltopo/source/blender/editors/space_buttons/buttons_texture.c
    branches/cloth-eltopo/source/blender/editors/space_clip/CMakeLists.txt
    branches/cloth-eltopo/source/blender/editors/space_clip/clip_buttons.c
    branches/cloth-eltopo/source/blender/editors/space_clip/clip_dopesheet_draw.c
    branches/cloth-eltopo/source/blender/editors/space_clip/clip_draw.c
    branches/cloth-eltopo/source/blender/editors/space_clip/clip_editor.c
    branches/cloth-eltopo/source/blender/editors/space_clip/clip_graph_draw.c
    branches/cloth-eltopo/source/blender/editors/space_clip/clip_graph_ops.c
    branches/cloth-eltopo/source/blender/editors/space_clip/clip_ops.c
    branches/cloth-eltopo/source/blender/editors/space_clip/space_clip.c
    branches/cloth-eltopo/source/blender/editors/space_console/space_console.c
    branches/cloth-eltopo/source/blender/editors/space_file/file_intern.h
    branches/cloth-eltopo/source/blender/editors/space_file/file_ops.c
    branches/cloth-eltopo/source/blender/editors/space_file/file_panels.c
    branches/cloth-eltopo/source/blender/editors/space_file/filelist.c
    branches/cloth-eltopo/source/blender/editors/space_file/filesel.c
    branches/cloth-eltopo/source/blender/editors/space_file/fsmenu.c
    branches/cloth-eltopo/source/blender/editors/space_file/fsmenu.h
    branches/cloth-eltopo/source/blender/editors/space_file/space_file.c
    branches/cloth-eltopo/source/blender/editors/space_graph/graph_buttons.c
    branches/cloth-eltopo/source/blender/editors/space_graph/graph_draw.c
    branches/cloth-eltopo/source/blender/editors/space_graph/graph_edit.c
    branches/cloth-eltopo/source/blender/editors/space_graph/graph_ops.c
    branches/cloth-eltopo/source/blender/editors/space_graph/graph_select.c
    branches/cloth-eltopo/source/blender/editors/space_image/image_buttons.c
    branches/cloth-eltopo/source/blender/editors/space_image/image_draw.c
    branches/cloth-eltopo/source/blender/editors/space_image/image_edit.c
    branches/cloth-eltopo/source/blender/editors/space_image/image_intern.h
    branches/cloth-eltopo/source/blender/editors/space_image/image_ops.c
    branches/cloth-eltopo/source/blender/editors/space_image/space_image.c
    branches/cloth-eltopo/source/blender/editors/space_info/info_stats.c
    branches/cloth-eltopo/source/blender/editors/space_info/space_info.c
    branches/cloth-eltopo/source/blender/editors/space_logic/logic_buttons.c
    branches/cloth-eltopo/source/blender/editors/space_logic/logic_window.c
    branches/cloth-eltopo/source/blender/editors/space_nla/nla_buttons.c
    branches/cloth-eltopo/source/blender/editors/space_nla/nla_edit.c
    branches/cloth-eltopo/source/blender/editors/space_nla/nla_select.c
    branches/cloth-eltopo/source/blender/editors/space_node/drawnode.c
    branches/cloth-eltopo/source/blender/editors/space_node/node_draw.c
    branches/cloth-eltopo/source/blender/editors/space_node/node_edit.c
    branches/cloth-eltopo/source/blender/editors/space_node/node_group.c
    branches/cloth-eltopo/source/blender/editors/space_node/node_header.c
    branches/cloth-eltopo/source/blender/editors/space_node/node_intern.h
    branches/cloth-eltopo/source/blender/editors/space_node/node_ops.c
    branches/cloth-eltopo/source/blender/editors/space_node/node_relationships.c
    branches/cloth-eltopo/source/blender/editors/space_node/node_select.c
    branches/cloth-eltopo/source/blender/editors/space_node/node_templates.c
    branches/cloth-eltopo/source/blender/editors/space_node/node_view.c
    branches/cloth-eltopo/source/blender/editors/space_node/space_node.c
    branches/cloth-eltopo/source/blender/editors/space_outliner/outliner_draw.c
    branches/cloth-eltopo/source/blender/editors/space_outliner/outliner_edit.c
    branches/cloth-eltopo/source/blender/editors/space_outliner/outliner_select.c
    branches/cloth-eltopo/source/blender/editors/space_outliner/outliner_tree.c
    branches/cloth-eltopo/source/blender/editors/space_sequencer/sequencer_add.c
    branches/cloth-eltopo/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/cloth-eltopo/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/cloth-eltopo/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/cloth-eltopo/source/blender/editors/space_sequencer/sequencer_scopes.c
    branches/cloth-eltopo/source/blender/editors/space_sequencer/sequencer_select.c
    branches/cloth-eltopo/source/blender/editors/space_sequencer/sequencer_view.c
    branches/cloth-eltopo/source/blender/editors/space_sequencer/space_sequencer.c
    branches/cloth-eltopo/source/blender/editors/space_text/text_draw.c
    branches/cloth-eltopo/source/blender/editors/space_text/text_header.c
    branches/cloth-eltopo/source/blender/editors/space_text/text_ops.c
    branches/cloth-eltopo/source/blender/editors/space_text/text_python.c
    branches/cloth-eltopo/source/blender/editors/space_time/space_time.c
    branches/cloth-eltopo/source/blender/editors/space_time/time_ops.c
    branches/cloth-eltopo/source/blender/editors/space_userpref/space_userpref.c
    branches/cloth-eltopo/source/blender/editors/space_view3d/drawanimviz.c
    branches/cloth-eltopo/source/blender/editors/space_view3d/drawarmature.c
    branches/cloth-eltopo/source/blender/editors/space_view3d/drawmesh.c
    branches/cloth-eltopo/source/blender/editors/space_view3d/drawobject.c
    branches/cloth-eltopo/source/blender/editors/space_view3d/view3d_buttons.c
    branches/cloth-eltopo/source/blender/editors/space_view3d/view3d_draw.c
    branches/cloth-eltopo/source/blender/editors/space_view3d/view3d_edit.c
    branches/cloth-eltopo/source/blender/editors/space_view3d/view3d_fly.c
    branches/cloth-eltopo/source/blender/editors/space_view3d/view3d_header.c
    branches/cloth-eltopo/source/blender/editors/space_view3d/view3d_select.c
    branches/cloth-eltopo/source/blender/editors/space_view3d/view3d_snap.c
    branches/cloth-eltopo/source/blender/editors/space_view3d/view3d_view.c
    branches/cloth-eltopo/source/blender/editors/transform/transform.c
    branches/cloth-eltopo/source/blender/editors/transform/transform.h
    branches/cloth-eltopo/source/blender/editors/transform/transform_conversions.c
    branches/cloth-eltopo/source/blender/editors/transform/transform_generics.c
    branches/cloth-eltopo/source/blender/editors/transform/transform_orientations.c
    branches/cloth-eltopo/source/blender/editors/transform/transform_snap.c
    branches/cloth-eltopo/source/blender/editors/util/ed_util.c
    branches/cloth-eltopo/source/blender/editors/util/editmode_undo.c
    branches/cloth-eltopo/source/blender/editors/util/numinput.c
    branches/cloth-eltopo/source/blender/editors/util/undo.c
    branches/cloth-eltopo/source/blender/editors/uvedit/uvedit_ops.c
    branches/cloth-eltopo/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/cloth-eltopo/source/blender/gpu/GPU_draw.h
    branches/cloth-eltopo/source/blender/gpu/GPU_material.h
    branches/cloth-eltopo/source/blender/gpu/intern/gpu_buffers.c
    branches/cloth-eltopo/source/blender/gpu/intern/gpu_draw.c
    branches/cloth-eltopo/source/blender/gpu/intern/gpu_material.c
    branches/cloth-eltopo/source/blender/ikplugin/intern/itasc_plugin.cpp
    branches/cloth-eltopo/source/blender/imbuf/CMakeLists.txt
    branches/cloth-eltopo/source/blender/imbuf/IMB_imbuf.h
    branches/cloth-eltopo/source/blender/imbuf/IMB_imbuf_types.h
    branches/cloth-eltopo/source/blender/imbuf/SConscript
    branches/cloth-eltopo/source/blender/imbuf/intern/IMB_anim.h
    branches/cloth-eltopo/source/blender/imbuf/intern/IMB_filetype.h
    branches/cloth-eltopo/source/blender/imbuf/intern/IMB_metadata.h
    branches/cloth-eltopo/source/blender/imbuf/intern/allocimbuf.c
    branches/cloth-eltopo/source/blender/imbuf/intern/anim_movie.c
    branches/cloth-eltopo/source/blender/imbuf/intern/bmp.c
    branches/cloth-eltopo/source/blender/imbuf/intern/cineon/cineon_dpx.c
    branches/cloth-eltopo/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
    branches/cloth-eltopo/source/blender/imbuf/intern/dds/dds_api.cpp
    branches/cloth-eltopo/source/blender/imbuf/intern/dds/dds_api.h
    branches/cloth-eltopo/source/blender/imbuf/intern/divers.c
    branches/cloth-eltopo/source/blender/imbuf/intern/filetype.c
    branches/cloth-eltopo/source/blender/imbuf/intern/imageprocess.c
    branches/cloth-eltopo/source/blender/imbuf/intern/indexer.c
    branches/cloth-eltopo/source/blender/imbuf/intern/indexer_dv.c
    branches/cloth-eltopo/source/blender/imbuf/intern/iris.c
    branches/cloth-eltopo/source/blender/imbuf/intern/jp2.c
    branches/cloth-eltopo/source/blender/imbuf/intern/jpeg.c
    branches/cloth-eltopo/source/blender/imbuf/intern/metadata.c
    branches/cloth-eltopo/source/blender/imbuf/intern/module.c
    branches/cloth-eltopo/source/blender/imbuf/intern/moviecache.c
    branches/cloth-eltopo/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/cloth-eltopo/source/blender/imbuf/intern/openexr/openexr_api.h
    branches/cloth-eltopo/source/blender/imbuf/intern/png.c
    branches/cloth-eltopo/source/blender/imbuf/intern/radiance_hdr.c
    branches/cloth-eltopo/source/blender/imbuf/intern/readimage.c
    branches/cloth-eltopo/source/blender/imbuf/intern/rectop.c
    branches/cloth-eltopo/source/blender/imbuf/intern/scaling.c
    branches/cloth-eltopo/source/blender/imbuf/intern/targa.c
    branches/cloth-eltopo/source/blender/imbuf/intern/thumbs.c
    branches/cloth-eltopo/source/blender/imbuf/intern/tiff.c
    branches/cloth-eltopo/source/blender/imbuf/intern/util.c
    branches/cloth-eltopo/source/blender/imbuf/intern/writeimage.c
    branches/cloth-eltopo/source/blender/makesdna/DNA_action_types.h
    branches/cloth-eltopo/source/blender/makesdna/DNA_armature_types.h
    branches/cloth-eltopo/source/blender/makesdna/DNA_camera_types.h
    branches/cloth-eltopo/source/blender/makesdna/DNA_color_types.h
    branches/cloth-eltopo/source/blender/makesdna/DNA_constraint_types.h
    branches/cloth-eltopo/source/blender/makesdna/DNA_curve_types.h
    branches/cloth-eltopo/source/blender/makesdna/DNA_customdata_types.h
    branches/cloth-eltopo/source/blender/makesdna/DNA_defs.h
    branches/cloth-eltopo/source/blender/makesdna/DNA_dynamicpaint_types.h
    branches/cloth-eltopo/source/blender/makesdna/DNA_gpencil_types.h
    branches/cloth-eltopo/source/blender/makesdna/DNA_image_types.h
    branches/cloth-eltopo/source/blender/makesdna/DNA_ipo_types.h
    branches/cloth-eltopo/source/blender/makesdna/DNA_key_types.h
    branches/cloth-eltopo/source/blender/makesdna/DNA_material_types.h
    branches/cloth-eltopo/source/blender/makesdna/DNA_mesh_types.h
    branches/cloth-eltopo/source/blender/makesdna/DNA_meshdata_types.h
    branches/cloth-eltopo/source/blender/makesdna/DNA_modifier_types.h
    branches/cloth-eltopo/source/blender/makesdna/DNA_movieclip_types.h
    branches/cloth-eltopo/source/blender/makesdna/DNA_object_types.h
    branches/cloth-eltopo/source/blender/makesdna/DNA_scene_types.h
    branches/cloth-eltopo/source/blender/makesdna/DNA_sdna_types.h
    branches/cloth-eltopo/source/blender/makesdna/DNA_sequence_types.h
    branches/cloth-eltopo/source/blender/makesdna/DNA_space_types.h
    branches/cloth-eltopo/source/blender/makesdna/DNA_view3d_types.h
    branches/cloth-eltopo/source/blender/makesdna/intern/makesdna.c
    branches/cloth-eltopo/source/blender/makesrna/RNA_access.h
    branches/cloth-eltopo/source/blender/makesrna/intern/makesrna.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_ID.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_access.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_action_api.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_actuator.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_actuator_api.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_animation.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_animation_api.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_armature.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_armature_api.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_camera_api.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_color.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_constraint.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_controller.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_controller_api.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_curve.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_define.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_fcurve.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_fcurve_api.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_gpencil.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_image.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_image_api.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_internal.h
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_key.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_main_api.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_mask.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_material.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_material_api.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_mesh.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_mesh_api.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_modifier.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_movieclip.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_nla.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_nodetree.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_nodetree_types.h
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_object.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_object_api.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_particle.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_pose.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_pose_api.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_property.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_scene.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_scene_api.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_screen.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_sensor.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_sensor_api.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_sequencer.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_sequencer_api.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_space.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_speaker.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_text_api.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_texture.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_texture_api.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_tracking.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_ui_api.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_userdef.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_wm.c
    branches/cloth-eltopo/source/blender/makesrna/intern/rna_wm_api.c
    branches/cloth-eltopo/source/blender/modifiers/intern/MOD_bevel.c
    branches/cloth-eltopo/source/blender/modifiers/intern/MOD_cloth.c
    branches/cloth-eltopo/source/blender/modifiers/intern/MOD_multires.c
    branches/cloth-eltopo/source/blender/modifiers/intern/MOD_particleinstance.c
    branches/cloth-eltopo/source/blender/modifiers/intern/MOD_particlesystem.c
    branches/cloth-eltopo/source/blender/modifiers/intern/MOD_screw.c
    branches/cloth-eltopo/source/blender/modifiers/intern/MOD_shapekey.c
    branches/cloth-eltopo/source/blender/modifiers/intern/MOD_simpledeform.c
    branches/cloth-eltopo/source/blender/modifiers/intern/MOD_solidify.c
    branches/cloth-eltopo/source/blender/modifiers/intern/MOD_uvproject.c
    branches/cloth-eltopo/source/blender/modifiers/intern/MOD_weightvgproximity.c
    branches/cloth-eltopo/source/blender/nodes/composite/node_composite_tree.c
    branches/cloth-eltopo/source/blender/nodes/composite/node_composite_util.c
    branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
    branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
    branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
    branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_image.c
    branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_outputFile.c
    branches/cloth-eltopo/source/blender/nodes/intern/node_common.c
    branches/cloth-eltopo/source/blender/nodes/intern/node_util.h
    branches/cloth-eltopo/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
    branches/cloth-eltopo/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
    branches/cloth-eltopo/source/blender/nodes/shader/nodes/node_shader_tex_image.c
    branches/cloth-eltopo/source/blender/nodes/texture/node_texture_util.c
    branches/cloth-eltopo/source/blender/nodes/texture/node_texture_util.h
    branches/cloth-eltopo/source/blender/opencl/intern/OCL_opencl.c
    branches/cloth-eltopo/source/blender/python/bmesh/bmesh_py_ops.c
    branches/cloth-eltopo/source/blender/python/bmesh/bmesh_py_types.c
    branches/cloth-eltopo/source/blender/python/bmesh/bmesh_py_types_customdata.c
    branches/cloth-eltopo/source/blender/python/bmesh/bmesh_py_types_meshdata.c
    branches/cloth-eltopo/source/blender/python/bmesh/bmesh_py_types_select.c
    branches/cloth-eltopo/source/blender/python/generic/bgl.c
    branches/cloth-eltopo/source/blender/python/generic/py_capi_utils.c
    branches/cloth-eltopo/source/blender/python/intern/CMakeLists.txt
    branches/cloth-eltopo/source/blender/python/intern/bpy.c
    branches/cloth-eltopo/source/blender/python/intern/bpy.h
    branches/cloth-eltopo/source/blender/python/intern/bpy_app_ffmpeg.c
    branches/cloth-eltopo/source/blender/python/intern/bpy_app_handlers.c
    branches/cloth-eltopo/source/blender/python/intern/bpy_interface.c
    branches/cloth-eltopo/source/blender/python/intern/bpy_interface_atexit.c
    branches/cloth-eltopo/source/blender/python/intern/bpy_library.c
    branches/cloth-eltopo/source/blender/python/intern/bpy_props.c
    branches/cloth-eltopo/source/blender/python/intern/bpy_rna.c
    branches/cloth-eltopo/source/blender/python/intern/bpy_rna.h
    branches/cloth-eltopo/source/blender/python/intern/bpy_rna_anim.c
    branches/cloth-eltopo/source/blender/python/intern/bpy_util.c
    branches/cloth-eltopo/source/blender/python/intern/gpu.c
    branches/cloth-eltopo/source/blender/python/intern/gpu.h
    branches/cloth-eltopo/source/blender/python/intern/stubs.c
    branches/cloth-eltopo/source/blender/python/mathutils/mathutils_Color.c
    branches/cloth-eltopo/source/blender/python/mathutils/mathutils_Matrix.c
    branches/cloth-eltopo/source/blender/python/mathutils/mathutils_Quaternion.c
    branches/cloth-eltopo/source/blender/python/mathutils/mathutils_Vector.c
    branches/cloth-eltopo/source/blender/python/mathutils/mathutils_geometry.c
    branches/cloth-eltopo/source/blender/quicktime/apple/qtkit_import.m
    branches/cloth-eltopo/source/blender/quicktime/apple/quicktime_import.c
    branches/cloth-eltopo/source/blender/render/extern/include/RE_pipeline.h
    branches/cloth-eltopo/source/blender/render/extern/include/RE_render_ext.h
    branches/cloth-eltopo/source/blender/render/extern/include/RE_shader_ext.h
    branches/cloth-eltopo/source/blender/render/intern/include/render_result.h
    branches/cloth-eltopo/source/blender/render/intern/include/renderdatabase.h
    branches/cloth-eltopo/source/blender/render/intern/include/zbuf.h
    branches/cloth-eltopo/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
    branches/cloth-eltopo/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
    branches/cloth-eltopo/source/blender/render/intern/source/convertblender.c
    branches/cloth-eltopo/source/blender/render/intern/source/envmap.c
    branches/cloth-eltopo/source/blender/render/intern/source/gammaCorrectionTables.c
    branches/cloth-eltopo/source/blender/render/intern/source/imagetexture.c
    branches/cloth-eltopo/source/blender/render/intern/source/initrender.c
    branches/cloth-eltopo/source/blender/render/intern/source/occlusion.c
    branches/cloth-eltopo/source/blender/render/intern/source/pipeline.c
    branches/cloth-eltopo/source/blender/render/intern/source/render_result.c
    branches/cloth-eltopo/source/blender/render/intern/source/render_texture.c
    branches/cloth-eltopo/source/blender/render/intern/source/rendercore.c
    branches/cloth-eltopo/source/blender/render/intern/source/renderdatabase.c
    branches/cloth-eltopo/source/blender/render/intern/source/shadbuf.c
    branches/cloth-eltopo/source/blender/render/intern/source/shadeinput.c
    branches/cloth-eltopo/source/blender/render/intern/source/strand.c
    branches/cloth-eltopo/source/blender/render/intern/source/sunsky.c
    branches/cloth-eltopo/source/blender/render/intern/source/texture_ocean.c
    branches/cloth-eltopo/source/blender/render/intern/source/zbuf.c
    branches/cloth-eltopo/source/blender/windowmanager/WM_api.h
    branches/cloth-eltopo/source/blender/windowmanager/intern/wm_cursors.c
    branches/cloth-eltopo/source/blender/windowmanager/intern/wm_event_system.c
    branches/cloth-eltopo/source/blender/windowmanager/intern/wm_files.c
    branches/cloth-eltopo/source/blender/windowmanager/intern/wm_gesture.c
    branches/cloth-eltopo/source/blender/windowmanager/intern/wm_init_exit.c
    branches/cloth-eltopo/source/blender/windowmanager/intern/wm_jobs.c
    branches/cloth-eltopo/source/blender/windowmanager/intern/wm_keymap.c
    branches/cloth-eltopo/source/blender/windowmanager/intern/wm_operators.c
    branches/cloth-eltopo/source/blender/windowmanager/intern/wm_playanim.c
    branches/cloth-eltopo/source/blender/windowmanager/intern/wm_subwindow.c
    branches/cloth-eltopo/source/blender/windowmanager/intern/wm_window.c
    branches/cloth-eltopo/source/blenderplayer/CMakeLists.txt
    branches/cloth-eltopo/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/cloth-eltopo/source/creator/CMakeLists.txt
    branches/cloth-eltopo/source/creator/creator.c
    branches/cloth-eltopo/source/darwin/blender.app/Contents/Info.plist
    branches/cloth-eltopo/source/darwin/blenderplayer.app/Contents/Info.plist
    branches/cloth-eltopo/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/cloth-eltopo/source/gameengine/BlenderRoutines/CMakeLists.txt
    branches/cloth-eltopo/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
    branches/cloth-eltopo/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/cloth-eltopo/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
    branches/cloth-eltopo/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
    branches/cloth-eltopo/source/gameengine/CMakeLists.txt
    branches/cloth-eltopo/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/cloth-eltopo/source/gameengine/Converter/BL_ArmatureActuator.cpp
    branches/cloth-eltopo/source/gameengine/Converter/BL_ArmatureActuator.h
    branches/cloth-eltopo/source/gameengine/Converter/BL_ArmatureChannel.cpp
    branches/cloth-eltopo/source/gameengine/Converter/BL_ArmatureChannel.h
    branches/cloth-eltopo/source/gameengine/Converter/BL_ArmatureConstraint.cpp
    branches/cloth-eltopo/source/gameengine/Converter/BL_ArmatureConstraint.h
    branches/cloth-eltopo/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/cloth-eltopo/source/gameengine/Converter/BL_ArmatureObject.h
    branches/cloth-eltopo/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/cloth-eltopo/source/gameengine/Converter/BL_DeformableGameObject.h
    branches/cloth-eltopo/source/gameengine/Converter/BL_MeshDeformer.cpp
    branches/cloth-eltopo/source/gameengine/Converter/BL_ModifierDeformer.cpp
    branches/cloth-eltopo/source/gameengine/Converter/BL_ModifierDeformer.h
    branches/cloth-eltopo/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/cloth-eltopo/source/gameengine/Converter/BL_ShapeDeformer.cpp
    branches/cloth-eltopo/source/gameengine/Converter/BL_ShapeDeformer.h
    branches/cloth-eltopo/source/gameengine/Converter/BL_SkinDeformer.cpp
    branches/cloth-eltopo/source/gameengine/Converter/BlenderWorldInfo.cpp
    branches/cloth-eltopo/source/gameengine/Converter/BlenderWorldInfo.h
    branches/cloth-eltopo/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
    branches/cloth-eltopo/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
    branches/cloth-eltopo/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/cloth-eltopo/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/cloth-eltopo/source/gameengine/Converter/KX_ConvertControllers.cpp
    branches/cloth-eltopo/source/gameengine/Converter/KX_ConvertProperties.cpp
    branches/cloth-eltopo/source/gameengine/Converter/KX_ConvertSensors.cpp
    branches/cloth-eltopo/source/gameengine/Converter/KX_IpoConvert.cpp
    branches/cloth-eltopo/source/gameengine/Expressions/BoolValue.cpp
    branches/cloth-eltopo/source/gameengine/Expressions/BoolValue.h
    branches/cloth-eltopo/source/gameengine/Expressions/EXP_C-Api.cpp
    branches/cloth-eltopo/source/gameengine/Expressions/EXP_C-Api.h
    branches/cloth-eltopo/source/gameengine/Expressions/FloatValue.cpp
    branches/cloth-eltopo/source/gameengine/Expressions/InputParser.cpp
    branches/cloth-eltopo/source/gameengine/Expressions/IntValue.cpp
    branches/cloth-eltopo/source/gameengine/Expressions/KX_HashedPtr.h
    branches/cloth-eltopo/source/gameengine/Expressions/ListValue.cpp
    branches/cloth-eltopo/source/gameengine/Expressions/ListValue.h
    branches/cloth-eltopo/source/gameengine/Expressions/Operator2Expr.cpp
    branches/cloth-eltopo/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/cloth-eltopo/source/gameengine/Expressions/PyObjectPlus.h
    branches/cloth-eltopo/source/gameengine/Expressions/StringValue.h
    branches/cloth-eltopo/source/gameengine/Expressions/Value.cpp
    branches/cloth-eltopo/source/gameengine/Expressions/Value.h
    branches/cloth-eltopo/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
    branches/cloth-eltopo/source/gameengine/GameLogic/SCA_IController.cpp
    branches/cloth-eltopo/source/gameengine/GameLogic/SCA_IInputDevice.cpp
    branches/cloth-eltopo/source/gameengine/GameLogic/SCA_IInputDevice.h
    branches/cloth-eltopo/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
    branches/cloth-eltopo/source/gameengine/GameLogic/SCA_ILogicBrick.h
    branches/cloth-eltopo/source/gameengine/GameLogic/SCA_IObject.cpp
    branches/cloth-eltopo/source/gameengine/GameLogic/SCA_IObject.h
    branches/cloth-eltopo/source/gameengine/GameLogic/SCA_ISensor.cpp
    branches/cloth-eltopo/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
    branches/cloth-eltopo/source/gameengine/GameLogic/SCA_KeyboardManager.h
    branches/cloth-eltopo/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    branches/cloth-eltopo/source/gameengine/GameLogic/SCA_KeyboardSensor.h
    branches/cloth-eltopo/source/gameengine/GameLogic/SCA_MouseManager.h
    branches/cloth-eltopo/source/gameengine/GameLogic/SCA_MouseSensor.cpp
    branches/cloth-eltopo/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
    branches/cloth-eltopo/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/cloth-eltopo/source/gameengine/GameLogic/SCA_PythonController.h
    branches/cloth-eltopo/source/gameengine/GameLogic/SCA_PythonKeyboard.cpp
    branches/cloth-eltopo/source/gameengine/GameLogic/SCA_PythonKeyboard.h
    branches/cloth-eltopo/source/gameengine/GameLogic/SCA_PythonMouse.cpp
    branches/cloth-eltopo/source/gameengine/GameLogic/SCA_PythonMouse.h
    branches/cloth-eltopo/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    branches/cloth-eltopo/source/gameengine/GameLogic/SCA_RandomActuator.h
    branches/cloth-eltopo/source/gameengine/GameLogic/SCA_RandomSensor.cpp
    branches/cloth-eltopo/source/gameengine/GameLogic/SCA_TimeEventManager.cpp
    branches/cloth-eltopo/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
    branches/cloth-eltopo/source/gameengine/GamePlayer/common/GPC_Canvas.h
    branches/cloth-eltopo/source/gameengine/GamePlayer/common/GPC_MouseDevice.cpp
    branches/cloth-eltopo/source/gameengine/GamePlayer/common/GPC_RawImage.cpp
    branches/cloth-eltopo/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
    branches/cloth-eltopo/source/gameengine/GamePlayer/common/bmfont.cpp
    branches/cloth-eltopo/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/cloth-eltopo/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/BL_Shader.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/BL_Shader.h
    branches/cloth-eltopo/source/gameengine/Ketsji/BL_Texture.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_ArmatureSensor.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_ArmatureSensor.h
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_BlenderMaterial.h
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_Camera.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_Camera.h
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_CameraActuator.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_CameraIpoSGController.h
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_ConstraintActuator.h
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_ConstraintWrapper.h
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_Dome.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_FontObject.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_GameObject.h
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_IInterpolator.h
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_IScalarInterpolator.h
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_IpoActuator.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_Light.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_Light.h
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_LightIpoSGController.h
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_MeshProxy.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_MeshProxy.h
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_NavMeshObject.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_ObjectActuator.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_ObstacleSimulation.h
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_ParentActuator.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_ParentActuator.h
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_PolyProxy.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_PolyProxy.h
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_PolygonMaterial.h
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_PyMath.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_PyMath.h
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_PythonInit.h
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_PythonInitTypes.h
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_PythonSeq.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_RadarSensor.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_RaySensor.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_RaySensor.h
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_SG_NodeRelationships.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_SG_NodeRelationships.h
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_Scene.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_Scene.h
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_SceneActuator.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_SceneActuator.h
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_SoundActuator.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_SoundActuator.h
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_SteeringActuator.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_SteeringActuator.h
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_TouchSensor.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_TouchSensor.h
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_TrackToActuator.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_TrackToActuator.h
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_VertexProxy.cpp
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_VertexProxy.h
    branches/cloth-eltopo/source/gameengine/Ketsji/KX_WorldIpoController.h
    branches/cloth-eltopo/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
    branches/cloth-eltopo/source/gameengine/Network/NG_NetworkScene.h
    branches/cloth-eltopo/source/gameengine/Physics/Bullet/CcdGraphicController.h
    branches/cloth-eltopo/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/cloth-eltopo/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/cloth-eltopo/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/cloth-eltopo/source/gameengine/Physics/common/PHY_DynamicTypes.h
    branches/cloth-eltopo/source/gameengine/Physics/common/PHY_IController.h
    branches/cloth-eltopo/source/gameengine/Physics/common/PHY_IMotionState.h
    branches/cloth-eltopo/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
    branches/cloth-eltopo/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
    branches/cloth-eltopo/source/gameengine/Rasterizer/RAS_BucketManager.cpp
    branches/cloth-eltopo/source/gameengine/Rasterizer/RAS_Deformer.h
    branches/cloth-eltopo/source/gameengine/Rasterizer/RAS_FramingManager.cpp
    branches/cloth-eltopo/source/gameengine/Rasterizer/RAS_FramingManager.h
    branches/cloth-eltopo/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/cloth-eltopo/source/gameengine/Rasterizer/RAS_IRenderTools.h
    branches/cloth-eltopo/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
    branches/cloth-eltopo/source/gameengine/Rasterizer/RAS_MeshObject.cpp
    branches/cloth-eltopo/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/cloth-eltopo/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/cloth-eltopo/source/gameengine/SceneGraph/SG_Controller.h
    branches/cloth-eltopo/source/gameengine/SceneGraph/SG_IObject.cpp
    branches/cloth-eltopo/source/gameengine/SceneGraph/SG_IObject.h
    branches/cloth-eltopo/source/gameengine/SceneGraph/SG_Node.cpp
    branches/cloth-eltopo/source/gameengine/SceneGraph/SG_Node.h
    branches/cloth-eltopo/source/gameengine/SceneGraph/SG_ParentRelation.h
    branches/cloth-eltopo/source/gameengine/SceneGraph/SG_Spatial.cpp
    branches/cloth-eltopo/source/gameengine/SceneGraph/SG_Spatial.h
    branches/cloth-eltopo/source/gameengine/SceneGraph/SG_Tree.cpp
    branches/cloth-eltopo/source/gameengine/VideoTexture/BlendType.h
    branches/cloth-eltopo/source/gameengine/VideoTexture/FilterBase.cpp
    branches/cloth-eltopo/source/gameengine/VideoTexture/FilterBase.h
    branches/cloth-eltopo/source/gameengine/VideoTexture/FilterBlueScreen.cpp
    branches/cloth-eltopo/source/gameengine/VideoTexture/FilterColor.cpp
    branches/cloth-eltopo/source/gameengine/VideoTexture/FilterNormal.cpp
    branches/cloth-eltopo/source/gameengine/VideoTexture/ImageBase.cpp
    branches/cloth-eltopo/source/gameengine/VideoTexture/ImageBase.h
    branches/cloth-eltopo/source/gameengine/VideoTexture/ImageBuff.cpp
    branches/cloth-eltopo/source/gameengine/VideoTexture/ImageMix.cpp
    branches/cloth-eltopo/source/gameengine/VideoTexture/ImageRender.cpp
    branches/cloth-eltopo/source/gameengine/VideoTexture/ImageViewport.cpp
    branches/cloth-eltopo/source/gameengine/VideoTexture/ImageViewport.h
    branches/cloth-eltopo/source/gameengine/VideoTexture/PyTypeList.cpp
    branches/cloth-eltopo/source/gameengine/VideoTexture/PyTypeList.h
    branches/cloth-eltopo/source/gameengine/VideoTexture/Texture.cpp
    branches/cloth-eltopo/source/gameengine/VideoTexture/Texture.h
    branches/cloth-eltopo/source/gameengine/VideoTexture/VideoBase.cpp
    branches/cloth-eltopo/source/gameengine/VideoTexture/VideoBase.h
    branches/cloth-eltopo/source/gameengine/VideoTexture/VideoFFmpeg.cpp
    branches/cloth-eltopo/source/gameengine/VideoTexture/VideoFFmpeg.h
    branches/cloth-eltopo/source/gameengine/VideoTexture/blendVideoTex.cpp
    branches/cloth-eltopo/source/tests/bl_run_operators.py
    branches/cloth-eltopo/source/tests/rna_info_dump.py
    branches/cloth-eltopo/source/tools/spell_check_source_config.py
    branches/cloth-eltopo/source/tools/tag_release.py

Added Paths:
-----------
    branches/cloth-eltopo/build_files/cmake/Modules/FindOpenColorIO.cmake
    branches/cloth-eltopo/build_files/cmake/cmake_static_check_smatch.py
    branches/cloth-eltopo/extern/libmv/third_party/ceres/include/ceres/crs_matrix.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/include/ceres/fpclassify.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/array_utils.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/array_utils.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/cxsparse.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/cxsparse.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/dense_normal_cholesky_solver.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/dense_normal_cholesky_solver.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/dogleg_strategy.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/dogleg_strategy.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/generate_eliminator_specialization.py
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/levenberg_marquardt_strategy.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/levenberg_marquardt_strategy.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/polynomial_solver.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/polynomial_solver.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/split.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/trust_region_minimizer.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/trust_region_minimizer.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/trust_region_strategy.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/trust_region_strategy.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/patches/msvc_glog_fix.patch
    branches/cloth-eltopo/extern/libmv/third_party/ceres/patches/no_previous_declaration_fix.patch
    branches/cloth-eltopo/intern/cycles/kernel/kernel_attribute.h
    branches/cloth-eltopo/intern/cycles/kernel/osl/nodes/node_object_info.osl
    branches/cloth-eltopo/intern/cycles/kernel/osl/nodes/node_particle_info.osl
    branches/cloth-eltopo/intern/cycles/kernel/osl/nodes/node_rgb_ramp.osl
    branches/cloth-eltopo/intern/cycles/util/util_attribute.cpp
    branches/cloth-eltopo/intern/cycles/util/util_attribute.h
    branches/cloth-eltopo/intern/opencolorio/
    branches/cloth-eltopo/release/datafiles/colormanagement/
    branches/cloth-eltopo/source/blender/imbuf/IMB_colormanagement.h
    branches/cloth-eltopo/source/blender/imbuf/intern/IMB_colormanagement_intern.h
    branches/cloth-eltopo/source/blender/imbuf/intern/colormanagement.c
    branches/cloth-eltopo/source/blender/python/intern/bpy_library.h
    branches/cloth-eltopo/source/tests/bl_rna_wiki_reference.py

Removed Paths:
-------------
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/levenberg_marquardt.cc
    branches/cloth-eltopo/extern/libmv/third_party/ceres/internal/ceres/levenberg_marquardt.h
    branches/cloth-eltopo/extern/libmv/third_party/ceres/patches/msvc_isfinite.patch
    branches/cloth-eltopo/intern/raskter/raskter_kdtree.c
    branches/cloth-eltopo/intern/raskter/raskter_kdtree.h
    branches/cloth-eltopo/intern/raskter/raskter_mt.c
    branches/cloth-eltopo/source/blender/imbuf/intern/imbuf_cocoa.m

Property Changed:
----------------
    branches/cloth-eltopo/source/blender/editors/interface/interface.c
    branches/cloth-eltopo/source/blender/editors/space_outliner/

Modified: branches/cloth-eltopo/CMakeLists.txt
===================================================================
--- branches/cloth-eltopo/CMakeLists.txt	2012-10-05 14:56:04 UTC (rev 51089)
+++ branches/cloth-eltopo/CMakeLists.txt	2012-10-05 15:34:31 UTC (rev 51090)
@@ -120,7 +120,7 @@
 option(WITH_PYTHON        "Enable Embedded Python API  (only disable for development)" ON)
 option(WITH_PYTHON_SECURITY "Disables execution of scripts within blend files by default (recommend to leave off)" OFF)
 mark_as_advanced(WITH_PYTHON)  # dont want people disabling this unless they really know what they are doing.
-mark_as_advanced(WITH_PYTHON_SECURITY)  # some distrobutions see this as a security issue, rather than have them patch it, make a build option.
+mark_as_advanced(WITH_PYTHON_SECURITY)  # some distributions see this as a security issue, rather than have them patch it, make a build option.
 
 option(WITH_PYTHON_SAFETY "Enable internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency, only enable for development)." OFF)
 option(WITH_PYTHON_MODULE "Enable building as a python module which runs without a user interface, like running regular blender in background mode (experimental, only enable for development)" OFF)
@@ -131,8 +131,9 @@
 option(WITH_BULLET        "Enable Bullet (Physics Engine)" ON)
 option(WITH_GAMEENGINE    "Enable Game Engine" ON)
 option(WITH_PLAYER        "Build Player" OFF)
+option(WITH_OPENCOLORIO   "Enable OpenColorIO color management" ON)
 option(WITH_COMPOSITOR    "Enable the tile based nodal compositor" ON)
-option(WITH_COMPOSITOR_LEGACY "Enable legacy compositor" ON)
+option(WITH_COMPOSITOR_LEGACY "Enable legacy compositor" OFF)
 
 # GHOST Windowing Library Options
 option(WITH_GHOST_DEBUG   "Enable debugging output for the GHOST library" OFF)
@@ -371,13 +372,15 @@
 	set(WITH_BOOST ON)
 endif()
 
-# don't store paths to libs for portable distrobution
+# don't store paths to libs for portable distribution
 if(WITH_INSTALL_PORTABLE)
 	set(CMAKE_SKIP_BUILD_RPATH TRUE)
 endif()
 
 if(WITH_GHOST_SDL OR WITH_HEADLESS)
 	set(WITH_GHOST_XDND OFF)
+	set(WITH_X11_XF86VMODE OFF)
+	set(WITH_X11_XINPUT OFF)
 endif()
 
 if(MINGW)
@@ -563,7 +566,14 @@
 		endif()
 
 		mark_as_advanced(FFMPEG)
-		set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include ${FFMPEG}/include/ffmpeg)
+
+		# lame, but until we have proper find module for ffmpeg
+		set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
+		if(EXISTS "${FFMPEG}/include/ffmpeg/")
+			list(APPEND FFMPEG_INCLUDE_DIRS "${FFMPEG}/include/ffmpeg")
+		endif()
+		# end lameness
+
 		mark_as_advanced(FFMPEG_LIBRARIES)
 		set(FFMPEG_LIBPATH ${FFMPEG}/lib)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")
@@ -638,7 +648,11 @@
 			else()
 				set(Boost_USE_MULTITHREADED ON)
 			endif()
-			find_package(Boost 1.34 COMPONENTS filesystem regex system thread)
+			if(WITH_CYCLES_OSL)
+				find_package(Boost 1.34 COMPONENTS filesystem python3 regex system thread) # osl_nodes uses boost_python
+			else()
+				find_package(Boost 1.34 COMPONENTS filesystem regex system thread)
+			endif()
 			mark_as_advanced(Boost_DIR)  # why doesnt boost do this?
 		endif()
 
@@ -673,6 +687,49 @@
 		endif()
 	endif()
 
+	if(WITH_OPENCOLORIO)
+		# use lib dir if available and nothing else specified
+		if(LIBDIR AND NOT OPENCOLORIO_ROOT_DIR)
+			set(OPENCOLORIO_ROOT_DIR ${LIBDIR}/ocio)
+		endif()
+
+		find_package(OpenColorIO)
+
+		set(OPENCOLORIO_LIBRARIES ${OPENCOLORIO_LIBRARIES})
+		set(OPENCOLORIO_LIBPATH)  # TODO, remove and reference the absolute path everywhere
+		set(OPENCOLORIO_DEFINITIONS)
+
+		if(NOT OPENCOLORIO_FOUND)
+			set(WITH_OPENCOLORIO OFF)
+			message(STATUS "OpenColorIO not found")
+		endif()
+	endif()
+
+	if(WITH_CYCLES_OSL)
+		set(CYCLES_OSL ${LIBDIR}/osl CACHE PATH "Path to OpenShadingLanguage installation")
+	
+		message(STATUS "CYCLES_OSL = ${CYCLES_OSL}")
+	
+		find_library(OSL_LIB_EXEC NAMES oslexec PATHS ${CYCLES_OSL}/lib)
+		find_library(OSL_LIB_COMP NAMES oslcomp PATHS ${CYCLES_OSL}/lib)
+		find_library(OSL_LIB_QUERY NAMES oslquery PATHS ${CYCLES_OSL}/lib)
+		# WARNING! depends on correct order of OSL libs linking
+		list(APPEND OSL_LIBRARIES ${OSL_LIB_COMP} ${OSL_LIB_EXEC} ${OSL_LIB_QUERY})
+		find_path(OSL_INCLUDES OSL/oslclosure.h PATHS ${CYCLES_OSL}/include)
+		find_program(OSL_COMPILER NAMES oslc PATHS ${CYCLES_OSL}/bin)
+	
+		if(OSL_INCLUDES AND OSL_LIBRARIES AND OSL_COMPILER)
+			set(OSL_FOUND TRUE)
+			message(STATUS "OSL includes = ${OSL_INCLUDES}")
+			message(STATUS "OSL library = ${OSL_LIBRARIES}")
+			message(STATUS "OSL compiler = ${OSL_COMPILER}")
+		else()
+			message(STATUS "OSL not found")
+		endif()
+	
+		include_directories(${OSL_INCLUDES})
+	endif()
+
 	# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
 	set(PLATFORM_LINKLIBS "-lutil -lc -lm -lpthread -lstdc++")
 
@@ -817,6 +874,31 @@
 		add_definitions(-D__SSE__ -D__MMX__)
 	endif()
 
+	if(WITH_CYCLES_OSL)
+		set(CYCLES_OSL ${LIBDIR}/osl CACHE PATH "Path to OpenShadingLanguage installation")
+	
+		message(STATUS "CYCLES_OSL = ${CYCLES_OSL}")
+	
+		find_library(OSL_LIB_EXEC NAMES oslexec PATHS ${CYCLES_OSL}/lib)
+		find_library(OSL_LIB_COMP NAMES oslcomp PATHS ${CYCLES_OSL}/lib)
+		find_library(OSL_LIB_QUERY NAMES oslquery PATHS ${CYCLES_OSL}/lib)
+		# WARNING! depends on correct order of OSL libs linking
+		list(APPEND OSL_LIBRARIES ${OSL_LIB_COMP} ${OSL_LIB_EXEC} ${OSL_LIB_QUERY})
+		find_path(OSL_INCLUDES OSL/oslclosure.h PATHS ${CYCLES_OSL}/include)
+		find_program(OSL_COMPILER NAMES oslc PATHS ${CYCLES_OSL}/bin)
+	
+		if(OSL_INCLUDES AND OSL_LIBRARIES AND OSL_COMPILER)
+			set(OSL_FOUND TRUE)
+			message(STATUS "OSL includes = ${OSL_INCLUDES}")
+			message(STATUS "OSL library = ${OSL_LIBRARIES}")
+			message(STATUS "OSL compiler = ${OSL_COMPILER}")
+		else()
+			message(STATUS "OSL not found")
+		endif()
+	
+		include_directories(${OSL_INCLUDES})
+	endif()
+
 	if(MSVC)
 		set(PLATFORM_LINKLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid)
 
@@ -1002,9 +1084,17 @@
 			endif()
 			set(BOOST_LIBRARIES
 				optimized libboost_date_time-${BOOST_POSTFIX} optimized libboost_filesystem-${BOOST_POSTFIX}
-				optimized libboost_regex-${BOOST_POSTFIX} optimized libboost_system-${BOOST_POSTFIX} optimized libboost_thread-${BOOST_POSTFIX}
+				optimized libboost_regex-${BOOST_POSTFIX}
+				optimized libboost_system-${BOOST_POSTFIX} optimized libboost_thread-${BOOST_POSTFIX}
 				debug libboost_date_time-${BOOST_DEBUG_POSTFIX} debug libboost_filesystem-${BOOST_DEBUG_POSTFIX}
-				debug libboost_regex-${BOOST_DEBUG_POSTFIX} debug libboost_system-${BOOST_DEBUG_POSTFIX} debug libboost_thread-${BOOST_DEBUG_POSTFIX})
+				debug libboost_regex-${BOOST_DEBUG_POSTFIX}
+				debug libboost_system-${BOOST_DEBUG_POSTFIX} debug libboost_thread-${BOOST_DEBUG_POSTFIX})
+				if(WITH_CYCLES_OSL)
+					set(BOOST_LIBRARIES ${BOOST_LIBRARIES}
+						optimized libboost_python3-${BOOST_POSTFIX}
+						debug libboost_python3-${BOOST_DEBUG_POSTFIX})
+				endif(WITH_CYCLES_OSL)
+				
 			set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")
 		endif()
 			
@@ -1016,6 +1106,14 @@
 			set(OPENIMAGEIO_DEFINITIONS)
 		endif()
 
+		if(WITH_OPENCOLORIO)
+			set(OPENCOLORIO ${LIBDIR}/opencolorio)
+			set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
+			set(OPENCOLORIO_LIBRARIES OpenColorIO)
+			set(OPENCOLORIO_LIBPATH ${LIBDIR}/opencolorio/lib)
+			set(OPENCOLORIO_DEFINITIONS)
+		endif()
+
 		set(PLATFORM_LINKFLAGS "/SUBSYSTEM:CONSOLE /STACK:2097152 /INCREMENTAL:NO /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:msvcmrt.lib /NODEFAULTLIB:msvcurt.lib /NODEFAULTLIB:msvcrtd.lib")
 
 		# MSVC only, Mingw doesnt need
@@ -1028,7 +1126,7 @@
 		set(PLATFORM_LINKFLAGS_DEBUG "/NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libc.lib")
 
 		# used in many places so include globally, like OpenGL
-		blender_include_dirs("${PTHREADS_INCLUDE_DIRS}")
+		blender_include_dirs_sys("${PTHREADS_INCLUDE_DIRS}")
 
 	elseif(CMAKE_COMPILER_IS_GNUCC)
 	# keep GCC specific stuff here		
@@ -1167,14 +1265,22 @@
 				set(BOOST_POSTFIX "mgw47-mt-s-1_49")
 				set(BOOST_DEBUG_POSTFIX "mgw47-mt-sd-1_49")
 			else()
-				set(BOOST_POSTFIX "mgw46-mt-s-1_47")
-				set(BOOST_DEBUG_POSTFIX "mgw46-mt-sd-1_47")
+				set(BOOST_POSTFIX "mgw46-mt-s-1_49")
+				set(BOOST_DEBUG_POSTFIX "mgw46-mt-sd-1_49")
 			endif()		
 			set(BOOST_LIBRARIES
 				optimized boost_date_time-${BOOST_POSTFIX} boost_filesystem-${BOOST_POSTFIX}
-				boost_regex-${BOOST_POSTFIX} boost_system-${BOOST_POSTFIX} boost_thread-${BOOST_POSTFIX}
+				boost_regex-${BOOST_POSTFIX}
+				boost_system-${BOOST_POSTFIX} boost_thread-${BOOST_POSTFIX}
 				debug boost_date_time-${BOOST_DEBUG_POSTFIX} boost_filesystem-${BOOST_DEBUG_POSTFIX}
-				boost_regex-${BOOST_DEBUG_POSTFIX} boost_system-${BOOST_DEBUG_POSTFIX} boost_thread-${BOOST_DEBUG_POSTFIX})
+				boost_regex-${BOOST_DEBUG_POSTFIX}
+				boost_system-${BOOST_DEBUG_POSTFIX} boost_thread-${BOOST_DEBUG_POSTFIX})
+				if(WITH_CYCLES_OSL)
+					set(BOOST_LIBRARIES ${BOOST_LIBRARIES}
+						optimized libboost_python3-${BOOST_POSTFIX}
+						debug libboost_python3-${BOOST_DEBUG_POSTFIX}) 
+				endif(WITH_CYCLES_OSL)
+					
 			set(BOOST_LIBPATH ${BOOST}/lib)
 			set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB -DBOOST_THREAD_USE_LIB ")
 		endif()
@@ -1187,10 +1293,18 @@
 			set(OPENIMAGEIO_DEFINITIONS)
 		endif()
 		
+		if(WITH_OPENCOLORIO)
+			set(OPENCOLORIO ${LIBDIR}/opencolorio)
+			set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
+			set(OPENCOLORIO_LIBRARIES OpenColorIO)
+			set(OPENCOLORIO_LIBPATH ${OPENCOLORIO}/lib)
+			set(OPENCOLORIO_DEFINITIONS)
+		endif()
+
 		set(PLATFORM_LINKFLAGS "-Xlinker --stack=2097152")
 
 		## DISABLE - causes linking errors 
-		## for re-distrobution, so users dont need mingw installed
+		## for re-distribution, so users dont need mingw installed
 		# set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -static-libgcc -static-libstdc++")
 
 	endif()
@@ -1302,6 +1416,7 @@
 
 	if(WITH_IMAGE_OPENEXR)
 		set(OPENEXR ${LIBDIR}/openexr)
+		set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
 		set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
 		set(OPENEXR_LIBRARIES Iex Half IlmImf Imath IlmThread)
 		set(OPENEXR_LIBPATH ${OPENEXR}/lib)
@@ -1420,7 +1535,11 @@
 	if(WITH_BOOST)
 		set(BOOST ${LIBDIR}/boost)
 		set(BOOST_INCLUDE_DIR ${BOOST}/include)

@@ Diff output truncated at 10240 characters. @@