diff options
| author | Thomas Beck <software@plasmasolutions.de> | 2014-05-03 14:49:21 +0400 |
|---|---|---|
| committer | Thomas Beck <software@plasmasolutions.de> | 2014-05-03 14:51:51 +0400 |
| commit | 0cd49fde56ba61a4a530555798afd67a8fe0aabc (patch) | |
| tree | 1bc5b0e48b6a33b8b24518d4cf23142c9a4a554d | |
| parent | a4408f405d914464e1085e07a52cba85b88afcc7 (diff) | |
Make blenderplayer compilable again after recent commit b7f085d9c128f31d576c732c6439b5a71e8922ee by Tamito.
Inserted a stub in stub.c and added the struct keyword to make gcc happy
| -rw-r--r-- | source/blender/editors/include/ED_buttons.h | 2 | ||||
| -rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/include/ED_buttons.h b/source/blender/editors/include/ED_buttons.h index 0e245c71609..64c16605dec 100644 --- a/source/blender/editors/include/ED_buttons.h +++ b/source/blender/editors/include/ED_buttons.h @@ -34,7 +34,7 @@ bool ED_texture_context_check_world(const struct bContext *C); bool ED_texture_context_check_material(const struct bContext *C); bool ED_texture_context_check_lamp(const struct bContext *C); bool ED_texture_context_check_particles(const struct bContext *C); -bool ED_texture_context_check_linestyle(const bContext *C); +bool ED_texture_context_check_linestyle(const struct bContext *C); bool ED_texture_context_check_others(const struct bContext *C); #endif /* __ED_BUTTONS_H__ */ diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 943ecf4460c..2c1e960b4db 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -226,6 +226,9 @@ void RE_zbuf_accumulate_vecblur(struct NodeBlurData *nbd, int xsize, int ysize, /* imagetexture.c stub */ void ibuf_sample(struct ImBuf *ibuf, float fx, float fy, float dx, float dy, float *result) RET_NONE +/* Freestyle */ +bool ED_texture_context_check_linestyle(const struct bContext *C) RET_ZERO + /* texture.c */ int multitex_ext(struct Tex *tex, float texvec[3], float dxt[3], float dyt[3], int osatex, struct TexResult *texres, struct ImagePool *pool, bool scene_color_manage) RET_ZERO int multitex_ext_safe(struct Tex *tex, float texvec[3], struct TexResult *texres, struct ImagePool *pool, bool scene_color_manage) RET_ZERO |