diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2015-04-27 18:09:04 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2015-04-27 18:10:35 +0300 |
| commit | 4a80c4faded742aeebc2852f23e210163a5759dc (patch) | |
| tree | 713447b5839c973e307e0dbdd3350c3cce9f341f | |
| parent | f809eef968c997dc00ffccd10bb0b1221d66d05a (diff) | |
Multi-View: Code cleanup
I finally put the time into understanding what was going on here.
Basically RE_AcquireResultImage() produces RenderResults without
RenderViews. That will be fine for now since I'm planning to refactor
RenderResult soon.
| -rw-r--r-- | source/blender/blenkernel/intern/image.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index d76537ab696..162f45379d8 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -3569,26 +3569,26 @@ static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser, void **lock_ if (from_render) { BLI_lock_thread(LOCK_VIEWER); *lock_r = re; + rv = NULL; + } + else { + rv = BLI_findlink(&rres.views, actview); + if (rv == NULL) + rv = rres.views.first; } - rv = BLI_findlink(&rres.views, actview); - if (rv == NULL) - rv = rres.views.first; - - if (rv != NULL) { - /* this gives active layer, composite or sequence result */ + /* this gives active layer, composite or sequence result */ + if (rv == NULL) { + rect = (unsigned int *)rres.rect32; + rectf = rres.rectf; + rectz = rres.rectz; + } + else { rect = (unsigned int *)rv->rect32; rectf = rv->rectf; rectz = rv->rectz; } - else { - /* XXX This should never happen, yet it does - T44498, T44514 - * I'm waiting to investigate more, but meanwhile this fix - * the immediate issue */ - rect = NULL; - rectf = NULL; - rectz = NULL; - } + dither = iuser->scene->r.dither_intensity; /* combined layer gets added as first layer */ |