[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51322] branches/merwin-playground: merging in latest changes from trunk (r50936 through r51318)
Mike Erwin
significant.bit at gmail.com
Sun Oct 14 23:17:19 CEST 2012
Revision: 51322
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51322
Author: merwin
Date: 2012-10-14 21:17:16 +0000 (Sun, 14 Oct 2012)
Log Message:
-----------
merging in latest changes from trunk (r50936 through r51318)
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50936
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51318
Modified Paths:
--------------
branches/merwin-playground/CMakeLists.txt
branches/merwin-playground/GNUmakefile
branches/merwin-playground/SConstruct
branches/merwin-playground/build_files/buildbot/master.cfg
branches/merwin-playground/build_files/buildbot/master_unpack.py
branches/merwin-playground/build_files/buildbot/slave_pack.py
branches/merwin-playground/build_files/cmake/cmake_qtcreator_project.py
branches/merwin-playground/build_files/cmake/cmake_static_check_cppcheck.py
branches/merwin-playground/build_files/cmake/cmake_static_check_smatch.py
branches/merwin-playground/build_files/cmake/cmake_static_check_sparse.py
branches/merwin-playground/build_files/cmake/cmake_static_check_splint.py
branches/merwin-playground/build_files/cmake/config/blender_lite.cmake
branches/merwin-playground/build_files/cmake/macros.cmake
branches/merwin-playground/build_files/cmake/project_source_info.py
branches/merwin-playground/build_files/package_spec/rpm/blender.spec.in
branches/merwin-playground/build_files/scons/config/win32-mingw-config.py
branches/merwin-playground/build_files/scons/config/win64-mingw-config.py
branches/merwin-playground/doc/guides/interface_API.txt
branches/merwin-playground/doc/manpage/blender.1
branches/merwin-playground/doc/python_api/examples/bpy.types.Operator.4.py
branches/merwin-playground/doc/python_api/examples/bpy.types.Operator.5.py
branches/merwin-playground/doc/python_api/rst/bge.logic.rst
branches/merwin-playground/doc/python_api/rst/bge.types.rst
branches/merwin-playground/doc/python_api/rst/change_log.rst
branches/merwin-playground/doc/python_api/sphinx_changelog_gen.py
branches/merwin-playground/doc/python_api/sphinx_doc_gen.py
branches/merwin-playground/extern/carve/CMakeLists.txt
branches/merwin-playground/extern/libmv/third_party/ceres/CMakeLists.txt
branches/merwin-playground/intern/audaspace/fftw/AUD_BandPassFactory.h
branches/merwin-playground/intern/audaspace/intern/AUD_PyInit.h
branches/merwin-playground/intern/bsp/CMakeLists.txt
branches/merwin-playground/intern/bsp/intern/BOP_CarveInterface.cpp
branches/merwin-playground/intern/cycles/blender/addon/properties.py
branches/merwin-playground/intern/cycles/blender/addon/ui.py
branches/merwin-playground/intern/cycles/blender/blender_camera.cpp
branches/merwin-playground/intern/cycles/blender/blender_mesh.cpp
branches/merwin-playground/intern/cycles/blender/blender_object.cpp
branches/merwin-playground/intern/cycles/blender/blender_session.cpp
branches/merwin-playground/intern/cycles/blender/blender_shader.cpp
branches/merwin-playground/intern/cycles/blender/blender_sync.cpp
branches/merwin-playground/intern/cycles/blender/blender_sync.h
branches/merwin-playground/intern/cycles/blender/blender_util.h
branches/merwin-playground/intern/cycles/device/device_cpu.cpp
branches/merwin-playground/intern/cycles/device/device_cuda.cpp
branches/merwin-playground/intern/cycles/device/device_opencl.cpp
branches/merwin-playground/intern/cycles/device/device_task.h
branches/merwin-playground/intern/cycles/kernel/kernel_bvh.h
branches/merwin-playground/intern/cycles/kernel/kernel_camera.h
branches/merwin-playground/intern/cycles/kernel/kernel_montecarlo.h
branches/merwin-playground/intern/cycles/kernel/kernel_object.h
branches/merwin-playground/intern/cycles/kernel/kernel_passes.h
branches/merwin-playground/intern/cycles/kernel/kernel_path.h
branches/merwin-playground/intern/cycles/kernel/kernel_shader.h
branches/merwin-playground/intern/cycles/kernel/kernel_types.h
branches/merwin-playground/intern/cycles/kernel/osl/background.cpp
branches/merwin-playground/intern/cycles/kernel/osl/bsdf_ashikhmin_velvet.cpp
branches/merwin-playground/intern/cycles/kernel/osl/bsdf_diffuse.cpp
branches/merwin-playground/intern/cycles/kernel/osl/bsdf_microfacet.cpp
branches/merwin-playground/intern/cycles/kernel/osl/bsdf_oren_nayar.cpp
branches/merwin-playground/intern/cycles/kernel/osl/bsdf_phong.cpp
branches/merwin-playground/intern/cycles/kernel/osl/bsdf_reflection.cpp
branches/merwin-playground/intern/cycles/kernel/osl/bsdf_refraction.cpp
branches/merwin-playground/intern/cycles/kernel/osl/bsdf_transparent.cpp
branches/merwin-playground/intern/cycles/kernel/osl/bsdf_ward.cpp
branches/merwin-playground/intern/cycles/kernel/osl/bsdf_westin.cpp
branches/merwin-playground/intern/cycles/kernel/osl/bssrdf.cpp
branches/merwin-playground/intern/cycles/kernel/osl/debug.cpp
branches/merwin-playground/intern/cycles/kernel/osl/emissive.cpp
branches/merwin-playground/intern/cycles/kernel/osl/osl_closures.cpp
branches/merwin-playground/intern/cycles/kernel/osl/osl_closures.h
branches/merwin-playground/intern/cycles/kernel/osl/osl_shader.cpp
branches/merwin-playground/intern/cycles/kernel/osl/vol_subsurface.cpp
branches/merwin-playground/intern/cycles/kernel/svm/bsdf_ashikhmin_velvet.h
branches/merwin-playground/intern/cycles/kernel/svm/bsdf_diffuse.h
branches/merwin-playground/intern/cycles/kernel/svm/bsdf_microfacet.h
branches/merwin-playground/intern/cycles/kernel/svm/bsdf_oren_nayar.h
branches/merwin-playground/intern/cycles/kernel/svm/bsdf_reflection.h
branches/merwin-playground/intern/cycles/kernel/svm/bsdf_refraction.h
branches/merwin-playground/intern/cycles/kernel/svm/bsdf_ward.h
branches/merwin-playground/intern/cycles/kernel/svm/bsdf_westin.h
branches/merwin-playground/intern/cycles/kernel/svm/svm.h
branches/merwin-playground/intern/cycles/kernel/svm/svm_closure.h
branches/merwin-playground/intern/cycles/kernel/svm/svm_displace.h
branches/merwin-playground/intern/cycles/kernel/svm/svm_geometry.h
branches/merwin-playground/intern/cycles/kernel/svm/svm_tex_coord.h
branches/merwin-playground/intern/cycles/kernel/svm/svm_types.h
branches/merwin-playground/intern/cycles/render/CMakeLists.txt
branches/merwin-playground/intern/cycles/render/attribute.cpp
branches/merwin-playground/intern/cycles/render/buffers.cpp
branches/merwin-playground/intern/cycles/render/camera.cpp
branches/merwin-playground/intern/cycles/render/graph.cpp
branches/merwin-playground/intern/cycles/render/graph.h
branches/merwin-playground/intern/cycles/render/light.cpp
branches/merwin-playground/intern/cycles/render/mesh.cpp
branches/merwin-playground/intern/cycles/render/nodes.cpp
branches/merwin-playground/intern/cycles/render/nodes.h
branches/merwin-playground/intern/cycles/render/object.cpp
branches/merwin-playground/intern/cycles/render/object.h
branches/merwin-playground/intern/cycles/render/session.cpp
branches/merwin-playground/intern/cycles/render/session.h
branches/merwin-playground/intern/cycles/render/tile.cpp
branches/merwin-playground/intern/cycles/render/tile.h
branches/merwin-playground/intern/cycles/util/util_progress.h
branches/merwin-playground/intern/cycles/util/util_thread.h
branches/merwin-playground/intern/cycles/util/util_types.h
branches/merwin-playground/intern/dualcon/CMakeLists.txt
branches/merwin-playground/intern/dualcon/intern/octree.cpp
branches/merwin-playground/intern/dualcon/intern/octree.h
branches/merwin-playground/intern/elbeem/intern/utilities.cpp
branches/merwin-playground/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
branches/merwin-playground/intern/ghost/intern/GHOST_SystemX11.cpp
branches/merwin-playground/intern/itasc/CMakeLists.txt
branches/merwin-playground/intern/opencolorio/CMakeLists.txt
branches/merwin-playground/intern/opencolorio/SConscript
branches/merwin-playground/intern/opencolorio/ocio_capi.h
branches/merwin-playground/intern/opennl/intern/opennl.c
branches/merwin-playground/intern/opennl/superlu/get_perm_c.c
branches/merwin-playground/intern/smoke/CMakeLists.txt
branches/merwin-playground/intern/smoke/extern/smoke_API.h
branches/merwin-playground/intern/smoke/intern/FLUID_3D.cpp
branches/merwin-playground/intern/smoke/intern/FLUID_3D.h
branches/merwin-playground/intern/smoke/intern/FLUID_3D_SOLVERS.cpp
branches/merwin-playground/intern/smoke/intern/FLUID_3D_STATIC.cpp
branches/merwin-playground/intern/smoke/intern/WTURBULENCE.cpp
branches/merwin-playground/intern/smoke/intern/WTURBULENCE.h
branches/merwin-playground/intern/smoke/intern/smoke_API.cpp
branches/merwin-playground/intern/tools/bpy_introspect_ui.py
branches/merwin-playground/intern/tools/credits_svn_gen.py
branches/merwin-playground/release/datafiles/blender_icons.png
branches/merwin-playground/release/datafiles/splash.png
branches/merwin-playground/release/datafiles/startup.blend
branches/merwin-playground/release/scripts/modules/addon_utils.py
branches/merwin-playground/release/scripts/modules/bl_i18n_utils/bl_process_msg.py
branches/merwin-playground/release/scripts/modules/bl_i18n_utils/rtl_preprocess.py
branches/merwin-playground/release/scripts/modules/bl_i18n_utils/settings.py
branches/merwin-playground/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
branches/merwin-playground/release/scripts/modules/bl_i18n_utils/update_pot.py
branches/merwin-playground/release/scripts/modules/bl_i18n_utils/utils.py
branches/merwin-playground/release/scripts/modules/bpy/path.py
branches/merwin-playground/release/scripts/modules/bpy_extras/mesh_utils.py
branches/merwin-playground/release/scripts/modules/bpy_types.py
branches/merwin-playground/release/scripts/modules/bpyml.py
branches/merwin-playground/release/scripts/modules/console_python.py
branches/merwin-playground/release/scripts/modules/console_shell.py
branches/merwin-playground/release/scripts/modules/rna_info.py
branches/merwin-playground/release/scripts/modules/rna_xml.py
branches/merwin-playground/release/scripts/presets/interface_theme/back_to_black.xml
branches/merwin-playground/release/scripts/presets/interface_theme/blender_24x.xml
branches/merwin-playground/release/scripts/presets/interface_theme/elsyiun.xml
branches/merwin-playground/release/scripts/presets/interface_theme/hexagon.xml
branches/merwin-playground/release/scripts/presets/interface_theme/ubuntu_ambiance.xml
branches/merwin-playground/release/scripts/presets/keyconfig/maya.py
branches/merwin-playground/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/merwin-playground/release/scripts/startup/bl_operators/anim.py
branches/merwin-playground/release/scripts/startup/bl_operators/clip.py
branches/merwin-playground/release/scripts/startup/bl_operators/console.py
branches/merwin-playground/release/scripts/startup/bl_operators/mesh.py
branches/merwin-playground/release/scripts/startup/bl_operators/object.py
branches/merwin-playground/release/scripts/startup/bl_operators/object_quick_effects.py
branches/merwin-playground/release/scripts/startup/bl_operators/presets.py
branches/merwin-playground/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
branches/merwin-playground/release/scripts/startup/bl_operators/wm.py
branches/merwin-playground/release/scripts/startup/bl_ui/__init__.py
branches/merwin-playground/release/scripts/startup/bl_ui/properties_animviz.py
branches/merwin-playground/release/scripts/startup/bl_ui/properties_data_armature.py
branches/merwin-playground/release/scripts/startup/bl_ui/properties_data_bone.py
branches/merwin-playground/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/merwin-playground/release/scripts/startup/bl_ui/properties_object.py
branches/merwin-playground/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/merwin-playground/release/scripts/startup/bl_ui/properties_particle.py
branches/merwin-playground/release/scripts/startup/bl_ui/properties_physics_cloth.py
branches/merwin-playground/release/scripts/startup/bl_ui/properties_physics_common.py
branches/merwin-playground/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
branches/merwin-playground/release/scripts/startup/bl_ui/properties_physics_field.py
branches/merwin-playground/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/merwin-playground/release/scripts/startup/bl_ui/properties_physics_softbody.py
branches/merwin-playground/release/scripts/startup/bl_ui/properties_render.py
branches/merwin-playground/release/scripts/startup/bl_ui/properties_texture.py
branches/merwin-playground/release/scripts/startup/bl_ui/space_clip.py
branches/merwin-playground/release/scripts/startup/bl_ui/space_console.py
branches/merwin-playground/release/scripts/startup/bl_ui/space_dopesheet.py
branches/merwin-playground/release/scripts/startup/bl_ui/space_info.py
branches/merwin-playground/release/scripts/startup/bl_ui/space_userpref.py
branches/merwin-playground/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/merwin-playground/release/scripts/startup/bl_ui/space_view3d.py
branches/merwin-playground/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/merwin-playground/release/scripts/startup/keyingsets_builtins.py
branches/merwin-playground/release/scripts/templates/addon_add_object.py
branches/merwin-playground/release/scripts/templates/ui_panel.py
branches/merwin-playground/release/windows/contrib/vfapi/vfapi-plugin.c
branches/merwin-playground/source/blender/CMakeLists.txt
branches/merwin-playground/source/blender/avi/AVI_avi.h
branches/merwin-playground/source/blender/avi/CMakeLists.txt
branches/merwin-playground/source/blender/avi/intern/avi.c
branches/merwin-playground/source/blender/blenfont/BLF_api.h
branches/merwin-playground/source/blender/blenfont/BLF_translation.h
branches/merwin-playground/source/blender/blenfont/intern/blf.c
branches/merwin-playground/source/blender/blenkernel/BKE_anim.h
branches/merwin-playground/source/blender/blenkernel/BKE_armature.h
branches/merwin-playground/source/blender/blenkernel/BKE_blender.h
branches/merwin-playground/source/blender/blenkernel/BKE_gpencil.h
branches/merwin-playground/source/blender/blenkernel/BKE_key.h
branches/merwin-playground/source/blender/blenkernel/BKE_mball.h
branches/merwin-playground/source/blender/blenkernel/BKE_multires.h
branches/merwin-playground/source/blender/blenkernel/BKE_navmesh_conversion.h
branches/merwin-playground/source/blender/blenkernel/BKE_node.h
branches/merwin-playground/source/blender/blenkernel/BKE_scene.h
branches/merwin-playground/source/blender/blenkernel/BKE_sequencer.h
branches/merwin-playground/source/blender/blenkernel/BKE_smoke.h
branches/merwin-playground/source/blender/blenkernel/BKE_utildefines.h
branches/merwin-playground/source/blender/blenkernel/CMakeLists.txt
branches/merwin-playground/source/blender/blenkernel/intern/DerivedMesh.c
branches/merwin-playground/source/blender/blenkernel/intern/action.c
branches/merwin-playground/source/blender/blenkernel/intern/anim.c
branches/merwin-playground/source/blender/blenkernel/intern/armature.c
branches/merwin-playground/source/blender/blenkernel/intern/blender.c
branches/merwin-playground/source/blender/blenkernel/intern/boids.c
branches/merwin-playground/source/blender/blenkernel/intern/brush.c
branches/merwin-playground/source/blender/blenkernel/intern/cloth.c
branches/merwin-playground/source/blender/blenkernel/intern/colortools.c
branches/merwin-playground/source/blender/blenkernel/intern/curve.c
branches/merwin-playground/source/blender/blenkernel/intern/customdata.c
branches/merwin-playground/source/blender/blenkernel/intern/depsgraph.c
branches/merwin-playground/source/blender/blenkernel/intern/displist.c
branches/merwin-playground/source/blender/blenkernel/intern/dynamicpaint.c
branches/merwin-playground/source/blender/blenkernel/intern/effect.c
branches/merwin-playground/source/blender/blenkernel/intern/fmodifier.c
branches/merwin-playground/source/blender/blenkernel/intern/font.c
branches/merwin-playground/source/blender/blenkernel/intern/gpencil.c
branches/merwin-playground/source/blender/blenkernel/intern/image.c
branches/merwin-playground/source/blender/blenkernel/intern/implicit.c
branches/merwin-playground/source/blender/blenkernel/intern/ipo.c
branches/merwin-playground/source/blender/blenkernel/intern/lattice.c
branches/merwin-playground/source/blender/blenkernel/intern/mask.c
branches/merwin-playground/source/blender/blenkernel/intern/material.c
branches/merwin-playground/source/blender/blenkernel/intern/mball.c
branches/merwin-playground/source/blender/blenkernel/intern/mesh.c
branches/merwin-playground/source/blender/blenkernel/intern/mesh_validate.c
branches/merwin-playground/source/blender/blenkernel/intern/modifier.c
branches/merwin-playground/source/blender/blenkernel/intern/modifiers_bmesh.c
branches/merwin-playground/source/blender/blenkernel/intern/movieclip.c
branches/merwin-playground/source/blender/blenkernel/intern/multires.c
branches/merwin-playground/source/blender/blenkernel/intern/node.c
branches/merwin-playground/source/blender/blenkernel/intern/object.c
branches/merwin-playground/source/blender/blenkernel/intern/packedFile.c
branches/merwin-playground/source/blender/blenkernel/intern/particle.c
branches/merwin-playground/source/blender/blenkernel/intern/pointcache.c
branches/merwin-playground/source/blender/blenkernel/intern/report.c
branches/merwin-playground/source/blender/blenkernel/intern/scene.c
branches/merwin-playground/source/blender/blenkernel/intern/seqeffects.c
branches/merwin-playground/source/blender/blenkernel/intern/sequencer.c
branches/merwin-playground/source/blender/blenkernel/intern/smoke.c
branches/merwin-playground/source/blender/blenkernel/intern/softbody.c
branches/merwin-playground/source/blender/blenkernel/intern/texture.c
branches/merwin-playground/source/blender/blenkernel/intern/tracking.c
branches/merwin-playground/source/blender/blenkernel/intern/writeavi.c
branches/merwin-playground/source/blender/blenkernel/nla_private.h
branches/merwin-playground/source/blender/blenlib/BLI_blenlib.h
branches/merwin-playground/source/blender/blenlib/BLI_bpath.h
branches/merwin-playground/source/blender/blenlib/BLI_dlrbTree.h
branches/merwin-playground/source/blender/blenlib/BLI_endian_switch_inline.h
branches/merwin-playground/source/blender/blenlib/BLI_fileops.h
branches/merwin-playground/source/blender/blenlib/BLI_kdopbvh.h
branches/merwin-playground/source/blender/blenlib/BLI_lasso.h
branches/merwin-playground/source/blender/blenlib/BLI_math_vector.h
branches/merwin-playground/source/blender/blenlib/BLI_pbvh.h
branches/merwin-playground/source/blender/blenlib/BLI_rect.h
branches/merwin-playground/source/blender/blenlib/BLI_string.h
branches/merwin-playground/source/blender/blenlib/BLI_string_utf8.h
branches/merwin-playground/source/blender/blenlib/BLI_utildefines.h
branches/merwin-playground/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/merwin-playground/source/blender/blenlib/intern/DLRB_tree.c
branches/merwin-playground/source/blender/blenlib/intern/bpath.c
branches/merwin-playground/source/blender/blenlib/intern/fileops.c
branches/merwin-playground/source/blender/blenlib/intern/lasso.c
branches/merwin-playground/source/blender/blenlib/intern/math_base_inline.c
branches/merwin-playground/source/blender/blenlib/intern/math_vector_inline.c
branches/merwin-playground/source/blender/blenlib/intern/pbvh.c
branches/merwin-playground/source/blender/blenlib/intern/rct.c
branches/merwin-playground/source/blender/blenlib/intern/string.c
branches/merwin-playground/source/blender/blenlib/intern/string_utf8.c
branches/merwin-playground/source/blender/blenloader/intern/readfile.c
branches/merwin-playground/source/blender/blenloader/intern/versioning_250.c
branches/merwin-playground/source/blender/blenloader/intern/writefile.c
branches/merwin-playground/source/blender/bmesh/intern/bmesh_construct.c
branches/merwin-playground/source/blender/bmesh/intern/bmesh_core.c
branches/merwin-playground/source/blender/bmesh/intern/bmesh_mesh.c
branches/merwin-playground/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/merwin-playground/source/blender/bmesh/intern/bmesh_queries.c
branches/merwin-playground/source/blender/bmesh/intern/bmesh_queries.h
branches/merwin-playground/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/merwin-playground/source/blender/bmesh/operators/bmo_bevel.c
branches/merwin-playground/source/blender/bmesh/operators/bmo_connect.c
branches/merwin-playground/source/blender/bmesh/operators/bmo_create.c
branches/merwin-playground/source/blender/bmesh/operators/bmo_extrude.c
branches/merwin-playground/source/blender/bmesh/operators/bmo_join_triangles.c
branches/merwin-playground/source/blender/bmesh/operators/bmo_primitive.c
branches/merwin-playground/source/blender/collada/DocumentExporter.cpp
branches/merwin-playground/source/blender/collada/DocumentImporter.cpp
branches/merwin-playground/source/blender/collada/DocumentImporter.h
branches/merwin-playground/source/blender/collada/GeometryExporter.cpp
branches/merwin-playground/source/blender/compositor/intern/COM_ExecutionSystem.cpp
branches/merwin-playground/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
branches/merwin-playground/source/blender/compositor/intern/COM_Node.cpp
branches/merwin-playground/source/blender/compositor/intern/COM_Node.h
branches/merwin-playground/source/blender/compositor/intern/COM_NodeBase.h
branches/merwin-playground/source/blender/compositor/intern/COM_OpenCLDevice.cpp
branches/merwin-playground/source/blender/compositor/nodes/COM_ChannelMatteNode.h
branches/merwin-playground/source/blender/compositor/nodes/COM_ChromaMatteNode.h
branches/merwin-playground/source/blender/compositor/nodes/COM_ColorBalanceNode.h
branches/merwin-playground/source/blender/compositor/nodes/COM_ColorMatteNode.h
branches/merwin-playground/source/blender/compositor/nodes/COM_ColorRampNode.h
branches/merwin-playground/source/blender/compositor/nodes/COM_ColorSpillNode.h
branches/merwin-playground/source/blender/compositor/nodes/COM_DifferenceMatteNode.h
branches/merwin-playground/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
branches/merwin-playground/source/blender/compositor/nodes/COM_DistanceMatteNode.h
branches/merwin-playground/source/blender/compositor/nodes/COM_FilterNode.h
branches/merwin-playground/source/blender/compositor/nodes/COM_KeyingNode.cpp
branches/merwin-playground/source/blender/compositor/nodes/COM_LuminanceMatteNode.h
branches/merwin-playground/source/blender/compositor/nodes/COM_MapValueNode.h
branches/merwin-playground/source/blender/compositor/nodes/COM_MaskNode.h
branches/merwin-playground/source/blender/compositor/nodes/COM_MovieClipNode.h
branches/merwin-playground/source/blender/compositor/nodes/COM_NormalNode.h
branches/merwin-playground/source/blender/compositor/nodes/COM_TransformNode.h
branches/merwin-playground/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
branches/merwin-playground/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
branches/merwin-playground/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
branches/merwin-playground/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
branches/merwin-playground/source/blender/compositor/operations/COM_GlareGhostOperation.cpp
branches/merwin-playground/source/blender/compositor/operations/COM_GlareStreaksOperation.cpp
branches/merwin-playground/source/blender/compositor/operations/COM_MapUVOperation.cpp
branches/merwin-playground/source/blender/compositor/operations/COM_MaskOperation.cpp
branches/merwin-playground/source/blender/compositor/operations/COM_MixColorOperation.cpp
branches/merwin-playground/source/blender/compositor/operations/COM_MixGlareOperation.cpp
branches/merwin-playground/source/blender/compositor/operations/COM_MovieDistortionOperation.h
branches/merwin-playground/source/blender/compositor/operations/COM_OutputFileOperation.cpp
branches/merwin-playground/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
branches/merwin-playground/source/blender/compositor/operations/COM_TrackPositionOperation.h
branches/merwin-playground/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
branches/merwin-playground/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
branches/merwin-playground/source/blender/compositor/operations/COM_ZCombineOperation.cpp
branches/merwin-playground/source/blender/editors/animation/anim_filter.c
branches/merwin-playground/source/blender/editors/animation/anim_intern.h
branches/merwin-playground/source/blender/editors/animation/anim_markers.c
branches/merwin-playground/source/blender/editors/animation/anim_ops.c
branches/merwin-playground/source/blender/editors/animation/keyframing.c
branches/merwin-playground/source/blender/editors/armature/editarmature.c
branches/merwin-playground/source/blender/editors/armature/editarmature_retarget.c
branches/merwin-playground/source/blender/editors/armature/editarmature_sketch.c
branches/merwin-playground/source/blender/editors/armature/meshlaplacian.c
branches/merwin-playground/source/blender/editors/armature/poseSlide.c
branches/merwin-playground/source/blender/editors/armature/poseobject.c
branches/merwin-playground/source/blender/editors/curve/editcurve.c
branches/merwin-playground/source/blender/editors/curve/editfont.c
branches/merwin-playground/source/blender/editors/gpencil/drawgpencil.c
branches/merwin-playground/source/blender/editors/gpencil/gpencil_buttons.c
branches/merwin-playground/source/blender/editors/gpencil/gpencil_edit.c
branches/merwin-playground/source/blender/editors/gpencil/gpencil_paint.c
branches/merwin-playground/source/blender/editors/gpencil/gpencil_undo.c
branches/merwin-playground/source/blender/editors/include/ED_anim_api.h
branches/merwin-playground/source/blender/editors/include/ED_armature.h
branches/merwin-playground/source/blender/editors/include/ED_keyframes_draw.h
branches/merwin-playground/source/blender/editors/include/ED_mesh.h
branches/merwin-playground/source/blender/editors/include/ED_object.h
branches/merwin-playground/source/blender/editors/include/ED_particle.h
branches/merwin-playground/source/blender/editors/include/ED_sculpt.h
branches/merwin-playground/source/blender/editors/include/ED_view3d.h
branches/merwin-playground/source/blender/editors/include/UI_icons.h
branches/merwin-playground/source/blender/editors/include/UI_interface.h
branches/merwin-playground/source/blender/editors/interface/interface.c
branches/merwin-playground/source/blender/editors/interface/interface_draw.c
branches/merwin-playground/source/blender/editors/interface/interface_handlers.c
branches/merwin-playground/source/blender/editors/interface/interface_intern.h
branches/merwin-playground/source/blender/editors/interface/interface_layout.c
branches/merwin-playground/source/blender/editors/interface/interface_ops.c
branches/merwin-playground/source/blender/editors/interface/interface_regions.c
branches/merwin-playground/source/blender/editors/interface/interface_templates.c
branches/merwin-playground/source/blender/editors/interface/interface_widgets.c
branches/merwin-playground/source/blender/editors/interface/resources.c
branches/merwin-playground/source/blender/editors/interface/view2d_ops.c
branches/merwin-playground/source/blender/editors/mask/CMakeLists.txt
branches/merwin-playground/source/blender/editors/mask/mask_add.c
branches/merwin-playground/source/blender/editors/mask/mask_draw.c
branches/merwin-playground/source/blender/editors/mask/mask_ops.c
branches/merwin-playground/source/blender/editors/mask/mask_select.c
branches/merwin-playground/source/blender/editors/mesh/editface.c
branches/merwin-playground/source/blender/editors/mesh/editmesh_add.c
branches/merwin-playground/source/blender/editors/mesh/editmesh_bvh.c
branches/merwin-playground/source/blender/editors/mesh/editmesh_knife.c
branches/merwin-playground/source/blender/editors/mesh/editmesh_loopcut.c
branches/merwin-playground/source/blender/editors/mesh/editmesh_rip.c
branches/merwin-playground/source/blender/editors/mesh/editmesh_select.c
branches/merwin-playground/source/blender/editors/mesh/editmesh_slide.c
branches/merwin-playground/source/blender/editors/mesh/editmesh_tools.c
branches/merwin-playground/source/blender/editors/mesh/editmesh_utils.c
branches/merwin-playground/source/blender/editors/mesh/mesh_data.c
branches/merwin-playground/source/blender/editors/mesh/mesh_intern.h
branches/merwin-playground/source/blender/editors/mesh/mesh_ops.c
branches/merwin-playground/source/blender/editors/mesh/meshtools.c
branches/merwin-playground/source/blender/editors/metaball/mball_edit.c
branches/merwin-playground/source/blender/editors/object/CMakeLists.txt
branches/merwin-playground/source/blender/editors/object/object_add.c
branches/merwin-playground/source/blender/editors/object/object_bake.c
branches/merwin-playground/source/blender/editors/object/object_constraint.c
branches/merwin-playground/source/blender/editors/object/object_edit.c
branches/merwin-playground/source/blender/editors/object/object_hook.c
branches/merwin-playground/source/blender/editors/object/object_intern.h
branches/merwin-playground/source/blender/editors/object/object_lattice.c
branches/merwin-playground/source/blender/editors/object/object_modifier.c
branches/merwin-playground/source/blender/editors/object/object_ops.c
branches/merwin-playground/source/blender/editors/object/object_shapekey.c
branches/merwin-playground/source/blender/editors/object/object_transform.c
branches/merwin-playground/source/blender/editors/object/object_vgroup.c
branches/merwin-playground/source/blender/editors/physics/dynamicpaint_ops.c
branches/merwin-playground/source/blender/editors/physics/particle_edit.c
branches/merwin-playground/source/blender/editors/physics/physics_fluid.c
branches/merwin-playground/source/blender/editors/physics/physics_pointcache.c
branches/merwin-playground/source/blender/editors/render/render_internal.c
branches/merwin-playground/source/blender/editors/render/render_opengl.c
branches/merwin-playground/source/blender/editors/render/render_preview.c
branches/merwin-playground/source/blender/editors/render/render_shading.c
branches/merwin-playground/source/blender/editors/render/render_update.c
branches/merwin-playground/source/blender/editors/screen/area.c
branches/merwin-playground/source/blender/editors/screen/screen_ops.c
branches/merwin-playground/source/blender/editors/sculpt_paint/CMakeLists.txt
branches/merwin-playground/source/blender/editors/sculpt_paint/paint_cursor.c
branches/merwin-playground/source/blender/editors/sculpt_paint/paint_hide.c
branches/merwin-playground/source/blender/editors/sculpt_paint/paint_image.c
branches/merwin-playground/source/blender/editors/sculpt_paint/paint_intern.h
branches/merwin-playground/source/blender/editors/sculpt_paint/paint_mask.c
branches/merwin-playground/source/blender/editors/sculpt_paint/paint_stroke.c
branches/merwin-playground/source/blender/editors/sculpt_paint/paint_undo.c
branches/merwin-playground/source/blender/editors/sculpt_paint/paint_utils.c
branches/merwin-playground/source/blender/editors/sculpt_paint/paint_vertex.c
branches/merwin-playground/source/blender/editors/sculpt_paint/sculpt.c
branches/merwin-playground/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/merwin-playground/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/merwin-playground/source/blender/editors/space_action/action_edit.c
branches/merwin-playground/source/blender/editors/space_action/space_action.c
branches/merwin-playground/source/blender/editors/space_buttons/buttons_context.c
branches/merwin-playground/source/blender/editors/space_buttons/buttons_ops.c
branches/merwin-playground/source/blender/editors/space_clip/CMakeLists.txt
branches/merwin-playground/source/blender/editors/space_clip/clip_draw.c
branches/merwin-playground/source/blender/editors/space_clip/clip_editor.c
branches/merwin-playground/source/blender/editors/space_clip/clip_ops.c
branches/merwin-playground/source/blender/editors/space_clip/space_clip.c
branches/merwin-playground/source/blender/editors/space_clip/tracking_ops.c
branches/merwin-playground/source/blender/editors/space_clip/tracking_select.c
branches/merwin-playground/source/blender/editors/space_file/file_ops.c
branches/merwin-playground/source/blender/editors/space_file/filelist.c
branches/merwin-playground/source/blender/editors/space_file/space_file.c
branches/merwin-playground/source/blender/editors/space_graph/graph_edit.c
branches/merwin-playground/source/blender/editors/space_image/image_draw.c
branches/merwin-playground/source/blender/editors/space_image/image_edit.c
branches/merwin-playground/source/blender/editors/space_image/image_ops.c
branches/merwin-playground/source/blender/editors/space_image/space_image.c
branches/merwin-playground/source/blender/editors/space_info/info_ops.c
branches/merwin-playground/source/blender/editors/space_info/space_info.c
branches/merwin-playground/source/blender/editors/space_nla/nla_draw.c
branches/merwin-playground/source/blender/editors/space_nla/nla_edit.c
branches/merwin-playground/source/blender/editors/space_node/drawnode.c
branches/merwin-playground/source/blender/editors/space_node/node_edit.c
branches/merwin-playground/source/blender/editors/space_node/node_ops.c
branches/merwin-playground/source/blender/editors/space_node/node_select.c
branches/merwin-playground/source/blender/editors/space_node/node_templates.c
branches/merwin-playground/source/blender/editors/space_node/space_node.c
branches/merwin-playground/source/blender/editors/space_outliner/outliner_draw.c
branches/merwin-playground/source/blender/editors/space_outliner/outliner_tools.c
branches/merwin-playground/source/blender/editors/space_outliner/outliner_tree.c
branches/merwin-playground/source/blender/editors/space_sequencer/sequencer_add.c
branches/merwin-playground/source/blender/editors/space_sequencer/sequencer_draw.c
branches/merwin-playground/source/blender/editors/space_sequencer/sequencer_edit.c
branches/merwin-playground/source/blender/editors/space_sequencer/sequencer_select.c
branches/merwin-playground/source/blender/editors/space_sequencer/space_sequencer.c
branches/merwin-playground/source/blender/editors/space_text/text_draw.c
branches/merwin-playground/source/blender/editors/space_text/text_ops.c
branches/merwin-playground/source/blender/editors/space_userpref/space_userpref.c
branches/merwin-playground/source/blender/editors/space_view3d/drawanimviz.c
branches/merwin-playground/source/blender/editors/space_view3d/drawarmature.c
branches/merwin-playground/source/blender/editors/space_view3d/drawmesh.c
branches/merwin-playground/source/blender/editors/space_view3d/drawobject.c
branches/merwin-playground/source/blender/editors/space_view3d/drawvolume.c
branches/merwin-playground/source/blender/editors/space_view3d/space_view3d.c
branches/merwin-playground/source/blender/editors/space_view3d/view3d_buttons.c
branches/merwin-playground/source/blender/editors/space_view3d/view3d_draw.c
branches/merwin-playground/source/blender/editors/space_view3d/view3d_edit.c
branches/merwin-playground/source/blender/editors/space_view3d/view3d_fly.c
branches/merwin-playground/source/blender/editors/space_view3d/view3d_intern.h
branches/merwin-playground/source/blender/editors/space_view3d/view3d_ops.c
branches/merwin-playground/source/blender/editors/space_view3d/view3d_select.c
branches/merwin-playground/source/blender/editors/space_view3d/view3d_snap.c
branches/merwin-playground/source/blender/editors/space_view3d/view3d_view.c
branches/merwin-playground/source/blender/editors/transform/transform.c
branches/merwin-playground/source/blender/editors/transform/transform.h
branches/merwin-playground/source/blender/editors/transform/transform_conversions.c
branches/merwin-playground/source/blender/editors/transform/transform_generics.c
branches/merwin-playground/source/blender/editors/transform/transform_ops.c
branches/merwin-playground/source/blender/editors/transform/transform_orientations.c
branches/merwin-playground/source/blender/editors/transform/transform_snap.c
branches/merwin-playground/source/blender/editors/util/numinput.c
branches/merwin-playground/source/blender/editors/uvedit/uvedit_draw.c
branches/merwin-playground/source/blender/editors/uvedit/uvedit_intern.h
branches/merwin-playground/source/blender/editors/uvedit/uvedit_ops.c
branches/merwin-playground/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/merwin-playground/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/merwin-playground/source/blender/gpu/GPU_buffers.h
branches/merwin-playground/source/blender/gpu/GPU_draw.h
branches/merwin-playground/source/blender/gpu/GPU_extensions.h
branches/merwin-playground/source/blender/gpu/intern/gpu_buffers.c
branches/merwin-playground/source/blender/gpu/intern/gpu_draw.c
branches/merwin-playground/source/blender/gpu/intern/gpu_extensions.c
branches/merwin-playground/source/blender/gpu/intern/gpu_material.c
branches/merwin-playground/source/blender/ikplugin/BIK_api.h
branches/merwin-playground/source/blender/ikplugin/CMakeLists.txt
branches/merwin-playground/source/blender/ikplugin/intern/ikplugin_api.h
branches/merwin-playground/source/blender/ikplugin/intern/iksolver_plugin.h
branches/merwin-playground/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/merwin-playground/source/blender/ikplugin/intern/itasc_plugin.h
branches/merwin-playground/source/blender/imbuf/CMakeLists.txt
branches/merwin-playground/source/blender/imbuf/IMB_colormanagement.h
branches/merwin-playground/source/blender/imbuf/IMB_imbuf.h
branches/merwin-playground/source/blender/imbuf/IMB_imbuf_types.h
branches/merwin-playground/source/blender/imbuf/intern/IMB_anim.h
branches/merwin-playground/source/blender/imbuf/intern/IMB_colormanagement_intern.h
branches/merwin-playground/source/blender/imbuf/intern/anim_movie.c
branches/merwin-playground/source/blender/imbuf/intern/colormanagement.c
branches/merwin-playground/source/blender/imbuf/intern/dds/BlockDXT.h
branches/merwin-playground/source/blender/imbuf/intern/dds/Color.h
branches/merwin-playground/source/blender/imbuf/intern/dds/ColorBlock.h
branches/merwin-playground/source/blender/imbuf/intern/dds/DirectDrawSurface.h
branches/merwin-playground/source/blender/imbuf/intern/dds/Image.h
branches/merwin-playground/source/blender/imbuf/intern/dds/PixelFormat.h
branches/merwin-playground/source/blender/imbuf/intern/dds/Stream.h
branches/merwin-playground/source/blender/imbuf/intern/divers.c
branches/merwin-playground/source/blender/imbuf/intern/imageprocess.c
branches/merwin-playground/source/blender/imbuf/intern/indexer.c
branches/merwin-playground/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/merwin-playground/source/blender/imbuf/intern/radiance_hdr.c
branches/merwin-playground/source/blender/imbuf/intern/tiff.c
branches/merwin-playground/source/blender/imbuf/intern/util.c
branches/merwin-playground/source/blender/makesdna/DNA_action_types.h
branches/merwin-playground/source/blender/makesdna/DNA_constraint_types.h
branches/merwin-playground/source/blender/makesdna/DNA_curve_types.h
branches/merwin-playground/source/blender/makesdna/DNA_customdata_types.h
branches/merwin-playground/source/blender/makesdna/DNA_defs.h
branches/merwin-playground/source/blender/makesdna/DNA_mask_types.h
branches/merwin-playground/source/blender/makesdna/DNA_mesh_types.h
branches/merwin-playground/source/blender/makesdna/DNA_modifier_types.h
branches/merwin-playground/source/blender/makesdna/DNA_object_force.h
branches/merwin-playground/source/blender/makesdna/DNA_smoke_types.h
branches/merwin-playground/source/blender/makesdna/DNA_space_types.h
branches/merwin-playground/source/blender/makesdna/DNA_texture_types.h
branches/merwin-playground/source/blender/makesdna/DNA_tracking_types.h
branches/merwin-playground/source/blender/makesdna/DNA_userdef_types.h
branches/merwin-playground/source/blender/makesdna/DNA_windowmanager_types.h
branches/merwin-playground/source/blender/makesdna/intern/makesdna.c
branches/merwin-playground/source/blender/makesrna/RNA_enum_types.h
branches/merwin-playground/source/blender/makesrna/intern/makesrna.c
branches/merwin-playground/source/blender/makesrna/intern/rna_access.c
branches/merwin-playground/source/blender/makesrna/intern/rna_action.c
branches/merwin-playground/source/blender/makesrna/intern/rna_actuator.c
branches/merwin-playground/source/blender/makesrna/intern/rna_animation_api.c
branches/merwin-playground/source/blender/makesrna/intern/rna_constraint.c
branches/merwin-playground/source/blender/makesrna/intern/rna_curve.c
branches/merwin-playground/source/blender/makesrna/intern/rna_define.c
branches/merwin-playground/source/blender/makesrna/intern/rna_fcurve.c
branches/merwin-playground/source/blender/makesrna/intern/rna_gpencil.c
branches/merwin-playground/source/blender/makesrna/intern/rna_image_api.c
branches/merwin-playground/source/blender/makesrna/intern/rna_internal.h
branches/merwin-playground/source/blender/makesrna/intern/rna_lattice.c
branches/merwin-playground/source/blender/makesrna/intern/rna_main_api.c
branches/merwin-playground/source/blender/makesrna/intern/rna_material.c
branches/merwin-playground/source/blender/makesrna/intern/rna_modifier.c
branches/merwin-playground/source/blender/makesrna/intern/rna_nodetree.c
branches/merwin-playground/source/blender/makesrna/intern/rna_nodetree_types.h
branches/merwin-playground/source/blender/makesrna/intern/rna_object.c
branches/merwin-playground/source/blender/makesrna/intern/rna_object_api.c
branches/merwin-playground/source/blender/makesrna/intern/rna_object_force.c
branches/merwin-playground/source/blender/makesrna/intern/rna_render.c
branches/merwin-playground/source/blender/makesrna/intern/rna_scene.c
branches/merwin-playground/source/blender/makesrna/intern/rna_sequencer.c
branches/merwin-playground/source/blender/makesrna/intern/rna_sequencer_api.c
branches/merwin-playground/source/blender/makesrna/intern/rna_smoke.c
branches/merwin-playground/source/blender/makesrna/intern/rna_space.c
branches/merwin-playground/source/blender/makesrna/intern/rna_speaker.c
branches/merwin-playground/source/blender/makesrna/intern/rna_texture.c
branches/merwin-playground/source/blender/makesrna/intern/rna_texture_api.c
branches/merwin-playground/source/blender/makesrna/intern/rna_tracking.c
branches/merwin-playground/source/blender/makesrna/intern/rna_ui.c
branches/merwin-playground/source/blender/makesrna/intern/rna_ui_api.c
branches/merwin-playground/source/blender/makesrna/intern/rna_userdef.c
branches/merwin-playground/source/blender/makesrna/intern/rna_wm.c
branches/merwin-playground/source/blender/modifiers/MOD_modifiertypes.h
branches/merwin-playground/source/blender/modifiers/intern/MOD_boolean_util.h
branches/merwin-playground/source/blender/modifiers/intern/MOD_multires.c
branches/merwin-playground/source/blender/modifiers/intern/MOD_smoke.c
branches/merwin-playground/source/blender/modifiers/intern/MOD_wave.c
branches/merwin-playground/source/blender/nodes/CMakeLists.txt
branches/merwin-playground/source/blender/nodes/NOD_shader.h
branches/merwin-playground/source/blender/nodes/composite/node_composite_tree.c
branches/merwin-playground/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
branches/merwin-playground/source/blender/nodes/intern/node_common.c
branches/merwin-playground/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
branches/merwin-playground/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
branches/merwin-playground/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
branches/merwin-playground/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
branches/merwin-playground/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c
branches/merwin-playground/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c
branches/merwin-playground/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
branches/merwin-playground/source/blender/nodes/texture/nodes/node_texture_output.c
branches/merwin-playground/source/blender/opencl/intern/OCL_opencl.c
branches/merwin-playground/source/blender/python/bmesh/bmesh_py_types.c
branches/merwin-playground/source/blender/python/bmesh/bmesh_py_types_customdata.c
branches/merwin-playground/source/blender/python/generic/idprop_py_api.c
branches/merwin-playground/source/blender/python/generic/py_capi_utils.c
branches/merwin-playground/source/blender/python/generic/py_capi_utils.h
branches/merwin-playground/source/blender/python/intern/bpy.c
branches/merwin-playground/source/blender/python/intern/bpy_app.h
branches/merwin-playground/source/blender/python/intern/bpy_app_ffmpeg.h
branches/merwin-playground/source/blender/python/intern/bpy_app_handlers.h
branches/merwin-playground/source/blender/python/intern/bpy_driver.h
branches/merwin-playground/source/blender/python/intern/bpy_interface.c
branches/merwin-playground/source/blender/python/intern/bpy_props.c
branches/merwin-playground/source/blender/python/intern/bpy_rna.c
branches/merwin-playground/source/blender/python/intern/bpy_traceback.h
branches/merwin-playground/source/blender/python/intern/bpy_util.c
branches/merwin-playground/source/blender/python/intern/gpu.h
branches/merwin-playground/source/blender/python/mathutils/mathutils_noise.c
branches/merwin-playground/source/blender/python/mathutils/mathutils_noise.h
branches/merwin-playground/source/blender/python/rna_dump.py
branches/merwin-playground/source/blender/quicktime/apple/quicktime_export.c
branches/merwin-playground/source/blender/quicktime/quicktime_export.h
branches/merwin-playground/source/blender/quicktime/quicktime_import.h
branches/merwin-playground/source/blender/render/intern/include/render_types.h
branches/merwin-playground/source/blender/render/intern/include/texture.h
branches/merwin-playground/source/blender/render/intern/raytrace/rayobject_octree.cpp
branches/merwin-playground/source/blender/render/intern/raytrace/svbvh.h
branches/merwin-playground/source/blender/render/intern/source/convertblender.c
branches/merwin-playground/source/blender/render/intern/source/envmap.c
branches/merwin-playground/source/blender/render/intern/source/imagetexture.c
branches/merwin-playground/source/blender/render/intern/source/occlusion.c
branches/merwin-playground/source/blender/render/intern/source/pipeline.c
branches/merwin-playground/source/blender/render/intern/source/pointdensity.c
branches/merwin-playground/source/blender/render/intern/source/render_texture.c
branches/merwin-playground/source/blender/render/intern/source/rendercore.c
branches/merwin-playground/source/blender/render/intern/source/renderdatabase.c
branches/merwin-playground/source/blender/render/intern/source/shadeinput.c
branches/merwin-playground/source/blender/render/intern/source/shadeoutput.c
branches/merwin-playground/source/blender/render/intern/source/sss.c
branches/merwin-playground/source/blender/render/intern/source/sunsky.c
branches/merwin-playground/source/blender/render/intern/source/voxeldata.c
branches/merwin-playground/source/blender/render/intern/source/zbuf.c
branches/merwin-playground/source/blender/windowmanager/WM_api.h
branches/merwin-playground/source/blender/windowmanager/WM_types.h
branches/merwin-playground/source/blender/windowmanager/intern/wm_event_system.c
branches/merwin-playground/source/blender/windowmanager/intern/wm_files.c
branches/merwin-playground/source/blender/windowmanager/intern/wm_init_exit.c
branches/merwin-playground/source/blender/windowmanager/intern/wm_jobs.c
branches/merwin-playground/source/blender/windowmanager/intern/wm_operators.c
branches/merwin-playground/source/blender/windowmanager/intern/wm_playanim.c
branches/merwin-playground/source/blender/windowmanager/intern/wm_window.c
branches/merwin-playground/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/merwin-playground/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
branches/merwin-playground/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
branches/merwin-playground/source/gameengine/BlenderRoutines/KX_BlenderGL.h
branches/merwin-playground/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
branches/merwin-playground/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
branches/merwin-playground/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h
branches/merwin-playground/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
branches/merwin-playground/source/gameengine/BlenderRoutines/KX_BlenderSystem.h
branches/merwin-playground/source/gameengine/Converter/BL_ActionActuator.h
branches/merwin-playground/source/gameengine/Converter/BL_ArmatureActuator.h
branches/merwin-playground/source/gameengine/Converter/BL_ArmatureChannel.cpp
branches/merwin-playground/source/gameengine/Converter/BL_ArmatureChannel.h
branches/merwin-playground/source/gameengine/Converter/BL_ArmatureConstraint.h
branches/merwin-playground/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/merwin-playground/source/gameengine/Converter/BL_ArmatureObject.h
branches/merwin-playground/source/gameengine/Converter/BL_BlenderDataConversion.h
branches/merwin-playground/source/gameengine/Converter/BL_DeformableGameObject.h
branches/merwin-playground/source/gameengine/Converter/BL_MeshDeformer.h
branches/merwin-playground/source/gameengine/Converter/BL_ModifierDeformer.cpp
branches/merwin-playground/source/gameengine/Converter/BL_ModifierDeformer.h
branches/merwin-playground/source/gameengine/Converter/BL_ShapeActionActuator.h
branches/merwin-playground/source/gameengine/Converter/BL_ShapeDeformer.h
branches/merwin-playground/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/merwin-playground/source/gameengine/Converter/BL_SkinDeformer.h
branches/merwin-playground/source/gameengine/Converter/BlenderWorldInfo.h
branches/merwin-playground/source/gameengine/Converter/CMakeLists.txt
branches/merwin-playground/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
branches/merwin-playground/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
branches/merwin-playground/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/merwin-playground/source/gameengine/Converter/KX_ConvertActuators.h
branches/merwin-playground/source/gameengine/Converter/KX_ConvertControllers.h
branches/merwin-playground/source/gameengine/Converter/KX_ConvertProperties.h
branches/merwin-playground/source/gameengine/Converter/KX_ConvertSensors.h
branches/merwin-playground/source/gameengine/Converter/KX_IpoConvert.h
branches/merwin-playground/source/gameengine/Converter/KX_SoftBodyDeformer.h
branches/merwin-playground/source/gameengine/Expressions/BoolValue.h
branches/merwin-playground/source/gameengine/Expressions/ConstExpr.h
branches/merwin-playground/source/gameengine/Expressions/EXP_C-Api.h
branches/merwin-playground/source/gameengine/Expressions/EmptyValue.h
branches/merwin-playground/source/gameengine/Expressions/ErrorValue.h
branches/merwin-playground/source/gameengine/Expressions/Expression.h
branches/merwin-playground/source/gameengine/Expressions/FloatValue.h
branches/merwin-playground/source/gameengine/Expressions/IdentifierExpr.h
branches/merwin-playground/source/gameengine/Expressions/IfExpr.h
branches/merwin-playground/source/gameengine/Expressions/IntValue.h
branches/merwin-playground/source/gameengine/Expressions/KX_HashedPtr.h
branches/merwin-playground/source/gameengine/Expressions/KX_Python.h
branches/merwin-playground/source/gameengine/Expressions/ListValue.h
branches/merwin-playground/source/gameengine/Expressions/Operator1Expr.h
branches/merwin-playground/source/gameengine/Expressions/Operator2Expr.h
branches/merwin-playground/source/gameengine/Expressions/PyObjectPlus.h
branches/merwin-playground/source/gameengine/Expressions/StringValue.h
branches/merwin-playground/source/gameengine/Expressions/Value.h
branches/merwin-playground/source/gameengine/Expressions/VectorValue.h
branches/merwin-playground/source/gameengine/Expressions/VoidValue.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_ANDController.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_ActuatorSensor.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_AlwaysSensor.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_BasicEventManager.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_DelaySensor.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_ExpressionController.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_IActuator.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_IController.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_IInputDevice.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_ILogicBrick.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_IObject.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_IScene.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_ISensor.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_JoystickSensor.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_KeyboardManager.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_KeyboardSensor.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_LogicManager.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_MouseManager.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_MouseSensor.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_NANDController.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_NORController.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_ORController.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_PropertyActuator.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_PropertyEventManager.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_PythonController.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_PythonKeyboard.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_PythonMouse.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_RandomActuator.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_RandomEventManager.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_RandomSensor.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_TimeEventManager.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_XNORController.h
branches/merwin-playground/source/gameengine/GameLogic/SCA_XORController.h
branches/merwin-playground/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
branches/merwin-playground/source/gameengine/GamePlayer/common/GPC_Canvas.h
branches/merwin-playground/source/gameengine/GamePlayer/common/GPC_Engine.h
branches/merwin-playground/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h
branches/merwin-playground/source/gameengine/GamePlayer/common/GPC_MouseDevice.h
branches/merwin-playground/source/gameengine/GamePlayer/common/GPC_RawImage.h
branches/merwin-playground/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.h
branches/merwin-playground/source/gameengine/GamePlayer/common/GPC_RawLogoArrays.h
branches/merwin-playground/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/merwin-playground/source/gameengine/GamePlayer/common/GPC_RenderTools.h
branches/merwin-playground/source/gameengine/GamePlayer/common/GPC_System.h
branches/merwin-playground/source/gameengine/GamePlayer/ghost/GPG_Canvas.h
branches/merwin-playground/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.h
branches/merwin-playground/source/gameengine/GamePlayer/ghost/GPG_System.h
branches/merwin-playground/source/gameengine/Ketsji/BL_Action.h
branches/merwin-playground/source/gameengine/Ketsji/BL_ActionManager.h
branches/merwin-playground/source/gameengine/Ketsji/BL_BlenderShader.h
branches/merwin-playground/source/gameengine/Ketsji/BL_Shader.h
branches/merwin-playground/source/gameengine/Ketsji/BL_Texture.h
branches/merwin-playground/source/gameengine/Ketsji/CMakeLists.txt
branches/merwin-playground/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h
branches/merwin-playground/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
branches/merwin-playground/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
branches/merwin-playground/source/gameengine/Ketsji/KX_ArmatureSensor.h
branches/merwin-playground/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/merwin-playground/source/gameengine/Ketsji/KX_BulletPhysicsController.h
branches/merwin-playground/source/gameengine/Ketsji/KX_Camera.cpp
branches/merwin-playground/source/gameengine/Ketsji/KX_Camera.h
branches/merwin-playground/source/gameengine/Ketsji/KX_CameraActuator.h
branches/merwin-playground/source/gameengine/Ketsji/KX_CameraIpoSGController.h
branches/merwin-playground/source/gameengine/Ketsji/KX_ClientObjectInfo.h
branches/merwin-playground/source/gameengine/Ketsji/KX_ConstraintActuator.h
branches/merwin-playground/source/gameengine/Ketsji/KX_ConstraintWrapper.h
branches/merwin-playground/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
branches/merwin-playground/source/gameengine/Ketsji/KX_Dome.cpp
branches/merwin-playground/source/gameengine/Ketsji/KX_Dome.h
branches/merwin-playground/source/gameengine/Ketsji/KX_EmptyObject.h
branches/merwin-playground/source/gameengine/Ketsji/KX_FontObject.h
branches/merwin-playground/source/gameengine/Ketsji/KX_GameObject.cpp
branches/merwin-playground/source/gameengine/Ketsji/KX_GameObject.h
branches/merwin-playground/source/gameengine/Ketsji/KX_IPO_SGController.h
branches/merwin-playground/source/gameengine/Ketsji/KX_IPhysicsController.h
branches/merwin-playground/source/gameengine/Ketsji/KX_ISceneConverter.h
branches/merwin-playground/source/gameengine/Ketsji/KX_IpoActuator.h
branches/merwin-playground/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/merwin-playground/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/merwin-playground/source/gameengine/Ketsji/KX_Light.h
branches/merwin-playground/source/gameengine/Ketsji/KX_LightIpoSGController.h
branches/merwin-playground/source/gameengine/Ketsji/KX_MaterialIpoController.h
branches/merwin-playground/source/gameengine/Ketsji/KX_MeshProxy.h
branches/merwin-playground/source/gameengine/Ketsji/KX_MotionState.h
branches/merwin-playground/source/gameengine/Ketsji/KX_MouseFocusSensor.h
branches/merwin-playground/source/gameengine/Ketsji/KX_NavMeshObject.h
branches/merwin-playground/source/gameengine/Ketsji/KX_NearSensor.h
branches/merwin-playground/source/gameengine/Ketsji/KX_ObColorIpoSGController.h
branches/merwin-playground/source/gameengine/Ketsji/KX_ObjectActuator.h
branches/merwin-playground/source/gameengine/Ketsji/KX_ParentActuator.h
branches/merwin-playground/source/gameengine/Ketsji/KX_PhysicsEngineEnums.h
branches/merwin-playground/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
branches/merwin-playground/source/gameengine/Ketsji/KX_PhysicsPropertiesobsolete.h
branches/merwin-playground/source/gameengine/Ketsji/KX_PolyProxy.h
branches/merwin-playground/source/gameengine/Ketsji/KX_PolygonMaterial.h
branches/merwin-playground/source/gameengine/Ketsji/KX_PyConstraintBinding.h
branches/merwin-playground/source/gameengine/Ketsji/KX_PyMath.h
branches/merwin-playground/source/gameengine/Ketsji/KX_PythonInit.h
branches/merwin-playground/source/gameengine/Ketsji/KX_PythonSeq.h
branches/merwin-playground/source/gameengine/Ketsji/KX_RadarSensor.h
branches/merwin-playground/source/gameengine/Ketsji/KX_RayEventManager.h
branches/merwin-playground/source/gameengine/Ketsji/KX_RaySensor.h
branches/merwin-playground/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
branches/merwin-playground/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
branches/merwin-playground/source/gameengine/Ketsji/KX_Scene.cpp
branches/merwin-playground/source/gameengine/Ketsji/KX_Scene.h
branches/merwin-playground/source/gameengine/Ketsji/KX_SceneActuator.h
branches/merwin-playground/source/gameengine/Ketsji/KX_SoundActuator.h
branches/merwin-playground/source/gameengine/Ketsji/KX_SteeringActuator.h
branches/merwin-playground/source/gameengine/Ketsji/KX_TimeCategoryLogger.h
branches/merwin-playground/source/gameengine/Ketsji/KX_TimeLogger.h
branches/merwin-playground/source/gameengine/Ketsji/KX_TouchEventManager.h
branches/merwin-playground/source/gameengine/Ketsji/KX_TouchSensor.h
branches/merwin-playground/source/gameengine/Ketsji/KX_TrackToActuator.h
branches/merwin-playground/source/gameengine/Ketsji/KX_VehicleWrapper.h
branches/merwin-playground/source/gameengine/Ketsji/KX_VertexProxy.h
branches/merwin-playground/source/gameengine/Ketsji/KX_WorldInfo.h
branches/merwin-playground/source/gameengine/Ketsji/KX_WorldIpoController.h
branches/merwin-playground/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
branches/merwin-playground/source/gameengine/Network/NG_NetworkDeviceInterface.h
branches/merwin-playground/source/gameengine/Network/NG_NetworkMessage.h
branches/merwin-playground/source/gameengine/Network/NG_NetworkObject.h
branches/merwin-playground/source/gameengine/Network/NG_NetworkScene.h
branches/merwin-playground/source/gameengine/Physics/Bullet/CMakeLists.txt
branches/merwin-playground/source/gameengine/Physics/Bullet/CcdGraphicController.h
branches/merwin-playground/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/merwin-playground/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/merwin-playground/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/merwin-playground/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/merwin-playground/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
branches/merwin-playground/source/gameengine/Physics/common/PHY_DynamicTypes.h
branches/merwin-playground/source/gameengine/Physics/common/PHY_IController.h
branches/merwin-playground/source/gameengine/Physics/common/PHY_IGraphicController.h
branches/merwin-playground/source/gameengine/Physics/common/PHY_IMotionState.h
branches/merwin-playground/source/gameengine/Physics/common/PHY_IPhysicsController.h
branches/merwin-playground/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
branches/merwin-playground/source/gameengine/Physics/common/PHY_IVehicle.h
branches/merwin-playground/source/gameengine/Physics/common/PHY_Pro.h
branches/merwin-playground/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/merwin-playground/source/gameengine/Rasterizer/RAS_BucketManager.h
branches/merwin-playground/source/gameengine/Rasterizer/RAS_CameraData.h
branches/merwin-playground/source/gameengine/Rasterizer/RAS_Deformer.h
branches/merwin-playground/source/gameengine/Rasterizer/RAS_ICanvas.h
branches/merwin-playground/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
branches/merwin-playground/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
branches/merwin-playground/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/merwin-playground/source/gameengine/Rasterizer/RAS_IRenderTools.h
branches/merwin-playground/source/gameengine/Rasterizer/RAS_LightObject.h
branches/merwin-playground/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
branches/merwin-playground/source/gameengine/Rasterizer/RAS_MaterialBucket.h
branches/merwin-playground/source/gameengine/Rasterizer/RAS_MeshObject.cpp
branches/merwin-playground/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/merwin-playground/source/gameengine/Rasterizer/RAS_ObjectColor.h
branches/merwin-playground/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/merwin-playground/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/merwin-playground/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
branches/merwin-playground/source/gameengine/Rasterizer/RAS_Rect.h
branches/merwin-playground/source/gameengine/Rasterizer/RAS_TexMatrix.h
branches/merwin-playground/source/gameengine/Rasterizer/RAS_TexVert.h
branches/merwin-playground/source/gameengine/SceneGraph/SG_Controller.h
branches/merwin-playground/source/gameengine/SceneGraph/SG_DList.h
branches/merwin-playground/source/gameengine/SceneGraph/SG_IObject.h
branches/merwin-playground/source/gameengine/SceneGraph/SG_Node.h
branches/merwin-playground/source/gameengine/SceneGraph/SG_QList.h
branches/merwin-playground/source/gameengine/SceneGraph/SG_Spatial.h
branches/merwin-playground/source/gameengine/VideoTexture/VideoFFmpeg.h
branches/merwin-playground/source/tests/batch_import.py
branches/merwin-playground/source/tests/bl_load_addons.py
branches/merwin-playground/source/tests/bl_load_py_modules.py
branches/merwin-playground/source/tests/bl_mesh_modifiers.py
branches/merwin-playground/source/tools/check_style_c.py
branches/merwin-playground/source/tools/tag_release.py
Added Paths:
-----------
branches/merwin-playground/build_files/cmake/clang_array_check.py
branches/merwin-playground/build_files/cmake/cmake_static_check_clang_array.py
branches/merwin-playground/intern/opencolorio/fallback_impl.cc
branches/merwin-playground/intern/opencolorio/ocio_capi.cc
branches/merwin-playground/intern/opencolorio/ocio_impl.cc
branches/merwin-playground/intern/opencolorio/ocio_impl.h
branches/merwin-playground/intern/smoke/intern/spectrum.cpp
branches/merwin-playground/intern/smoke/intern/spectrum.h
branches/merwin-playground/source/blender/avi/intern/avi_codecs.c
branches/merwin-playground/source/blender/avi/intern/avi_endian.c
branches/merwin-playground/source/blender/avi/intern/avi_endian.h
branches/merwin-playground/source/blender/avi/intern/avi_mjpeg.c
branches/merwin-playground/source/blender/avi/intern/avi_mjpeg.h
branches/merwin-playground/source/blender/avi/intern/avi_options.c
branches/merwin-playground/source/blender/avi/intern/avi_rgb.c
branches/merwin-playground/source/blender/avi/intern/avi_rgb.h
branches/merwin-playground/source/blender/avi/intern/avi_rgb32.c
branches/merwin-playground/source/blender/avi/intern/avi_rgb32.h
branches/merwin-playground/source/blender/editors/object/object_iterators.c
branches/merwin-playground/source/blender/nodes/shader/nodes/node_shader_bump.c
Removed Paths:
-------------
branches/merwin-playground/intern/opencolorio/ocio_capi.cpp
branches/merwin-playground/intern/opencolorio/ocio_capi_stub.cpp
branches/merwin-playground/source/blender/avi/intern/avirgb.c
branches/merwin-playground/source/blender/avi/intern/avirgb.h
branches/merwin-playground/source/blender/avi/intern/codecs.c
branches/merwin-playground/source/blender/avi/intern/endian.c
branches/merwin-playground/source/blender/avi/intern/endian.h
branches/merwin-playground/source/blender/avi/intern/mjpeg.c
branches/merwin-playground/source/blender/avi/intern/mjpeg.h
branches/merwin-playground/source/blender/avi/intern/options.c
branches/merwin-playground/source/blender/avi/intern/rgb32.c
branches/merwin-playground/source/blender/avi/intern/rgb32.h
Property Changed:
----------------
branches/merwin-playground/
branches/merwin-playground/build_files/cmake/
branches/merwin-playground/source/blender/editors/interface/interface.c
branches/merwin-playground/source/blender/editors/space_outliner/
Property changes on: branches/merwin-playground
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender:50936-51318
Modified: branches/merwin-playground/CMakeLists.txt
===================================================================
--- branches/merwin-playground/CMakeLists.txt 2012-10-14 19:57:49 UTC (rev 51321)
+++ branches/merwin-playground/CMakeLists.txt 2012-10-14 21:17:16 UTC (rev 51322)
@@ -120,7 +120,7 @@
option(WITH_PYTHON "Enable Embedded Python API (only disable for development)" ON)
option(WITH_PYTHON_SECURITY "Disables execution of scripts within blend files by default (recommend to leave off)" OFF)
mark_as_advanced(WITH_PYTHON) # dont want people disabling this unless they really know what they are doing.
-mark_as_advanced(WITH_PYTHON_SECURITY) # some distrobutions see this as a security issue, rather than have them patch it, make a build option.
+mark_as_advanced(WITH_PYTHON_SECURITY) # some distributions see this as a security issue, rather than have them patch it, make a build option.
option(WITH_PYTHON_SAFETY "Enable internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency, only enable for development)." OFF)
option(WITH_PYTHON_MODULE "Enable building as a python module which runs without a user interface, like running regular blender in background mode (experimental, only enable for development)" OFF)
@@ -206,6 +206,7 @@
option(WITH_IMAGE_FRAMESERVER "Enable image FrameServer Support for rendering" ON)
# Audio/Video format support
+option(WITH_CODEC_AVI "Enable Blenders own AVI file support (raw/jpeg)" ON)
option(WITH_CODEC_FFMPEG "Enable FFMPeg Support (http://ffmpeg.org)" OFF)
option(WITH_CODEC_SNDFILE "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
@@ -254,6 +255,9 @@
mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
unset(PLATFORM_DEFAULT)
+# LLVM
+option(WITH_LLVM "Use LLVM" OFF)
+
# disable for now, but plan to support on all platforms eventually
option(WITH_MEM_JEMALLOC "Enable malloc replacement (http://www.canonware.com/jemalloc)" OFF)
mark_as_advanced(WITH_MEM_JEMALLOC)
@@ -316,6 +320,9 @@
option(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" ON)
option(USE_QTKIT "Use QtKit instead of Carbon quicktime (needed for having partial quicktime for 64bit)" OFF)
option(WITH_LIBS10.5 "Use 10.5 libs (needed for 64bit builds)" OFF)
+ if(CMAKE_OSX_ARCHITECTURES MATCHES x86_64)
+ set(USE_QTKIT ON CACHE BOOL "ON" FORCE) # no Quicktime in 64bit
+ endif()
endif()
@@ -371,7 +378,12 @@
set(WITH_BOOST ON)
endif()
-# don't store paths to libs for portable distrobution
+# auto enable llvm for cycles_osl
+if(WITH_CYCLES_OSL)
+ set(WITH_LLVM ON CACHE BOOL "ON" FORCE)
+endif()
+
+# don't store paths to libs for portable distribution
if(WITH_INSTALL_PORTABLE)
set(CMAKE_SKIP_BUILD_RPATH TRUE)
endif()
@@ -569,7 +581,7 @@
# lame, but until we have proper find module for ffmpeg
set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
if(EXISTS "${FFMPEG}/include/ffmpeg/")
- set(FFMPEG_INCLUDE_DIRS "${FFMPEG_INCLUDE_DIRS} ${FFMPEG}/include/ffmpeg")
+ list(APPEND FFMPEG_INCLUDE_DIRS "${FFMPEG}/include/ffmpeg")
endif()
# end lameness
@@ -704,6 +716,56 @@
endif()
endif()
+ if(WITH_LLVM)
+ set(LLVM_DIRECTORY ${LIBDIR}/llvm CACHE PATH "Path to the LLVM installation")
+ set(LLVM_VERSION "3.0" CACHE STRING "Version of LLVM to use" "")
+ set(LLVM_STATIC YES)
+ if(LLVM_DIRECTORY)
+ set(LLVM_CONFIG "${LLVM_DIRECTORY}/bin/llvm-config")
+ else()
+ set(LLVM_CONFIG llvm-config)
+ 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)
+ execute_process(COMMAND ${LLVM_CONFIG} --includedir
+ OUTPUT_VARIABLE LLVM_INCLUDES
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ find_library(LLVM_LIBRARY
+ NAMES libLLVMAnalysis.a # first of a whole bunch of libs to get
+ PATHS ${LLVM_LIB_DIR})
+ message(STATUS "LLVM version = ${LLVM_VERSION}")
+ message(STATUS "LLVM dir = ${LLVM_DIRECTORY}")
+ message(STATUS "LLVM includes = ${LLVM_INCLUDES}")
+ message(STATUS "LLVM lib dir = ${LLVM_LIB_DIR}")
+
+ if(LLVM_LIBRARY AND LLVM_INCLUDES AND LLVM_DIRECTORY AND LLVM_LIB_DIR)
+ # ensure include directory is added (in case of non-standard locations
+ include_directories(BEFORE "${LLVM_INCLUDES}")
+ string(REGEX REPLACE "\\." "" OSL_LLVM_VERSION ${LLVM_VERSION})
+ message(STATUS "LLVM OSL_LLVM_VERSION = ${OSL_LLVM_VERSION}")
+ add_definitions("-DOSL_LLVM_VERSION=${OSL_LLVM_VERSION}")
+ if(LLVM_STATIC)
+ # if static LLVM libraries were requested, use llvm-config to generate
+ # the list of what libraries we need, and substitute that in the right
+ # way for LLVM_LIBRARY.
+ execute_process(COMMAND ${LLVM_CONFIG} --libfiles
+ OUTPUT_VARIABLE LLVM_LIBRARY
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ string(REPLACE " " ";" LLVM_LIBRARY ${LLVM_LIBRARY})
+ endif()
+ message(STATUS "LLVM library = ${LLVM_LIBRARY}")
+ else()
+ message(FATAL_ERROR "LLVM not found.")
+ endif()
+ endif()
+
if(WITH_CYCLES_OSL)
set(CYCLES_OSL ${LIBDIR}/osl CACHE PATH "Path to OpenShadingLanguage installation")
@@ -712,8 +774,9 @@
find_library(OSL_LIB_EXEC NAMES oslexec PATHS ${CYCLES_OSL}/lib)
find_library(OSL_LIB_COMP NAMES oslcomp PATHS ${CYCLES_OSL}/lib)
find_library(OSL_LIB_QUERY NAMES oslquery PATHS ${CYCLES_OSL}/lib)
- # WARNING! depends on correct order of OSL libs linking
- list(APPEND OSL_LIBRARIES ${OSL_LIB_COMP} ${OSL_LIB_EXEC} ${OSL_LIB_QUERY})
+ # Note: --whole-archive is needed to force loading of all symbols in liboslexec,
+ # otherwise LLVM is missing the osl_allocate_closure_component function
+ list(APPEND OSL_LIBRARIES ${OSL_LIB_COMP} -Wl,--whole-archive ${OSL_LIB_EXEC} -Wl,--no-whole-archive ${OSL_LIB_QUERY})
find_path(OSL_INCLUDES OSL/oslclosure.h PATHS ${CYCLES_OSL}/include)
find_program(OSL_COMPILER NAMES oslc PATHS ${CYCLES_OSL}/bin)
@@ -1303,7 +1366,7 @@
set(PLATFORM_LINKFLAGS "-Xlinker --stack=2097152")
## DISABLE - causes linking errors
- ## for re-distrobution, so users dont need mingw installed
+ ## for re-distribution, so users dont need mingw installed
# set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -static-libgcc -static-libstdc++")
endif()
@@ -1546,7 +1609,7 @@
if(WITH_OPENIMAGEIO)
set(OPENIMAGEIO ${LIBDIR}/openimageio)
set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
- set(OPENIMAGEIO_LIBRARIES -force_load ${OPENIMAGEIO}/lib/libOpenImageIO.a ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARY} ${OPENEXR_LIBRARIES} ${ZLIB_LIBRARIES})
+ set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO}/lib/libOpenImageIO.a ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARY} ${OPENEXR_LIBRARIES} ${ZLIB_LIBRARIES})
set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib ${JPEG_LIBPATH} ${PNG_LIBPATH} ${TIFF_LIBPATH} ${OPENEXR_LIBPATH} ${ZLIB_LIBPATH})
set(OPENIMAGEIO_DEFINITIONS "-DOIIO_STATIC_BUILD")
endif()
@@ -1559,6 +1622,56 @@
set(OPENCOLORIO_DEFINITIONS "-DOCIO_STATIC_BUILD")
endif()
+ if(WITH_LLVM)
+ set(LLVM_DIRECTORY ${LIBDIR}/llvm CACHE PATH "Path to the LLVM installation")
+ set(LLVM_VERSION "3.1" CACHE STRING "Version of LLVM to use" "")
+ set(LLVM_STATIC YES)
+ if(LLVM_DIRECTORY)
+ set(LLVM_CONFIG "${LLVM_DIRECTORY}/bin/llvm-config")
+ else()
+ set(LLVM_CONFIG llvm-config)
+ 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)
+ execute_process(COMMAND ${LLVM_CONFIG} --includedir
+ OUTPUT_VARIABLE LLVM_INCLUDES
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ find_library(LLVM_LIBRARY
+ NAMES libLLVMAnalysis.a # first of a whole bunch of libs to get
+ PATHS ${LLVM_LIB_DIR})
+ message(STATUS "LLVM version = ${LLVM_VERSION}")
+ message(STATUS "LLVM dir = ${LLVM_DIRECTORY}")
+ message(STATUS "LLVM includes = ${LLVM_INCLUDES}")
+ message(STATUS "LLVM lib dir = ${LLVM_LIB_DIR}")
+
+ if(LLVM_LIBRARY AND LLVM_INCLUDES AND LLVM_DIRECTORY AND LLVM_LIB_DIR)
+ # ensure include directory is added (in case of non-standard locations
+ include_directories(BEFORE "${LLVM_INCLUDES}")
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list