[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11255] branches/soc-2007-maike/source/ blender: More Mac bugfixes

[Miguel Torres Lima]

Revision: 11255
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11255
Author:   maike
Date:     2007-07-12 20:29:36 +0200 (Thu, 12 Jul 2007)

Log Message:
-----------
More Mac bugfixes

Modified Paths:
--------------
    branches/soc-2007-maike/source/blender/include/BIF_glsl_util.h
    branches/soc-2007-maike/source/blender/src/glsl_util.c

Modified: branches/soc-2007-maike/source/blender/include/BIF_glsl_util.h
===================================================================
--- branches/soc-2007-maike/source/blender/include/BIF_glsl_util.h	2007-07-12 18:23:26 UTC (rev 11254)
+++ branches/soc-2007-maike/source/blender/include/BIF_glsl_util.h	2007-07-12 18:29:36 UTC (rev 11255)
@@ -24,7 +24,7 @@
 void glsl_error(int type, char *text, char *msg);
 
 #ifdef __APPLE__
-int glsl_uniform_location(unsigned long program, char *name);
+long glsl_uniform_location(unsigned long program, char *name);
 #else
 int glsl_uniform_location(unsigned int program, char *name);
 #endif

Modified: branches/soc-2007-maike/source/blender/src/glsl_util.c
===================================================================
--- branches/soc-2007-maike/source/blender/src/glsl_util.c	2007-07-12 18:23:26 UTC (rev 11254)
+++ branches/soc-2007-maike/source/blender/src/glsl_util.c	2007-07-12 18:29:36 UTC (rev 11255)
@@ -8,6 +8,7 @@
 #include "BIF_glsl_material.h"
 #include "BIF_glsl_util.h"
 #include "BIF_glsl_program.h"
+#include "BIF_glutil.h"
 
 #include "DNA_object_types.h"
 #include "DNA_material_types.h"