Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-06-18 13:36:42 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-06-18 14:59:55 +0300
commit96f0d22e3b8a2c50cdb96e82146489f26628c127 (patch)
tree2ecef745ab89b30f8ce3c59e6c85acf568a5ae8b /source/blender/blenkernel/intern/image.c
parent8c40bbb15f10601737bcd6652f0358d51102d045 (diff)
Cleanup: remove unused render buffers
Diffstat (limited to 'source/blender/blenkernel/intern/image.c')
-rw-r--r--source/blender/blenkernel/intern/image.c24
1 files changed, 3 insertions, 21 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 34e57f61a72..f3ef48cafa8 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -4135,7 +4135,6 @@ static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser, void **r_loc
ImBuf *ibuf;
int from_render = (ima->render_slot == ima->last_render_slot);
int actview;
- bool byte_buffer_in_display_space = false;
if (!(iuser && iuser->scene)) {
return NULL;
@@ -4221,16 +4220,7 @@ static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser, void **r_loc
RenderPass *rpass = image_render_pass_get(rl, pass, actview, NULL);
if (rpass) {
rectf = rpass->rect;
- if (pass == 0) {
- if (rectf == NULL) {
- /* Happens when Save Buffers is enabled.
- * Use display buffer stored in the render layer.
- */
- rect = (unsigned int *)rl->display_buffer;
- byte_buffer_in_display_space = true;
- }
- }
- else {
+ if (pass != 0) {
channels = rpass->channels;
dither = 0.0f; /* don't dither passes */
}
@@ -4261,16 +4251,8 @@ static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser, void **r_loc
* For other cases we need to be sure it stays to default byte buffer space.
*/
if (ibuf->rect != rect) {
- if (byte_buffer_in_display_space) {
- const char *colorspace = IMB_colormanagement_get_display_colorspace_name(
- &iuser->scene->view_settings, &iuser->scene->display_settings);
- IMB_colormanagement_assign_rect_colorspace(ibuf, colorspace);
- }
- else {
- const char *colorspace = IMB_colormanagement_role_colorspace_name_get(
- COLOR_ROLE_DEFAULT_BYTE);
- IMB_colormanagement_assign_rect_colorspace(ibuf, colorspace);
- }
+ const char *colorspace = IMB_colormanagement_role_colorspace_name_get(COLOR_ROLE_DEFAULT_BYTE);
+ IMB_colormanagement_assign_rect_colorspace(ibuf, colorspace);
}
/* invalidate color managed buffers if render result changed */