[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27251] trunk/blender: fix for minor errors/warnings

[Campbell Barton]

Revision: 27251
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27251
Author:   campbellbarton
Date:     2010-03-03 14:59:57 +0100 (Wed, 03 Mar 2010)

Log Message:
-----------
fix for minor errors/warnings

Modified Paths:
--------------
    trunk/blender/intern/elbeem/CMakeLists.txt
    trunk/blender/intern/smoke/CMakeLists.txt
    trunk/blender/source/blender/blenlib/BLI_string.h
    trunk/blender/source/blender/editors/animation/keyframes_general.c
    trunk/blender/source/blender/python/intern/bpy.c
    trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
    trunk/blender/source/gameengine/GamePlayer/common/CMakeLists.txt

Modified: trunk/blender/intern/elbeem/CMakeLists.txt
===================================================================
--- trunk/blender/intern/elbeem/CMakeLists.txt	2010-03-03 13:20:18 UTC (rev 27250)
+++ trunk/blender/intern/elbeem/CMakeLists.txt	2010-03-03 13:59:57 UTC (rev 27251)
@@ -24,7 +24,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC ${PNG_INC} ${ZLIB_INC} extern)
+SET(INC ${ZLIB_INC} extern)
 
 FILE(GLOB SRC intern/*.cpp)
 

Modified: trunk/blender/intern/smoke/CMakeLists.txt
===================================================================
--- trunk/blender/intern/smoke/CMakeLists.txt	2010-03-03 13:20:18 UTC (rev 27250)
+++ trunk/blender/intern/smoke/CMakeLists.txt	2010-03-03 13:59:57 UTC (rev 27251)
@@ -24,7 +24,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC ${PNG_INC} ${ZLIB_INC} intern ../../extern/bullet2/src ../memutil ../guardealloc)
+SET(INC ${ZLIB_INC} intern ../../extern/bullet2/src ../memutil ../guardealloc)
 
 FILE(GLOB SRC intern/*.cpp)
 

Modified: trunk/blender/source/blender/blenlib/BLI_string.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_string.h	2010-03-03 13:20:18 UTC (rev 27250)
+++ trunk/blender/source/blender/blenlib/BLI_string.h	2010-03-03 13:59:57 UTC (rev 27251)
@@ -128,6 +128,7 @@
 int BLI_strcasecmp(const char *s1, const char *s2);
 int BLI_strncasecmp(const char *s1, const char *s2, int n);
 int BLI_natstrcmp(const char *s1, const char *s2);
+size_t BLI_strnlen(const char *str, size_t maxlen);
 
 void BLI_timestr(double _time, char *str); /* time var is global */
 

Modified: trunk/blender/source/blender/editors/animation/keyframes_general.c
===================================================================
--- trunk/blender/source/blender/editors/animation/keyframes_general.c	2010-03-03 13:20:18 UTC (rev 27250)
+++ trunk/blender/source/blender/editors/animation/keyframes_general.c	2010-03-03 13:59:57 UTC (rev 27251)
@@ -374,7 +374,7 @@
 	int i, n, nIndex;
 
 	if(fcu->bezt==NULL) /* ignore baked */
-		return NULL;
+		return;
 	
 	/* find selected keyframes... once pair has been found, add keyframes  */
 	for (i=0, bezt=fcu->bezt; i < fcu->totvert; i++, bezt++) {

Modified: trunk/blender/source/blender/python/intern/bpy.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy.c	2010-03-03 13:20:18 UTC (rev 27250)
+++ trunk/blender/source/blender/python/intern/bpy.c	2010-03-03 13:59:57 UTC (rev 27251)
@@ -26,7 +26,8 @@
  * a script writer should never directly access this module */
  
 #include <Python.h>
- 
+
+#include "bpy_util.h" 
 #include "bpy_rna.h"
 #include "bpy_app.h"
 #include "bpy_props.h"

Modified: trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
--- trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c	2010-03-03 13:20:18 UTC (rev 27250)
+++ trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c	2010-03-03 13:59:57 UTC (rev 27251)
@@ -32,6 +32,51 @@
 #include "DNA_listBase.h"
 #include "RNA_types.h"
 
+struct ARegion;
+struct ARegionType;
+struct Base;
+struct CSG_FaceIteratorDescriptor;
+struct CSG_VertexIteratorDescriptor;
+struct ColorBand;
+struct CurveMapping;
+struct EditBone;
+struct EditMesh;
+struct ID;
+struct ImBuf;
+struct Image;
+struct ImageUser;
+struct LOD_Decimation_Info;
+struct MTex;
+struct Main;
+struct Material;
+struct MenuType;
+struct Mesh;
+struct ModifierData;
+struct NodeBlurData;
+struct Object;
+struct Render;
+struct RenderEngine;
+struct RenderLayer;
+struct RenderResult;
+struct ScrArea;
+struct ShadeInput;
+struct ShadeResult;
+struct SpaceImage;
+struct Tex;
+struct TexResult;
+struct Text;
+struct bAction;
+struct bArmature;
+struct bConstraint;
+struct bNode;
+struct bPoseChannel;
+struct uiLayout;
+struct wmEvent;
+struct wmKeyConfig;
+struct wmKeyMap;
+struct wmOperator;
+struct wmWindowManager;
+
 /*new render funcs */
 float *RE_RenderLayerGetPass(struct RenderLayer *rl, int passtype) {return NULL;}
 float RE_filter_value(int type, float x) {return 0.0f;}
@@ -235,6 +280,7 @@
 void uiTemplateDopeSheetFilter(struct uiLayout *layout, struct bContext *C, struct PointerRNA *ptr){}
 void uiTemplateColorWheel(struct uiLayout *layout, struct PointerRNA *ptr, char *propname, int value_slider){}
 void uiTemplateHistogram(struct uiLayout *layout, struct PointerRNA *ptr, char *propname, int expand){}
+void uiTemplateReportsBanner(struct uiLayout *layout, struct bContext *C, struct wmOperator *op){}
 
 /* rna render */
 struct RenderResult *RE_engine_begin_result(struct RenderEngine *engine, int x, int y, int w, int h){return (struct RenderResult *) NULL;}

Modified: trunk/blender/source/gameengine/GamePlayer/common/CMakeLists.txt
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/common/CMakeLists.txt	2010-03-03 13:20:18 UTC (rev 27250)
+++ trunk/blender/source/gameengine/GamePlayer/common/CMakeLists.txt	2010-03-03 13:59:57 UTC (rev 27251)
@@ -67,7 +67,6 @@
 	../../../../source/blender/gpu
 	../../../../extern/glew/include
 	${PYTHON_INC}
-	${PNG_INC}
 	${ZLIB_INC}
 )