diff options
| -rw-r--r-- | intern/elbeem/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/smoke/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/BLI_string.h | 1 | ||||
| -rw-r--r-- | source/blender/editors/animation/keyframes_general.c | 2 | ||||
| -rw-r--r-- | source/blender/python/intern/bpy.c | 3 | ||||
| -rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 46 | ||||
| -rw-r--r-- | source/gameengine/GamePlayer/common/CMakeLists.txt | 1 |
7 files changed, 52 insertions, 5 deletions
diff --git a/intern/elbeem/CMakeLists.txt b/intern/elbeem/CMakeLists.txt index e45a210bd88..c8a47871637 100644 --- a/intern/elbeem/CMakeLists.txt +++ b/intern/elbeem/CMakeLists.txt @@ -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) diff --git a/intern/smoke/CMakeLists.txt b/intern/smoke/CMakeLists.txt index 8579c76b322..33dcd5be4bc 100644 --- a/intern/smoke/CMakeLists.txt +++ b/intern/smoke/CMakeLists.txt @@ -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) diff --git a/source/blender/blenlib/BLI_string.h b/source/blender/blenlib/BLI_string.h index c722ffb1693..39123a438df 100644 --- a/source/blender/blenlib/BLI_string.h +++ b/source/blender/blenlib/BLI_string.h @@ -128,6 +128,7 @@ char *BLI_strcasestr(const char *s, const char *find); 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 */ diff --git a/source/blender/editors/animation/keyframes_general.c b/source/blender/editors/animation/keyframes_general.c index ae2c617bc80..1784c6ef32c 100644 --- a/source/blender/editors/animation/keyframes_general.c +++ b/source/blender/editors/animation/keyframes_general.c @@ -374,7 +374,7 @@ void sample_fcurve (FCurve *fcu) 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++) { diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c index 4df14a1f603..222e41c3bb8 100644 --- a/source/blender/python/intern/bpy.c +++ b/source/blender/python/intern/bpy.c @@ -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" diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 0235d22465e..00c827bab94 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -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 uiTemplateImage(struct uiLayout *layout, struct bContext *C, struct Pointer 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;} diff --git a/source/gameengine/GamePlayer/common/CMakeLists.txt b/source/gameengine/GamePlayer/common/CMakeLists.txt index 418b77357a4..909aebfc387 100644 --- a/source/gameengine/GamePlayer/common/CMakeLists.txt +++ b/source/gameengine/GamePlayer/common/CMakeLists.txt @@ -67,7 +67,6 @@ SET(INC ../../../../source/blender/gpu ../../../../extern/glew/include ${PYTHON_INC} - ${PNG_INC} ${ZLIB_INC} ) |