Blender Git Loki

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

Conflicts:
build_files/buildbot/slave_compile.py
build_files/cmake/buildinfo.cmake
build_files/cmake/config/blender_release.cmake
build_files/cmake/macros.cmake
build_files/cmake/packaging.cmake
build_files/cmake/platform/platform_win32_msvc.cmake
doc/python_api/sphinx_doc_gen.py
doc/python_api/sphinx_doc_update.py
intern/atomic/atomic_ops.h
intern/atomic/intern/atomic_ops_ext.h
intern/atomic/intern/atomic_ops_unix.h
intern/cycles/CMakeLists.txt
intern/cycles/blender/addon/properties.py
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_mesh.cpp
intern/cycles/blender/blender_object.cpp
intern/cycles/blender/blender_object_cull.cpp
intern/cycles/blender/blender_object_cull.h
intern/cycles/blender/blender_python.cpp
intern/cycles/blender/blender_session.cpp
intern/cycles/blender/blender_session.h
intern/cycles/blender/blender_shader.cpp
intern/cycles/blender/blender_util.h
intern/cycles/bvh/bvh.cpp
intern/cycles/bvh/bvh.h
intern/cycles/bvh/bvh_build.cpp
intern/cycles/bvh/bvh_node.h
intern/cycles/device/device.cpp
intern/cycles/device/device.h
intern/cycles/device/device_cpu.cpp
intern/cycles/device/device_cuda.cpp
intern/cycles/device/device_opencl.cpp
intern/cycles/device/device_task.cpp
intern/cycles/device/opencl/opencl.h
intern/cycles/device/opencl/opencl_base.cpp
intern/cycles/device/opencl/opencl_mega.cpp
intern/cycles/device/opencl/opencl_split.cpp
intern/cycles/device/opencl/opencl_util.cpp
intern/cycles/kernel/bvh/bvh.h
intern/cycles/kernel/bvh/bvh_nodes.h
intern/cycles/kernel/bvh/bvh_shadow_all.h
intern/cycles/kernel/bvh/bvh_volume_all.h
intern/cycles/kernel/bvh/qbvh_shadow_all.h
intern/cycles/kernel/bvh/qbvh_subsurface.h
intern/cycles/kernel/bvh/qbvh_traversal.h
intern/cycles/kernel/bvh/qbvh_volume.h
intern/cycles/kernel/bvh/qbvh_volume_all.h
intern/cycles/kernel/closure/bsdf.h
intern/cycles/kernel/closure/bsdf_microfacet.h
intern/cycles/kernel/closure/bsdf_microfacet_multi.h
intern/cycles/kernel/closure/bsdf_microfacet_multi_impl.h
intern/cycles/kernel/geom/geom.h
intern/cycles/kernel/geom/geom_curve.h
intern/cycles/kernel/geom/geom_motion_curve.h
intern/cycles/kernel/geom/geom_motion_triangle_intersect.h
intern/cycles/kernel/geom/geom_motion_triangle_shader.h
intern/cycles/kernel/geom/geom_object.h
intern/cycles/kernel/geom/geom_triangle.h
intern/cycles/kernel/geom/geom_triangle_intersect.h
intern/cycles/kernel/geom/geom_volume.h
intern/cycles/kernel/kernel_accumulate.h
intern/cycles/kernel/kernel_bake.h
intern/cycles/kernel/kernel_compat_cpu.h
intern/cycles/kernel/kernel_compat_cuda.h
intern/cycles/kernel/kernel_emission.h
intern/cycles/kernel/kernel_image_opencl.h
intern/cycles/kernel/kernel_light.h
intern/cycles/kernel/kernel_passes.h
intern/cycles/kernel/kernel_path.h
intern/cycles/kernel/kernel_path_branched.h
intern/cycles/kernel/kernel_path_common.h
intern/cycles/kernel/kernel_path_surface.h
intern/cycles/kernel/kernel_path_volume.h
intern/cycles/kernel/kernel_random.h
intern/cycles/kernel/kernel_shader.h
intern/cycles/kernel/kernel_shadow.h
intern/cycles/kernel/kernel_subsurface.h
intern/cycles/kernel/kernel_textures.h
intern/cycles/kernel/kernel_types.h
intern/cycles/kernel/kernel_volume.h
intern/cycles/kernel/kernels/cpu/kernel_avx.cpp
intern/cycles/kernel/kernels/cpu/kernel_avx2.cpp
intern/cycles/kernel/kernels/opencl/kernel.cl
intern/cycles/kernel/split/kernel_background_buffer_update.h
intern/cycles/kernel/split/kernel_data_init.h
intern/cycles/kernel/split/kernel_direct_lighting.h
intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h
intern/cycles/kernel/split/kernel_next_iteration_setup.h
intern/cycles/kernel/split/kernel_scene_intersect.h
intern/cycles/kernel/split/kernel_split_common.h
intern/cycles/kernel/svm/svm_displace.h
intern/cycles/kernel/svm/svm_image.h
intern/cycles/kernel/svm/svm_tex_coord.h
intern/cycles/render/buffers.cpp
intern/cycles/render/graph.cpp
intern/cycles/render/graph.h
intern/cycles/render/image.cpp
intern/cycles/render/image.h
intern/cycles/render/mesh_subdivision.cpp
intern/cycles/render/osl.cpp
intern/cycles/render/session.cpp
intern/cycles/render/session.h
intern/cycles/render/svm.cpp
intern/cycles/render/svm.h
intern/cycles/render/tile.cpp
intern/cycles/render/tile.h
intern/cycles/util/util_atomic.h
intern/cycles/util/util_boundbox.h
intern/cycles/util/util_half.h
intern/cycles/util/util_image.h
intern/cycles/util/util_image_impl.h
intern/cycles/util/util_math.h
intern/cycles/util/util_path.cpp
intern/cycles/util/util_progress.h
intern/cycles/util/util_simd.h
intern/cycles/util/util_task.cpp
intern/cycles/util/util_types.h
intern/ghost/intern/GHOST_SystemCocoa.mm
make.bat
release/datafiles/locale
release/scripts/addons
release/scripts/presets/interface_theme/24x_blues.xml
release/scripts/presets/interface_theme/flatty_light.xml
release/scripts/startup/bl_operators/wm.py
release/scripts/startup/bl_ui/space_userpref.py
source/blender/blenkernel/BKE_library_query.h
source/blender/blenkernel/BKE_sca.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/armature.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/library_query.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/rigidbody.c
source/blender/blenkernel/intern/sca.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenlib/intern/task.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_270.c
source/blender/blenloader/intern/writefile.c
source/blender/collada/ArmatureImporter.cpp
source/blender/depsgraph/DEG_depsgraph_build.h
source/blender/depsgraph/intern/builder/deg_builder.cc
source/blender/depsgraph/intern/builder/deg_builder_cycle.cc
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/depsgraph/intern/builder/deg_builder_nodes.h
source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.h
source/blender/depsgraph/intern/builder/deg_builder_relations_keys.cc
source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc
source/blender/depsgraph/intern/debug/deg_debug_graphviz.cc
source/blender/depsgraph/intern/depsgraph.h
source/blender/depsgraph/intern/depsgraph_build.cc
source/blender/depsgraph/intern/depsgraph_eval.cc
source/blender/depsgraph/intern/eval/deg_eval.cc
source/blender/depsgraph/intern/eval/deg_eval_debug.cc
source/blender/depsgraph/intern/nodes/deg_node.cc
source/blender/depsgraph/intern/nodes/deg_node.h
source/blender/depsgraph/intern/nodes/deg_node_component.cc
source/blender/depsgraph/intern/nodes/deg_node_component.h
source/blender/depsgraph/intern/nodes/deg_node_operation.cc
source/blender/depsgraph/util/deg_util_foreach.h
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_draw.c
source/blender/editors/armature/pose_transform.c
source/blender/editors/interface/interface_layout.c
source/blender/editors/object/object_modifier.c
source/blender/editors/space_outliner/outliner_edit.c
source/blender/editors/transform/transform_snap_object.c
source/blender/gpu/shaders/gpu_shader_material.glsl
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_rigidbody_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_mesh_api.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_render.c
source/blender/makesrna/intern/rna_rigidbody.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/makesrna/intern/rna_wm_api.c
source/blender/modifiers/MOD_modifiertypes.h
source/blender/modifiers/intern/MOD_boolean.c
source/blender/modifiers/intern/MOD_normal_edit.c
source/blender/modifiers/intern/MOD_util.c
source/blender/nodes/shader/nodes/node_shader_tex_brick.c
source/blender/python/intern/bpy_rna_id_collection.c
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/source/render_result.c
source/creator/CMakeLists.txt
tests/gtests/CMakeLists.txt
tests/gtests/blenlib/BLI_string_test.cc
tests/python/CMakeLists.txt

reordered all FM related functions to the end of file

renamed "Anti-Trigger" to "Stop Trigger" in python and UI now

performance regression fix which reduces some static-static collision checking

reworked the trigger system to work in narrowphase of bullet (more exact shapes)

support for "anti-triggers" which stop movement of active rigidbody shards

using quaternions and correction of quaternion sign flips for convert to keyframes now

attempt to reduce memory usage with dynamic fracture

but somewhere a memory leak is still present there

minor fix: forgot to update frame in display when converting to keyframes

fix for wrong centroid calculation when re-using existing mesh-islands

this affected the physics mesh and the convert to keyframes function, which created incorrect results.

2.79 release: point submodules to correct branches and versions.

take position for constraint between both rigidbodies for fixed constraints now, too

skip exceeded verts in average coord calculation in keep distort mode now too

allow a bit "cleaner" cut edges when keep distort is not set, else they keep jaggy

added deform weakening factor

the threshold is multiplied with 1.0-fac per deform iteration, so it can automatically break at some point.

added additional distances and angles settings in order to control plastic deform better

refinement for plastic deformation

attempt to have "plastic" constraint deform by re-constraining via angle, distance

deformation mode happens when breakable is set to false, but angle or distance is set

fix attempt for memory leak after loading FM blends in prefractured mode

note: works only with newly saved FM files, older still have unnecessary data in them which wont be automatically cleaned

do not check constraint islands in case constraint collision is activated (allow self collision)