[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17155] trunk/blender: Patch from Timothy Baldridge

[Nathan Letwory]

Revision: 17155
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17155
Author:   jesterking
Date:     2008-10-22 01:07:09 +0200 (Wed, 22 Oct 2008)

Log Message:
-----------
Patch from Timothy Baldridge
* add irix6 to GHOST windowing system (same as linux2 et al)
* fix faulty return lines in shrinkwrap.c

Modified Paths:
--------------
    trunk/blender/intern/ghost/SConscript
    trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c
    trunk/blender/tools/btools.py

Modified: trunk/blender/intern/ghost/SConscript
===================================================================
--- trunk/blender/intern/ghost/SConscript	2008-10-21 22:48:11 UTC (rev 17154)
+++ trunk/blender/intern/ghost/SConscript	2008-10-21 23:07:09 UTC (rev 17155)
@@ -10,7 +10,7 @@
 
 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')

Modified: trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c	2008-10-21 22:48:11 UTC (rev 17154)
+++ trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c	2008-10-21 23:07:09 UTC (rev 17155)
@@ -215,7 +215,11 @@
 
 
 	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 @@
 
 	//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;

Modified: trunk/blender/tools/btools.py
===================================================================
--- trunk/blender/tools/btools.py	2008-10-21 22:48:11 UTC (rev 17154)
+++ trunk/blender/tools/btools.py	2008-10-21 23:07:09 UTC (rev 17155)
@@ -53,8 +53,8 @@
             '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',