[Bf-blender-cvs] [0617474e70f] cycles-x: Merge branch 'master' into cycles-x

[Sergey Sharybin]

Commit: 0617474e70f38a2b50d4824817e494d61e9ca708
Author: Sergey Sharybin
Date:   Tue May 18 10:51:26 2021 +0200
Branches: cycles-x
https://developer.blender.org/rB0617474e70f38a2b50d4824817e494d61e9ca708

Merge branch 'master' into cycles-x

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



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

diff --cc intern/cycles/blender/blender_sync.cpp
index 12ee7f4a027,9d0f9f29f94..06a8996fdd7
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@@ -68,10 -67,10 +68,11 @@@ BlenderSync::BlenderSync(BL::RenderEngi
        scene(scene),
        preview(preview),
        experimental(false),
 +      use_developer_ui(use_developer_ui),
        dicing_rate(1.0f),
        max_subdivisions(12),
-       progress(progress)
+       progress(progress),
+       has_updates_(true)
  {
    PointerRNA cscene = RNA_pointer_get(&b_scene.ptr, "cycles");
    dicing_rate = preview ? RNA_float_get(&cscene, "preview_dicing_rate") :