[Bf-blender-cvs] [e4c83bc] master: Fix T46679: ZMask layers don't update w/ animation

[Campbell Barton]

Commit: e4c83bc3459847c33269557499cc891ed4f747af
Author: Campbell Barton
Date:   Tue Jan 26 23:29:51 2016 +1100
Branches: master
https://developer.blender.org/rBe4c83bc3459847c33269557499cc891ed4f747af

Fix T46679: ZMask layers don't update w/ animation

Make sure z-mask layers aren't excluded for animation evaluation.

===================================================================

M	source/blender/render/intern/source/external_engine.c

===================================================================

diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c
index 082c2ac..0286aee 100644
--- a/source/blender/render/intern/source/external_engine.c
+++ b/source/blender/render/intern/source/external_engine.c
@@ -606,7 +606,7 @@ int RE_engine_render(Render *re, int do_all)
 			if (re->r.scemode & R_SINGLE_LAYER) {
 				srl = BLI_findlink(&re->r.layers, re->r.actlay);
 				if (srl) {
-					non_excluded_lay |= ~srl->lay_exclude;
+					non_excluded_lay |= ~(srl->lay_exclude & ~srl->lay_zmask);
 
 					/* in this case we must update all because animation for
 					 * the scene has not been updated yet, and so may not be
@@ -618,7 +618,7 @@ int RE_engine_render(Render *re, int do_all)
 			else {
 				for (srl = re->r.layers.first; srl; srl = srl->next) {
 					if (!(srl->layflag & SCE_LAY_DISABLE)) {
-						non_excluded_lay |= ~srl->lay_exclude;
+						non_excluded_lay |= ~(srl->lay_exclude & ~srl->lay_zmask);
 
 						if (render_layer_exclude_animated(re->scene, srl))
 							non_excluded_lay |= ~0;