[Bf-blender-cvs] [01162f756a0] master: Fix unreported crash/assert in Cycles with volume render pass in viewport

Dalai Felinto noreply at git.blender.org
Thu Feb 27 11:41:06 CET 2020


Commit: 01162f756a02739314b10fd817759e0c6f344d07
Author: Dalai Felinto
Date:   Thu Feb 27 11:30:57 2020 +0100
Branches: master
https://developer.blender.org/rB01162f756a02739314b10fd817759e0c6f344d07

Fix unreported crash/assert in Cycles with volume render pass in viewport

Bug introduced on e0085bfd24da.

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

M	intern/cycles/kernel/kernel_types.h

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

diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index 75187ad1bd2..442b84a4f41 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -390,7 +390,7 @@ typedef enum PassType {
   PASS_TRANSMISSION_DIRECT,
   PASS_TRANSMISSION_INDIRECT,
   PASS_TRANSMISSION_COLOR,
-  PASS_VOLUME_DIRECT,
+  PASS_VOLUME_DIRECT = 50,
   PASS_VOLUME_INDIRECT,
   /* No Scatter color since it's tricky to define what it would even mean. */
   PASS_CATEGORY_LIGHT_END = 63,



More information about the Bf-blender-cvs mailing list