[Bf-blender-cvs] [52b15ab7acb] cycles_procedural_api: Merge branch 'master' into cycles_procedural_api

[Kévin Dietrich]

Commit: 52b15ab7acbb56dac0eeedde8ebc40644a2ca094
Author: Kévin Dietrich
Date:   Fri Oct 9 01:50:19 2020 +0200
Branches: cycles_procedural_api
https://developer.blender.org/rB52b15ab7acbb56dac0eeedde8ebc40644a2ca094

Merge branch 'master' into cycles_procedural_api

===================================================================



===================================================================

diff --cc intern/cycles/render/stats.cpp
index d00c4d7befb,1a840a906a5..2c6273842e2
--- a/intern/cycles/render/stats.cpp
+++ b/intern/cycles/render/stats.cpp
@@@ -381,21 -380,20 +381,21 @@@ string SceneUpdateStats::full_report(
  
  void SceneUpdateStats::clear()
  {
-   geometry.times.entries.clear();
-   image.times.entries.clear();
-   light.times.entries.clear();
-   object.times.entries.clear();
-   background.times.entries.clear();
-   bake.times.entries.clear();
-   camera.times.entries.clear();
-   film.times.entries.clear();
-   integrator.times.entries.clear();
-   osl.times.entries.clear();
-   particles.times.entries.clear();
-   scene.times.entries.clear();
-   svm.times.entries.clear();
-   tables.times.entries.clear();
-   procedurals.times.entries.clear();
+   geometry.times.clear();
+   image.times.clear();
+   light.times.clear();
+   object.times.clear();
+   background.times.clear();
+   bake.times.clear();
+   camera.times.clear();
+   film.times.clear();
+   integrator.times.clear();
+   osl.times.clear();
+   particles.times.clear();
+   scene.times.clear();
+   svm.times.clear();
+   tables.times.clear();
++  procedurals.times.clear();
  }
  
  CCL_NAMESPACE_END