[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27331] trunk/blender/source/blender/ blenkernel/intern/depsgraph.c: Depsgraph: more tweaks to last commit to get it actually working

[Brecht Van Lommel]

Revision: 27331
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27331
Author:   blendix
Date:     2010-03-08 16:38:10 +0100 (Mon, 08 Mar 2010)

Log Message:
-----------
Depsgraph: more tweaks to last commit to get it actually working
int more complex files.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/depsgraph.c

Modified: trunk/blender/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/depsgraph.c	2010-03-08 15:31:30 UTC (rev 27330)
+++ trunk/blender/source/blender/blenkernel/intern/depsgraph.c	2010-03-08 15:38:10 UTC (rev 27331)
@@ -1780,7 +1780,7 @@
 	
 	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 @@
 	   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 @@
 		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;
 			}
 		}
 	}