Blender Git Loki
Git Commits -> Revision 7faf3f4
Revision 7faf3f4 by Martin Felke (temp-fracture-modifier-2.8) March 2, 2019, 09:43 (GMT) |
Merge remote-tracking branch 'origin/master' into fracture_modifier-2.8 # Conflicts: # intern/cycles/blender/blender_mesh.cpp # intern/rigidbody/RBI_api.h # intern/rigidbody/rb_bullet_api.cpp # source/blender/blenkernel/BKE_rigidbody.h # source/blender/blenkernel/intern/rigidbody.c # source/blender/depsgraph/intern/builder/deg_builder_relations.cc # source/blender/draw/intern/draw_manager.c # source/blender/editors/physics/rigidbody_object.c # source/blender/makesdna/DNA_modifier_types.h # source/blender/makesdna/DNA_rigidbody_types.h # source/blender/makesrna/intern/rna_modifier.c # source/blender/makesrna/intern/rna_rigidbody.c # source/blender/modifiers/intern/MOD_boolean.c # source/blender/modifiers/intern/MOD_multires.c # source/blender/modifiers/intern/MOD_remesh.c |
Commit Details:
Full Hash: 7faf3f47363058ba4a2dfb15f180deffe706573e
Parent Commits: 0c0de34, 42faf52