[Bf-blender-cvs] [6a2a6fa5143] master: Fix T82428: Cycles crashes when building volume meshes

Kévin Dietrich noreply at git.blender.org
Thu Nov 5 18:55:35 CET 2020


Commit: 6a2a6fa5143e7b115c47b8e2ef4787f569c670df
Author: Kévin Dietrich
Date:   Thu Nov 5 18:46:01 2020 +0100
Branches: master
https://developer.blender.org/rB6a2a6fa5143e7b115c47b8e2ef4787f569c670df

Fix T82428: Cycles crashes when building volume meshes

The Volume Node did not have all of the sockets from its Mesh base class
which are now required due to the recent socket API change.

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

M	intern/cycles/render/volume.cpp

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

diff --git a/intern/cycles/render/volume.cpp b/intern/cycles/render/volume.cpp
index 54ec85a27b3..63261d6a247 100644
--- a/intern/cycles/render/volume.cpp
+++ b/intern/cycles/render/volume.cpp
@@ -36,11 +36,7 @@ CCL_NAMESPACE_BEGIN
 
 NODE_DEFINE(Volume)
 {
-  NodeType *type = NodeType::add("volume", create, NodeType::NONE, Geometry::node_base_type);
-
-  SOCKET_INT_ARRAY(triangles, "Triangles", array<int>());
-  SOCKET_POINT_ARRAY(verts, "Vertices", array<float3>());
-  SOCKET_INT_ARRAY(shader, "Shader", array<int>());
+  NodeType *type = NodeType::add("volume", create, NodeType::NONE, Mesh::node_type);
 
   SOCKET_FLOAT(clipping, "Clipping", 0.001f);
   SOCKET_FLOAT(step_size, "Step Size", 0.0f);



More information about the Bf-blender-cvs mailing list