[Bf-blender-cvs] [91d7f5d2463] master: Fix T74572: adaptive sampling still not working correct with shader AOVs

[Brecht Van Lommel]

Commit: 91d7f5d2463495f20f1e3a985241a2672961ad3f
Author: Brecht Van Lommel
Date:   Wed Apr 8 14:09:10 2020 +0200
Branches: master
https://developer.blender.org/rB91d7f5d2463495f20f1e3a985241a2672961ad3f

Fix T74572: adaptive sampling still not working correct with shader AOVs

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

M	intern/cycles/render/film.cpp

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

diff --git a/intern/cycles/render/film.cpp b/intern/cycles/render/film.cpp
index f28c943ea6c..26eda93fadd 100644
--- a/intern/cycles/render/film.cpp
+++ b/intern/cycles/render/film.cpp
@@ -500,16 +500,16 @@ void Film::device_update(Device *device, DeviceScene *dscene, Scene *scene)
         kfilm->pass_sample_count = kfilm->pass_stride;
         break;
       case PASS_AOV_COLOR:
-        if (kfilm->pass_aov_value_num == 0) {
+        if (kfilm->pass_aov_color_num == 0) {
           kfilm->pass_aov_color = kfilm->pass_stride;
         }
-        kfilm->pass_aov_value_num++;
+        kfilm->pass_aov_color_num++;
         break;
       case PASS_AOV_VALUE:
-        if (kfilm->pass_aov_color_num == 0) {
+        if (kfilm->pass_aov_value_num == 0) {
           kfilm->pass_aov_value = kfilm->pass_stride;
         }
-        kfilm->pass_aov_color_num++;
+        kfilm->pass_aov_value_num++;
         break;
       default:
         assert(false);