Cycles: Fix wrong order in object flags calculations
[blender.git] / intern / cycles / render / scene.cpp
index ccb03eaf1e0e069bf782633c73fe0715f48929b8..19d715d834b45cc9ce2ddd164815412571f12849 100644 (file)
@@ -11,7 +11,7 @@
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
- * limitations under the License
+ * limitations under the License.
  */
 
 #include <stdlib.h>
 #include "util_foreach.h"
 #include "util_progress.h"
 
+#ifdef WITH_CYCLES_DEBUG
+#  include "util_guarded_allocator.h"
+#  include "util_logging.h"
+#endif
+
 CCL_NAMESPACE_BEGIN
 
 Scene::Scene(const SceneParams& params_, const DeviceInfo& device_info_)
@@ -155,13 +160,13 @@ void Scene::device_update(Device *device_, Progress& progress)
 
        if(progress.get_cancel() || device->have_error()) return;
 
-       progress.set_status("Updating Images");
-       image_manager->device_update(device, &dscene, progress);
+       progress.set_status("Updating Background");
+       background->device_update(device, &dscene, this);
 
        if(progress.get_cancel() || device->have_error()) return;
 
-       progress.set_status("Updating Background");
-       background->device_update(device, &dscene, this);
+       progress.set_status("Updating Camera");
+       camera->device_update(device, &dscene, this);
 
        if(progress.get_cancel() || device->have_error()) return;
 
@@ -170,6 +175,11 @@ void Scene::device_update(Device *device_, Progress& progress)
 
        if(progress.get_cancel() || device->have_error()) return;
 
+       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");
        mesh_manager->device_update(device, &dscene, this, progress);
 
@@ -180,6 +190,16 @@ void Scene::device_update(Device *device_, Progress& progress)
 
        if(progress.get_cancel() || device->have_error()) return;
 
+       progress.set_status("Updating Images");
+       image_manager->device_update(device, &dscene, progress);
+
+       if(progress.get_cancel() || device->have_error()) return;
+
+       progress.set_status("Updating Camera Volume");
+       camera->device_update_volume(device, &dscene, this);
+
+       if(progress.get_cancel() || device->have_error()) return;
+
        progress.set_status("Updating Hair Systems");
        curve_system_manager->device_update(device, &dscene, this, progress);
 
@@ -190,12 +210,6 @@ void Scene::device_update(Device *device_, Progress& progress)
 
        if(progress.get_cancel() || device->have_error()) return;
 
-       /* TODO(sergey): Make sure camera is not needed above. */
-       progress.set_status("Updating Camera");
-       camera->device_update(device, &dscene, this);
-
-       if(progress.get_cancel() || device->have_error()) return;
-
        progress.set_status("Updating Lights");
        light_manager->device_update(device, &dscene, this, progress);
 
@@ -230,6 +244,12 @@ void Scene::device_update(Device *device_, Progress& progress)
                progress.set_status("Updating Device", "Writing constant memory");
                device->const_copy_to("__data", &dscene.data, sizeof(dscene.data));
        }
+
+#ifdef WITH_CYCLES_DEBUG
+       VLOG(1) << "System memory statistics after full device sync:\n"
+               << "  Usage: " << util_guarded_get_mem_used() << "\n"
+               << "  Peak: " << util_guarded_get_mem_peak();
+#endif
 }
 
 Scene::MotionType Scene::need_motion(bool advanced_shading)