[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60886] branches/asset-browser: == asset browser ==

Andrea Weikert elubie at gmx.net
Mon Oct 21 21:48:45 CEST 2013


Revision: 60886
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60886
Author:   elubie
Date:     2013-10-21 19:48:44 +0000 (Mon, 21 Oct 2013)
Log Message:
-----------
== asset browser ==

merge from trunk rev. 59558-60854

NOTE: also contains code for thumb loading forgotten to commit previously

Modified Paths:
--------------
    branches/asset-browser/CMakeLists.txt
    branches/asset-browser/GNUmakefile
    branches/asset-browser/SConstruct
    branches/asset-browser/build_files/build_environment/install_deps.sh
    branches/asset-browser/build_files/buildbot/config/user-config-mac-i386.py
    branches/asset-browser/build_files/buildbot/config/user-config-mac-x86_64.py
    branches/asset-browser/build_files/cmake/Modules/FindPythonLibsUnix.cmake
    branches/asset-browser/build_files/cmake/macros.cmake
    branches/asset-browser/build_files/scons/config/darwin-config.py
    branches/asset-browser/build_files/scons/config/freebsd8-config.py
    branches/asset-browser/build_files/scons/config/freebsd9-config.py
    branches/asset-browser/build_files/scons/config/linux-config.py
    branches/asset-browser/build_files/scons/tools/Blender.py
    branches/asset-browser/build_files/scons/tools/btools.py
    branches/asset-browser/doc/python_api/examples/bpy.props.5.py
    branches/asset-browser/doc/python_api/examples/bpy.types.WindowManager.popup_menu.py
    branches/asset-browser/doc/python_api/rst/bge.logic.rst
    branches/asset-browser/doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst
    branches/asset-browser/doc/python_api/sphinx_doc_gen.py
    branches/asset-browser/extern/libmv/CMakeLists.txt
    branches/asset-browser/extern/libmv/SConscript
    branches/asset-browser/extern/libmv/bundle.sh
    branches/asset-browser/extern/libmv/libmv/multiview/euclidean_resection.cc
    branches/asset-browser/extern/libmv/libmv/multiview/euclidean_resection.h
    branches/asset-browser/extern/libmv/libmv/multiview/fundamental.cc
    branches/asset-browser/extern/libmv/libmv/multiview/fundamental.h
    branches/asset-browser/extern/libmv/libmv/multiview/homography.cc
    branches/asset-browser/extern/libmv/libmv/multiview/homography.h
    branches/asset-browser/extern/libmv/libmv/simple_pipeline/keyframe_selection.cc
    branches/asset-browser/extern/libmv/libmv/simple_pipeline/keyframe_selection.h
    branches/asset-browser/extern/libmv/libmv/simple_pipeline/pipeline.cc
    branches/asset-browser/extern/libmv/libmv/simple_pipeline/pipeline.h
    branches/asset-browser/extern/libmv/libmv/simple_pipeline/reconstruction.h
    branches/asset-browser/extern/libmv/libmv/simple_pipeline/resect.cc
    branches/asset-browser/extern/libmv/libmv/simple_pipeline/resect.h
    branches/asset-browser/extern/libmv/libmv-capi.cc
    branches/asset-browser/extern/libmv/libmv-capi.h
    branches/asset-browser/extern/libmv/libmv-capi_stub.cc
    branches/asset-browser/extern/libmv/third_party/ceres/CMakeLists.txt
    branches/asset-browser/extern/libmv/third_party/ceres/ChangeLog
    branches/asset-browser/extern/libmv/third_party/ceres/SConscript
    branches/asset-browser/extern/libmv/third_party/ceres/bundle.sh
    branches/asset-browser/extern/libmv/third_party/ceres/files.txt
    branches/asset-browser/extern/libmv/third_party/ceres/include/ceres/autodiff_cost_function.h
    branches/asset-browser/extern/libmv/third_party/ceres/include/ceres/autodiff_local_parameterization.h
    branches/asset-browser/extern/libmv/third_party/ceres/include/ceres/ceres.h
    branches/asset-browser/extern/libmv/third_party/ceres/include/ceres/cost_function.h
    branches/asset-browser/extern/libmv/third_party/ceres/include/ceres/dynamic_autodiff_cost_function.h
    branches/asset-browser/extern/libmv/third_party/ceres/include/ceres/internal/autodiff.h
    branches/asset-browser/extern/libmv/third_party/ceres/include/ceres/internal/fixed_array.h
    branches/asset-browser/extern/libmv/third_party/ceres/include/ceres/internal/variadic_evaluate.h
    branches/asset-browser/extern/libmv/third_party/ceres/include/ceres/iteration_callback.h
    branches/asset-browser/extern/libmv/third_party/ceres/include/ceres/jet.h
    branches/asset-browser/extern/libmv/third_party/ceres/include/ceres/loss_function.h
    branches/asset-browser/extern/libmv/third_party/ceres/include/ceres/numeric_diff_cost_function.h
    branches/asset-browser/extern/libmv/third_party/ceres/include/ceres/problem.h
    branches/asset-browser/extern/libmv/third_party/ceres/include/ceres/sized_cost_function.h
    branches/asset-browser/extern/libmv/third_party/ceres/include/ceres/solver.h
    branches/asset-browser/extern/libmv/third_party/ceres/include/ceres/types.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/blas.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/block_jacobi_preconditioner.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/block_jacobi_preconditioner.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/block_random_access_sparse_matrix.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/block_sparse_matrix.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/block_sparse_matrix.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/block_structure.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/cgnr_solver.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/cgnr_solver.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/compressed_row_sparse_matrix.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/compressed_row_sparse_matrix.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/coordinate_descent_minimizer.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/corrector.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/corrector.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/cxsparse.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/cxsparse.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/dense_normal_cholesky_solver.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/dense_normal_cholesky_solver.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/dense_qr_solver.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/dense_qr_solver.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/dogleg_strategy.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/dogleg_strategy.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/graph_algorithms.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/implicit_schur_complement.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/implicit_schur_complement.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/iterative_schur_complement_solver.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/iterative_schur_complement_solver.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/levenberg_marquardt_strategy.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/line_search.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/line_search.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/line_search_direction.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/line_search_direction.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/line_search_minimizer.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/linear_least_squares_problems.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/linear_least_squares_problems.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/linear_solver.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/low_rank_inverse_hessian.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/low_rank_inverse_hessian.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/minimizer.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/parameter_block.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/parameter_block_ordering.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/parameter_block_ordering.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/partitioned_matrix_view.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/partitioned_matrix_view.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/preconditioner.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/preconditioner.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/problem.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/problem_impl.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/problem_impl.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/program_evaluator.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/residual_block.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/schur_eliminator_impl.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/schur_jacobi_preconditioner.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/schur_jacobi_preconditioner.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/solver.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/solver_impl.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/solver_impl.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/sparse_matrix.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/split.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/suitesparse.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/suitesparse.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/triplet_sparse_matrix.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/triplet_sparse_matrix.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/trust_region_minimizer.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/trust_region_strategy.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/types.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/visibility.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/wall_time.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/wall_time.h
    branches/asset-browser/extern/libmv/third_party/msinttypes/stdint.h
    branches/asset-browser/intern/atomic/atomic_ops.h
    branches/asset-browser/intern/cycles/CMakeLists.txt
    branches/asset-browser/intern/cycles/SConscript
    branches/asset-browser/intern/cycles/app/CMakeLists.txt
    branches/asset-browser/intern/cycles/app/cycles_standalone.cpp
    branches/asset-browser/intern/cycles/app/cycles_xml.cpp
    branches/asset-browser/intern/cycles/blender/CMakeLists.txt
    branches/asset-browser/intern/cycles/blender/addon/ui.py
    branches/asset-browser/intern/cycles/blender/blender_curves.cpp
    branches/asset-browser/intern/cycles/blender/blender_mesh.cpp
    branches/asset-browser/intern/cycles/blender/blender_object.cpp
    branches/asset-browser/intern/cycles/blender/blender_session.cpp
    branches/asset-browser/intern/cycles/blender/blender_shader.cpp
    branches/asset-browser/intern/cycles/blender/blender_sync.cpp
    branches/asset-browser/intern/cycles/blender/blender_sync.h
    branches/asset-browser/intern/cycles/bvh/bvh_build.cpp
    branches/asset-browser/intern/cycles/cmake/external_libs.cmake
    branches/asset-browser/intern/cycles/device/device.cpp
    branches/asset-browser/intern/cycles/device/device_cpu.cpp
    branches/asset-browser/intern/cycles/device/device_cuda.cpp
    branches/asset-browser/intern/cycles/device/device_memory.h
    branches/asset-browser/intern/cycles/device/device_multi.cpp
    branches/asset-browser/intern/cycles/device/device_network.cpp
    branches/asset-browser/intern/cycles/device/device_network.h
    branches/asset-browser/intern/cycles/device/device_opencl.cpp
    branches/asset-browser/intern/cycles/device/device_task.cpp
    branches/asset-browser/intern/cycles/device/device_task.h
    branches/asset-browser/intern/cycles/kernel/CMakeLists.txt
    branches/asset-browser/intern/cycles/kernel/SConscript
    branches/asset-browser/intern/cycles/kernel/closure/bsdf.h
    branches/asset-browser/intern/cycles/kernel/closure/bssrdf.h
    branches/asset-browser/intern/cycles/kernel/kernel.cl
    branches/asset-browser/intern/cycles/kernel/kernel.cpp
    branches/asset-browser/intern/cycles/kernel/kernel.cu
    branches/asset-browser/intern/cycles/kernel/kernel.h
    branches/asset-browser/intern/cycles/kernel/kernel_accumulate.h
    branches/asset-browser/intern/cycles/kernel/kernel_bvh.h
    branches/asset-browser/intern/cycles/kernel/kernel_compat_cuda.h
    branches/asset-browser/intern/cycles/kernel/kernel_film.h
    branches/asset-browser/intern/cycles/kernel/kernel_globals.h
    branches/asset-browser/intern/cycles/kernel/kernel_passes.h
    branches/asset-browser/intern/cycles/kernel/kernel_path.h
    branches/asset-browser/intern/cycles/kernel/kernel_primitive.h
    branches/asset-browser/intern/cycles/kernel/kernel_shader.h
    branches/asset-browser/intern/cycles/kernel/kernel_sse2.cpp
    branches/asset-browser/intern/cycles/kernel/kernel_sse3.cpp
    branches/asset-browser/intern/cycles/kernel/kernel_subsurface.h
    branches/asset-browser/intern/cycles/kernel/kernel_types.h
    branches/asset-browser/intern/cycles/kernel/osl/osl_bssrdf.cpp
    branches/asset-browser/intern/cycles/kernel/osl/osl_bssrdf.h
    branches/asset-browser/intern/cycles/kernel/osl/osl_closures.cpp
    branches/asset-browser/intern/cycles/kernel/osl/osl_closures.h
    branches/asset-browser/intern/cycles/kernel/osl/osl_services.cpp
    branches/asset-browser/intern/cycles/kernel/osl/osl_shader.cpp
    branches/asset-browser/intern/cycles/kernel/shaders/CMakeLists.txt
    branches/asset-browser/intern/cycles/kernel/shaders/SConscript
    branches/asset-browser/intern/cycles/kernel/shaders/node_blackbody.osl
    branches/asset-browser/intern/cycles/kernel/shaders/node_combine_hsv.osl
    branches/asset-browser/intern/cycles/kernel/shaders/node_environment_texture.osl
    branches/asset-browser/intern/cycles/kernel/shaders/node_separate_hsv.osl
    branches/asset-browser/intern/cycles/kernel/shaders/node_sky_texture.osl
    branches/asset-browser/intern/cycles/kernel/shaders/node_subsurface_scattering.osl
    branches/asset-browser/intern/cycles/kernel/shaders/node_vector_transform.osl
    branches/asset-browser/intern/cycles/kernel/shaders/node_ward_bsdf.osl
    branches/asset-browser/intern/cycles/kernel/shaders/stdosl.h
    branches/asset-browser/intern/cycles/kernel/svm/svm.h
    branches/asset-browser/intern/cycles/kernel/svm/svm_closure.h
    branches/asset-browser/intern/cycles/kernel/svm/svm_sepcomb_hsv.h
    branches/asset-browser/intern/cycles/kernel/svm/svm_sky.h
    branches/asset-browser/intern/cycles/kernel/svm/svm_types.h
    branches/asset-browser/intern/cycles/kernel/svm/svm_vector_transform.h
    branches/asset-browser/intern/cycles/render/CMakeLists.txt
    branches/asset-browser/intern/cycles/render/attribute.cpp
    branches/asset-browser/intern/cycles/render/blackbody.cpp
    branches/asset-browser/intern/cycles/render/blackbody.h
    branches/asset-browser/intern/cycles/render/buffers.cpp
    branches/asset-browser/intern/cycles/render/buffers.h
    branches/asset-browser/intern/cycles/render/camera.cpp
    branches/asset-browser/intern/cycles/render/film.cpp
    branches/asset-browser/intern/cycles/render/image.cpp
    branches/asset-browser/intern/cycles/render/integrator.cpp
    branches/asset-browser/intern/cycles/render/mesh.cpp
    branches/asset-browser/intern/cycles/render/nodes.cpp
    branches/asset-browser/intern/cycles/render/nodes.h
    branches/asset-browser/intern/cycles/render/object.cpp
    branches/asset-browser/intern/cycles/render/scene.cpp
    branches/asset-browser/intern/cycles/render/scene.h
    branches/asset-browser/intern/cycles/render/session.cpp
    branches/asset-browser/intern/cycles/render/session.h
    branches/asset-browser/intern/cycles/render/shader.cpp
    branches/asset-browser/intern/cycles/render/shader.h
    branches/asset-browser/intern/cycles/render/svm.cpp
    branches/asset-browser/intern/cycles/render/svm.h
    branches/asset-browser/intern/cycles/render/tile.cpp
    branches/asset-browser/intern/cycles/render/tile.h
    branches/asset-browser/intern/cycles/util/CMakeLists.txt
    branches/asset-browser/intern/cycles/util/util_opengl.h
    branches/asset-browser/intern/cycles/util/util_task.cpp
    branches/asset-browser/intern/cycles/util/util_task.h
    branches/asset-browser/intern/cycles/util/util_types.h
    branches/asset-browser/intern/elbeem/CMakeLists.txt
    branches/asset-browser/intern/elbeem/SConscript
    branches/asset-browser/intern/elbeem/intern/attributes.h
    branches/asset-browser/intern/elbeem/intern/controlparticles.h
    branches/asset-browser/intern/elbeem/intern/isosurface.h
    branches/asset-browser/intern/elbeem/intern/mvmcoords.h
    branches/asset-browser/intern/elbeem/intern/ntl_blenderdumper.h
    branches/asset-browser/intern/elbeem/intern/ntl_bsptree.h
    branches/asset-browser/intern/elbeem/intern/ntl_geometryclass.h
    branches/asset-browser/intern/elbeem/intern/ntl_geometrymodel.h
    branches/asset-browser/intern/elbeem/intern/ntl_geometryobject.h
    branches/asset-browser/intern/elbeem/intern/ntl_geometryshader.h
    branches/asset-browser/intern/elbeem/intern/ntl_lighting.h
    branches/asset-browser/intern/elbeem/intern/ntl_matrices.h
    branches/asset-browser/intern/elbeem/intern/ntl_ray.h
    branches/asset-browser/intern/elbeem/intern/ntl_vector3dim.h
    branches/asset-browser/intern/elbeem/intern/ntl_world.h
    branches/asset-browser/intern/elbeem/intern/parametrizer.h
    branches/asset-browser/intern/elbeem/intern/particletracer.cpp
    branches/asset-browser/intern/elbeem/intern/particletracer.h
    branches/asset-browser/intern/elbeem/intern/simulation_object.cpp
    branches/asset-browser/intern/elbeem/intern/simulation_object.h
    branches/asset-browser/intern/elbeem/intern/solver_class.h
    branches/asset-browser/intern/elbeem/intern/solver_control.cpp
    branches/asset-browser/intern/elbeem/intern/solver_control.h
    branches/asset-browser/intern/elbeem/intern/solver_interface.cpp
    branches/asset-browser/intern/elbeem/intern/solver_interface.h
    branches/asset-browser/intern/elbeem/intern/solver_main.cpp
    branches/asset-browser/intern/ghost/CMakeLists.txt
    branches/asset-browser/intern/ghost/SConscript
    branches/asset-browser/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm
    branches/asset-browser/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
    branches/asset-browser/intern/ghost/intern/GHOST_EventManager.cpp
    branches/asset-browser/intern/ghost/intern/GHOST_NDOFManager.h
    branches/asset-browser/intern/ghost/intern/GHOST_NDOFManagerCocoa.h
    branches/asset-browser/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
    branches/asset-browser/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/asset-browser/intern/ghost/intern/GHOST_SystemPathsX11.cpp
    branches/asset-browser/intern/ghost/intern/GHOST_SystemSDL.cpp
    branches/asset-browser/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/asset-browser/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/asset-browser/intern/ghost/intern/GHOST_WindowCocoa.h
    branches/asset-browser/intern/ghost/intern/GHOST_WindowSDL.cpp
    branches/asset-browser/intern/ghost/intern/GHOST_WindowSDL.h
    branches/asset-browser/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/asset-browser/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/asset-browser/intern/ghost/test/CMakeLists.txt
    branches/asset-browser/intern/ghost/test/gears/GHOST_Test.cpp
    branches/asset-browser/intern/ghost/test/multitest/MultiTest.c
    branches/asset-browser/intern/guardedalloc/CMakeLists.txt
    branches/asset-browser/intern/guardedalloc/MEM_guardedalloc.h
    branches/asset-browser/intern/guardedalloc/SConscript
    branches/asset-browser/intern/guardedalloc/intern/mallocn.c
    branches/asset-browser/intern/guardedalloc/intern/mmap_win.c
    branches/asset-browser/intern/guardedalloc/mmap_win.h
    branches/asset-browser/intern/guardedalloc/test/simpletest/memtest.c
    branches/asset-browser/intern/locale/boost_locale_wrapper.cpp
    branches/asset-browser/intern/mikktspace/mikktspace.c
    branches/asset-browser/intern/opencolorio/CMakeLists.txt
    branches/asset-browser/intern/opencolorio/SConscript
    branches/asset-browser/intern/opencolorio/fallback_impl.cc
    branches/asset-browser/intern/opencolorio/ocio_capi.cc
    branches/asset-browser/intern/opencolorio/ocio_capi.h
    branches/asset-browser/intern/opencolorio/ocio_impl.cc
    branches/asset-browser/intern/opencolorio/ocio_impl.h
    branches/asset-browser/intern/opencolorio/ocio_impl_glsl.cc
    branches/asset-browser/intern/tools/bpy_introspect_ui.py
    branches/asset-browser/intern/utfconv/utf_winfunc.c
    branches/asset-browser/release/datafiles/colormanagement/config.ocio
    branches/asset-browser/release/datafiles/preview_cycles.blend
    branches/asset-browser/release/datafiles/splash.png
    branches/asset-browser/release/scripts/freestyle/style_modules/ChainingIterators.py
    branches/asset-browser/release/scripts/freestyle/style_modules/PredicatesB1D.py
    branches/asset-browser/release/scripts/freestyle/style_modules/PredicatesU1D.py
    branches/asset-browser/release/scripts/freestyle/style_modules/parameter_editor.py
    branches/asset-browser/release/scripts/freestyle/style_modules/shaders.py
    branches/asset-browser/release/scripts/modules/addon_utils.py
    branches/asset-browser/release/scripts/modules/bl_i18n_utils/utils.py
    branches/asset-browser/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
    branches/asset-browser/release/scripts/modules/bpy/path.py
    branches/asset-browser/release/scripts/modules/bpy/utils.py
    branches/asset-browser/release/scripts/modules/bpy_extras/mesh_utils.py
    branches/asset-browser/release/scripts/modules/bpy_extras/object_utils.py
    branches/asset-browser/release/scripts/modules/bpy_types.py
    branches/asset-browser/release/scripts/modules/rna_info.py
    branches/asset-browser/release/scripts/modules/rna_keymap_ui.py
    branches/asset-browser/release/scripts/presets/cycles/sampling/final.py
    branches/asset-browser/release/scripts/presets/cycles/sampling/preview.py
    branches/asset-browser/release/scripts/presets/keyconfig/3dsmax.py
    branches/asset-browser/release/scripts/presets/keyconfig/maya.py
    branches/asset-browser/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/asset-browser/release/scripts/startup/bl_operators/node.py
    branches/asset-browser/release/scripts/startup/bl_operators/uvcalc_lightmap.py
    branches/asset-browser/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/asset-browser/release/scripts/startup/bl_operators/view3d.py
    branches/asset-browser/release/scripts/startup/bl_operators/wm.py
    branches/asset-browser/release/scripts/startup/bl_ui/__init__.py
    branches/asset-browser/release/scripts/startup/bl_ui/properties_constraint.py
    branches/asset-browser/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/asset-browser/release/scripts/startup/bl_ui/properties_data_curve.py
    branches/asset-browser/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/asset-browser/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/asset-browser/release/scripts/startup/bl_ui/properties_freestyle.py
    branches/asset-browser/release/scripts/startup/bl_ui/properties_game.py
    branches/asset-browser/release/scripts/startup/bl_ui/properties_mask_common.py
    branches/asset-browser/release/scripts/startup/bl_ui/properties_material.py
    branches/asset-browser/release/scripts/startup/bl_ui/properties_paint_common.py
    branches/asset-browser/release/scripts/startup/bl_ui/properties_particle.py
    branches/asset-browser/release/scripts/startup/bl_ui/properties_physics_common.py
    branches/asset-browser/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
    branches/asset-browser/release/scripts/startup/bl_ui/properties_render.py
    branches/asset-browser/release/scripts/startup/bl_ui/properties_render_layer.py
    branches/asset-browser/release/scripts/startup/bl_ui/properties_scene.py
    branches/asset-browser/release/scripts/startup/bl_ui/properties_texture.py
    branches/asset-browser/release/scripts/startup/bl_ui/space_clip.py
    branches/asset-browser/release/scripts/startup/bl_ui/space_dopesheet.py
    branches/asset-browser/release/scripts/startup/bl_ui/space_image.py
    branches/asset-browser/release/scripts/startup/bl_ui/space_info.py
    branches/asset-browser/release/scripts/startup/bl_ui/space_node.py
    branches/asset-browser/release/scripts/startup/bl_ui/space_sequencer.py
    branches/asset-browser/release/scripts/startup/bl_ui/space_text.py
    branches/asset-browser/release/scripts/startup/bl_ui/space_time.py
    branches/asset-browser/release/scripts/startup/bl_ui/space_userpref.py
    branches/asset-browser/release/scripts/startup/bl_ui/space_view3d.py
    branches/asset-browser/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/asset-browser/release/scripts/startup/nodeitems_builtins.py
    branches/asset-browser/release/scripts/templates_py/custom_nodes.py
    branches/asset-browser/release/scripts/templates_py/ui_list.py
    branches/asset-browser/release/text/readme.html
    branches/asset-browser/source/CMakeLists.txt
    branches/asset-browser/source/blender/CMakeLists.txt
    branches/asset-browser/source/blender/SConscript
    branches/asset-browser/source/blender/blenfont/intern/blf_font.c
    branches/asset-browser/source/blender/blenfont/intern/blf_glyph.c
    branches/asset-browser/source/blender/blenfont/intern/blf_internal_types.h
    branches/asset-browser/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/asset-browser/source/blender/blenkernel/BKE_action.h
    branches/asset-browser/source/blender/blenkernel/BKE_addon.h
    branches/asset-browser/source/blender/blenkernel/BKE_animsys.h
    branches/asset-browser/source/blender/blenkernel/BKE_assets.h
    branches/asset-browser/source/blender/blenkernel/BKE_blender.h
    branches/asset-browser/source/blender/blenkernel/BKE_brush.h
    branches/asset-browser/source/blender/blenkernel/BKE_ccg.h
    branches/asset-browser/source/blender/blenkernel/BKE_curve.h
    branches/asset-browser/source/blender/blenkernel/BKE_customdata.h
    branches/asset-browser/source/blender/blenkernel/BKE_deform.h
    branches/asset-browser/source/blender/blenkernel/BKE_editmesh.h
    branches/asset-browser/source/blender/blenkernel/BKE_editmesh_bvh.h
    branches/asset-browser/source/blender/blenkernel/BKE_fcurve.h
    branches/asset-browser/source/blender/blenkernel/BKE_idprop.h
    branches/asset-browser/source/blender/blenkernel/BKE_lamp.h
    branches/asset-browser/source/blender/blenkernel/BKE_library.h
    branches/asset-browser/source/blender/blenkernel/BKE_mask.h
    branches/asset-browser/source/blender/blenkernel/BKE_mesh.h
    branches/asset-browser/source/blender/blenkernel/BKE_modifier.h
    branches/asset-browser/source/blender/blenkernel/BKE_navmesh_conversion.h
    branches/asset-browser/source/blender/blenkernel/BKE_node.h
    branches/asset-browser/source/blender/blenkernel/BKE_object.h
    branches/asset-browser/source/blender/blenkernel/BKE_ocean.h
    branches/asset-browser/source/blender/blenkernel/BKE_paint.h
    branches/asset-browser/source/blender/blenkernel/BKE_pbvh.h
    branches/asset-browser/source/blender/blenkernel/BKE_pointcache.h
    branches/asset-browser/source/blender/blenkernel/BKE_report.h
    branches/asset-browser/source/blender/blenkernel/BKE_screen.h
    branches/asset-browser/source/blender/blenkernel/BKE_sequencer.h
    branches/asset-browser/source/blender/blenkernel/BKE_shrinkwrap.h
    branches/asset-browser/source/blender/blenkernel/BKE_subsurf.h
    branches/asset-browser/source/blender/blenkernel/BKE_text.h
    branches/asset-browser/source/blender/blenkernel/BKE_texture.h
    branches/asset-browser/source/blender/blenkernel/BKE_tracking.h
    branches/asset-browser/source/blender/blenkernel/CMakeLists.txt
    branches/asset-browser/source/blender/blenkernel/SConscript
    branches/asset-browser/source/blender/blenkernel/intern/CCGSubSurf.c
    branches/asset-browser/source/blender/blenkernel/intern/CCGSubSurf.h
    branches/asset-browser/source/blender/blenkernel/intern/DerivedMesh.c
    branches/asset-browser/source/blender/blenkernel/intern/action.c
    branches/asset-browser/source/blender/blenkernel/intern/addon.c
    branches/asset-browser/source/blender/blenkernel/intern/anim.c
    branches/asset-browser/source/blender/blenkernel/intern/anim_sys.c
    branches/asset-browser/source/blender/blenkernel/intern/armature.c
    branches/asset-browser/source/blender/blenkernel/intern/assets.c
    branches/asset-browser/source/blender/blenkernel/intern/blender.c
    branches/asset-browser/source/blender/blenkernel/intern/boids.c
    branches/asset-browser/source/blender/blenkernel/intern/bpath.c
    branches/asset-browser/source/blender/blenkernel/intern/brush.c
    branches/asset-browser/source/blender/blenkernel/intern/bvhutils.c
    branches/asset-browser/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/asset-browser/source/blender/blenkernel/intern/collision.c
    branches/asset-browser/source/blender/blenkernel/intern/colortools.c
    branches/asset-browser/source/blender/blenkernel/intern/constraint.c
    branches/asset-browser/source/blender/blenkernel/intern/curve.c
    branches/asset-browser/source/blender/blenkernel/intern/customdata.c
    branches/asset-browser/source/blender/blenkernel/intern/deform.c
    branches/asset-browser/source/blender/blenkernel/intern/depsgraph.c
    branches/asset-browser/source/blender/blenkernel/intern/displist.c
    branches/asset-browser/source/blender/blenkernel/intern/dynamicpaint.c
    branches/asset-browser/source/blender/blenkernel/intern/editderivedmesh.c
    branches/asset-browser/source/blender/blenkernel/intern/editmesh.c
    branches/asset-browser/source/blender/blenkernel/intern/editmesh_bvh.c
    branches/asset-browser/source/blender/blenkernel/intern/fcurve.c
    branches/asset-browser/source/blender/blenkernel/intern/freestyle.c
    branches/asset-browser/source/blender/blenkernel/intern/gpencil.c
    branches/asset-browser/source/blender/blenkernel/intern/idprop.c
    branches/asset-browser/source/blender/blenkernel/intern/image.c
    branches/asset-browser/source/blender/blenkernel/intern/library.c
    branches/asset-browser/source/blender/blenkernel/intern/linestyle.c
    branches/asset-browser/source/blender/blenkernel/intern/mask.c
    branches/asset-browser/source/blender/blenkernel/intern/mask_rasterize.c
    branches/asset-browser/source/blender/blenkernel/intern/mball.c
    branches/asset-browser/source/blender/blenkernel/intern/mesh.c
    branches/asset-browser/source/blender/blenkernel/intern/mesh_validate.c
    branches/asset-browser/source/blender/blenkernel/intern/modifier.c
    branches/asset-browser/source/blender/blenkernel/intern/modifiers_bmesh.c
    branches/asset-browser/source/blender/blenkernel/intern/movieclip.c
    branches/asset-browser/source/blender/blenkernel/intern/multires.c
    branches/asset-browser/source/blender/blenkernel/intern/navmesh_conversion.c
    branches/asset-browser/source/blender/blenkernel/intern/node.c
    branches/asset-browser/source/blender/blenkernel/intern/object.c
    branches/asset-browser/source/blender/blenkernel/intern/ocean.c
    branches/asset-browser/source/blender/blenkernel/intern/packedFile.c
    branches/asset-browser/source/blender/blenkernel/intern/paint.c
    branches/asset-browser/source/blender/blenkernel/intern/particle.c
    branches/asset-browser/source/blender/blenkernel/intern/particle_system.c
    branches/asset-browser/source/blender/blenkernel/intern/pbvh.c
    branches/asset-browser/source/blender/blenkernel/intern/pbvh_bmesh.c
    branches/asset-browser/source/blender/blenkernel/intern/pbvh_intern.h
    branches/asset-browser/source/blender/blenkernel/intern/pointcache.c
    branches/asset-browser/source/blender/blenkernel/intern/rigidbody.c
    branches/asset-browser/source/blender/blenkernel/intern/sca.c
    branches/asset-browser/source/blender/blenkernel/intern/scene.c
    branches/asset-browser/source/blender/blenkernel/intern/screen.c
    branches/asset-browser/source/blender/blenkernel/intern/sequencer.c
    branches/asset-browser/source/blender/blenkernel/intern/shrinkwrap.c
    branches/asset-browser/source/blender/blenkernel/intern/smoke.c
    branches/asset-browser/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/asset-browser/source/blender/blenkernel/intern/text.c
    branches/asset-browser/source/blender/blenkernel/intern/texture.c
    branches/asset-browser/source/blender/blenkernel/intern/tracking.c
    branches/asset-browser/source/blender/blenkernel/intern/treehash.c
    branches/asset-browser/source/blender/blenkernel/intern/writeffmpeg.c
    branches/asset-browser/source/blender/blenlib/BLI_alloca.h
    branches/asset-browser/source/blender/blenlib/BLI_array.h
    branches/asset-browser/source/blender/blenlib/BLI_bitmap.h
    branches/asset-browser/source/blender/blenlib/BLI_boxpack2d.h
    branches/asset-browser/source/blender/blenlib/BLI_buffer.h
    branches/asset-browser/source/blender/blenlib/BLI_callbacks.h
    branches/asset-browser/source/blender/blenlib/BLI_dynstr.h
    branches/asset-browser/source/blender/blenlib/BLI_edgehash.h
    branches/asset-browser/source/blender/blenlib/BLI_endian_switch.h
    branches/asset-browser/source/blender/blenlib/BLI_fnmatch.h
    branches/asset-browser/source/blender/blenlib/BLI_ghash.h
    branches/asset-browser/source/blender/blenlib/BLI_jitter.h
    branches/asset-browser/source/blender/blenlib/BLI_kdopbvh.h
    branches/asset-browser/source/blender/blenlib/BLI_kdtree.h
    branches/asset-browser/source/blender/blenlib/BLI_lasso.h
    branches/asset-browser/source/blender/blenlib/BLI_linklist_stack.h
    branches/asset-browser/source/blender/blenlib/BLI_listbase.h
    branches/asset-browser/source/blender/blenlib/BLI_math_base.h
    branches/asset-browser/source/blender/blenlib/BLI_math_geom.h
    branches/asset-browser/source/blender/blenlib/BLI_math_interp.h
    branches/asset-browser/source/blender/blenlib/BLI_math_matrix.h
    branches/asset-browser/source/blender/blenlib/BLI_math_rotation.h
    branches/asset-browser/source/blender/blenlib/BLI_math_vector.h
    branches/asset-browser/source/blender/blenlib/BLI_memarena.h
    branches/asset-browser/source/blender/blenlib/BLI_mempool.h
    branches/asset-browser/source/blender/blenlib/BLI_path_util.h
    branches/asset-browser/source/blender/blenlib/BLI_scanfill.h
    branches/asset-browser/source/blender/blenlib/BLI_smallhash.h
    branches/asset-browser/source/blender/blenlib/BLI_string.h
    branches/asset-browser/source/blender/blenlib/BLI_string_utf8.h
    branches/asset-browser/source/blender/blenlib/BLI_sys_types.h
    branches/asset-browser/source/blender/blenlib/BLI_threads.h
    branches/asset-browser/source/blender/blenlib/BLI_utildefines.h
    branches/asset-browser/source/blender/blenlib/CMakeLists.txt
    branches/asset-browser/source/blender/blenlib/PIL_time.h
    branches/asset-browser/source/blender/blenlib/intern/BLI_array.c
    branches/asset-browser/source/blender/blenlib/intern/BLI_ghash.c
    branches/asset-browser/source/blender/blenlib/intern/BLI_heap.c
    branches/asset-browser/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/asset-browser/source/blender/blenlib/intern/BLI_kdtree.c
    branches/asset-browser/source/blender/blenlib/intern/BLI_memarena.c
    branches/asset-browser/source/blender/blenlib/intern/BLI_mempool.c
    branches/asset-browser/source/blender/blenlib/intern/boxpack2d.c
    branches/asset-browser/source/blender/blenlib/intern/buffer.c
    branches/asset-browser/source/blender/blenlib/intern/callbacks.c
    branches/asset-browser/source/blender/blenlib/intern/edgehash.c
    branches/asset-browser/source/blender/blenlib/intern/fileops.c
    branches/asset-browser/source/blender/blenlib/intern/gsqueue.c
    branches/asset-browser/source/blender/blenlib/intern/lasso.c
    branches/asset-browser/source/blender/blenlib/intern/listbase.c
    branches/asset-browser/source/blender/blenlib/intern/math_base_inline.c
    branches/asset-browser/source/blender/blenlib/intern/math_geom.c
    branches/asset-browser/source/blender/blenlib/intern/math_interp.c
    branches/asset-browser/source/blender/blenlib/intern/math_matrix.c
    branches/asset-browser/source/blender/blenlib/intern/math_rotation.c
    branches/asset-browser/source/blender/blenlib/intern/math_vector_inline.c
    branches/asset-browser/source/blender/blenlib/intern/noise.c
    branches/asset-browser/source/blender/blenlib/intern/path_util.c
    branches/asset-browser/source/blender/blenlib/intern/quadric.c
    branches/asset-browser/source/blender/blenlib/intern/rand.c
    branches/asset-browser/source/blender/blenlib/intern/scanfill.c
    branches/asset-browser/source/blender/blenlib/intern/smallhash.c
    branches/asset-browser/source/blender/blenlib/intern/threads.c
    branches/asset-browser/source/blender/blenloader/BLO_readfile.h
    branches/asset-browser/source/blender/blenloader/CMakeLists.txt
    branches/asset-browser/source/blender/blenloader/intern/readfile.c
    branches/asset-browser/source/blender/blenloader/intern/versioning_legacy.c
    branches/asset-browser/source/blender/blenloader/intern/writefile.c
    branches/asset-browser/source/blender/bmesh/CMakeLists.txt
    branches/asset-browser/source/blender/bmesh/bmesh.h
    branches/asset-browser/source/blender/bmesh/bmesh_class.h
    branches/asset-browser/source/blender/bmesh/bmesh_tools.h
    branches/asset-browser/source/blender/bmesh/intern/bmesh_construct.c
    branches/asset-browser/source/blender/bmesh/intern/bmesh_core.c
    branches/asset-browser/source/blender/bmesh/intern/bmesh_core.h
    branches/asset-browser/source/blender/bmesh/intern/bmesh_edgeloop.c
    branches/asset-browser/source/blender/bmesh/intern/bmesh_inline.h
    branches/asset-browser/source/blender/bmesh/intern/bmesh_iterators.c
    branches/asset-browser/source/blender/bmesh/intern/bmesh_iterators.h
    branches/asset-browser/source/blender/bmesh/intern/bmesh_log.c
    branches/asset-browser/source/blender/bmesh/intern/bmesh_log.h
    branches/asset-browser/source/blender/bmesh/intern/bmesh_mesh.h
    branches/asset-browser/source/blender/bmesh/intern/bmesh_opdefines.c
    branches/asset-browser/source/blender/bmesh/intern/bmesh_operator_api.h
    branches/asset-browser/source/blender/bmesh/intern/bmesh_operator_api_inline.h
    branches/asset-browser/source/blender/bmesh/intern/bmesh_operators.c
    branches/asset-browser/source/blender/bmesh/intern/bmesh_polygon.c
    branches/asset-browser/source/blender/bmesh/intern/bmesh_polygon.h
    branches/asset-browser/source/blender/bmesh/intern/bmesh_walkers_impl.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_beautify.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_bridge.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_connect.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_connect_nonplanar.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_dissolve.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_dupe.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_edgenet.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_extrude.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_fill_attribute.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_fill_grid.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_fill_holes.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_hull.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_inset.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_join_triangles.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_normals.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_poke.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_primitive.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_removedoubles.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_subdivide.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_subdivide_edgering.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_symmetrize.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_triangulate.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_utils.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_wireframe.c
    branches/asset-browser/source/blender/bmesh/tools/bmesh_bevel.c
    branches/asset-browser/source/blender/bmesh/tools/bmesh_bisect_plane.c
    branches/asset-browser/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
    branches/asset-browser/source/blender/bmesh/tools/bmesh_edgenet.c
    branches/asset-browser/source/blender/bmesh/tools/bmesh_triangulate.c
    branches/asset-browser/source/blender/bmesh/tools/bmesh_triangulate.h
    branches/asset-browser/source/blender/collada/AnimationExporter.cpp
    branches/asset-browser/source/blender/collada/ArmatureExporter.cpp
    branches/asset-browser/source/blender/collada/CameraExporter.cpp
    branches/asset-browser/source/blender/collada/CameraExporter.h
    branches/asset-browser/source/blender/collada/ControllerExporter.cpp
    branches/asset-browser/source/blender/collada/DocumentImporter.cpp
    branches/asset-browser/source/blender/collada/ExportSettings.h
    branches/asset-browser/source/blender/collada/MeshImporter.cpp
    branches/asset-browser/source/blender/collada/collada.cpp
    branches/asset-browser/source/blender/collada/collada.h
    branches/asset-browser/source/blender/compositor/CMakeLists.txt
    branches/asset-browser/source/blender/compositor/COM_compositor.h
    branches/asset-browser/source/blender/compositor/COM_defines.h
    branches/asset-browser/source/blender/compositor/intern/COM_Converter.cpp
    branches/asset-browser/source/blender/compositor/intern/COM_ExecutionGroup.cpp
    branches/asset-browser/source/blender/compositor/intern/COM_ExecutionGroup.h
    branches/asset-browser/source/blender/compositor/intern/COM_ExecutionSystem.cpp
    branches/asset-browser/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
    branches/asset-browser/source/blender/compositor/intern/COM_ExecutionSystemHelper.h
    branches/asset-browser/source/blender/compositor/intern/COM_MemoryBuffer.cpp
    branches/asset-browser/source/blender/compositor/intern/COM_MemoryBuffer.h
    branches/asset-browser/source/blender/compositor/intern/COM_NodeBase.h
    branches/asset-browser/source/blender/compositor/intern/COM_NodeOperation.h
    branches/asset-browser/source/blender/compositor/nodes/COM_AlphaOverNode.cpp
    branches/asset-browser/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
    branches/asset-browser/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
    branches/asset-browser/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp
    branches/asset-browser/source/blender/compositor/nodes/COM_ColorMatteNode.cpp
    branches/asset-browser/source/blender/compositor/nodes/COM_ColorRampNode.cpp
    branches/asset-browser/source/blender/compositor/nodes/COM_ColorToBWNode.cpp
    branches/asset-browser/source/blender/compositor/nodes/COM_CombineHSVANode.cpp
    branches/asset-browser/source/blender/compositor/nodes/COM_CombineRGBANode.cpp
    branches/asset-browser/source/blender/compositor/nodes/COM_CombineYCCANode.cpp
    branches/asset-browser/source/blender/compositor/nodes/COM_CombineYUVANode.cpp
    branches/asset-browser/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp
    branches/asset-browser/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
    branches/asset-browser/source/blender/compositor/nodes/COM_FilterNode.cpp
    branches/asset-browser/source/blender/compositor/nodes/COM_GlareNode.cpp
    branches/asset-browser/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
    branches/asset-browser/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
    branches/asset-browser/source/blender/compositor/nodes/COM_ImageNode.cpp
    branches/asset-browser/source/blender/compositor/nodes/COM_ImageNode.h
    branches/asset-browser/source/blender/compositor/nodes/COM_KeyingNode.cpp
    branches/asset-browser/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp
    branches/asset-browser/source/blender/compositor/nodes/COM_MixNode.cpp
    branches/asset-browser/source/blender/compositor/nodes/COM_OutputFileNode.cpp
    branches/asset-browser/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
    branches/asset-browser/source/blender/compositor/nodes/COM_RenderLayersNode.h
    branches/asset-browser/source/blender/compositor/nodes/COM_SeparateHSVANode.cpp
    branches/asset-browser/source/blender/compositor/nodes/COM_SeparateRGBANode.cpp
    branches/asset-browser/source/blender/compositor/nodes/COM_SeparateYCCANode.cpp
    branches/asset-browser/source/blender/compositor/nodes/COM_SeparateYUVANode.cpp
    branches/asset-browser/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
    branches/asset-browser/source/blender/compositor/nodes/COM_TranslateNode.cpp
    branches/asset-browser/source/blender/compositor/nodes/COM_ZCombineNode.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_ChangeHSVOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_ChannelMatteOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_ChromaMatteOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_ColorMatteOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_DifferenceMatteOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_GlareGhostOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_GlareStreaksOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_ImageOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_InpaintOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_LuminanceMatteOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_MultilayerImageOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_OutputFileOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_ReadBufferOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_ReadBufferOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_SetColorOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_SetValueOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_SetVectorOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_TrackPositionOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_ViewerOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_WrapOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_WrapOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_ZCombineOperation.h
    branches/asset-browser/source/blender/datatoc/datatoc.c
    branches/asset-browser/source/blender/editors/animation/anim_channels_defines.c
    branches/asset-browser/source/blender/editors/animation/anim_channels_edit.c
    branches/asset-browser/source/blender/editors/animation/anim_filter.c
    branches/asset-browser/source/blender/editors/animation/anim_ipo_utils.c
    branches/asset-browser/source/blender/editors/animation/anim_markers.c
    branches/asset-browser/source/blender/editors/animation/anim_ops.c
    branches/asset-browser/source/blender/editors/animation/drivers.c
    branches/asset-browser/source/blender/editors/animation/keyframes_edit.c
    branches/asset-browser/source/blender/editors/animation/keyframing.c
    branches/asset-browser/source/blender/editors/armature/BIF_retarget.h
    branches/asset-browser/source/blender/editors/armature/armature_naming.c
    branches/asset-browser/source/blender/editors/armature/armature_utils.c
    branches/asset-browser/source/blender/editors/armature/editarmature_retarget.c
    branches/asset-browser/source/blender/editors/armature/pose_edit.c
    branches/asset-browser/source/blender/editors/armature/pose_lib.c
    branches/asset-browser/source/blender/editors/armature/pose_select.c
    branches/asset-browser/source/blender/editors/armature/pose_slide.c
    branches/asset-browser/source/blender/editors/curve/CMakeLists.txt
    branches/asset-browser/source/blender/editors/curve/curve_intern.h
    branches/asset-browser/source/blender/editors/curve/curve_ops.c
    branches/asset-browser/source/blender/editors/curve/editcurve.c
    branches/asset-browser/source/blender/editors/curve/editfont.c
    branches/asset-browser/source/blender/editors/curve/lorem.c
    branches/asset-browser/source/blender/editors/gpencil/gpencil_paint.c
    branches/asset-browser/source/blender/editors/include/BIF_glutil.h
    branches/asset-browser/source/blender/editors/include/ED_armature.h
    branches/asset-browser/source/blender/editors/include/ED_clip.h
    branches/asset-browser/source/blender/editors/include/ED_curve.h
    branches/asset-browser/source/blender/editors/include/ED_keyframing.h
    branches/asset-browser/source/blender/editors/include/ED_lattice.h
    branches/asset-browser/source/blender/editors/include/ED_mask.h
    branches/asset-browser/source/blender/editors/include/ED_mball.h
    branches/asset-browser/source/blender/editors/include/ED_mesh.h
    branches/asset-browser/source/blender/editors/include/ED_object.h
    branches/asset-browser/source/blender/editors/include/ED_render.h
    branches/asset-browser/source/blender/editors/include/ED_screen_types.h
    branches/asset-browser/source/blender/editors/include/ED_transform.h
    branches/asset-browser/source/blender/editors/include/ED_util.h
    branches/asset-browser/source/blender/editors/include/ED_view3d.h
    branches/asset-browser/source/blender/editors/include/UI_interface.h
    branches/asset-browser/source/blender/editors/include/UI_resources.h
    branches/asset-browser/source/blender/editors/include/UI_view2d.h
    branches/asset-browser/source/blender/editors/interface/CMakeLists.txt
    branches/asset-browser/source/blender/editors/interface/interface.c
    branches/asset-browser/source/blender/editors/interface/interface_anim.c
    branches/asset-browser/source/blender/editors/interface/interface_draw.c
    branches/asset-browser/source/blender/editors/interface/interface_handlers.c
    branches/asset-browser/source/blender/editors/interface/interface_intern.h
    branches/asset-browser/source/blender/editors/interface/interface_layout.c
    branches/asset-browser/source/blender/editors/interface/interface_ops.c
    branches/asset-browser/source/blender/editors/interface/interface_regions.c
    branches/asset-browser/source/blender/editors/interface/interface_templates.c
    branches/asset-browser/source/blender/editors/interface/interface_widgets.c
    branches/asset-browser/source/blender/editors/interface/resources.c
    branches/asset-browser/source/blender/editors/interface/view2d_ops.c
    branches/asset-browser/source/blender/editors/io/io_collada.c
    branches/asset-browser/source/blender/editors/listview/listview_draw.c
    branches/asset-browser/source/blender/editors/mask/SConscript
    branches/asset-browser/source/blender/editors/mask/mask_draw.c
    branches/asset-browser/source/blender/editors/mesh/CMakeLists.txt
    branches/asset-browser/source/blender/editors/mesh/editface.c
    branches/asset-browser/source/blender/editors/mesh/editmesh_add.c
    branches/asset-browser/source/blender/editors/mesh/editmesh_bevel.c
    branches/asset-browser/source/blender/editors/mesh/editmesh_extrude.c
    branches/asset-browser/source/blender/editors/mesh/editmesh_inset.c
    branches/asset-browser/source/blender/editors/mesh/editmesh_knife.c
    branches/asset-browser/source/blender/editors/mesh/editmesh_loopcut.c
    branches/asset-browser/source/blender/editors/mesh/editmesh_select.c
    branches/asset-browser/source/blender/editors/mesh/editmesh_tools.c
    branches/asset-browser/source/blender/editors/mesh/editmesh_utils.c
    branches/asset-browser/source/blender/editors/mesh/mesh_intern.h
    branches/asset-browser/source/blender/editors/mesh/mesh_navmesh.c
    branches/asset-browser/source/blender/editors/mesh/mesh_ops.c
    branches/asset-browser/source/blender/editors/mesh/meshtools.c
    branches/asset-browser/source/blender/editors/metaball/mball_edit.c
    branches/asset-browser/source/blender/editors/object/object_add.c
    branches/asset-browser/source/blender/editors/object/object_bake.c
    branches/asset-browser/source/blender/editors/object/object_edit.c
    branches/asset-browser/source/blender/editors/object/object_group.c
    branches/asset-browser/source/blender/editors/object/object_hook.c
    branches/asset-browser/source/blender/editors/object/object_relations.c
    branches/asset-browser/source/blender/editors/object/object_shapekey.c
    branches/asset-browser/source/blender/editors/object/object_transform.c
    branches/asset-browser/source/blender/editors/object/object_vgroup.c
    branches/asset-browser/source/blender/editors/physics/dynamicpaint_ops.c
    branches/asset-browser/source/blender/editors/physics/particle_edit.c
    branches/asset-browser/source/blender/editors/physics/physics_pointcache.c
    branches/asset-browser/source/blender/editors/render/render_internal.c
    branches/asset-browser/source/blender/editors/render/render_opengl.c
    branches/asset-browser/source/blender/editors/render/render_preview.c
    branches/asset-browser/source/blender/editors/render/render_shading.c
    branches/asset-browser/source/blender/editors/screen/area.c
    branches/asset-browser/source/blender/editors/screen/glutil.c
    branches/asset-browser/source/blender/editors/screen/screen_edit.c
    branches/asset-browser/source/blender/editors/screen/screen_ops.c
    branches/asset-browser/source/blender/editors/screen/screendump.c
    branches/asset-browser/source/blender/editors/sculpt_paint/paint_cursor.c
    branches/asset-browser/source/blender/editors/sculpt_paint/paint_image.c
    branches/asset-browser/source/blender/editors/sculpt_paint/paint_image_proj.c
    branches/asset-browser/source/blender/editors/sculpt_paint/paint_intern.h
    branches/asset-browser/source/blender/editors/sculpt_paint/paint_ops.c
    branches/asset-browser/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/asset-browser/source/blender/editors/sculpt_paint/paint_undo.c
    branches/asset-browser/source/blender/editors/sculpt_paint/paint_utils.c
    branches/asset-browser/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/asset-browser/source/blender/editors/sculpt_paint/sculpt.c
    branches/asset-browser/source/blender/editors/sculpt_paint/sculpt_uv.c
    branches/asset-browser/source/blender/editors/space_asset/assetlist.c
    branches/asset-browser/source/blender/editors/space_asset/space_asset.c
    branches/asset-browser/source/blender/editors/space_clip/clip_buttons.c
    branches/asset-browser/source/blender/editors/space_clip/clip_draw.c
    branches/asset-browser/source/blender/editors/space_clip/clip_editor.c
    branches/asset-browser/source/blender/editors/space_clip/clip_graph_draw.c
    branches/asset-browser/source/blender/editors/space_clip/clip_graph_ops.c
    branches/asset-browser/source/blender/editors/space_clip/clip_intern.h
    branches/asset-browser/source/blender/editors/space_clip/clip_ops.c
    branches/asset-browser/source/blender/editors/space_clip/clip_utils.c
    branches/asset-browser/source/blender/editors/space_clip/space_clip.c
    branches/asset-browser/source/blender/editors/space_clip/tracking_ops.c
    branches/asset-browser/source/blender/editors/space_clip/tracking_select.c
    branches/asset-browser/source/blender/editors/space_console/console_ops.c
    branches/asset-browser/source/blender/editors/space_console/space_console.c
    branches/asset-browser/source/blender/editors/space_file/CMakeLists.txt
    branches/asset-browser/source/blender/editors/space_file/SConscript
    branches/asset-browser/source/blender/editors/space_file/file_intern.h
    branches/asset-browser/source/blender/editors/space_file/file_ops.c
    branches/asset-browser/source/blender/editors/space_file/file_panels.c
    branches/asset-browser/source/blender/editors/space_file/filelist.c
    branches/asset-browser/source/blender/editors/space_file/filesel.c
    branches/asset-browser/source/blender/editors/space_file/fsmenu.c
    branches/asset-browser/source/blender/editors/space_file/space_file.c
    branches/asset-browser/source/blender/editors/space_graph/graph_draw.c
    branches/asset-browser/source/blender/editors/space_graph/graph_edit.c
    branches/asset-browser/source/blender/editors/space_graph/graph_select.c
    branches/asset-browser/source/blender/editors/space_image/CMakeLists.txt
    branches/asset-browser/source/blender/editors/space_image/SConscript
    branches/asset-browser/source/blender/editors/space_image/image_buttons.c
    branches/asset-browser/source/blender/editors/space_image/image_draw.c
    branches/asset-browser/source/blender/editors/space_image/image_ops.c
    branches/asset-browser/source/blender/editors/space_image/space_image.c
    branches/asset-browser/source/blender/editors/space_info/info_stats.c
    branches/asset-browser/source/blender/editors/space_info/textview.c
    branches/asset-browser/source/blender/editors/space_info/textview.h
    branches/asset-browser/source/blender/editors/space_logic/logic_ops.c
    branches/asset-browser/source/blender/editors/space_logic/logic_window.c
    branches/asset-browser/source/blender/editors/space_node/drawnode.c
    branches/asset-browser/source/blender/editors/space_node/node_add.c
    branches/asset-browser/source/blender/editors/space_node/node_draw.c
    branches/asset-browser/source/blender/editors/space_node/node_edit.c
    branches/asset-browser/source/blender/editors/space_node/node_intern.h
    branches/asset-browser/source/blender/editors/space_node/node_ops.c
    branches/asset-browser/source/blender/editors/space_node/node_relationships.c
    branches/asset-browser/source/blender/editors/space_node/node_select.c
    branches/asset-browser/source/blender/editors/space_node/node_templates.c
    branches/asset-browser/source/blender/editors/space_node/node_view.c
    branches/asset-browser/source/blender/editors/space_node/space_node.c
    branches/asset-browser/source/blender/editors/space_outliner/outliner_draw.c
    branches/asset-browser/source/blender/editors/space_outliner/outliner_edit.c
    branches/asset-browser/source/blender/editors/space_outliner/outliner_select.c
    branches/asset-browser/source/blender/editors/space_outliner/outliner_tools.c
    branches/asset-browser/source/blender/editors/space_outliner/outliner_tree.c
    branches/asset-browser/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/asset-browser/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/asset-browser/source/blender/editors/space_sequencer/sequencer_modifier.c
    branches/asset-browser/source/blender/editors/space_sequencer/sequencer_select.c
    branches/asset-browser/source/blender/editors/space_sequencer/sequencer_view.c
    branches/asset-browser/source/blender/editors/space_sequencer/space_sequencer.c
    branches/asset-browser/source/blender/editors/space_text/space_text.c
    branches/asset-browser/source/blender/editors/space_text/text_autocomplete.c
    branches/asset-browser/source/blender/editors/space_text/text_draw.c
    branches/asset-browser/source/blender/editors/space_text/text_intern.h
    branches/asset-browser/source/blender/editors/space_text/text_ops.c
    branches/asset-browser/source/blender/editors/space_view3d/drawarmature.c
    branches/asset-browser/source/blender/editors/space_view3d/drawmesh.c
    branches/asset-browser/source/blender/editors/space_view3d/drawobject.c
    branches/asset-browser/source/blender/editors/space_view3d/drawvolume.c
    branches/asset-browser/source/blender/editors/space_view3d/space_view3d.c
    branches/asset-browser/source/blender/editors/space_view3d/view3d_buttons.c
    branches/asset-browser/source/blender/editors/space_view3d/view3d_draw.c
    branches/asset-browser/source/blender/editors/space_view3d/view3d_edit.c
    branches/asset-browser/source/blender/editors/space_view3d/view3d_fly.c
    branches/asset-browser/source/blender/editors/space_view3d/view3d_intern.h
    branches/asset-browser/source/blender/editors/space_view3d/view3d_ops.c
    branches/asset-browser/source/blender/editors/space_view3d/view3d_project.c
    branches/asset-browser/source/blender/editors/space_view3d/view3d_ruler.c
    branches/asset-browser/source/blender/editors/space_view3d/view3d_select.c
    branches/asset-browser/source/blender/editors/space_view3d/view3d_snap.c
    branches/asset-browser/source/blender/editors/space_view3d/view3d_view.c
    branches/asset-browser/source/blender/editors/transform/transform.c
    branches/asset-browser/source/blender/editors/transform/transform.h
    branches/asset-browser/source/blender/editors/transform/transform_conversions.c
    branches/asset-browser/source/blender/editors/transform/transform_generics.c
    branches/asset-browser/source/blender/editors/transform/transform_input.c
    branches/asset-browser/source/blender/editors/transform/transform_manipulator.c
    branches/asset-browser/source/blender/editors/transform/transform_ops.c
    branches/asset-browser/source/blender/editors/transform/transform_orientations.c
    branches/asset-browser/source/blender/editors/transform/transform_snap.c
    branches/asset-browser/source/blender/editors/util/crazyspace.c
    branches/asset-browser/source/blender/editors/util/ed_util.c
    branches/asset-browser/source/blender/editors/uvedit/uvedit_draw.c
    branches/asset-browser/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/asset-browser/source/blender/editors/uvedit/uvedit_parametrizer.h
    branches/asset-browser/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/asset-browser/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
    branches/asset-browser/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
    branches/asset-browser/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp
    branches/asset-browser/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp
    branches/asset-browser/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.cpp
    branches/asset-browser/source/blender/freestyle/intern/stroke/StrokeRep.cpp
    branches/asset-browser/source/blender/freestyle/intern/stroke/TextStrokeRenderer.cpp
    branches/asset-browser/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h
    branches/asset-browser/source/blender/freestyle/intern/view_map/Functions0D.h
    branches/asset-browser/source/blender/freestyle/intern/view_map/Functions1D.h
    branches/asset-browser/source/blender/freestyle/intern/view_map/SteerableViewMap.h
    branches/asset-browser/source/blender/freestyle/intern/view_map/ViewMap.h
    branches/asset-browser/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
    branches/asset-browser/source/blender/gpu/GPU_extensions.h
    branches/asset-browser/source/blender/gpu/intern/gpu_codegen.c
    branches/asset-browser/source/blender/gpu/intern/gpu_extensions.c
    branches/asset-browser/source/blender/gpu/intern/gpu_material.c
    branches/asset-browser/source/blender/gpu/shaders/gpu_shader_material.glsl
    branches/asset-browser/source/blender/imbuf/CMakeLists.txt
    branches/asset-browser/source/blender/imbuf/IMB_colormanagement.h
    branches/asset-browser/source/blender/imbuf/IMB_imbuf.h
    branches/asset-browser/source/blender/imbuf/IMB_imbuf_types.h
    branches/asset-browser/source/blender/imbuf/SConscript
    branches/asset-browser/source/blender/imbuf/intern/IMB_allocimbuf.h
    branches/asset-browser/source/blender/imbuf/intern/IMB_colormanagement_intern.h
    branches/asset-browser/source/blender/imbuf/intern/IMB_filetype.h
    branches/asset-browser/source/blender/imbuf/intern/IMB_indexer.h
    branches/asset-browser/source/blender/imbuf/intern/IMB_metadata.h
    branches/asset-browser/source/blender/imbuf/intern/allocimbuf.c
    branches/asset-browser/source/blender/imbuf/intern/bmp.c
    branches/asset-browser/source/blender/imbuf/intern/colormanagement.c
    branches/asset-browser/source/blender/imbuf/intern/divers.c
    branches/asset-browser/source/blender/imbuf/intern/filetype.c
    branches/asset-browser/source/blender/imbuf/intern/indexer.c
    branches/asset-browser/source/blender/imbuf/intern/indexer_dv.c
    branches/asset-browser/source/blender/imbuf/intern/jpeg.c
    branches/asset-browser/source/blender/imbuf/intern/metadata.c
    branches/asset-browser/source/blender/imbuf/intern/readimage.c
    branches/asset-browser/source/blender/imbuf/intern/tiff.c
    branches/asset-browser/source/blender/imbuf/intern/util.c
    branches/asset-browser/source/blender/imbuf/intern/writeimage.c
    branches/asset-browser/source/blender/makesdna/DNA_asset_types.h
    branches/asset-browser/source/blender/makesdna/DNA_color_types.h
    branches/asset-browser/source/blender/makesdna/DNA_constraint_types.h
    branches/asset-browser/source/blender/makesdna/DNA_curve_types.h
    branches/asset-browser/source/blender/makesdna/DNA_customdata_types.h
    branches/asset-browser/source/blender/makesdna/DNA_freestyle_types.h
    branches/asset-browser/source/blender/makesdna/DNA_ipo_types.h
    branches/asset-browser/source/blender/makesdna/DNA_linestyle_types.h
    branches/asset-browser/source/blender/makesdna/DNA_mask_types.h
    branches/asset-browser/source/blender/makesdna/DNA_mesh_types.h
    branches/asset-browser/source/blender/makesdna/DNA_meshdata_types.h
    branches/asset-browser/source/blender/makesdna/DNA_modifier_types.h
    branches/asset-browser/source/blender/makesdna/DNA_node_types.h
    branches/asset-browser/source/blender/makesdna/DNA_object_types.h
    branches/asset-browser/source/blender/makesdna/DNA_scene_types.h
    branches/asset-browser/source/blender/makesdna/DNA_screen_types.h
    branches/asset-browser/source/blender/makesdna/DNA_sensor_types.h
    branches/asset-browser/source/blender/makesdna/DNA_space_types.h
    branches/asset-browser/source/blender/makesdna/DNA_texture_types.h
    branches/asset-browser/source/blender/makesdna/DNA_tracking_types.h
    branches/asset-browser/source/blender/makesdna/DNA_userdef_types.h
    branches/asset-browser/source/blender/makesdna/DNA_view3d_types.h
    branches/asset-browser/source/blender/makesdna/DNA_windowmanager_types.h
    branches/asset-browser/source/blender/makesdna/intern/CMakeLists.txt
    branches/asset-browser/source/blender/makesdna/intern/SConscript
    branches/asset-browser/source/blender/makesrna/RNA_access.h
    branches/asset-browser/source/blender/makesrna/RNA_define.h
    branches/asset-browser/source/blender/makesrna/RNA_enum_types.h
    branches/asset-browser/source/blender/makesrna/RNA_types.h
    branches/asset-browser/source/blender/makesrna/SConscript
    branches/asset-browser/source/blender/makesrna/intern/CMakeLists.txt
    branches/asset-browser/source/blender/makesrna/intern/SConscript
    branches/asset-browser/source/blender/makesrna/intern/makesrna.c
    branches/asset-browser/source/blender/makesrna/intern/rna_ID.c
    branches/asset-browser/source/blender/makesrna/intern/rna_access.c
    branches/asset-browser/source/blender/makesrna/intern/rna_action.c
    branches/asset-browser/source/blender/makesrna/intern/rna_actuator.c
    branches/asset-browser/source/blender/makesrna/intern/rna_animation.c
    branches/asset-browser/source/blender/makesrna/intern/rna_animviz.c
    branches/asset-browser/source/blender/makesrna/intern/rna_armature.c
    branches/asset-browser/source/blender/makesrna/intern/rna_boid.c
    branches/asset-browser/source/blender/makesrna/intern/rna_brush.c
    branches/asset-browser/source/blender/makesrna/intern/rna_color.c
    branches/asset-browser/source/blender/makesrna/intern/rna_constraint.c
    branches/asset-browser/source/blender/makesrna/intern/rna_controller.c
    branches/asset-browser/source/blender/makesrna/intern/rna_curve.c
    branches/asset-browser/source/blender/makesrna/intern/rna_define.c
    branches/asset-browser/source/blender/makesrna/intern/rna_dynamicpaint.c
    branches/asset-browser/source/blender/makesrna/intern/rna_fcurve.c
    branches/asset-browser/source/blender/makesrna/intern/rna_gpencil.c
    branches/asset-browser/source/blender/makesrna/intern/rna_image_api.c
    branches/asset-browser/source/blender/makesrna/intern/rna_internal.h
    branches/asset-browser/source/blender/makesrna/intern/rna_key.c
    branches/asset-browser/source/blender/makesrna/intern/rna_lamp.c
    branches/asset-browser/source/blender/makesrna/intern/rna_linestyle.c
    branches/asset-browser/source/blender/makesrna/intern/rna_main_api.c
    branches/asset-browser/source/blender/makesrna/intern/rna_mask.c
    branches/asset-browser/source/blender/makesrna/intern/rna_material.c
    branches/asset-browser/source/blender/makesrna/intern/rna_mesh.c
    branches/asset-browser/source/blender/makesrna/intern/rna_mesh_api.c
    branches/asset-browser/source/blender/makesrna/intern/rna_mesh_utils.h
    branches/asset-browser/source/blender/makesrna/intern/rna_meta.c
    branches/asset-browser/source/blender/makesrna/intern/rna_modifier.c
    branches/asset-browser/source/blender/makesrna/intern/rna_nla.c
    branches/asset-browser/source/blender/makesrna/intern/rna_nodetree.c
    branches/asset-browser/source/blender/makesrna/intern/rna_object.c
    branches/asset-browser/source/blender/makesrna/intern/rna_object_api.c
    branches/asset-browser/source/blender/makesrna/intern/rna_object_force.c
    branches/asset-browser/source/blender/makesrna/intern/rna_packedfile.c
    branches/asset-browser/source/blender/makesrna/intern/rna_particle.c
    branches/asset-browser/source/blender/makesrna/intern/rna_pose.c
    branches/asset-browser/source/blender/makesrna/intern/rna_property.c
    branches/asset-browser/source/blender/makesrna/intern/rna_render.c
    branches/asset-browser/source/blender/makesrna/intern/rna_rigidbody.c
    branches/asset-browser/source/blender/makesrna/intern/rna_scene.c
    branches/asset-browser/source/blender/makesrna/intern/rna_scene_api.c
    branches/asset-browser/source/blender/makesrna/intern/rna_screen.c
    branches/asset-browser/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/asset-browser/source/blender/makesrna/intern/rna_sensor.c
    branches/asset-browser/source/blender/makesrna/intern/rna_sequencer.c
    branches/asset-browser/source/blender/makesrna/intern/rna_smoke.c
    branches/asset-browser/source/blender/makesrna/intern/rna_space.c
    branches/asset-browser/source/blender/makesrna/intern/rna_test.c
    branches/asset-browser/source/blender/makesrna/intern/rna_text.c
    branches/asset-browser/source/blender/makesrna/intern/rna_texture.c
    branches/asset-browser/source/blender/makesrna/intern/rna_tracking.c
    branches/asset-browser/source/blender/makesrna/intern/rna_ui.c
    branches/asset-browser/source/blender/makesrna/intern/rna_userdef.c
    branches/asset-browser/source/blender/makesrna/intern/rna_wm.c
    branches/asset-browser/source/blender/makesrna/intern/rna_wm_api.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_array.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_build.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_decimate.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_explode.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_meshcache_util.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_meshcache_util.h
    branches/asset-browser/source/blender/modifiers/intern/MOD_subsurf.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_uvproject.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_weightvgproximity.c
    branches/asset-browser/source/blender/nodes/CMakeLists.txt
    branches/asset-browser/source/blender/nodes/NOD_common.h
    branches/asset-browser/source/blender/nodes/NOD_composite.h
    branches/asset-browser/source/blender/nodes/NOD_shader.h
    branches/asset-browser/source/blender/nodes/NOD_static_types.h
    branches/asset-browser/source/blender/nodes/NOD_texture.h
    branches/asset-browser/source/blender/nodes/composite/node_composite_tree.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_mapValue.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_outputFile.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_scale.c
    branches/asset-browser/source/blender/nodes/intern/node_exec.c
    branches/asset-browser/source/blender/nodes/intern/node_util.c
    branches/asset-browser/source/blender/nodes/shader/node_shader_tree.c
    branches/asset-browser/source/blender/nodes/shader/node_shader_util.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_blackbody.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_gamma.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_mapping.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_sepcombHSV.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_tex_brick.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_tex_image.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_vectTransform.c
    branches/asset-browser/source/blender/nodes/texture/nodes/node_texture_common.c
    branches/asset-browser/source/blender/python/bmesh/bmesh_py_ops_call.c
    branches/asset-browser/source/blender/python/bmesh/bmesh_py_types.c
    branches/asset-browser/source/blender/python/bmesh/bmesh_py_types.h
    branches/asset-browser/source/blender/python/generic/blf_py_api.h
    branches/asset-browser/source/blender/python/generic/idprop_py_api.c
    branches/asset-browser/source/blender/python/generic/idprop_py_api.h
    branches/asset-browser/source/blender/python/generic/py_capi_utils.c
    branches/asset-browser/source/blender/python/generic/py_capi_utils.h
    branches/asset-browser/source/blender/python/intern/CMakeLists.txt
    branches/asset-browser/source/blender/python/intern/bpy.h
    branches/asset-browser/source/blender/python/intern/bpy_driver.c
    branches/asset-browser/source/blender/python/intern/bpy_interface.c
    branches/asset-browser/source/blender/python/intern/bpy_intern_string.h
    branches/asset-browser/source/blender/python/intern/bpy_operator_wrap.c
    branches/asset-browser/source/blender/python/intern/bpy_props.c
    branches/asset-browser/source/blender/python/intern/bpy_rna.c
    branches/asset-browser/source/blender/python/intern/bpy_rna_anim.c
    branches/asset-browser/source/blender/python/intern/bpy_rna_anim.h
    branches/asset-browser/source/blender/python/intern/bpy_rna_callback.h
    branches/asset-browser/source/blender/python/intern/gpu.h
    branches/asset-browser/source/blender/python/mathutils/mathutils.c
    branches/asset-browser/source/blender/python/mathutils/mathutils_Euler.c
    branches/asset-browser/source/blender/python/mathutils/mathutils_Euler.h
    branches/asset-browser/source/blender/python/mathutils/mathutils_Matrix.c
    branches/asset-browser/source/blender/python/mathutils/mathutils_Quaternion.c
    branches/asset-browser/source/blender/python/mathutils/mathutils_Quaternion.h
    branches/asset-browser/source/blender/python/mathutils/mathutils_Vector.c
    branches/asset-browser/source/blender/python/mathutils/mathutils_Vector.h
    branches/asset-browser/source/blender/python/mathutils/mathutils_geometry.c
    branches/asset-browser/source/blender/quicktime/apple/qtkit_export.m
    branches/asset-browser/source/blender/quicktime/apple/qtkit_import.m
    branches/asset-browser/source/blender/render/extern/include/RE_multires_bake.h
    branches/asset-browser/source/blender/render/extern/include/RE_pipeline.h
    branches/asset-browser/source/blender/render/extern/include/RE_shader_ext.h
    branches/asset-browser/source/blender/render/intern/include/render_types.h
    branches/asset-browser/source/blender/render/intern/include/texture.h
    branches/asset-browser/source/blender/render/intern/include/texture_ocean.h
    branches/asset-browser/source/blender/render/intern/source/bake.c
    branches/asset-browser/source/blender/render/intern/source/convertblender.c
    branches/asset-browser/source/blender/render/intern/source/external_engine.c
    branches/asset-browser/source/blender/render/intern/source/imagetexture.c
    branches/asset-browser/source/blender/render/intern/source/multires_bake.c
    branches/asset-browser/source/blender/render/intern/source/pipeline.c
    branches/asset-browser/source/blender/render/intern/source/pixelshading.c
    branches/asset-browser/source/blender/render/intern/source/rayshade.c
    branches/asset-browser/source/blender/render/intern/source/render_result.c
    branches/asset-browser/source/blender/render/intern/source/render_texture.c
    branches/asset-browser/source/blender/render/intern/source/rendercore.c
    branches/asset-browser/source/blender/render/intern/source/shadbuf.c
    branches/asset-browser/source/blender/render/intern/source/shadeinput.c
    branches/asset-browser/source/blender/render/intern/source/shadeoutput.c
    branches/asset-browser/source/blender/render/intern/source/sss.c
    branches/asset-browser/source/blender/render/intern/source/texture_ocean.c
    branches/asset-browser/source/blender/render/intern/source/volume_precache.c
    branches/asset-browser/source/blender/render/intern/source/voxeldata.c
    branches/asset-browser/source/blender/render/intern/source/zbuf.c
    branches/asset-browser/source/blender/windowmanager/WM_api.h
    branches/asset-browser/source/blender/windowmanager/WM_keymap.h
    branches/asset-browser/source/blender/windowmanager/WM_types.h
    branches/asset-browser/source/blender/windowmanager/intern/wm_cursors.c
    branches/asset-browser/source/blender/windowmanager/intern/wm_dragdrop.c
    branches/asset-browser/source/blender/windowmanager/intern/wm_event_system.c
    branches/asset-browser/source/blender/windowmanager/intern/wm_files.c
    branches/asset-browser/source/blender/windowmanager/intern/wm_gesture.c
    branches/asset-browser/source/blender/windowmanager/intern/wm_jobs.c
    branches/asset-browser/source/blender/windowmanager/intern/wm_keymap.c
    branches/asset-browser/source/blender/windowmanager/intern/wm_operators.c
    branches/asset-browser/source/blender/windowmanager/intern/wm_playanim.c
    branches/asset-browser/source/blender/windowmanager/intern/wm_subwindow.c
    branches/asset-browser/source/blender/windowmanager/intern/wm_window.c
    branches/asset-browser/source/blender/windowmanager/wm_subwindow.h
    branches/asset-browser/source/blender/windowmanager/wm_window.h
    branches/asset-browser/source/blenderplayer/CMakeLists.txt
    branches/asset-browser/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/asset-browser/source/creator/CMakeLists.txt
    branches/asset-browser/source/creator/creator.c
    branches/asset-browser/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/asset-browser/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
    branches/asset-browser/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/asset-browser/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/asset-browser/source/gameengine/Converter/KX_ConvertActuators.h
    branches/asset-browser/source/gameengine/Converter/KX_ConvertSensors.cpp
    branches/asset-browser/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
    branches/asset-browser/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
    branches/asset-browser/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
    branches/asset-browser/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/asset-browser/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_GameObject.h
    branches/asset-browser/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_TouchEventManager.cpp
    branches/asset-browser/source/gameengine/Rasterizer/RAS_MeshObject.cpp
    branches/asset-browser/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
    branches/asset-browser/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
    branches/asset-browser/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/asset-browser/source/tests/bl_run_operators.py
    branches/asset-browser/source/tools/CTS/FBlender.py
    branches/asset-browser/source/tools/CTS/README.txt
    branches/asset-browser/source/tools/check_style_c.py
    branches/asset-browser/source/tools/spell_check_source.py

Added Paths:
-----------
    branches/asset-browser/doc/python_api/examples/bpy.types.UIList.1.py
    branches/asset-browser/doc/python_api/examples/bpy.types.UIList.2.py
    branches/asset-browser/doc/python_api/examples/bpy.types.bpy_prop_collection.foreach_get.py
    branches/asset-browser/doc/python_api/examples/bpy.types.bpy_prop_collection.foreach_set.py
    branches/asset-browser/extern/libmv/libmv-capi_intern.h
    branches/asset-browser/extern/libmv/third_party/ceres/include/ceres/c_api.h
    branches/asset-browser/extern/libmv/third_party/ceres/include/ceres/covariance.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/blas.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/block_random_access_crs_matrix.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/block_random_access_crs_matrix.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/c_api.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/compressed_col_sparse_matrix_utils.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/compressed_col_sparse_matrix_utils.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/covariance.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/covariance_impl.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/covariance_impl.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/incomplete_lq_factorization.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/incomplete_lq_factorization.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/lapack.cc
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/lapack.h
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/small_blas.h
    branches/asset-browser/intern/cycles/kernel/closure/bsdf_hair.h
    branches/asset-browser/intern/cycles/kernel/kernel_path_state.h
    branches/asset-browser/intern/cycles/kernel/shaders/node_hair_bsdf.osl
    branches/asset-browser/intern/cycles/render/sky_model.cpp
    branches/asset-browser/intern/cycles/render/sky_model.h
    branches/asset-browser/intern/cycles/render/sky_model_data.h
    branches/asset-browser/intern/ghost/intern/GHOST_NDOFManager3Dconnexion.c
    branches/asset-browser/intern/ghost/intern/GHOST_NDOFManager3Dconnexion.h
    branches/asset-browser/intern/ghost/test/multitest/stubs.c
    branches/asset-browser/intern/guardedalloc/intern/mallocn_guarded_impl.c
    branches/asset-browser/intern/guardedalloc/intern/mallocn_intern.h
    branches/asset-browser/intern/guardedalloc/intern/mallocn_lockfree_impl.c
    branches/asset-browser/intern/opencolorio/gpu_shader_display_transform.glsl
    branches/asset-browser/release/datafiles/colormanagement/luts/camera_response/
    branches/asset-browser/release/datafiles/colormanagement/luts/film_response/
    branches/asset-browser/release/scripts/presets/operator/wm.collada_export/sl_plus_open_sim_rigged.py
    branches/asset-browser/release/scripts/presets/operator/wm.collada_export/sl_plus_open_sim_static.py
    branches/asset-browser/release/scripts/templates_py/ui_list_simple.py
    branches/asset-browser/source/blender/blenkernel/intern/mesh_evaluate.c
    branches/asset-browser/source/blender/blenlib/BLI_compiler_attrs.h
    branches/asset-browser/source/blender/blenlib/BLI_convexhull2d.h
    branches/asset-browser/source/blender/blenlib/BLI_sort_utils.h
    branches/asset-browser/source/blender/blenlib/BLI_strict_flags.h
    branches/asset-browser/source/blender/blenlib/BLI_task.h
    branches/asset-browser/source/blender/blenlib/PIL_time_utildefines.h
    branches/asset-browser/source/blender/blenlib/intern/convexhull2d.c
    branches/asset-browser/source/blender/blenlib/intern/sort_utils.c
    branches/asset-browser/source/blender/blenlib/intern/task.c
    branches/asset-browser/source/blender/blenloader/intern/versioning_defaults.c
    branches/asset-browser/source/blender/bmesh/tools/bmesh_beautify.c
    branches/asset-browser/source/blender/bmesh/tools/bmesh_beautify.h
    branches/asset-browser/source/blender/collada/version.conf
    branches/asset-browser/source/blender/compositor/intern/COM_Debug.cpp
    branches/asset-browser/source/blender/compositor/intern/COM_Debug.h
    branches/asset-browser/source/blender/compositor/operations/COM_ConvertOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_ConvertOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_MixOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_MixOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersProg.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersProg.h
    branches/asset-browser/source/blender/editors/curve/editcurve_add.c
    branches/asset-browser/source/blender/editors/interface/interface_eyedropper.c
    branches/asset-browser/source/blender/editors/mesh/editmesh_bisect.c
    branches/asset-browser/source/blender/imbuf/intern/oiio/
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_bsdf_hair.c
    branches/asset-browser/source/tools/check_descriptions.py

Removed Paths:
-------------
    branches/asset-browser/build_files/scons/config/freebsd7-config.py
    branches/asset-browser/doc/python_api/examples/bpy.types.UIList.py
    branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/matrix_proto.h
    branches/asset-browser/intern/cycles/render/bssrdf.cpp
    branches/asset-browser/intern/cycles/render/bssrdf.h
    branches/asset-browser/release/scripts/presets/operator/wm.collada_export/second_life_rigged.py
    branches/asset-browser/release/scripts/presets/operator/wm.collada_export/second_life_static.py
    branches/asset-browser/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_CombineChannelsOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_ConvertColorToValueProg.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_ConvertColorToValueProg.h
    branches/asset-browser/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_ConvertPremulToStraightOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_ConvertPremulToStraightOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_ConvertStraightToPremulOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_ConvertStraightToPremulOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_ConvertValueToColorProg.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_ConvertValueToColorProg.h
    branches/asset-browser/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_MixAddOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_MixAddOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_MixBaseOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_MixBaseOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_MixBlendOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_MixBlendOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_MixBurnOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_MixBurnOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_MixColorOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_MixColorOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_MixDarkenOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_MixDifferenceOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_MixDivideOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_MixDivideOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_MixDodgeOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_MixDodgeOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_MixGlareOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_MixGlareOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_MixHueOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_MixHueOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_MixLightenOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_MixLightenOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_MixLinearLightOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_MixMultiplyOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_MixMultiplyOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_MixOverlayOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_MixSaturationOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_MixScreenOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_MixScreenOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_MixSoftLightOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_MixSubtractOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_MixValueOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_MixValueOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersAOOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersAOOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersAlphaProg.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersAlphaProg.h
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersBaseProg.h
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersColorOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersColorOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersCyclesOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersCyclesOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersDepthProg.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersDepthProg.h
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersDiffuseOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersDiffuseOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersEmitOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersEmitOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersEnvironmentOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersEnvironmentOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersImageProg.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersImageProg.h
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersIndirectOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersIndirectOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersMaterialIndexOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersMaterialIndexOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersMistOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersMistOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersNormalOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersNormalOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersObjectIndexOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersObjectIndexOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersReflectionOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersReflectionOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersRefractionOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersRefractionOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersShadowOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersShadowOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersSpecularOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersSpecularOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersSpeedOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersSpeedOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersUVOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_RenderLayersUVOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_SeparateChannelOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_SeparateChannelOperation.h

Property Changed:
----------------
    branches/asset-browser/
    branches/asset-browser/doc/python_api/examples/bpy.types.WindowManager.popup_menu.py
    branches/asset-browser/extern/rangetree/CMakeLists.txt
    branches/asset-browser/extern/wcwidth/CMakeLists.txt
    branches/asset-browser/intern/atomic/atomic_ops.h
    branches/asset-browser/intern/cycles/kernel/shaders/node_blackbody.osl
    branches/asset-browser/intern/cycles/kernel/shaders/node_combine_hsv.osl
    branches/asset-browser/intern/cycles/kernel/shaders/node_separate_hsv.osl
    branches/asset-browser/intern/cycles/kernel/shaders/node_vector_transform.osl
    branches/asset-browser/intern/cycles/kernel/svm/svm_blackbody.h
    branches/asset-browser/intern/cycles/kernel/svm/svm_sepcomb_hsv.h
    branches/asset-browser/intern/cycles/kernel/svm/svm_vector_transform.h
    branches/asset-browser/intern/cycles/render/blackbody.cpp
    branches/asset-browser/intern/cycles/render/blackbody.h
    branches/asset-browser/intern/locale/CMakeLists.txt
    branches/asset-browser/intern/opencolorio/CMakeLists.txt
    branches/asset-browser/release/datafiles/LICENSE-bmonofont-i18n.ttf.txt
    branches/asset-browser/release/datafiles/LICENSE-droidsans.ttf.txt
    branches/asset-browser/release/datafiles/blender_icons.svg
    branches/asset-browser/release/datafiles/prvicons.svg
    branches/asset-browser/release/scripts/freestyle/data/env_map/brown00.png
    branches/asset-browser/release/scripts/freestyle/data/env_map/gray00.png
    branches/asset-browser/release/scripts/freestyle/data/env_map/gray01.png
    branches/asset-browser/release/scripts/freestyle/data/env_map/gray02.png
    branches/asset-browser/release/scripts/freestyle/data/env_map/gray03.png
    branches/asset-browser/release/scripts/freestyle/data/textures/papers/whitepaper.jpg
    branches/asset-browser/release/scripts/presets/cycles/sampling/final.py
    branches/asset-browser/release/scripts/presets/cycles/sampling/preview.py
    branches/asset-browser/release/scripts/startup/bl_operators/mask.py
    branches/asset-browser/release/text/GPL3-license.txt
    branches/asset-browser/release/text/jemalloc-license.txt
    branches/asset-browser/scons/scons-local/SCons/Action.py
    branches/asset-browser/scons/scons-local/SCons/Builder.py
    branches/asset-browser/scons/scons-local/SCons/CacheDir.py
    branches/asset-browser/scons/scons-local/SCons/Conftest.py
    branches/asset-browser/scons/scons-local/SCons/Debug.py
    branches/asset-browser/scons/scons-local/SCons/Defaults.py
    branches/asset-browser/scons/scons-local/SCons/Environment.py
    branches/asset-browser/scons/scons-local/SCons/Errors.py
    branches/asset-browser/scons/scons-local/SCons/Executor.py
    branches/asset-browser/scons/scons-local/SCons/Job.py
    branches/asset-browser/scons/scons-local/SCons/Memoize.py
    branches/asset-browser/scons/scons-local/SCons/Node/Alias.py
    branches/asset-browser/scons/scons-local/SCons/Node/FS.py
    branches/asset-browser/scons/scons-local/SCons/Node/Python.py
    branches/asset-browser/scons/scons-local/SCons/Node/__init__.py
    branches/asset-browser/scons/scons-local/SCons/Options/BoolOption.py
    branches/asset-browser/scons/scons-local/SCons/Options/EnumOption.py
    branches/asset-browser/scons/scons-local/SCons/Options/ListOption.py
    branches/asset-browser/scons/scons-local/SCons/Options/PackageOption.py
    branches/asset-browser/scons/scons-local/SCons/Options/PathOption.py
    branches/asset-browser/scons/scons-local/SCons/Options/__init__.py
    branches/asset-browser/scons/scons-local/SCons/PathList.py
    branches/asset-browser/scons/scons-local/SCons/Platform/__init__.py
    branches/asset-browser/scons/scons-local/SCons/Platform/aix.py
    branches/asset-browser/scons/scons-local/SCons/Platform/cygwin.py
    branches/asset-browser/scons/scons-local/SCons/Platform/darwin.py
    branches/asset-browser/scons/scons-local/SCons/Platform/hpux.py
    branches/asset-browser/scons/scons-local/SCons/Platform/irix.py
    branches/asset-browser/scons/scons-local/SCons/Platform/os2.py
    branches/asset-browser/scons/scons-local/SCons/Platform/posix.py
    branches/asset-browser/scons/scons-local/SCons/Platform/sunos.py
    branches/asset-browser/scons/scons-local/SCons/Platform/win32.py
    branches/asset-browser/scons/scons-local/SCons/SConf.py
    branches/asset-browser/scons/scons-local/SCons/SConsign.py
    branches/asset-browser/scons/scons-local/SCons/Scanner/C.py
    branches/asset-browser/scons/scons-local/SCons/Scanner/D.py
    branches/asset-browser/scons/scons-local/SCons/Scanner/Dir.py
    branches/asset-browser/scons/scons-local/SCons/Scanner/Fortran.py
    branches/asset-browser/scons/scons-local/SCons/Scanner/IDL.py
    branches/asset-browser/scons/scons-local/SCons/Scanner/LaTeX.py
    branches/asset-browser/scons/scons-local/SCons/Scanner/Prog.py
    branches/asset-browser/scons/scons-local/SCons/Scanner/RC.py
    branches/asset-browser/scons/scons-local/SCons/Scanner/__init__.py
    branches/asset-browser/scons/scons-local/SCons/Script/Interactive.py
    branches/asset-browser/scons/scons-local/SCons/Script/Main.py
    branches/asset-browser/scons/scons-local/SCons/Script/SConsOptions.py
    branches/asset-browser/scons/scons-local/SCons/Script/SConscript.py
    branches/asset-browser/scons/scons-local/SCons/Script/__init__.py
    branches/asset-browser/scons/scons-local/SCons/Sig.py
    branches/asset-browser/scons/scons-local/SCons/Subst.py
    branches/asset-browser/scons/scons-local/SCons/Taskmaster.py
    branches/asset-browser/scons/scons-local/SCons/Tool/386asm.py
    branches/asset-browser/scons/scons-local/SCons/Tool/BitKeeper.py
    branches/asset-browser/scons/scons-local/SCons/Tool/CVS.py
    branches/asset-browser/scons/scons-local/SCons/Tool/FortranCommon.py
    branches/asset-browser/scons/scons-local/SCons/Tool/GettextCommon.py
    branches/asset-browser/scons/scons-local/SCons/Tool/JavaCommon.py
    branches/asset-browser/scons/scons-local/SCons/Tool/MSCommon/__init__.py
    branches/asset-browser/scons/scons-local/SCons/Tool/MSCommon/arch.py
    branches/asset-browser/scons/scons-local/SCons/Tool/MSCommon/common.py
    branches/asset-browser/scons/scons-local/SCons/Tool/MSCommon/netframework.py
    branches/asset-browser/scons/scons-local/SCons/Tool/MSCommon/sdk.py
    branches/asset-browser/scons/scons-local/SCons/Tool/MSCommon/vc.py
    branches/asset-browser/scons/scons-local/SCons/Tool/MSCommon/vs.py
    branches/asset-browser/scons/scons-local/SCons/Tool/Perforce.py
    branches/asset-browser/scons/scons-local/SCons/Tool/PharLapCommon.py
    branches/asset-browser/scons/scons-local/SCons/Tool/RCS.py
    branches/asset-browser/scons/scons-local/SCons/Tool/SCCS.py
    branches/asset-browser/scons/scons-local/SCons/Tool/Subversion.py
    branches/asset-browser/scons/scons-local/SCons/Tool/__init__.py
    branches/asset-browser/scons/scons-local/SCons/Tool/aixc++.py
    branches/asset-browser/scons/scons-local/SCons/Tool/aixcc.py
    branches/asset-browser/scons/scons-local/SCons/Tool/aixf77.py
    branches/asset-browser/scons/scons-local/SCons/Tool/aixlink.py
    branches/asset-browser/scons/scons-local/SCons/Tool/applelink.py
    branches/asset-browser/scons/scons-local/SCons/Tool/ar.py
    branches/asset-browser/scons/scons-local/SCons/Tool/as.py
    branches/asset-browser/scons/scons-local/SCons/Tool/bcc32.py
    branches/asset-browser/scons/scons-local/SCons/Tool/c++.py
    branches/asset-browser/scons/scons-local/SCons/Tool/cc.py
    branches/asset-browser/scons/scons-local/SCons/Tool/cvf.py
    branches/asset-browser/scons/scons-local/SCons/Tool/default.py
    branches/asset-browser/scons/scons-local/SCons/Tool/dmd.py
    branches/asset-browser/scons/scons-local/SCons/Tool/dvi.py
    branches/asset-browser/scons/scons-local/SCons/Tool/dvipdf.py
    branches/asset-browser/scons/scons-local/SCons/Tool/dvips.py
    branches/asset-browser/scons/scons-local/SCons/Tool/f03.py
    branches/asset-browser/scons/scons-local/SCons/Tool/f77.py
    branches/asset-browser/scons/scons-local/SCons/Tool/f90.py
    branches/asset-browser/scons/scons-local/SCons/Tool/f95.py
    branches/asset-browser/scons/scons-local/SCons/Tool/filesystem.py
    branches/asset-browser/scons/scons-local/SCons/Tool/fortran.py
    branches/asset-browser/scons/scons-local/SCons/Tool/g++.py
    branches/asset-browser/scons/scons-local/SCons/Tool/g77.py
    branches/asset-browser/scons/scons-local/SCons/Tool/gas.py
    branches/asset-browser/scons/scons-local/SCons/Tool/gcc.py
    branches/asset-browser/scons/scons-local/SCons/Tool/gettext.py
    branches/asset-browser/scons/scons-local/SCons/Tool/gfortran.py
    branches/asset-browser/scons/scons-local/SCons/Tool/gnulink.py
    branches/asset-browser/scons/scons-local/SCons/Tool/gs.py
    branches/asset-browser/scons/scons-local/SCons/Tool/hpc++.py
    branches/asset-browser/scons/scons-local/SCons/Tool/hpcc.py
    branches/asset-browser/scons/scons-local/SCons/Tool/hplink.py
    branches/asset-browser/scons/scons-local/SCons/Tool/icc.py
    branches/asset-browser/scons/scons-local/SCons/Tool/icl.py
    branches/asset-browser/scons/scons-local/SCons/Tool/ifl.py
    branches/asset-browser/scons/scons-local/SCons/Tool/ifort.py
    branches/asset-browser/scons/scons-local/SCons/Tool/ilink.py
    branches/asset-browser/scons/scons-local/SCons/Tool/ilink32.py
    branches/asset-browser/scons/scons-local/SCons/Tool/install.py
    branches/asset-browser/scons/scons-local/SCons/Tool/intelc.py
    branches/asset-browser/scons/scons-local/SCons/Tool/ipkg.py
    branches/asset-browser/scons/scons-local/SCons/Tool/jar.py
    branches/asset-browser/scons/scons-local/SCons/Tool/javac.py
    branches/asset-browser/scons/scons-local/SCons/Tool/javah.py
    branches/asset-browser/scons/scons-local/SCons/Tool/latex.py
    branches/asset-browser/scons/scons-local/SCons/Tool/lex.py
    branches/asset-browser/scons/scons-local/SCons/Tool/link.py
    branches/asset-browser/scons/scons-local/SCons/Tool/linkloc.py
    branches/asset-browser/scons/scons-local/SCons/Tool/m4.py
    branches/asset-browser/scons/scons-local/SCons/Tool/masm.py
    branches/asset-browser/scons/scons-local/SCons/Tool/midl.py
    branches/asset-browser/scons/scons-local/SCons/Tool/mingw.py
    branches/asset-browser/scons/scons-local/SCons/Tool/msgfmt.py
    branches/asset-browser/scons/scons-local/SCons/Tool/msginit.py
    branches/asset-browser/scons/scons-local/SCons/Tool/msgmerge.py
    branches/asset-browser/scons/scons-local/SCons/Tool/mslib.py
    branches/asset-browser/scons/scons-local/SCons/Tool/mslink.py
    branches/asset-browser/scons/scons-local/SCons/Tool/mssdk.py
    branches/asset-browser/scons/scons-local/SCons/Tool/msvc.py
    branches/asset-browser/scons/scons-local/SCons/Tool/msvs.py
    branches/asset-browser/scons/scons-local/SCons/Tool/mwcc.py
    branches/asset-browser/scons/scons-local/SCons/Tool/mwld.py
    branches/asset-browser/scons/scons-local/SCons/Tool/nasm.py
    branches/asset-browser/scons/scons-local/SCons/Tool/packaging/__init__.py
    branches/asset-browser/scons/scons-local/SCons/Tool/packaging/ipk.py
    branches/asset-browser/scons/scons-local/SCons/Tool/packaging/msi.py
    branches/asset-browser/scons/scons-local/SCons/Tool/packaging/rpm.py
    branches/asset-browser/scons/scons-local/SCons/Tool/packaging/src_tarbz2.py
    branches/asset-browser/scons/scons-local/SCons/Tool/packaging/src_targz.py
    branches/asset-browser/scons/scons-local/SCons/Tool/packaging/src_zip.py
    branches/asset-browser/scons/scons-local/SCons/Tool/packaging/tarbz2.py
    branches/asset-browser/scons/scons-local/SCons/Tool/packaging/targz.py
    branches/asset-browser/scons/scons-local/SCons/Tool/packaging/zip.py
    branches/asset-browser/scons/scons-local/SCons/Tool/pdf.py
    branches/asset-browser/scons/scons-local/SCons/Tool/pdflatex.py
    branches/asset-browser/scons/scons-local/SCons/Tool/pdftex.py
    branches/asset-browser/scons/scons-local/SCons/Tool/qt.py
    branches/asset-browser/scons/scons-local/SCons/Tool/rmic.py
    branches/asset-browser/scons/scons-local/SCons/Tool/rpcgen.py
    branches/asset-browser/scons/scons-local/SCons/Tool/rpm.py
    branches/asset-browser/scons/scons-local/SCons/Tool/rpmutils.py
    branches/asset-browser/scons/scons-local/SCons/Tool/sgiar.py
    branches/asset-browser/scons/scons-local/SCons/Tool/sgic++.py
    branches/asset-browser/scons/scons-local/SCons/Tool/sgicc.py
    branches/asset-browser/scons/scons-local/SCons/Tool/sgilink.py
    branches/asset-browser/scons/scons-local/SCons/Tool/sunar.py
    branches/asset-browser/scons/scons-local/SCons/Tool/sunc++.py
    branches/asset-browser/scons/scons-local/SCons/Tool/suncc.py
    branches/asset-browser/scons/scons-local/SCons/Tool/sunf77.py
    branches/asset-browser/scons/scons-local/SCons/Tool/sunf90.py
    branches/asset-browser/scons/scons-local/SCons/Tool/sunf95.py
    branches/asset-browser/scons/scons-local/SCons/Tool/sunlink.py
    branches/asset-browser/scons/scons-local/SCons/Tool/swig.py
    branches/asset-browser/scons/scons-local/SCons/Tool/tar.py
    branches/asset-browser/scons/scons-local/SCons/Tool/tex.py
    branches/asset-browser/scons/scons-local/SCons/Tool/textfile.py
    branches/asset-browser/scons/scons-local/SCons/Tool/tlib.py
    branches/asset-browser/scons/scons-local/SCons/Tool/wix.py
    branches/asset-browser/scons/scons-local/SCons/Tool/xgettext.py
    branches/asset-browser/scons/scons-local/SCons/Tool/yacc.py
    branches/asset-browser/scons/scons-local/SCons/Tool/zip.py
    branches/asset-browser/scons/scons-local/SCons/Util.py
    branches/asset-browser/scons/scons-local/SCons/Variables/BoolVariable.py
    branches/asset-browser/scons/scons-local/SCons/Variables/EnumVariable.py
    branches/asset-browser/scons/scons-local/SCons/Variables/ListVariable.py
    branches/asset-browser/scons/scons-local/SCons/Variables/PackageVariable.py
    branches/asset-browser/scons/scons-local/SCons/Variables/PathVariable.py
    branches/asset-browser/scons/scons-local/SCons/Variables/__init__.py
    branches/asset-browser/scons/scons-local/SCons/Warnings.py
    branches/asset-browser/scons/scons-local/SCons/__init__.py
    branches/asset-browser/scons/scons-local/SCons/compat/__init__.py
    branches/asset-browser/scons/scons-local/SCons/compat/_scons_builtins.py
    branches/asset-browser/scons/scons-local/SCons/compat/_scons_collections.py
    branches/asset-browser/scons/scons-local/SCons/compat/_scons_dbm.py
    branches/asset-browser/scons/scons-local/SCons/compat/_scons_hashlib.py
    branches/asset-browser/scons/scons-local/SCons/compat/_scons_io.py
    branches/asset-browser/scons/scons-local/SCons/compat/_scons_sets.py
    branches/asset-browser/scons/scons-local/SCons/compat/_scons_subprocess.py
    branches/asset-browser/scons/scons-local/SCons/cpp.py
    branches/asset-browser/scons/scons-local/SCons/dblite.py
    branches/asset-browser/scons/scons-local/SCons/exitfuncs.py
    branches/asset-browser/source/blender/blenkernel/BKE_treehash.h
    branches/asset-browser/source/blender/blenkernel/intern/treehash.c
    branches/asset-browser/source/blender/blenlib/BLI_sort.h
    branches/asset-browser/source/blender/blenlib/intern/sort.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_connect_nonplanar.c
    branches/asset-browser/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp
    branches/asset-browser/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h
    branches/asset-browser/source/blender/compositor/operations/COM_PlaneTrackCommonOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_PlaneTrackCommonOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.h
    branches/asset-browser/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp
    branches/asset-browser/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.h
    branches/asset-browser/source/blender/editors/interface/interface.c
    branches/asset-browser/source/blender/editors/space_outliner/
    branches/asset-browser/source/blender/freestyle/CMakeLists.txt
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_blackbody.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_sepcombHSV.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_vectTransform.c


Property changes on: branches/asset-browser
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032
/tags/blender-2.67b-release/blender:57122
/trunk/blender:43077-44985,44987-49474,49476-59558
   + /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260,59942,60073,60094,60096,60105
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/branches/soc-2013-rigid_body_sim:60311
/tags/blender-2.67b-release/blender:57122
/trunk/blender:43077-44985,44987-49474,49476-60854

Modified: branches/asset-browser/CMakeLists.txt
===================================================================
--- branches/asset-browser/CMakeLists.txt	2013-10-21 19:01:33 UTC (rev 60885)
+++ branches/asset-browser/CMakeLists.txt	2013-10-21 19:48:44 UTC (rev 60886)
@@ -203,6 +203,7 @@
 option(WITH_MOD_OCEANSIM        "Enable Ocean Modifier" OFF)
 
 # Image format support
+option(WITH_OPENIMAGEIO         "Enable OpenImageIO Support (http://www.openimageio.org)" OFF)
 option(WITH_IMAGE_OPENEXR       "Enable OpenEXR Support (http://www.openexr.com)" ON)
 option(WITH_IMAGE_OPENJPEG      "Enable OpenJpeg Support (http://www.openjpeg.org)" ON)
 option(WITH_IMAGE_TIFF          "Enable LibTIFF Support" ON)
@@ -262,6 +263,7 @@
 # Cycles
 option(WITH_CYCLES					"Enable cycles Render Engine" ON)
 option(WITH_CYCLES_STANDALONE		"Build cycles standalone application" OFF)
+option(WITH_CYCLES_STANDALONE_GUI	"Build cycles standalone with GUI" OFF)
 option(WITH_CYCLES_OSL				"Build Cycles with OSL support" OFF)
 option(WITH_CYCLES_CUDA_BINARIES	"Build cycles CUDA binaries" OFF)
 set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 sm_35 CACHE STRING "CUDA architectures to build binaries for")
@@ -277,13 +279,14 @@
 option(WITH_MEM_JEMALLOC   "Enable malloc replacement (http://www.canonware.com/jemalloc)" OFF)
 mark_as_advanced(WITH_MEM_JEMALLOC)
 
+# currently only used for BLI_mempool
+option(WITH_MEM_VALGRIND "Enable extended valgrind support for better reporting" OFF)
+mark_as_advanced(WITH_MEM_VALGRIND)
+
 # Debug
 option(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking (only enable for development)" OFF)
 mark_as_advanced(WITH_CXX_GUARDEDALLOC)
 
-option(WITH_GUARDEDALLOC "Enable GuardedAlloc (DISABLE AT OWN RISK!)" ON)
-mark_as_advanced(WITH_GUARDEDALLOC)
-
 option(WITH_ASSERT_ABORT "Call abort() when raising an assertion through BLI_assert()" OFF)
 mark_as_advanced(WITH_ASSERT_ABORT)
 
@@ -305,7 +308,9 @@
 	endif()
 	
 	execute_process(COMMAND uname -r OUTPUT_VARIABLE MAC_SYS) # check for actual system-version
-	if(${MAC_SYS} MATCHES 12)
+	if(${MAC_SYS} MATCHES 13)
+		set(OSX_SYSTEM 10.9)
+	elseif(${MAC_SYS} MATCHES 12)
 		set(OSX_SYSTEM 10.8)
 	elseif(${MAC_SYS} MATCHES 11)
 		set(OSX_SYSTEM 10.7)
@@ -317,9 +322,22 @@
 		set(OSX_SYSTEM unsupported)
 	endif()
 	message(STATUS "Detected system-version: " ${OSX_SYSTEM})
-
+	
+	# workaround for incorrect cmake xcode lookup for developer previews - XCODE_VERSION does not take xcode-select path into accout
+	# but would always look into /Applications/Xcode.app while dev versions are named Xcode<version>-DP<preview_number>
+	execute_process(COMMAND xcode-select --print-path  OUTPUT_VARIABLE XCODE_CHECK OUTPUT_STRIP_TRAILING_WHITESPACE)
+	string(REPLACE "/Contents/Developer" "" XCODE_BUNDLE ${XCODE_CHECK}) # truncate to bundlepath in any case
+	message(STATUS "Xcode-bundle : " ${XCODE_BUNDLE})
+	
 	if(${CMAKE_GENERATOR} MATCHES "Xcode")
 	
+		if(${XCODE_VERSION} VERSION_GREATER 4.2) # earlier xcode has no bundled developer dir, no sense in getting xcode path from
+			string(SUBSTRING "${XCODE_CHECK}" 14 6 DP_NAME) # reduce to XCode name without dp extension
+			if(${DP_NAME} MATCHES Xcode5)
+				set(XCODE_VERSION 5)
+			endif()
+		endif()
+
 		##### cmake incompatibility with xcode  4.3 and higher #####
 		if(${XCODE_VERSION} MATCHES '') # cmake fails due looking for xcode in the wrong path, thus will be empty var
 			message(FATAL_ERROR "Xcode 4.3 and higher must be used with cmake 2.8-8 or higher")
@@ -343,15 +361,16 @@
 	if(${XCODE_VERSION} VERSION_LESS 4.3)
 		set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk CACHE PATH "" FORCE)  # use guaranteed existing sdk
 	else()
-		# note: i don't use xcode-select path on purpose, cause also /Applications/Xcode.app would be allowed
-		# absolute pathes are more foolproof here !
-		set(OSX_SYSROOT_PREFIX /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform)
+		# note: xcode-select path could be ambigous, cause /Applications/Xcode.app/Contents/Developer or /Applications/Xcode.app would be allowed
+		# so i use a selfcomposed bundlepath here  
+		set(OSX_SYSROOT_PREFIX ${XCODE_BUNDLE}/Contents/Developer/Platforms/MacOSX.platform)
+		message(STATUS "OSX_SYSROOT_PREFIX: " ${OSX_SYSROOT_PREFIX})
 		set(OSX_DEVELOPER_PREFIX /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk) # use guaranteed existing sdk
 		set(CMAKE_OSX_SYSROOT ${OSX_SYSROOT_PREFIX}/${OSX_DEVELOPER_PREFIX} CACHE PATH "" FORCE)
 	endif()
 	
 	if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
-			set(CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING "" FORCE) # 10.5 is our min. target, if you use higher sdk, weak linking happens
+		set(CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING "" FORCE) # 10.5 is our min. target, if you use higher sdk, weak linking happens
 	endif()
 	
 	if(NOT ${CMAKE_GENERATOR} MATCHES "Xcode")
@@ -439,7 +458,7 @@
 
 	set_and_warn(WITH_OPENAL         OFF)  # depends on AUDASPACE
 	set_and_warn(WITH_GAMEENGINE     OFF)  # depends on AUDASPACE
-elseif(WITH_CYCLES OR WITH_MOD_BOOLEAN OR WITH_AUDASPACE OR WITH_INTERNATIONAL)
+elseif(WITH_CYCLES OR WITH_OPENIMAGEIO OR WITH_MOD_BOOLEAN OR WITH_AUDASPACE OR WITH_INTERNATIONAL)
 	# Keep enabled
 else()
 	# Enabled but we don't need it
@@ -771,43 +790,48 @@
 		endif()
 
 		if(LLVM_DIRECTORY)
-			FIND_PROGRAM(LLVM_CONFIG llvm-config-${LLVM_VERSION} HINTS ${LLVM_DIRECTORY}/bin NO_CMAKE_PATH)
+			find_program(LLVM_CONFIG llvm-config-${LLVM_VERSION} HINTS ${LLVM_DIRECTORY}/bin NO_CMAKE_PATH)
 			if(NOT LLVM_CONFIG)
-				FIND_PROGRAM(LLVM_CONFIG llvm-config HINTS ${LLVM_DIRECTORY}/bin NO_CMAKE_PATH)
+				find_program(LLVM_CONFIG llvm-config HINTS ${LLVM_DIRECTORY}/bin NO_CMAKE_PATH)
 			endif()
 		else()
-			FIND_PROGRAM(LLVM_CONFIG llvm-config-${LLVM_VERSION})
+			find_program(LLVM_CONFIG llvm-config-${LLVM_VERSION})
 			if(NOT LLVM_CONFIG)
-				FIND_PROGRAM(LLVM_CONFIG llvm-config)
+				find_program(LLVM_CONFIG llvm-config)
 			endif()
 		endif()
-		execute_process(COMMAND ${LLVM_CONFIG} --version
-		                OUTPUT_VARIABLE LLVM_VERSION
-		                OUTPUT_STRIP_TRAILING_WHITESPACE)
-		execute_process(COMMAND ${LLVM_CONFIG} --prefix
-		                OUTPUT_VARIABLE LLVM_DIRECTORY
-		                OUTPUT_STRIP_TRAILING_WHITESPACE)
-		execute_process(COMMAND ${LLVM_CONFIG} --libdir
-		                OUTPUT_VARIABLE LLVM_LIB_DIR
-		                OUTPUT_STRIP_TRAILING_WHITESPACE)
 
+		if(NOT DEFINED LLVM_VERSION)
+			execute_process(COMMAND ${LLVM_CONFIG} --version
+							OUTPUT_VARIABLE LLVM_VERSION
+							OUTPUT_STRIP_TRAILING_WHITESPACE)
+			set(LLVM_VERSION ${LLVM_VERSION} CACHE STRING "Version of LLVM to use")
+		endif()
+		if(NOT DEFINED LLVM_DIRECTORY)
+			execute_process(COMMAND ${LLVM_CONFIG} --prefix
+							OUTPUT_VARIABLE LLVM_DIRECTORY
+							OUTPUT_STRIP_TRAILING_WHITESPACE)
+			set(LLVM_DIRECTORY ${LLVM_DIRECTORY} CACHE PATH "Path to the LLVM installation")
+		endif()
+		if(NOT DEFINED LLVM_LIBPATH)
+			execute_process(COMMAND ${LLVM_CONFIG} --libdir
+							OUTPUT_VARIABLE LLVM_LIBPATH
+							OUTPUT_STRIP_TRAILING_WHITESPACE)
+			set(LLVM_LIBPATH ${LLVM_LIBPATH} CACHE PATH "Path to the LLVM library path")
+		endif()
+
 		if(LLVM_STATIC)
 			find_library(LLVM_LIBRARY
 			             NAMES LLVMAnalysis # first of a whole bunch of libs to get
-			             PATHS ${LLVM_LIB_DIR})
+			             PATHS ${LLVM_LIBPATH})
 		else()
 			find_library(LLVM_LIBRARY
 			             NAMES LLVM-${LLVM_VERSION}
-			             PATHS ${LLVM_LIB_DIR})
+			             PATHS ${LLVM_LIBPATH})
 		endif()
 
-		message(STATUS "LLVM version  = ${LLVM_VERSION}")
-		message(STATUS "LLVM dir      = ${LLVM_DIRECTORY}")
-		message(STATUS "LLVM lib dir  = ${LLVM_LIB_DIR}")
-		set(LLVM_VERSION ${LLVM_VERSION} CACHE STRING "Version of LLVM to use")

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list