Depsgraph: more tweaks to last commit to get it actually working

int more complex files.

1 files changed, 3 insertions, 3 deletions

diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index c59569d88f1..155cc2af05e 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -1780,7 +1780,7 @@ static void flush_update_node(DagNode *node, unsigned int layer, int curtime)
 	
 	ob= node->ob;
 	if(ob && (ob->recalc & OB_RECALC)) {
-		all_layer= ob->lay;
+		all_layer= node->scelay;
 
 		/* got an object node that changes, now check relations */
 		for(itA = node->child; itA; itA= itA->next) {
@@ -1935,7 +1935,7 @@ void DAG_scene_flush_update(Scene *sce, unsigned int lay, int time)
 	   they ared still used for rendering or setting the camera view */
 	if(sce->camera) {
 		node= dag_get_node(sce->theDag, sce->camera);
-		node->scelay= lay;
+		node->scelay |= lay;
 	}
 
 #ifdef DURIAN_CAMERA_SWITCH
@@ -1945,7 +1945,7 @@ void DAG_scene_flush_update(Scene *sce, unsigned int lay, int time)
 		for(m= sce->markers.first; m; m= m->next) {
 			if(m->camera) {
 				node= dag_get_node(sce->theDag, m->camera);
-				node->scelay= lay;
+				node->scelay |= lay;
 			}
 		}
 	}