sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix freestyle/bplayer build (usual stub stuff).

Browse Source
This commit is contained in:
Bastien Montagne 2014-10-02 12:47:05 +02:00
parent 1b0214cb88
commit 69356b0b9b
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/freestyle/FRS_freestyle.h
View File

@ -48,7 +48,7 @@ int FRS_is_freestyle_enabled(struct SceneRenderLayer *srl);
void FRS_init_stroke_rendering(struct Render *re); void FRS_init_stroke_rendering(struct Render *re);
struct Render *FRS_do_stroke_rendering(struct Render *re, struct SceneRenderLayer *srl, int render); struct Render *FRS_do_stroke_rendering(struct Render *re, struct SceneRenderLayer *srl, int render);
void FRS_finish_stroke_rendering(struct Render *re); 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_composite_result(struct Render *re, struct SceneRenderLayer *srl, struct Render *freestyle_render);
void FRS_exit(void); void FRS_exit(void);

2
source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
View File

@ -651,7 +651,7 @@ void FRS_finish_stroke_rendering(Render *re)
controller->Clear(); controller->Clear();
} }
void FRS_free_view_map_cache() void FRS_free_view_map_cache(void)
{ {
// free cache // free cache
controller->DeleteViewMap(true); controller->DeleteViewMap(true);

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

@ -168,6 +168,7 @@ struct wmWindowManager;
#include "../blender/editors/include/UI_interface_icons.h" #include "../blender/editors/include/UI_interface_icons.h"
#include "../blender/editors/include/UI_resources.h" #include "../blender/editors/include/UI_resources.h"
#include "../blender/editors/include/UI_view2d.h" #include "../blender/editors/include/UI_view2d.h"
#include "../blender/freestyle/FRS_freestyle.h"
#include "../blender/python/BPY_extern.h" #include "../blender/python/BPY_extern.h"
#include "../blender/render/extern/include/RE_engine.h" #include "../blender/render/extern/include/RE_engine.h"
#include "../blender/render/extern/include/RE_pipeline.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 */ /* Freestyle */
bool ED_texture_context_check_linestyle(const struct bContext *C) RET_ZERO bool ED_texture_context_check_linestyle(const struct bContext *C) RET_ZERO
void FRS_free_view_map_cache(void) RET_NONE
/* texture.c */ /* 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(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