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
path: root/intern
diff options
context:
space:
mode:
authorKévin Dietrich <kevin.dietrich@mailoo.org>2020-11-05 20:46:01 +0300
committerKévin Dietrich <kevin.dietrich@mailoo.org>2020-11-05 20:46:26 +0300
commit6a2a6fa5143e7b115c47b8e2ef4787f569c670df (patch)
tree4457475f441e8ba16e60f69029da49d96805a7b7 /intern
parentd9dd408b42c8b0c98e85290dc353672780212464 (diff)
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.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/render/volume.cpp6
1 files changed, 1 insertions, 5 deletions
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);