Patch from Timothy Baldridge
authorNathan Letwory <nathan@letworyinteractive.com>
Tue, 21 Oct 2008 23:07:09 +0000 (23:07 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Tue, 21 Oct 2008 23:07:09 +0000 (23:07 +0000)
* add irix6 to GHOST windowing system (same as linux2 et al)
* fix faulty return lines in shrinkwrap.c

intern/ghost/SConscript
source/blender/blenkernel/intern/shrinkwrap.c
tools/btools.py

index 40968e8..f6283cf 100644 (file)
@@ -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')
index 76af9a7..28bf7ae 100644 (file)
@@ -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;
index 3112e61..7de1f47 100755 (executable)
@@ -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',