[Bf-blender-cvs] [69356b0] master: Fix freestyle/bplayer build (usual stub stuff).
Bastien Montagne
noreply at git.blender.org
Thu Oct 2 12:47:34 CEST 2014
Commit: 69356b0b9b89a555a7e73baf821ad0d979b864ce
Author: Bastien Montagne
Date: Thu Oct 2 12:47:05 2014 +0200
Branches: master
https://developer.blender.org/rB69356b0b9b89a555a7e73baf821ad0d979b864ce
Fix freestyle/bplayer build (usual stub stuff).
===================================================================
M source/blender/freestyle/FRS_freestyle.h
M source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
M source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
diff --git a/source/blender/freestyle/FRS_freestyle.h b/source/blender/freestyle/FRS_freestyle.h
index 1815883..9766372 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 7443da7..4dd4598 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 97e7d99..84cd47c 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
More information about the Bf-blender-cvs
mailing list