Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--intern/cycles/blender/addon/engine.py2
-rw-r--r--intern/cycles/kernel/svm/aov.h2
-rw-r--r--intern/cycles/scene/pass.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/blender/addon/engine.py b/intern/cycles/blender/addon/engine.py
index b7713dc7110..1b03581ae03 100644
--- a/intern/cycles/blender/addon/engine.py
+++ b/intern/cycles/blender/addon/engine.py
@@ -226,7 +226,7 @@ def list_render_passes(scene, srl):
if aov.type == 'VALUE':
yield (aov.name, "X", 'VALUE')
else:
- yield (aov.name, "RGB", 'COLOR')
+ yield (aov.name, "RGBA", 'COLOR')
# Light groups.
for lightgroup in srl.lightgroups:
diff --git a/intern/cycles/kernel/svm/aov.h b/intern/cycles/kernel/svm/aov.h
index 334fb79cb75..9b818f0e6f8 100644
--- a/intern/cycles/kernel/svm/aov.h
+++ b/intern/cycles/kernel/svm/aov.h
@@ -32,7 +32,7 @@ ccl_device void svm_node_aov_color(KernelGlobals kg,
kernel_data.film.pass_stride;
ccl_global float *buffer = render_buffer + render_buffer_offset +
(kernel_data.film.pass_aov_color + node.z);
- kernel_write_pass_float3(buffer, make_float3(val.x, val.y, val.z));
+ kernel_write_pass_float4(buffer, make_float4(val.x, val.y, val.z, 1.0f));
}
}
diff --git a/intern/cycles/scene/pass.cpp b/intern/cycles/scene/pass.cpp
index 5f5b19e710d..c2f12355ac7 100644
--- a/intern/cycles/scene/pass.cpp
+++ b/intern/cycles/scene/pass.cpp
@@ -321,7 +321,7 @@ PassInfo Pass::get_info(const PassType type, const bool include_albedo, const bo
break;
case PASS_AOV_COLOR:
- pass_info.num_components = 3;
+ pass_info.num_components = 4;
break;
case PASS_AOV_VALUE:
pass_info.num_components = 1;