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:
authorJacques Lucke <jacques@blender.org>2021-12-07 15:26:39 +0300
committerJacques Lucke <jacques@blender.org>2021-12-07 15:26:39 +0300
commit0f48b37aae0230119523a9718b331961bd989a78 (patch)
tree3cbbeb57645785ed0be60719dd16392c9cee595a /source/blender/nodes/intern
parentae5a89e80af78b85877a049d392a84553f2791aa (diff)
Revert moving all shader nodes to c++
This reverts to following commits: * rB5cad004d716da02f511bd34983ac7da820308676 * rB97e3a2d935ba9b21b127eda7ca104d4bcf4e48bd * rBf60b95b5320f8d6abe6a629fe8fc4f1b94d0d91c * rB0bd3cad04edf4bf9b9d3b1353f955534aa5e6740 * rBf72cc47d8edf849af98e196f721022bacf86a5e7 * rB3f7014ecc9d523997062eadd62888af5fc70a2b6 * rB0578921063fbb081239439062215f2538a31af4b * rBc20098e6ec6adee874a12e510aa4a56d89f92838 * rBd5efda72f501ad95679d7ac554086a1fb18c1ac0 The original move to c++ that the other commits depended upon had some issues that should be fixed before committing it again. The issues were reported in T93797, T93809 and T93798. We should also find a better rule for not using c-style casts going forward, although that wouldn't have been reason enough to revert the commits. Introducing something like a `MEM_new<T>` and `MEM_delete<T>` function might help with the the most common case of casting the return type of `MEM_malloc`. Going forward, I recommend first committing the changes that don't require converting files to c++. Then convert the shading node files in smaller chunks. Especially don't mix fairly low risk changes like moving some simple nodes, with higher risk changes.
Diffstat (limited to 'source/blender/nodes/intern')
-rw-r--r--source/blender/nodes/intern/node_socket_declarations.cc25
1 files changed, 0 insertions, 25 deletions
diff --git a/source/blender/nodes/intern/node_socket_declarations.cc b/source/blender/nodes/intern/node_socket_declarations.cc
index 1795cc339e7..ed5691ebf7f 100644
--- a/source/blender/nodes/intern/node_socket_declarations.cc
+++ b/source/blender/nodes/intern/node_socket_declarations.cc
@@ -376,29 +376,4 @@ GeometryBuilder &GeometryBuilder::only_instances(bool value)
/** \} */
-/* -------------------------------------------------------------------- */
-/** \name #Shader
- * \{ */
-
-bNodeSocket &Shader::build(bNodeTree &ntree, bNode &node, eNodeSocketInOut in_out) const
-{
- bNodeSocket &socket = *nodeAddSocket(
- &ntree, &node, in_out, "NodeSocketShader", identifier_.c_str(), name_.c_str());
- this->set_common_flags(socket);
- return socket;
-}
-
-bool Shader::matches(const bNodeSocket &socket) const
-{
- if (!this->matches_common_data(socket)) {
- return false;
- }
- if (socket.type != SOCK_SHADER) {
- return false;
- }
- return true;
-}
-
-/** \} */
-
} // namespace blender::nodes::decl