Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix for minor errors/warnings

Browse Source
This commit is contained in:
Campbell Barton
2010-03-03 13:59:57 +00:00
parent ca7b6e2cd0
commit f09efddcda
7 changed files with 52 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/elbeem/CMakeLists.txt
View File

@@ -24,7 +24,7 @@
# #
# ***** END GPL LICENSE BLOCK ***** # ***** END GPL LICENSE BLOCK *****
SET(INC ${PNG_INC} ${ZLIB_INC} extern) SET(INC ${ZLIB_INC} extern)
FILE(GLOB SRC intern/*.cpp) FILE(GLOB SRC intern/*.cpp)

2
intern/smoke/CMakeLists.txt
View File

@@ -24,7 +24,7 @@
# #
# ***** END GPL LICENSE BLOCK ***** # ***** 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) FILE(GLOB SRC intern/*.cpp)

1
source/blender/blenlib/BLI_string.h
View File

@@ -128,6 +128,7 @@ char *BLI_strcasestr(const char *s, const char *find);
int BLI_strcasecmp(const char *s1, const char *s2); int BLI_strcasecmp(const char *s1, const char *s2);
int BLI_strncasecmp(const char *s1, const char *s2, int n); int BLI_strncasecmp(const char *s1, const char *s2, int n);
int BLI_natstrcmp(const char *s1, const char *s2); 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 */ void BLI_timestr(double _time, char *str); /* time var is global */

2
source/blender/editors/animation/keyframes_general.c
View File

@@ -374,7 +374,7 @@ void sample_fcurve (FCurve *fcu)
int i, n, nIndex; int i, n, nIndex;
if(fcu->bezt==NULL) /* ignore baked */ if(fcu->bezt==NULL) /* ignore baked */
return NULL; return;
/* find selected keyframes... once pair has been found, add keyframes */ /* find selected keyframes... once pair has been found, add keyframes */
for (i=0, bezt=fcu->bezt; i < fcu->totvert; i++, bezt++) { for (i=0, bezt=fcu->bezt; i < fcu->totvert; i++, bezt++) {

1
source/blender/python/intern/bpy.c
View File

@@ -27,6 +27,7 @@
#include <Python.h> #include <Python.h>
#include "bpy_util.h"
#include "bpy_rna.h" #include "bpy_rna.h"
#include "bpy_app.h" #include "bpy_app.h"
#include "bpy_props.h" #include "bpy_props.h"

46
source/blenderplayer/bad_level_call_stubs/stubs.c
View File

@@ -32,6 +32,51 @@
#include "DNA_listBase.h" #include "DNA_listBase.h"
#include "RNA_types.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 */ /*new render funcs */
float *RE_RenderLayerGetPass(struct RenderLayer *rl, int passtype) {return NULL;} float *RE_RenderLayerGetPass(struct RenderLayer *rl, int passtype) {return NULL;}
float RE_filter_value(int type, float x) {return 0.0f;} 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 uiTemplateDopeSheetFilter(struct uiLayout *layout, struct bContext *C, struct PointerRNA *ptr){}
void uiTemplateColorWheel(struct uiLayout *layout, struct PointerRNA *ptr, char *propname, int value_slider){} 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 uiTemplateHistogram(struct uiLayout *layout, struct PointerRNA *ptr, char *propname, int expand){}
void uiTemplateReportsBanner(struct uiLayout *layout, struct bContext *C, struct wmOperator *op){}
/* rna render */ /* rna render */
struct RenderResult *RE_engine_begin_result(struct RenderEngine *engine, int x, int y, int w, int h){return (struct RenderResult *) NULL;} struct RenderResult *RE_engine_begin_result(struct RenderEngine *engine, int x, int y, int w, int h){return (struct RenderResult *) NULL;}

1
source/gameengine/GamePlayer/common/CMakeLists.txt
View File

@@ -67,7 +67,6 @@ SET(INC
../../../../source/blender/gpu ../../../../source/blender/gpu
../../../../extern/glew/include ../../../../extern/glew/include
${PYTHON_INC} ${PYTHON_INC}
${PNG_INC}
${ZLIB_INC} ${ZLIB_INC}
) )