Blender Git Commit Log

Merge remote-tracking branch 'refs/remotes/origin/blender-v2.78-release' into fracture_modifier

Conflicts:
CMakeLists.txt
build_files/build_environment/install_deps.sh
build_files/cmake/macros.cmake
doc/python_api/sphinx_doc_gen.sh
intern/cycles/app/CMakeLists.txt
intern/cycles/blender/addon/properties.py
intern/cycles/blender/blender_sync.cpp
intern/cycles/kernel/bvh/bvh.h
intern/cycles/kernel/geom/geom_bvh_volume.h
intern/cycles/kernel/geom/geom_bvh_volume_all.h
intern/cycles/kernel/kernel_volume.h
intern/cycles/kernel/kernels/opencl/kernel.cl
intern/cycles/kernel/shaders/node_subsurface_scattering.osl
intern/cycles/kernel/svm/svm_closure.h
intern/cycles/util/util_vector.h
release/datafiles/splash.png
release/datafiles/splash_2x.png
release/scripts/addons
source/blender/blenfont/intern/blf_font.c
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/BKE_mesh_mapping.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/particle_distribute.c
source/blender/blenkernel/intern/rigidbody.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/speaker.c
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/intern/bmesh_core.c
source/blender/bmesh/intern/bmesh_polygon.c
source/blender/editors/gpencil/gpencil_brush.c
source/blender/editors/gpencil/gpencil_ops.c
source/blender/editors/object/object_relations.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/space_view3d/drawarmature.c
source/blender/editors/space_view3d/drawvolume.c
source/blender/editors/transform/transform_snap.c
source/blender/gpu/shaders/gpu_shader_material.glsl
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_camera.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_sculpt_paint.c
source/blender/modifiers/MOD_modifiertypes.h
source/blender/modifiers/intern/MOD_util.c
source/blender/nodes/shader/nodes/node_shader_bump.c
source/blender/nodes/shader/nodes/node_shader_fresnel.c
source/blender/nodes/shader/nodes/node_shader_normal_map.c
source/blender/render/intern/source/render_result.c
source/blender/render/intern/source/render_texture.c
source/blender/windowmanager/WM_api.h
source/creator/CMakeLists.txt