[Bf-blender-cvs] [5a76281ae51] cycles_procedural_api: remove some Volume properties accidentally reintroduced in Mesh
Kévin Dietrich
noreply at git.blender.org
Tue Sep 22 14:14:45 CEST 2020
Commit: 5a76281ae5188edb6de10d90049d81dbd505175f
Author: Kévin Dietrich
Date: Mon Sep 21 11:50:08 2020 +0200
Branches: cycles_procedural_api
https://developer.blender.org/rB5a76281ae5188edb6de10d90049d81dbd505175f
remove some Volume properties accidentally reintroduced in Mesh
===================================================================
M intern/cycles/render/mesh.cpp
M intern/cycles/render/mesh.h
===================================================================
diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp
index 8f8c7974c1b..dfdb836d4a9 100644
--- a/intern/cycles/render/mesh.cpp
+++ b/intern/cycles/render/mesh.cpp
@@ -135,10 +135,6 @@ NODE_DEFINE(Mesh)
SOCKET_INT_ARRAY(triangle_patch, "Triangle Patch", array<int>());
SOCKET_POINT2_ARRAY(vert_patch_uv, "Patch UVs", array<float2>());
- SOCKET_FLOAT(volume_clipping, "Volume Clipping", 0.001f);
- SOCKET_FLOAT(volume_step_size, "Volume Step Size", 0.0f);
- SOCKET_BOOLEAN(volume_object_space, "Volume Object Space", false);
-
static NodeEnum subdivision_type_enum;
subdivision_type_enum.insert("none", SUBDIVISION_NONE);
subdivision_type_enum.insert("linear", SUBDIVISION_LINEAR);
diff --git a/intern/cycles/render/mesh.h b/intern/cycles/render/mesh.h
index 381709aa8cf..065faf67c35 100644
--- a/intern/cycles/render/mesh.h
+++ b/intern/cycles/render/mesh.h
@@ -145,10 +145,6 @@ class Mesh : public Geometry {
NODE_PUBLIC_API_ARRAY(array<int>, triangle_patch) /* must be < 0 for non subd triangles */
NODE_PUBLIC_API_ARRAY(array<float2>, vert_patch_uv)
- NODE_PUBLIC_API(float, volume_clipping)
- NODE_PUBLIC_API(float, volume_step_size)
- NODE_PUBLIC_API(bool, volume_object_space)
-
// NODE_PUBLIC_API_ARRAY(array<SubdFace>, subd_faces)
protected:
array<SubdFace> subd_faces;
More information about the Bf-blender-cvs
mailing list