[Bf-blender-cvs] [f084d3958b8] temp-trimesh-sculpt: Merge branch 'master' into joeedh-trimesh-sculpt

[Joseph Eagar]

Commit: f084d3958b8c21a44428bea516f305babf4f60aa
Author: Joseph Eagar
Date:   Sun Oct 4 17:12:46 2020 -0700
Branches: temp-trimesh-sculpt
https://developer.blender.org/rBf084d3958b8c21a44428bea516f305babf4f60aa

Merge branch 'master' into joeedh-trimesh-sculpt

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



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

diff --cc intern/cycles/render/integrator.cpp
index 75a50541275,4d1e95a0db7..6bea1d14b5f
--- a/intern/cycles/render/integrator.cpp
+++ b/intern/cycles/render/integrator.cpp
@@@ -23,8 -23,8 +23,9 @@@
  #include "render/scene.h"
  #include "render/shader.h"
  #include "render/sobol.h"
- #include "kernel/kernel_bluenoise_mask.h"
+ #include "render/stats.h"
  
++#include "kernel/kernel_bluenoise_mask.h"
  #include "kernel/kernel_types.h"
  
  #include "util/util_foreach.h"