From 329b4c3363e439f1c726b79545364d154c55f39d Mon Sep 17 00:00:00 2001 From: Sebastian Parborg Date: Thu, 6 Sep 2018 16:33:41 +0200 Subject: Fix T54329: brush texture preview not working. With the removal of blender internal, the texture preview had to be rewritten. Now we evaluate and write the texture directly to the preview buffer instead of going through the renderer. Differential Revision: https://developer.blender.org/D3670 --- source/blender/render/extern/include/RE_pipeline.h | 1 + source/blender/render/intern/source/pipeline.c | 7 +++++++ 2 files changed, 8 insertions(+) (limited to 'source/blender/render') diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h index cf52bb11d59..84e6c9ddd55 100644 --- a/source/blender/render/extern/include/RE_pipeline.h +++ b/source/blender/render/extern/include/RE_pipeline.h @@ -336,6 +336,7 @@ struct RenderPass *RE_pass_find_by_type(volatile struct RenderLayer *rl, int pas void RE_GetCameraWindow(struct Render *re, struct Object *camera, int frame, float mat[4][4]); void RE_GetCameraModelMatrix(struct Render *re, struct Object *camera, float r_mat[4][4]); struct Scene *RE_GetScene(struct Render *re); +void RE_SetScene(struct Render *re, struct Scene *sce); bool RE_is_rendering_allowed(struct Scene *scene, struct ViewLayer *single_layer, struct Object *camera_override, struct ReportList *reports); diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index b6fe518b906..b9ebaa8c184 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -364,6 +364,13 @@ Scene *RE_GetScene(Render *re) return NULL; } +void RE_SetScene(Render *re, Scene* sce) +{ + if (re) { + re->scene = sce; + } +} + /** * Same as #RE_AcquireResultImage but creating the necessary views to store the result * fill provided result struct with a copy of thew views of what is done so far the -- cgit v1.2.3