diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-10-02 14:47:05 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-10-02 14:47:05 +0400 |
| commit | 69356b0b9b89a555a7e73baf821ad0d979b864ce (patch) | |
| tree | e25cb3c6900efcb576df01dfd249444ad84190ed | |
| parent | 1b0214cb882985e4867bddce128a4b2d4f89660a (diff) | |
Fix freestyle/bplayer build (usual stub stuff).
| -rw-r--r-- | source/blender/freestyle/FRS_freestyle.h | 2 | ||||
| -rw-r--r-- | source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp | 2 | ||||
| -rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/freestyle/FRS_freestyle.h b/source/blender/freestyle/FRS_freestyle.h index 1815883bf0d..9766372507b 100644 --- a/source/blender/freestyle/FRS_freestyle.h +++ b/source/blender/freestyle/FRS_freestyle.h @@ -48,7 +48,7 @@ int FRS_is_freestyle_enabled(struct SceneRenderLayer *srl); void FRS_init_stroke_rendering(struct Render *re); struct Render *FRS_do_stroke_rendering(struct Render *re, struct SceneRenderLayer *srl, int render); void FRS_finish_stroke_rendering(struct Render *re); -void FRS_free_view_map_cache(); +void FRS_free_view_map_cache(void); void FRS_composite_result(struct Render *re, struct SceneRenderLayer *srl, struct Render *freestyle_render); void FRS_exit(void); diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp index 7443da77399..4dd4598cc91 100644 --- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp +++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp @@ -651,7 +651,7 @@ void FRS_finish_stroke_rendering(Render *re) controller->Clear(); } -void FRS_free_view_map_cache() +void FRS_free_view_map_cache(void) { // free cache controller->DeleteViewMap(true); diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 97e7d99c802..84cd47ca61a 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -168,6 +168,7 @@ struct wmWindowManager; #include "../blender/editors/include/UI_interface_icons.h" #include "../blender/editors/include/UI_resources.h" #include "../blender/editors/include/UI_view2d.h" +#include "../blender/freestyle/FRS_freestyle.h" #include "../blender/python/BPY_extern.h" #include "../blender/render/extern/include/RE_engine.h" #include "../blender/render/extern/include/RE_pipeline.h" @@ -229,6 +230,7 @@ void ibuf_sample(struct ImBuf *ibuf, float fx, float fy, float dx, float dy, flo /* Freestyle */ bool ED_texture_context_check_linestyle(const struct bContext *C) RET_ZERO +void FRS_free_view_map_cache(void) RET_NONE /* 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 |