[Bf-blender-cvs] [b3a3459e1ae] master: Cycles Denoising: Fix wrong order of denoising feature passes

[Lukas Stockner]

Commit: b3a3459e1ae4a79d03887ea03c20bf1ccc8c8aa0
Author: Lukas Stockner
Date:   Thu May 18 18:31:28 2017 +0200
Branches: master
https://developer.blender.org/rBb3a3459e1ae4a79d03887ea03c20bf1ccc8c8aa0

Cycles Denoising: Fix wrong order of denoising feature passes

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

M	intern/cycles/device/device_denoising.cpp

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

diff --git a/intern/cycles/device/device_denoising.cpp b/intern/cycles/device/device_denoising.cpp
index 39c8cf30105..f5543d7c82d 100644
--- a/intern/cycles/device/device_denoising.cpp
+++ b/intern/cycles/device/device_denoising.cpp
@@ -139,9 +139,9 @@ bool DenoisingTask::run_denoising()
 		nlm_state.temporary_2_ptr = *nlm_temporary_2;
 		nlm_state.temporary_3_ptr = *nlm_temporary_3;
 
-		int mean_from[]     = { 0, 1, 2, 6,  7,  8, 12 };
-		int variance_from[] = { 3, 4, 5, 9, 10, 11, 13 };
-		int pass_to[]       = { 1, 2, 3, 0,  5,  6,  7 };
+		int mean_from[]     = { 0, 1, 2, 12, 6,  7, 8 };
+		int variance_from[] = { 3, 4, 5, 13, 9, 10, 11};
+		int pass_to[]       = { 1, 2, 3, 0,  5,  6,  7};
 		for(int pass = 0; pass < 7; pass++) {
 			device_sub_ptr feature_pass(device, buffer.mem, pass_to[pass]*buffer.pass_stride, buffer.pass_stride, MEM_READ_WRITE);
 			/* Get the unfiltered pass and its variance from the RenderBuffers. */