[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43084] trunk/blender/intern/cycles/ blender/blender_sync.cpp: Fix #29740: missing cycles viewport update with animated node socket values.

Brecht Van Lommel brechtvanlommel at pandora.be
Mon Jan 2 20:44:07 CET 2012


Revision: 43084
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43084
Author:   blendix
Date:     2012-01-02 19:44:07 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
Fix #29740: missing cycles viewport update with animated node socket values.

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/blender_sync.cpp

Modified: trunk/blender/intern/cycles/blender/blender_sync.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_sync.cpp	2012-01-02 19:01:16 UTC (rev 43083)
+++ trunk/blender/intern/cycles/blender/blender_sync.cpp	2012-01-02 19:44:07 UTC (rev 43084)
@@ -69,13 +69,13 @@
 	BL::BlendData::materials_iterator b_mat;
 
 	for(b_data.materials.begin(b_mat); b_mat != b_data.materials.end(); ++b_mat)
-		if(b_mat->is_updated())
+		if(b_mat->is_updated() || (b_mat->node_tree() && b_mat->node_tree().is_updated()))
 			shader_map.set_recalc(*b_mat);
 
 	BL::BlendData::lamps_iterator b_lamp;
 
 	for(b_data.lamps.begin(b_lamp); b_lamp != b_data.lamps.end(); ++b_lamp)
-		if(b_lamp->is_updated())
+		if(b_lamp->is_updated() || (b_lamp->node_tree() && b_lamp->node_tree().is_updated()))
 			shader_map.set_recalc(*b_lamp);
 
 	BL::BlendData::objects_iterator b_ob;
@@ -107,7 +107,8 @@
 	BL::BlendData::worlds_iterator b_world;
 
 	for(b_data.worlds.begin(b_world); b_world != b_data.worlds.end(); ++b_world)
-		if(world_map == b_world->ptr.data && b_world->is_updated())
+		if(world_map == b_world->ptr.data &&
+			(b_world->is_updated() || (b_world->node_tree() && b_world->node_tree().is_updated())))
 			world_recalc = true;
 
 	bool recalc =



More information about the Bf-blender-cvs mailing list