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

Merge branch 'master' into blender2.8

Browse Source 
Conflicts:
	source/blender/blenloader/intern/versioning_270.c
	source/blender/depsgraph/intern/depsgraph_tag.cc
	source/blender/editors/mask/mask_draw.c
This commit is contained in:
Bastien Montagne
2017-05-19 09:36:14 +02:00
parent f95828a018 4a04d7ae89
commit 1f46da922a
49 changed files with 599 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/render/intern/source/envmap.c
View File

@@ -62,6 +62,7 @@
#include "renderpipeline.h"
#include "texture.h"
#include "zbuf.h"
#include "render_result.h"
/* ------------------------------------------------------------------------- */
@@ -143,8 +144,8 @@ static Render *envmap_render_copy(Render *re, EnvMap *env)
/* set up renderdata */
render_copy_renderdata(&envre->r, &re->r);
envre->r.mode &= ~(R_BORDER | R_PANORAMA | R_ORTHO | R_MBLUR);
BLI_listbase_clear(&envre->r.layers);
BLI_listbase_clear(&envre->r.views);
BLI_freelistN(&envre->r.layers);
BLI_freelistN(&envre->r.views);
envre->r.filtertype = 0;
envre->r.tilex = envre->r.xsch / 2;
envre->r.tiley = envre->r.ysch / 2;
@@ -491,11 +492,18 @@ static void render_envmap(Render *re, EnvMap *env)
env_rotate_scene(envre, tmat, 0);
if (re->test_break(re->tbh) == 0) {
RenderLayer *rl = envre->result->layers.first;
int y;
float *alpha;
float *rect;
if (envre->result->do_exr_tile) {
BLI_rw_mutex_lock(&envre->resultmutex, THREAD_LOCK_WRITE);
render_result_exr_file_end(envre);
BLI_rw_mutex_unlock(&envre->resultmutex);
}
RenderLayer *rl = envre->result->layers.first;
/* envmap is rendered independently of multiview */
rect = RE_RenderLayerGetPass(rl, RE_PASSNAME_COMBINED, "");
ibuf = IMB_allocImBuf(envre->rectx, envre->recty, 24, IB_rect | IB_rectfloat);