[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59436] branches/asset-browser: Merged revision(s) 59048-59435 from trunk/blender
Andrea Weikert
elubie at gmx.net
Fri Aug 23 20:10:12 CEST 2013
Revision: 59436
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59436
Author: elubie
Date: 2013-08-23 18:10:11 +0000 (Fri, 23 Aug 2013)
Log Message:
-----------
Merged revision(s) 59048-59435 from trunk/blender
Modified Paths:
--------------
branches/asset-browser/build_files/build_environment/install_deps.sh
branches/asset-browser/build_files/cmake/cmake_static_check_cppcheck.py
branches/asset-browser/build_files/cmake/macros.cmake
branches/asset-browser/build_files/scons/tools/Blender.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/extern/libmv/libmv/multiview/euclidean_resection.cc
branches/asset-browser/extern/libmv/libmv/multiview/euclidean_resection.h
branches/asset-browser/extern/libmv/libmv/tracking/track_region.cc
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/recastnavigation/recast-capi.cpp
branches/asset-browser/extern/recastnavigation/recast-capi.h
branches/asset-browser/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
branches/asset-browser/intern/audaspace/OpenAL/AUD_OpenALDevice.h
branches/asset-browser/intern/audaspace/Python/AUD_PyAPI.cpp
branches/asset-browser/intern/audaspace/intern/AUD_IHandle.h
branches/asset-browser/intern/audaspace/intern/AUD_SoftwareDevice.cpp
branches/asset-browser/intern/audaspace/intern/AUD_SoftwareDevice.h
branches/asset-browser/intern/audaspace/intern/AUD_Space.h
branches/asset-browser/intern/cycles/app/cycles_server.cpp
branches/asset-browser/intern/cycles/app/cycles_test.cpp
branches/asset-browser/intern/cycles/app/cycles_xml.cpp
branches/asset-browser/intern/cycles/app/cycles_xml.h
branches/asset-browser/intern/cycles/app/io_export_cycles_xml.py
branches/asset-browser/intern/cycles/blender/CCL_api.h
branches/asset-browser/intern/cycles/blender/addon/__init__.py
branches/asset-browser/intern/cycles/blender/addon/engine.py
branches/asset-browser/intern/cycles/blender/addon/osl.py
branches/asset-browser/intern/cycles/blender/addon/presets.py
branches/asset-browser/intern/cycles/blender/addon/properties.py
branches/asset-browser/intern/cycles/blender/addon/ui.py
branches/asset-browser/intern/cycles/blender/blender_camera.cpp
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_particles.cpp
branches/asset-browser/intern/cycles/blender/blender_python.cpp
branches/asset-browser/intern/cycles/blender/blender_session.cpp
branches/asset-browser/intern/cycles/blender/blender_session.h
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/blender/blender_util.h
branches/asset-browser/intern/cycles/bvh/bvh.cpp
branches/asset-browser/intern/cycles/device/device.cpp
branches/asset-browser/intern/cycles/device/device.h
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_intern.h
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/doc/license/CMakeLists.txt
branches/asset-browser/intern/cycles/doc/license/readme.txt
branches/asset-browser/intern/cycles/kernel/closure/bsdf.h
branches/asset-browser/intern/cycles/kernel/closure/bsdf_microfacet.h
branches/asset-browser/intern/cycles/kernel/closure/bsdf_oren_nayar.h
branches/asset-browser/intern/cycles/kernel/closure/bssrdf.h
branches/asset-browser/intern/cycles/kernel/closure/volume.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_bvh_traversal.h
branches/asset-browser/intern/cycles/kernel/kernel_camera.h
branches/asset-browser/intern/cycles/kernel/kernel_compat_cpu.h
branches/asset-browser/intern/cycles/kernel/kernel_compat_cuda.h
branches/asset-browser/intern/cycles/kernel/kernel_compat_opencl.h
branches/asset-browser/intern/cycles/kernel/kernel_curve.h
branches/asset-browser/intern/cycles/kernel/kernel_differential.h
branches/asset-browser/intern/cycles/kernel/kernel_displace.h
branches/asset-browser/intern/cycles/kernel/kernel_emission.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_jitter.h
branches/asset-browser/intern/cycles/kernel/kernel_light.h
branches/asset-browser/intern/cycles/kernel/kernel_math.h
branches/asset-browser/intern/cycles/kernel/kernel_montecarlo.h
branches/asset-browser/intern/cycles/kernel/kernel_object.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_random.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_textures.h
branches/asset-browser/intern/cycles/kernel/kernel_triangle.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_globals.h
branches/asset-browser/intern/cycles/kernel/osl/osl_services.cpp
branches/asset-browser/intern/cycles/kernel/osl/osl_services.h
branches/asset-browser/intern/cycles/kernel/osl/osl_shader.cpp
branches/asset-browser/intern/cycles/kernel/osl/osl_shader.h
branches/asset-browser/intern/cycles/kernel/shaders/node_add_closure.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_ambient_occlusion.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_attribute.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_background.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_blackbody.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_brick_texture.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_brightness.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_bump.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_camera.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_checker_texture.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_color.h
branches/asset-browser/intern/cycles/kernel/shaders/node_combine_hsv.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_combine_rgb.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_convert_from_color.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_convert_from_float.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_convert_from_int.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_convert_from_normal.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_convert_from_point.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_convert_from_string.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_convert_from_vector.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_diffuse_bsdf.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_emission.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_environment_texture.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_fresnel.h
branches/asset-browser/intern/cycles/kernel/shaders/node_fresnel.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_gamma.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_geometry.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_glass_bsdf.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_glossy_bsdf.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_gradient_texture.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_hair_info.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_holdout.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_hsv.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_image_texture.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_invert.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_layer_weight.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_light_falloff.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_light_path.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_magic_texture.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_mapping.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_math.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_mix.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_mix_closure.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_musgrave_texture.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_noise_texture.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_normal.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_normal_map.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_object_info.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_output_displacement.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_output_surface.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_output_volume.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_particle_info.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_refraction_bsdf.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_rgb_curves.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_rgb_ramp.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_separate_hsv.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_separate_rgb.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_set_normal.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_tangent.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_texture.h
branches/asset-browser/intern/cycles/kernel/shaders/node_texture_coordinate.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_toon_bsdf.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_translucent_bsdf.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_transparent_bsdf.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_value.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_vector_curves.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_vector_math.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_vector_transform.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_velvet_bsdf.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_voronoi_texture.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_ward_bsdf.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_wave_texture.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_wavelength.osl
branches/asset-browser/intern/cycles/kernel/shaders/node_wireframe.osl
branches/asset-browser/intern/cycles/kernel/shaders/oslutil.h
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_attribute.h
branches/asset-browser/intern/cycles/kernel/svm/svm_brick.h
branches/asset-browser/intern/cycles/kernel/svm/svm_brightness.h
branches/asset-browser/intern/cycles/kernel/svm/svm_camera.h
branches/asset-browser/intern/cycles/kernel/svm/svm_checker.h
branches/asset-browser/intern/cycles/kernel/svm/svm_closure.h
branches/asset-browser/intern/cycles/kernel/svm/svm_convert.h
branches/asset-browser/intern/cycles/kernel/svm/svm_displace.h
branches/asset-browser/intern/cycles/kernel/svm/svm_fresnel.h
branches/asset-browser/intern/cycles/kernel/svm/svm_gamma.h
branches/asset-browser/intern/cycles/kernel/svm/svm_geometry.h
branches/asset-browser/intern/cycles/kernel/svm/svm_gradient.h
branches/asset-browser/intern/cycles/kernel/svm/svm_hsv.h
branches/asset-browser/intern/cycles/kernel/svm/svm_image.h
branches/asset-browser/intern/cycles/kernel/svm/svm_invert.h
branches/asset-browser/intern/cycles/kernel/svm/svm_light_path.h
branches/asset-browser/intern/cycles/kernel/svm/svm_magic.h
branches/asset-browser/intern/cycles/kernel/svm/svm_mapping.h
branches/asset-browser/intern/cycles/kernel/svm/svm_math.h
branches/asset-browser/intern/cycles/kernel/svm/svm_mix.h
branches/asset-browser/intern/cycles/kernel/svm/svm_musgrave.h
branches/asset-browser/intern/cycles/kernel/svm/svm_noisetex.h
branches/asset-browser/intern/cycles/kernel/svm/svm_normal.h
branches/asset-browser/intern/cycles/kernel/svm/svm_ramp.h
branches/asset-browser/intern/cycles/kernel/svm/svm_sepcomb_hsv.h
branches/asset-browser/intern/cycles/kernel/svm/svm_sepcomb_rgb.h
branches/asset-browser/intern/cycles/kernel/svm/svm_sky.h
branches/asset-browser/intern/cycles/kernel/svm/svm_tex_coord.h
branches/asset-browser/intern/cycles/kernel/svm/svm_texture.h
branches/asset-browser/intern/cycles/kernel/svm/svm_types.h
branches/asset-browser/intern/cycles/kernel/svm/svm_value.h
branches/asset-browser/intern/cycles/kernel/svm/svm_vector_transform.h
branches/asset-browser/intern/cycles/kernel/svm/svm_voronoi.h
branches/asset-browser/intern/cycles/kernel/svm/svm_wave.h
branches/asset-browser/intern/cycles/render/attribute.cpp
branches/asset-browser/intern/cycles/render/attribute.h
branches/asset-browser/intern/cycles/render/background.cpp
branches/asset-browser/intern/cycles/render/background.h
branches/asset-browser/intern/cycles/render/blackbody.h
branches/asset-browser/intern/cycles/render/bssrdf.cpp
branches/asset-browser/intern/cycles/render/bssrdf.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/camera.h
branches/asset-browser/intern/cycles/render/curves.cpp
branches/asset-browser/intern/cycles/render/curves.h
branches/asset-browser/intern/cycles/render/film.cpp
branches/asset-browser/intern/cycles/render/film.h
branches/asset-browser/intern/cycles/render/graph.cpp
branches/asset-browser/intern/cycles/render/graph.h
branches/asset-browser/intern/cycles/render/image.cpp
branches/asset-browser/intern/cycles/render/image.h
branches/asset-browser/intern/cycles/render/integrator.cpp
branches/asset-browser/intern/cycles/render/integrator.h
branches/asset-browser/intern/cycles/render/light.cpp
branches/asset-browser/intern/cycles/render/light.h
branches/asset-browser/intern/cycles/render/mesh.cpp
branches/asset-browser/intern/cycles/render/mesh.h
branches/asset-browser/intern/cycles/render/mesh_displace.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/object.h
branches/asset-browser/intern/cycles/render/osl.cpp
branches/asset-browser/intern/cycles/render/osl.h
branches/asset-browser/intern/cycles/render/particles.cpp
branches/asset-browser/intern/cycles/render/particles.h
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/sobol.h
branches/asset-browser/intern/cycles/render/svm.cpp
branches/asset-browser/intern/cycles/render/svm.h
branches/asset-browser/intern/cycles/render/tables.cpp
branches/asset-browser/intern/cycles/render/tables.h
branches/asset-browser/intern/cycles/render/tile.cpp
branches/asset-browser/intern/cycles/render/tile.h
branches/asset-browser/intern/cycles/subd/subd_build.h
branches/asset-browser/intern/cycles/subd/subd_dice.cpp
branches/asset-browser/intern/cycles/subd/subd_dice.h
branches/asset-browser/intern/cycles/subd/subd_patch.cpp
branches/asset-browser/intern/cycles/subd/subd_patch.h
branches/asset-browser/intern/cycles/subd/subd_split.cpp
branches/asset-browser/intern/cycles/subd/subd_split.h
branches/asset-browser/intern/cycles/subd/subd_stencil.cpp
branches/asset-browser/intern/cycles/util/CMakeLists.txt
branches/asset-browser/intern/cycles/util/util_algorithm.h
branches/asset-browser/intern/cycles/util/util_args.h
branches/asset-browser/intern/cycles/util/util_boundbox.h
branches/asset-browser/intern/cycles/util/util_cache.cpp
branches/asset-browser/intern/cycles/util/util_cache.h
branches/asset-browser/intern/cycles/util/util_color.h
branches/asset-browser/intern/cycles/util/util_cuda.cpp
branches/asset-browser/intern/cycles/util/util_cuda.h
branches/asset-browser/intern/cycles/util/util_debug.h
branches/asset-browser/intern/cycles/util/util_dynlib.cpp
branches/asset-browser/intern/cycles/util/util_dynlib.h
branches/asset-browser/intern/cycles/util/util_foreach.h
branches/asset-browser/intern/cycles/util/util_function.h
branches/asset-browser/intern/cycles/util/util_hash.h
branches/asset-browser/intern/cycles/util/util_image.h
branches/asset-browser/intern/cycles/util/util_list.h
branches/asset-browser/intern/cycles/util/util_map.h
branches/asset-browser/intern/cycles/util/util_math.h
branches/asset-browser/intern/cycles/util/util_opengl.h
branches/asset-browser/intern/cycles/util/util_param.h
branches/asset-browser/intern/cycles/util/util_path.cpp
branches/asset-browser/intern/cycles/util/util_path.h
branches/asset-browser/intern/cycles/util/util_progress.h
branches/asset-browser/intern/cycles/util/util_set.h
branches/asset-browser/intern/cycles/util/util_stats.h
branches/asset-browser/intern/cycles/util/util_string.cpp
branches/asset-browser/intern/cycles/util/util_string.h
branches/asset-browser/intern/cycles/util/util_system.cpp
branches/asset-browser/intern/cycles/util/util_system.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_thread.h
branches/asset-browser/intern/cycles/util/util_time.cpp
branches/asset-browser/intern/cycles/util/util_time.h
branches/asset-browser/intern/cycles/util/util_transform.cpp
branches/asset-browser/intern/cycles/util/util_transform.h
branches/asset-browser/intern/cycles/util/util_types.h
branches/asset-browser/intern/cycles/util/util_vector.h
branches/asset-browser/intern/cycles/util/util_view.cpp
branches/asset-browser/intern/cycles/util/util_view.h
branches/asset-browser/intern/cycles/util/util_xml.h
branches/asset-browser/intern/ghost/intern/GHOST_SystemPathsX11.cpp
branches/asset-browser/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/asset-browser/intern/guardedalloc/CMakeLists.txt
branches/asset-browser/intern/guardedalloc/SConscript
branches/asset-browser/intern/guardedalloc/intern/mallocn.c
branches/asset-browser/intern/opencolorio/ocio_impl.cc
branches/asset-browser/release/datafiles/blender_icons16.png
branches/asset-browser/release/datafiles/blender_icons32.png
branches/asset-browser/release/datafiles/prvicons.png
branches/asset-browser/release/scripts/freestyle/style_modules/parameter_editor.py
branches/asset-browser/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
branches/asset-browser/release/scripts/modules/bl_i18n_utils/settings.py
branches/asset-browser/release/scripts/modules/bpy/path.py
branches/asset-browser/release/scripts/modules/bpy_extras/image_utils.py
branches/asset-browser/release/scripts/modules/bpy_extras/io_utils.py
branches/asset-browser/release/scripts/modules/bpy_types.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/startup/bl_operators/add_mesh_torus.py
branches/asset-browser/release/scripts/startup/bl_operators/wm.py
branches/asset-browser/release/scripts/startup/bl_ui/properties_mask_common.py
branches/asset-browser/release/scripts/startup/bl_ui/space_clip.py
branches/asset-browser/release/scripts/startup/bl_ui/space_sequencer.py
branches/asset-browser/release/scripts/startup/bl_ui/space_view3d.py
branches/asset-browser/release/scripts/startup/nodeitems_builtins.py
branches/asset-browser/release/scripts/templates_py/script_stub.py
branches/asset-browser/source/blender/avi/intern/avi.c
branches/asset-browser/source/blender/blenfont/intern/blf_glyph.c
branches/asset-browser/source/blender/blenkernel/BKE_anim.h
branches/asset-browser/source/blender/blenkernel/BKE_armature.h
branches/asset-browser/source/blender/blenkernel/BKE_curve.h
branches/asset-browser/source/blender/blenkernel/BKE_displist.h
branches/asset-browser/source/blender/blenkernel/BKE_key.h
branches/asset-browser/source/blender/blenkernel/BKE_lattice.h
branches/asset-browser/source/blender/blenkernel/BKE_mask.h
branches/asset-browser/source/blender/blenkernel/BKE_material.h
branches/asset-browser/source/blender/blenkernel/BKE_mball.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_node.h
branches/asset-browser/source/blender/blenkernel/BKE_object.h
branches/asset-browser/source/blender/blenkernel/BKE_particle.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_tracking.h
branches/asset-browser/source/blender/blenkernel/CMakeLists.txt
branches/asset-browser/source/blender/blenkernel/SConscript
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/anim.c
branches/asset-browser/source/blender/blenkernel/intern/armature.c
branches/asset-browser/source/blender/blenkernel/intern/brush.c
branches/asset-browser/source/blender/blenkernel/intern/camera.c
branches/asset-browser/source/blender/blenkernel/intern/cdderivedmesh.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/depsgraph.c
branches/asset-browser/source/blender/blenkernel/intern/displist.c
branches/asset-browser/source/blender/blenkernel/intern/effect.c
branches/asset-browser/source/blender/blenkernel/intern/font.c
branches/asset-browser/source/blender/blenkernel/intern/image.c
branches/asset-browser/source/blender/blenkernel/intern/key.c
branches/asset-browser/source/blender/blenkernel/intern/lattice.c
branches/asset-browser/source/blender/blenkernel/intern/mask.c
branches/asset-browser/source/blender/blenkernel/intern/material.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/modifier.c
branches/asset-browser/source/blender/blenkernel/intern/modifiers_bmesh.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/object_deform.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/screen.c
branches/asset-browser/source/blender/blenkernel/intern/sequencer.c
branches/asset-browser/source/blender/blenkernel/intern/sound.c
branches/asset-browser/source/blender/blenkernel/intern/tracking.c
branches/asset-browser/source/blender/blenlib/BLI_array.h
branches/asset-browser/source/blender/blenlib/BLI_callbacks.h
branches/asset-browser/source/blender/blenlib/BLI_edgehash.h
branches/asset-browser/source/blender/blenlib/BLI_fileops.h
branches/asset-browser/source/blender/blenlib/BLI_ghash.h
branches/asset-browser/source/blender/blenlib/BLI_linklist.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_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_threads.h
branches/asset-browser/source/blender/blenlib/BLI_utildefines.h
branches/asset-browser/source/blender/blenlib/BLI_winstuff.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_kdtree.c
branches/asset-browser/source/blender/blenlib/intern/BLI_linklist.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/edgehash.c
branches/asset-browser/source/blender/blenlib/intern/math_geom.c
branches/asset-browser/source/blender/blenlib/intern/math_geom_inline.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/smallhash.c
branches/asset-browser/source/blender/blenlib/intern/storage.c
branches/asset-browser/source/blender/blenlib/intern/threads.c
branches/asset-browser/source/blender/blenloader/intern/readfile.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/intern/bmesh_construct.c
branches/asset-browser/source/blender/bmesh/intern/bmesh_construct.h
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.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_marking.c
branches/asset-browser/source/blender/bmesh/intern/bmesh_marking.h
branches/asset-browser/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/asset-browser/source/blender/bmesh/intern/bmesh_mods.c
branches/asset-browser/source/blender/bmesh/intern/bmesh_opdefines.c
branches/asset-browser/source/blender/bmesh/intern/bmesh_operators_private.h
branches/asset-browser/source/blender/bmesh/intern/bmesh_polygon.c
branches/asset-browser/source/blender/bmesh/intern/bmesh_queries.c
branches/asset-browser/source/blender/bmesh/intern/bmesh_queries.h
branches/asset-browser/source/blender/bmesh/operators/bmo_bevel.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_create.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_edgeloop.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_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_split_edges.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_unsubdivide.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_decimate_dissolve.c
branches/asset-browser/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
branches/asset-browser/source/blender/bmesh/tools/bmesh_edgesplit.c
branches/asset-browser/source/blender/bmesh/tools/bmesh_edgesplit.h
branches/asset-browser/source/blender/collada/collada_utils.cpp
branches/asset-browser/source/blender/compositor/CMakeLists.txt
branches/asset-browser/source/blender/compositor/intern/COM_Converter.cpp
branches/asset-browser/source/blender/compositor/intern/COM_MemoryBuffer.cpp
branches/asset-browser/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/asset-browser/source/blender/compositor/operations/COM_ImageOperation.cpp
branches/asset-browser/source/blender/compositor/operations/COM_ImageOperation.h
branches/asset-browser/source/blender/compositor/operations/COM_MapUVOperation.cpp
branches/asset-browser/source/blender/compositor/operations/COM_MultilayerImageOperation.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_WriteBufferOperation.cpp
branches/asset-browser/source/blender/compositor/operations/COM_WriteBufferOperation.h
branches/asset-browser/source/blender/editors/armature/armature_skinning.c
branches/asset-browser/source/blender/editors/armature/pose_edit.c
branches/asset-browser/source/blender/editors/datafiles/CMakeLists.txt
branches/asset-browser/source/blender/editors/gpencil/gpencil_edit.c
branches/asset-browser/source/blender/editors/include/ED_anim_api.h
branches/asset-browser/source/blender/editors/include/ED_armature.h
branches/asset-browser/source/blender/editors/include/ED_transform.h
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_layout.c
branches/asset-browser/source/blender/editors/interface/interface_templates.c
branches/asset-browser/source/blender/editors/mask/mask_draw.c
branches/asset-browser/source/blender/editors/mask/mask_edit.c
branches/asset-browser/source/blender/editors/mask/mask_intern.h
branches/asset-browser/source/blender/editors/mask/mask_ops.c
branches/asset-browser/source/blender/editors/mask/mask_relationships.c
branches/asset-browser/source/blender/editors/mask/mask_shapekey.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_path.c
branches/asset-browser/source/blender/editors/mesh/editmesh_rip.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/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_edit.c
branches/asset-browser/source/blender/editors/object/object_modifier.c
branches/asset-browser/source/blender/editors/object/object_vgroup.c
branches/asset-browser/source/blender/editors/render/render_internal.c
branches/asset-browser/source/blender/editors/sculpt_paint/paint_hide.c
branches/asset-browser/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/asset-browser/source/blender/editors/sculpt_paint/paint_stroke.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_buttons/buttons_texture.c
branches/asset-browser/source/blender/editors/space_clip/clip_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_file/file_panels.c
branches/asset-browser/source/blender/editors/space_graph/graph_buttons.c
branches/asset-browser/source/blender/editors/space_graph/graph_edit.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_logic/logic_window.c
branches/asset-browser/source/blender/editors/space_node/drawnode.c
branches/asset-browser/source/blender/editors/space_outliner/outliner_edit.c
branches/asset-browser/source/blender/editors/space_outliner/outliner_tree.c
branches/asset-browser/source/blender/editors/space_outliner/space_outliner.c
branches/asset-browser/source/blender/editors/space_time/space_time.c
branches/asset-browser/source/blender/editors/space_view3d/drawarmature.c
branches/asset-browser/source/blender/editors/space_view3d/drawobject.c
branches/asset-browser/source/blender/editors/space_view3d/space_view3d.c
branches/asset-browser/source/blender/editors/space_view3d/view3d_draw.c
branches/asset-browser/source/blender/editors/space_view3d/view3d_iterators.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_constraints.c
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_snap.c
branches/asset-browser/source/blender/editors/util/crazyspace.c
branches/asset-browser/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/asset-browser/source/blender/freestyle/intern/geometry/FitCurve.cpp
branches/asset-browser/source/blender/freestyle/intern/stroke/StrokeRep.cpp
branches/asset-browser/source/blender/freestyle/intern/stroke/StrokeShader.h
branches/asset-browser/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
branches/asset-browser/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
branches/asset-browser/source/blender/gpu/intern/gpu_buffers.c
branches/asset-browser/source/blender/gpu/intern/gpu_draw.c
branches/asset-browser/source/blender/imbuf/intern/IMB_colormanagement_intern.h
branches/asset-browser/source/blender/imbuf/intern/bmp.c
branches/asset-browser/source/blender/imbuf/intern/imageprocess.c
branches/asset-browser/source/blender/makesdna/DNA_ID.h
branches/asset-browser/source/blender/makesdna/DNA_actuator_types.h
branches/asset-browser/source/blender/makesdna/DNA_curve_types.h
branches/asset-browser/source/blender/makesdna/DNA_image_types.h
branches/asset-browser/source/blender/makesdna/DNA_key_types.h
branches/asset-browser/source/blender/makesdna/DNA_lattice_types.h
branches/asset-browser/source/blender/makesdna/DNA_mask_types.h
branches/asset-browser/source/blender/makesdna/DNA_meta_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_particle_types.h
branches/asset-browser/source/blender/makesdna/DNA_scene_types.h
branches/asset-browser/source/blender/makesdna/DNA_space_types.h
branches/asset-browser/source/blender/makesdna/DNA_tracking_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/SConscript
branches/asset-browser/source/blender/makesrna/intern/CMakeLists.txt
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_actuator.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_internal.h
branches/asset-browser/source/blender/makesrna/intern/rna_lamp.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_mesh.c
branches/asset-browser/source/blender/makesrna/intern/rna_meta.c
branches/asset-browser/source/blender/makesrna/intern/rna_nodetree.c
branches/asset-browser/source/blender/makesrna/intern/rna_scene.c
branches/asset-browser/source/blender/makesrna/intern/rna_space.c
branches/asset-browser/source/blender/makesrna/intern/rna_tracking.c
branches/asset-browser/source/blender/modifiers/intern/MOD_array.c
branches/asset-browser/source/blender/modifiers/intern/MOD_bevel.c
branches/asset-browser/source/blender/modifiers/intern/MOD_decimate.c
branches/asset-browser/source/blender/modifiers/intern/MOD_edgesplit.c
branches/asset-browser/source/blender/modifiers/intern/MOD_explode.c
branches/asset-browser/source/blender/modifiers/intern/MOD_ocean.c
branches/asset-browser/source/blender/modifiers/intern/MOD_particleinstance.c
branches/asset-browser/source/blender/modifiers/intern/MOD_skin.c
branches/asset-browser/source/blender/modifiers/intern/MOD_triangulate.c
branches/asset-browser/source/blender/nodes/CMakeLists.txt
branches/asset-browser/source/blender/nodes/NOD_composite.h
branches/asset-browser/source/blender/nodes/NOD_static_types.h
branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.c
branches/asset-browser/source/blender/python/bmesh/bmesh_py_types.c
branches/asset-browser/source/blender/python/bmesh/bmesh_py_types_customdata.c
branches/asset-browser/source/blender/python/bmesh/bmesh_py_utils.c
branches/asset-browser/source/blender/python/intern/bpy_app_handlers.c
branches/asset-browser/source/blender/python/mathutils/mathutils_Vector.c
branches/asset-browser/source/blender/python/mathutils/mathutils_geometry.c
branches/asset-browser/source/blender/render/intern/source/convertblender.c
branches/asset-browser/source/blender/render/intern/source/occlusion.c
branches/asset-browser/source/blender/render/intern/source/pointdensity.c
branches/asset-browser/source/blender/windowmanager/intern/wm_init_exit.c
branches/asset-browser/source/creator/creator.c
branches/asset-browser/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/asset-browser/source/gameengine/Converter/BL_ActionActuator.cpp
branches/asset-browser/source/gameengine/Converter/BL_ActionActuator.h
branches/asset-browser/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/asset-browser/source/gameengine/Converter/BL_ArmatureObject.h
branches/asset-browser/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/asset-browser/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/asset-browser/source/gameengine/GameLogic/SCA_IScene.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/BL_Action.cpp
branches/asset-browser/source/gameengine/Ketsji/BL_Action.h
branches/asset-browser/source/gameengine/Ketsji/BL_ActionManager.cpp
branches/asset-browser/source/gameengine/Ketsji/BL_ActionManager.h
branches/asset-browser/source/gameengine/Ketsji/BL_BlenderShader.cpp
branches/asset-browser/source/gameengine/Ketsji/BL_BlenderShader.h
branches/asset-browser/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/asset-browser/source/gameengine/Ketsji/KX_Dome.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_KetsjiEngine.h
branches/asset-browser/source/gameengine/Ketsji/KX_Light.cpp
branches/asset-browser/source/gameengine/Ketsji/KX_Light.h
branches/asset-browser/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/asset-browser/source/gameengine/Ketsji/KX_RaySensor.h
branches/asset-browser/source/gameengine/Ketsji/KX_Scene.cpp
branches/asset-browser/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/asset-browser/source/gameengine/Rasterizer/RAS_BucketManager.cpp
branches/asset-browser/source/gameengine/Rasterizer/RAS_MeshObject.cpp
branches/asset-browser/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/asset-browser/source/tools/check_style_c.py
Added Paths:
-----------
branches/asset-browser/intern/atomic/
branches/asset-browser/intern/cycles/kernel/kernel_bvh_subsurface.h
branches/asset-browser/release/text/GPL3-license.txt
branches/asset-browser/release/text/jemalloc-license.txt
branches/asset-browser/source/blender/blenlib/BLI_linklist_stack.h
branches/asset-browser/source/blender/blenlib/BLI_sort.h
branches/asset-browser/source/blender/blenlib/intern/sort.c
branches/asset-browser/source/blender/bmesh/bmesh_tools.h
branches/asset-browser/source/blender/bmesh/operators/bmo_bisect_plane.c
branches/asset-browser/source/blender/bmesh/operators/bmo_fill_attribute.c
branches/asset-browser/source/blender/bmesh/tools/bmesh_bisect_plane.c
branches/asset-browser/source/blender/bmesh/tools/bmesh_bisect_plane.h
branches/asset-browser/source/blender/bmesh/tools/bmesh_edgenet.c
branches/asset-browser/source/blender/bmesh/tools/bmesh_edgenet.h
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/nodes/composite/nodes/node_composite_planetrackdeform.c
Removed Paths:
-------------
branches/asset-browser/intern/cycles/doc/license/Blender.txt
branches/asset-browser/intern/cycles/doc/license/GPL.txt
branches/asset-browser/intern/cycles/util/util_memarena.cpp
branches/asset-browser/intern/cycles/util/util_memarena.h
Property Changed:
----------------
branches/asset-browser/
branches/asset-browser/source/blender/editors/interface/interface.c
branches/asset-browser/source/blender/editors/space_outliner/
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
/branches/soc-2013-depsgraph_mt:57516
/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-59047
+ /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-59435
Modified: branches/asset-browser/build_files/build_environment/install_deps.sh
===================================================================
--- branches/asset-browser/build_files/build_environment/install_deps.sh 2013-08-23 18:02:23 UTC (rev 59435)
+++ branches/asset-browser/build_files/build_environment/install_deps.sh 2013-08-23 18:10:11 UTC (rev 59436)
@@ -212,6 +212,7 @@
OPENEXR_FORCE_REBUILD=false
OPENEXR_SKIP=false
_with_built_openexr=false
+_need_openexr_ldconfig=false
OIIO_VERSION="1.1.10"
OIIO_SOURCE="https://github.com/OpenImageIO/oiio/archive/Release-$OIIO_VERSION.tar.gz"
@@ -230,6 +231,7 @@
# OSL needs to be compiled for now!
OSL_VERSION="1.3.2"
+OSL_VERSION_MIN=$OSL_VERSION
OSL_SOURCE="https://github.com/imageworks/OpenShadingLanguage/archive/Release-$OSL_VERSION.tar.gz"
OSL_FORCE_REBUILD=false
OSL_SKIP=false
@@ -2776,7 +2778,7 @@
if [ $? -eq 0 ]; then
install_packages_ARCH llvm clang
have_llvm=true
- LLVM_VERSION=`check_package_version_ge_ARCH llvm`
+ LLVM_VERSION=`check_package_version_ge_ARCH llvm $LLVM_VERSION_MIN`
LLVM_VERSION_FOUND=$LLVM_VERSION
clean_LLVM
else
Modified: branches/asset-browser/build_files/cmake/cmake_static_check_cppcheck.py
===================================================================
--- branches/asset-browser/build_files/cmake/cmake_static_check_cppcheck.py 2013-08-23 18:02:23 UTC (rev 59435)
+++ branches/asset-browser/build_files/cmake/cmake_static_check_cppcheck.py 2013-08-23 18:10:11 UTC (rev 59436)
@@ -52,6 +52,7 @@
def main():
source_info = project_source_info.build_info(ignore_prefix_list=CHECKER_IGNORE_PREFIX)
+ source_defines = project_source_info.build_defines_as_args()
check_commands = []
for c, inc_dirs, defs in source_info:
@@ -59,7 +60,8 @@
CHECKER_ARGS +
[c] +
[("-I%s" % i) for i in inc_dirs] +
- [("-D%s" % d) for d in defs]
+ [("-D%s" % d) for d in defs] +
+ source_defines
)
check_commands.append((c, cmd))
Modified: branches/asset-browser/build_files/cmake/macros.cmake
===================================================================
--- branches/asset-browser/build_files/cmake/macros.cmake 2013-08-23 18:02:23 UTC (rev 59435)
+++ branches/asset-browser/build_files/cmake/macros.cmake 2013-08-23 18:10:11 UTC (rev 59436)
@@ -799,4 +799,35 @@
unset(_file_from)
unset(_file_to)
unset(_file_to_path)
+
endmacro()
+
+macro(svg_to_png
+ file_from
+ file_to
+ dpi
+ list_to_add)
+
+ # remove ../'s
+ get_filename_component(_file_from ${CMAKE_CURRENT_SOURCE_DIR}/${file_from} REALPATH)
+ get_filename_component(_file_to ${CMAKE_CURRENT_SOURCE_DIR}/${file_to} REALPATH)
+
+ list(APPEND ${list_to_add} ${_file_to})
+
+ find_program(INKSCAPE_EXE inkscape)
+ mark_as_advanced(INKSCAPE_EXE)
+
+ if(INKSCAPE_EXE)
+ add_custom_command(
+ OUTPUT ${_file_to}
+ COMMAND ${INKSCAPE_EXE} ${_file_from} --export-dpi=${dpi} --without-gui --export-png=${_file_to}
+ DEPENDS ${_file_from} ${INKSCAPE_EXE}
+ )
+ else()
+ message(WARNING "Inkscape not found, could not re-generate ${_file_to} from ${_file_from}!")
+ endif()
+
+ unset(_file_from)
+ unset(_file_to)
+
+endmacro()
\ No newline at end of file
Modified: branches/asset-browser/build_files/scons/tools/Blender.py
===================================================================
--- branches/asset-browser/build_files/scons/tools/Blender.py 2013-08-23 18:02:23 UTC (rev 59435)
+++ branches/asset-browser/build_files/scons/tools/Blender.py 2013-08-23 18:10:11 UTC (rev 59436)
@@ -151,12 +151,6 @@
libincs += Split(lenv['BF_JACK_LIBPATH'])
if lenv['WITH_BF_SNDFILE']:
libincs += Split(lenv['BF_SNDFILE_LIBPATH'])
- if lenv['WITH_BF_OPENEXR']:
- libincs += Split(lenv['BF_OPENEXR_LIBPATH'])
- if lenv['WITH_BF_STATICOPENEXR']:
- statlibs += Split(lenv['BF_OPENEXR_LIB_STATIC'])
- if lenv['WITH_BF_ZLIB'] and lenv['WITH_BF_STATICZLIB']:
- statlibs += Split(lenv['BF_ZLIB_LIB_STATIC'])
if lenv['WITH_BF_TIFF']:
libincs += Split(lenv['BF_TIFF_LIBPATH'])
if lenv['WITH_BF_STATICTIFF']:
@@ -212,6 +206,12 @@
libincs += Split(lenv['BF_OIIO_LIBPATH'])
if lenv['WITH_BF_STATICOIIO']:
statlibs += Split(lenv['BF_OIIO_LIB_STATIC'])
+ if lenv['WITH_BF_OPENEXR']:
+ libincs += Split(lenv['BF_OPENEXR_LIBPATH'])
+ if lenv['WITH_BF_STATICOPENEXR']:
+ statlibs += Split(lenv['BF_OPENEXR_LIB_STATIC'])
+ if lenv['WITH_BF_ZLIB'] and lenv['WITH_BF_STATICZLIB']:
+ statlibs += Split(lenv['BF_ZLIB_LIB_STATIC'])
if lenv['WITH_BF_OCIO']:
libincs += Split(lenv['BF_OCIO_LIBPATH'])
Modified: branches/asset-browser/doc/python_api/rst/bge.logic.rst
===================================================================
--- branches/asset-browser/doc/python_api/rst/bge.logic.rst 2013-08-23 18:02:23 UTC (rev 59435)
+++ branches/asset-browser/doc/python_api/rst/bge.logic.rst 2013-08-23 18:10:11 UTC (rev 59436)
@@ -362,9 +362,9 @@
Use / as directory separator in path
You can use '//' at the start of the string to define a relative path;
- Blender replaces that string by the directory of the startup .blend or runtime file
- to make a full path name (doesn't change during the game, even if you load other .blend).
- The function also converts the directory separator to the local file system format.
+ Blender replaces that string by the directory of the current .blend or runtime file
+ to make a full path name. The function also converts the directory separator to
+ the local file system format.
:arg path: The path string to be converted/expanded.
:type path: string
@@ -1114,7 +1114,20 @@
:value: 2
+.. _gameobject-playaction-blend:
+.. data:: KX_ACTION_BLEND_BLEND
+
+ Blend layers using linear interpolation
+
+ :value: 0
+
+.. data:: KX_ACTION_BLEND_ADD
+
+ Adds the layers together
+
+ :value: 1
+
-------------
Mouse Buttons
-------------
Modified: branches/asset-browser/doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst
===================================================================
--- branches/asset-browser/doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst 2013-08-23 18:02:23 UTC (rev 59435)
+++ branches/asset-browser/doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst 2013-08-23 18:10:11 UTC (rev 59436)
@@ -776,7 +776,7 @@
Return the value matching key, or the default value if its not found.
:return: The key value or a default.
- .. method:: playAction(name, start_frame, end_frame, layer=0, priority=0, blendin=0, play_mode=ACT_MODE_PLAY, layer_weight=0.0, ipo_flags=0, speed=1.0)
+ .. method:: playAction(name, start_frame, end_frame, layer=0, priority=0, blendin=0, play_mode=KX_ACTION_MODE_PLAY, layer_weight=0.0, ipo_flags=0, speed=1.0, blend_mode=KX_ACTION_BLEND_BLEND)
Plays an action.
@@ -794,12 +794,14 @@
:type blendin: float
:arg play_mode: the play mode
:type play_mode: one of :ref:`these constants <gameobject-playaction-mode>`
- :arg layer_weight: how much of the previous layer to use for blending (0 = add)
+ :arg layer_weight: how much of the previous layer to use for blending
:type layer_weight: float
:arg ipo_flags: flags for the old IPO behaviors (force, etc)
:type ipo_flags: int bitfield
:arg speed: the playback speed of the action as a factor (1.0 = normal speed, 2.0 = 2x speed, etc)
:type speed: float
+ :arg blend_mode: how to blend this layer with previous layers
+ :type blend_mode: one of :ref:`these constants <gameobject-playaction-blend>`
.. method:: stopAction(layer=0)
Modified: branches/asset-browser/extern/libmv/libmv/multiview/euclidean_resection.cc
===================================================================
--- branches/asset-browser/extern/libmv/libmv/multiview/euclidean_resection.cc 2013-08-23 18:02:23 UTC (rev 59435)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list