diff options
| author | Andre Susano Pinto <andresusanopinto@gmail.com> | 2008-08-06 20:50:07 +0400 |
|---|---|---|
| committer | Andre Susano Pinto <andresusanopinto@gmail.com> | 2008-08-06 20:50:07 +0400 |
| commit | 523634ca17a392a49e324244ee6f35ac2359544b (patch) | |
| tree | 38a0b55844b78c4750dfb5de9673ff34b60aa2e4 /intern | |
| parent | e57c5ef56c306fe495346525fb9d1f9bcf8cfd2b (diff) | |
svn merge -r 15908:15988 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/boolop/SConscript | 2 | ||||
| -rw-r--r-- | intern/boolop/intern/BOP_Interface.cpp | 2 | ||||
| -rw-r--r-- | intern/boolop/make/msvc_7_0/boolop.vcproj | 9 | ||||
| -rw-r--r-- | intern/bsp/SConscript | 2 |
4 files changed, 12 insertions, 3 deletions
diff --git a/intern/boolop/SConscript b/intern/boolop/SConscript index a3f3c0b6433..bec263f251f 100644 --- a/intern/boolop/SConscript +++ b/intern/boolop/SConscript @@ -8,7 +8,7 @@ incs += ' ../../source/blender/makesdna ../../intern/guardedalloc' incs += ' ../../source/blender/blenlib' if (env['OURPLATFORM'] == 'win32-mingw'): - env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype=['common','intern'], priority = [5,50] ) + env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype=['common','intern'], priority = [30,85] ) else: env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype='common', priority = 5 ) diff --git a/intern/boolop/intern/BOP_Interface.cpp b/intern/boolop/intern/BOP_Interface.cpp index 898ca708204..c6bcb4a74ce 100644 --- a/intern/boolop/intern/BOP_Interface.cpp +++ b/intern/boolop/intern/BOP_Interface.cpp @@ -37,7 +37,7 @@ #include "BOP_Chrono.h" #if defined(BOP_ORIG_MERGE) && defined(BOP_NEW_MERGE) -#include "../../source/blender/blenkernel/BKE_global.h" +#include "../../../source/blender/blenkernel/BKE_global.h" #endif BoolOpState BOP_intersectionBoolOp(BOP_Mesh* meshC, diff --git a/intern/boolop/make/msvc_7_0/boolop.vcproj b/intern/boolop/make/msvc_7_0/boolop.vcproj index 7ae417e42d5..6e6d6abeb43 100644 --- a/intern/boolop/make/msvc_7_0/boolop.vcproj +++ b/intern/boolop/make/msvc_7_0/boolop.vcproj @@ -279,6 +279,9 @@ ECHO Done RelativePath="..\..\intern\BOP_Merge.cpp"> </File> <File + RelativePath="..\..\intern\BOP_Merge2.cpp"> + </File> + <File RelativePath="..\..\intern\BOP_Mesh.cpp"> </File> <File @@ -331,9 +334,15 @@ ECHO Done RelativePath="..\..\intern\BOP_Merge.h"> </File> <File + RelativePath="..\..\intern\BOP_Merge2.h"> + </File> + <File RelativePath="..\..\intern\BOP_Mesh.h"> </File> <File + RelativePath="..\..\intern\BOP_Misc.h"> + </File> + <File RelativePath="..\..\intern\BOP_Segment.h"> </File> <File diff --git a/intern/bsp/SConscript b/intern/bsp/SConscript index 88d2529ae59..39f278625a9 100644 --- a/intern/bsp/SConscript +++ b/intern/bsp/SConscript @@ -6,7 +6,7 @@ sources = env.Glob('intern/*.cpp') incs = 'intern ../container ../moto/include ../memutil' if (env['OURPLATFORM'] == 'win32-mingw'): - env.BlenderLib ('blender_BSP', sources, Split(incs), [], libtype=['common','intern'], priority=[26,26] ) + env.BlenderLib ('blender_BSP', sources, Split(incs), [], libtype=['common','intern'], priority=[26,69] ) else: env.BlenderLib ('blender_BSP', sources, Split(incs), [], libtype='core', priority=26 ) |