Cycles: updates to follow code committed to trunk.

1 files changed, 8 insertions, 8 deletions

diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index 3a9514efa3c..d44fc3f29ca 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -67,31 +67,31 @@ bool BlenderSync::sync_recalc()
 	BL::BlendData::materials_iterator b_mat;
 
 	for(b_data.materials.begin(b_mat); b_mat != b_data.materials.end(); ++b_mat)
-		if(b_mat->recalc())
+		if(b_mat->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->recalc())
+		if(b_lamp->is_updated())
 			shader_map.set_recalc(*b_lamp);
 
 	BL::BlendData::objects_iterator b_ob;
 
 	for(b_data.objects.begin(b_ob); b_ob != b_data.objects.end(); ++b_ob) {
-		if(b_ob->recalc()) {
+		if(b_ob->is_updated()) {
 			object_map.set_recalc(*b_ob);
 			light_map.set_recalc(*b_ob);
 		}
 
 		if(object_is_mesh(*b_ob)) {
-			if(b_ob->recalc_data() || b_ob->data().recalc()) {
+			if(b_ob->is_updated_data() || b_ob->data().is_updated()) {
 				BL::ID key = object_is_modified(*b_ob)? *b_ob: b_ob->data();
 				mesh_map.set_recalc(key);
 			}
 		}
 		else if(object_is_light(*b_ob)) {
-			if(b_ob->recalc_data() || b_ob->data().recalc())
+			if(b_ob->is_updated_data() || b_ob->data().is_updated())
 				light_map.set_recalc(*b_ob);
 		}
 	}
@@ -99,13 +99,13 @@ bool BlenderSync::sync_recalc()
 	BL::BlendData::meshes_iterator b_mesh;
 
 	for(b_data.meshes.begin(b_mesh); b_mesh != b_data.meshes.end(); ++b_mesh)
-		if(b_mesh->recalc())
+		if(b_mesh->is_updated())
 			mesh_map.set_recalc(*b_mesh);
 
 	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->recalc())
+		if(world_map == b_world->ptr.data && b_world->is_updated())
 			world_recalc = true;
 
 	bool recalc =
@@ -113,7 +113,7 @@ bool BlenderSync::sync_recalc()
 		object_map.has_recalc() ||
 		light_map.has_recalc() ||
 		mesh_map.has_recalc() ||
-		BlendDataObjects_recalc_get(&b_data.ptr) ||
+		BlendDataObjects_is_updated_get(&b_data.ptr) ||
 		world_recalc;
 
 	return recalc;