[Bf-blender-cvs] [2ad3a1c3189] master: Nodes: fix material node copied over when socket is copied
Jacques Lucke
noreply at git.blender.org
Thu May 27 09:58:59 CEST 2021
Commit: 2ad3a1c3189ae7f5b50777d4fa2040aae857495c
Author: Jacques Lucke
Date: Thu May 27 09:58:45 2021 +0200
Branches: master
https://developer.blender.org/rB2ad3a1c3189ae7f5b50777d4fa2040aae857495c
Nodes: fix material node copied over when socket is copied
This was missing from rB207472930834a2916cf18bbdff51bcd77c6dd0c0.
===================================================================
M source/blender/nodes/intern/node_socket.cc
===================================================================
diff --git a/source/blender/nodes/intern/node_socket.cc b/source/blender/nodes/intern/node_socket.cc
index 783a7a9b3d8..052896d2f48 100644
--- a/source/blender/nodes/intern/node_socket.cc
+++ b/source/blender/nodes/intern/node_socket.cc
@@ -37,6 +37,7 @@
#include "BKE_node.h"
#include "DNA_collection_types.h"
+#include "DNA_material_types.h"
#include "RNA_access.h"
#include "RNA_types.h"
@@ -396,6 +397,13 @@ void node_socket_copy_default_value(bNodeSocket *to, const bNodeSocket *from)
id_us_plus(&toval->value->id);
break;
}
+ case SOCK_MATERIAL: {
+ bNodeSocketValueMaterial *toval = (bNodeSocketValueMaterial *)to->default_value;
+ bNodeSocketValueMaterial *fromval = (bNodeSocketValueMaterial *)from->default_value;
+ *toval = *fromval;
+ id_us_plus(&toval->value->id);
+ break;
+ }
}
to->flag |= (from->flag & SOCK_HIDE_VALUE);
More information about the Bf-blender-cvs
mailing list