Blender Git Loki
Git Commits -> Revision 4c52ad0
Revision 4c52ad0 by Martin Felke (fracture_modifier, fracture_modifier-master, temp-fracture-modifier-2.8) August 6, 2015, 12:22 (GMT) |
Merge remote-tracking branch 'refs/remotes/origin/master' into fracture_modifier Conflicts: CMakeLists.txt build_files/cmake/macros.cmake intern/cycles/kernel/geom/geom_triangle_intersect.h intern/cycles/kernel/kernel_shader.h intern/cycles/kernel/svm/svm_closure.h release/scripts/modules/bpy_extras/io_utils.py release/scripts/startup/bl_ui/properties_data_modifier.py release/scripts/startup/bl_ui/space_view3d.py release/scripts/startup/bl_ui/space_view3d_toolbar.py source/blender/blenkernel/BKE_blender.h source/blender/blenkernel/BKE_deform.h source/blender/blenkernel/BKE_mesh_mapping.h source/blender/blenkernel/BKE_object.h source/blender/blenkernel/BKE_rigidbody.h source/blender/blenkernel/CMakeLists.txt source/blender/blenkernel/SConscript source/blender/blenkernel/intern/cdderivedmesh.c source/blender/blenkernel/intern/object.c source/blender/blenkernel/intern/rigidbody.c source/blender/blenloader/intern/readfile.c source/blender/blenloader/intern/versioning_270.c source/blender/blenloader/intern/writefile.c source/blender/editors/animation/keyframes_general.c source/blender/editors/armature/armature_edit.c source/blender/editors/gpencil/gpencil_ops.c source/blender/editors/object/object_intern.h source/blender/editors/object/object_shapekey.c source/blender/editors/space_action/action_edit.c source/blender/editors/space_view3d/view3d_draw.c source/blender/makesdna/DNA_modifier_types.h source/blender/makesrna/intern/rna_modifier.c source/blender/modifiers/MOD_modifiertypes.h source/blender/modifiers/intern/MOD_fluidsim.c source/blender/modifiers/intern/MOD_normal_edit.c source/blender/modifiers/intern/MOD_util.c source/gameengine/Converter/KX_BlenderSceneConverter.cpp |
Commit Details:
Full Hash: 4c52ad04b1d57c171833111384d90746ea0a1476
Parent Commits: 0951ea2, 2c58498