archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'blender2.7'

Browse Source
This commit is contained in:
Brecht Van Lommel
2019-03-01 19:29:26 +01:00
parent d16386e50b 4c3be0bf52
commit a577499c75
6 changed files with 78 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/render/extern/include/RE_engine.h vendored
View File

@@ -100,7 +100,7 @@ typedef struct RenderEngineType {
ExtensionRNA ext;
} RenderEngineType;
typedef void (*update_render_passes_cb_t)(struct RenderEngine *engine, struct Scene *scene, struct ViewLayer *view_layer,
typedef void (*update_render_passes_cb_t)(void *userdata, struct Scene *scene, struct ViewLayer *view_layer,
const char *name, int channels, const char *chanid, int type);
typedef struct RenderEngine {
@@ -128,6 +128,7 @@ typedef struct RenderEngine {
/* callback for render pass query */
ThreadMutex update_render_passes_mutex;
update_render_passes_cb_t update_render_passes_cb;
void *update_render_passes_data;
rctf last_viewplane;
rcti last_disprect;
@@ -168,7 +169,7 @@ bool RE_engine_is_external(struct Render *re);
void RE_engine_frame_set(struct RenderEngine *engine, int frame, float subframe);
void RE_engine_update_render_passes(struct RenderEngine *engine, struct Scene *scene, struct ViewLayer *view_layer,
update_render_passes_cb_t callback);
update_render_passes_cb_t callback, void *callback_data);
void RE_engine_register_pass(struct RenderEngine *engine, struct Scene *scene, struct ViewLayer *view_layer,
const char *name, int channels, const char *chanid, int type);