Blender Git Loki
Git Commits -> Revision 98e0ec4
Revision 98e0ec4 by Martin Felke (fracture_modifier, fracture_modifier-master, temp-fracture-modifier-2.8) January 30, 2014, 18:08 (GMT) |
Merge branch 'refs/heads/boolean_fracture' into fracture Conflicts: intern/bsp/extern/CSG_BooleanOps.h intern/bsp/intern/BOP_CarveInterface.cpp |
Commit Details:
Full Hash: 98e0ec48507be6bb8a191d5f89cb488512542f68
Parent Commit: 2993b02
Lines Changed: +650, -3794
4 Added Paths:
/extern/carve/carve-capi.cc (+242, -0) (View)
/extern/carve/carve-capi.h (+120, -0) (View)
/extern/carve/carve-util.cc (+71, -0) (View)
/extern/carve/carve-util.h (+40, -0) (View)
/extern/carve/carve-capi.h (+120, -0) (View)
/extern/carve/carve-util.cc (+71, -0) (View)
/extern/carve/carve-util.h (+40, -0) (View)
9 Deleted Paths:
/intern/bsp/CMakeLists.txt (+0, -69)
/intern/bsp/intern/BOP_Interface.h (+0, -47)
/intern/bsp/intern/BSP_CSGMesh.cpp (+0, -659)
/intern/bsp/intern/BSP_CSGMesh.h (+0, -249)
/intern/bsp/intern/BSP_CSGMesh_CFIterator.h (+0, -272)
/intern/bsp/intern/BSP_MeshPrimitives.cpp (+0, -298)
/intern/bsp/intern/BSP_MeshPrimitives.h (+0, -280)
/intern/bsp/intern/CSG_BooleanOps.cpp (+0, -180)
/intern/bsp/SConscript (+0, -49)
/intern/bsp/intern/BOP_Interface.h (+0, -47)
/intern/bsp/intern/BSP_CSGMesh.cpp (+0, -659)
/intern/bsp/intern/BSP_CSGMesh.h (+0, -249)
/intern/bsp/intern/BSP_CSGMesh_CFIterator.h (+0, -272)
/intern/bsp/intern/BSP_MeshPrimitives.cpp (+0, -298)
/intern/bsp/intern/BSP_MeshPrimitives.h (+0, -280)
/intern/bsp/intern/CSG_BooleanOps.cpp (+0, -180)
/intern/bsp/SConscript (+0, -49)
7 Modified Paths:
/extern/carve/CMakeLists.txt (+4, -0) (Diff)
/intern/bsp/extern/CSG_BooleanOps.h (+0, -377) (Diff)
/intern/bsp/intern/BOP_CarveInterface.cpp (+0, -870) (Diff)
/intern/CMakeLists.txt (+0, -4) (Diff)
/source/blender/modifiers/CMakeLists.txt (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_boolean.c (+0, -4) (Diff)
/source/blender/modifiers/intern/MOD_boolean_util.c (+172, -435) (Diff)
/intern/bsp/extern/CSG_BooleanOps.h (+0, -377) (Diff)
/intern/bsp/intern/BOP_CarveInterface.cpp (+0, -870) (Diff)
/intern/CMakeLists.txt (+0, -4) (Diff)
/source/blender/modifiers/CMakeLists.txt (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_boolean.c (+0, -4) (Diff)
/source/blender/modifiers/intern/MOD_boolean_util.c (+172, -435) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021