diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-25 16:07:17 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-25 16:07:17 +0300 |
commit | b1532493c27b08444745cef348641f3a0e899ba8 (patch) | |
tree | 84db57081ef3e1d2a1bfbf3c4bbfe352854164f2 /source/blenderplayer | |
parent | 9186b9ae4806f4bbc1a14417c408e844f8e8cc1a (diff) | |
parent | e7721f5ec8b859d14c982a8a34bc269ab7eed82b (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/BKE_particle.h
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/particle.c
Diffstat (limited to 'source/blenderplayer')
-rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 37e9c7eae7a..8e3aace7fff 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -245,7 +245,7 @@ bool RE_HasFakeLayer(RenderResult *res) RET_ZERO /* zbuf.c stub */ void antialias_tagbuf(int xsize, int ysize, char *rectmove) RET_NONE -void RE_zbuf_accumulate_vecblur(struct NodeBlurData *nbd, int xsize, int ysize, float *newrect, float *imgrect, float *vecbufrect, float *zbufrect) RET_NONE +void RE_zbuf_accumulate_vecblur(struct NodeBlurData *nbd, int xsize, int ysize, float *newrect, const float *imgrect, float *vecbufrect, const float *zbufrect) RET_NONE /* imagetexture.c stub */ void ibuf_sample(struct ImBuf *ibuf, float fx, float fy, float dx, float dy, float *result) RET_NONE @@ -307,6 +307,8 @@ void WM_operator_handlers_clear(wmWindowManager *wm, struct wmOperatorType *ot) void WM_autosave_init(wmWindowManager *wm) RET_NONE void WM_jobs_kill_all_except(struct wmWindowManager *wm, void *owner) RET_NONE +void WM_lib_reload(struct Library *lib, struct bContext *C, struct ReportList *reports) RET_NONE + char *WM_clipboard_text_get(bool selection, int *r_len) RET_NULL char *WM_clipboard_text_get_firstline(bool selection, int *r_len) RET_NULL void WM_clipboard_text_set(const char *buf, bool selection) RET_NONE |