From 9431fc67648be89de7a88d54d40b81038752001e Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 31 Mar 2016 17:54:03 +0200 Subject: Cycles: Fix wrong initialization order of mesh flags and object transform --- intern/cycles/render/scene.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'intern/cycles/render') diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp index 62951af7f6b..9842cd10a1e 100644 --- a/intern/cycles/render/scene.cpp +++ b/intern/cycles/render/scene.cpp @@ -167,13 +167,13 @@ void Scene::device_update(Device *device_, Progress& progress) if(progress.get_cancel() || device->have_error()) return; - progress.set_status("Updating Objects"); - object_manager->device_update(device, &dscene, this, progress); + progress.set_status("Updating Meshes Flags"); + mesh_manager->device_update_flags(device, &dscene, this, progress); if(progress.get_cancel() || device->have_error()) return; - progress.set_status("Updating Meshes Flags"); - mesh_manager->device_update_flags(device, &dscene, this, progress); + progress.set_status("Updating Objects"); + object_manager->device_update(device, &dscene, this, progress); if(progress.get_cancel() || device->have_error()) return; -- cgit v1.2.3