diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2008-10-22 03:07:09 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2008-10-22 03:07:09 +0400 |
| commit | 71206c9337ec88d8711fa66c128fe464cf27e451 (patch) | |
| tree | 570102e52ff79db06f050a208c3aec667f9290dc | |
| parent | 7a4e9d97fff0a795a3ab076702d8b856b2e5bf62 (diff) | |
Patch from Timothy Baldridge
* add irix6 to GHOST windowing system (same as linux2 et al)
* fix faulty return lines in shrinkwrap.c
| -rw-r--r-- | intern/ghost/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/shrinkwrap.c | 12 | ||||
| -rwxr-xr-x | tools/btools.py | 4 |
3 files changed, 13 insertions, 5 deletions
diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index 40968e816a9..f6283cfc0f2 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -10,7 +10,7 @@ sources = env.Glob('intern/*.cpp') pf = ['GHOST_DisplayManager', 'GHOST_System', 'GHOST_Window'] -if window_system in ('linux2', 'openbsd3', 'sunos5', 'freebsd6'): +if window_system in ('linux2', 'openbsd3', 'sunos5', 'freebsd6', 'irix6'): for f in pf: sources.remove('intern' + os.sep + f + 'Win32.cpp') sources.remove('intern' + os.sep + f + 'Carbon.cpp') diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c index 76af9a763ee..28bf7aee884 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.c +++ b/source/blender/blenkernel/intern/shrinkwrap.c @@ -215,7 +215,11 @@ void shrinkwrap_calc_nearest_vertex(ShrinkwrapCalcData *calc) BENCH(bvhtree_from_mesh_verts(&treeData, calc->target, 0.0, 2, 6)); - if(treeData.tree == NULL) return OUT_OF_MEMORY(); + if(treeData.tree == NULL) + { + OUT_OF_MEMORY(); + return; + } //Setup nearest nearest.index = -1; @@ -526,7 +530,11 @@ void shrinkwrap_calc_nearest_surface_point(ShrinkwrapCalcData *calc) //Create a bvh-tree of the given target BENCH(bvhtree_from_mesh_faces( &treeData, calc->target, 0.0, 2, 6)); - if(treeData.tree == NULL) return OUT_OF_MEMORY(); + if(treeData.tree == NULL) + { + OUT_OF_MEMORY(); + return; + } //Setup nearest nearest.index = -1; diff --git a/tools/btools.py b/tools/btools.py index 3112e61918a..7de1f47a91c 100755 --- a/tools/btools.py +++ b/tools/btools.py @@ -53,8 +53,8 @@ def validate_arguments(args, bc): 'WITH_BF_FTGL', 'BF_FTGL', 'BF_FTGL_INC', 'BF_FTGL_LIB', 'WITH_BF_PLAYER', 'WITH_BF_NOBLENDER', - 'WITH_BF_BINRELOC', - 'CFLAGS', 'CCFLAGS', 'CPPFLAGS', + 'WITH_BF_BINRELOC', + 'CFLAGS', 'CCFLAGS', 'CPPFLAGS', 'REL_CFLAGS', 'REL_CCFLAGS', 'C_WARN', 'CC_WARN', 'LLIBS', 'PLATFORM_LINKFLAGS', 'BF_PROFILE_FLAGS', 'LCGDIR', |