[Bf-blender-cvs] [fdc332981e7] master: Cleanup: simplify comparison, clarify comment

Campbell Barton noreply at git.blender.org
Tue Aug 30 13:21:25 CEST 2022


Commit: fdc332981e718bafab92d34816fdfa3d6e0a8556
Author: Campbell Barton
Date:   Tue Aug 30 21:16:02 2022 +1000
Branches: master
https://developer.blender.org/rBfdc332981e718bafab92d34816fdfa3d6e0a8556

Cleanup: simplify comparison, clarify comment

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

M	intern/cycles/blender/addon/ui.py
M	source/blender/render/intern/pipeline.cc

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

diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 5f17b99858a..eb89e76dc75 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -305,7 +305,7 @@ class CYCLES_RENDER_PT_sampling_advanced(CyclesButtonsPanel, Panel):
         layout.separator()
 
         heading = layout.column(align=True, heading="Scrambling Distance")
-        heading.active = not cscene.sampling_pattern == 'SOBOL_BURLEY'
+        heading.active = cscene.sampling_pattern != 'SOBOL_BURLEY'
         heading.prop(cscene, "auto_scrambling_distance", text="Automatic")
         heading.prop(cscene, "preview_scrambling_distance", text="Viewport")
         heading.prop(cscene, "scrambling_distance", text="Multiplier")
diff --git a/source/blender/render/intern/pipeline.cc b/source/blender/render/intern/pipeline.cc
index 71b83a63d12..8cc1293eae3 100644
--- a/source/blender/render/intern/pipeline.cc
+++ b/source/blender/render/intern/pipeline.cc
@@ -436,7 +436,7 @@ void RE_AcquireResultImage(Render *re, RenderResult *rr, const int view_id)
       rr->rectx = re->result->rectx;
       rr->recty = re->result->recty;
 
-      /* actview view */
+      /* `scene.rd.actview` view. */
       rv = RE_RenderViewGetById(re->result, view_id);
       rr->have_combined = (rv->rectf != nullptr);



More information about the Bf-blender-cvs mailing list