[Bf-blender-cvs] [0cd49fd] master: Make blenderplayer compilable again after recent commit b7f085d9c128f31d576c732c6439b5a71e8922ee by Tamito.

Thomas Beck noreply at git.blender.org
Sat May 3 12:52:20 CEST 2014


Commit: 0cd49fde56ba61a4a530555798afd67a8fe0aabc
Author: Thomas Beck
Date:   Sat May 3 12:49:21 2014 +0200
https://developer.blender.org/rB0cd49fde56ba61a4a530555798afd67a8fe0aabc

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

===================================================================

M	source/blender/editors/include/ED_buttons.h
M	source/blenderplayer/bad_level_call_stubs/stubs.c

===================================================================

diff --git a/source/blender/editors/include/ED_buttons.h b/source/blender/editors/include/ED_buttons.h
index 0e245c7..64c1660 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 943ecf4..2c1e960 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




More information about the Bf-blender-cvs mailing list