Blender Git Loki
Git Commits -> Revision a04214d
Revision a04214d by Martin Felke (fracture_modifier, fracture_modifier-master, temp-fracture-modifier-2.8) April 16, 2014, 09:05 (GMT) |
Merge remote-tracking branch 'refs/remotes/origin/master' into fracture_modifier Conflicts: extern/carve/carve-capi.cc extern/carve/carve-capi.h extern/carve/carve-util.cc extern/carve/carve-util.h extern/carve/patches/series intern/bsp/intern/BSP_CSGException.h release/datafiles/locale source/blender/blenkernel/BKE_mesh.h source/blender/editors/space_view3d/view3d_select.c source/blender/makesrna/intern/rna_fracture.c source/blender/modifiers/intern/MOD_boolean_util.c source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLLight.h |
Commit Details:
Full Hash: a04214d1074c15037f88f360ef68fd19594c35d2
Parent Commits: cc8bb23, d050577