diff options
author | Hans Goudey <h.goudey@me.com> | 2021-11-15 18:10:19 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2021-11-15 18:10:19 +0300 |
commit | 8976b72843cf2f8781b7b1de9fcbaab4d099b5c9 (patch) | |
tree | 7b73ee09e705eb20b35df69607ebff8f21c5849c /source/blender | |
parent | c3472cb11cded38b277f71ca9d7fc06c417da022 (diff) | |
parent | 62da41d63dd9fb131a3c7a1f339b49e6186b3300 (diff) |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/node.cc | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc index 85ad233ab4f..a5800819ae5 100644 --- a/source/blender/blenkernel/intern/node.cc +++ b/source/blender/blenkernel/intern/node.cc @@ -490,8 +490,10 @@ static void write_node_socket_default_value(BlendWriter *writer, bNodeSocket *so case SOCK_MATERIAL: BLO_write_struct(writer, bNodeSocketValueMaterial, sock->default_value); break; - case __SOCK_MESH: case SOCK_CUSTOM: + /* Custom node sockets where default_value is defined uses custom properties for storage. */ + break; + case __SOCK_MESH: case SOCK_SHADER: case SOCK_GEOMETRY: BLI_assert_unreachable(); diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 53b3f07dbbc..aef3823338b 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -2805,6 +2805,7 @@ static StructRNA *rna_NodeSocket_register(Main *UNUSED(bmain), /* setup dummy socket & socket type to store static properties in */ memset(&dummyst, 0, sizeof(bNodeSocketType)); + dummyst.type = SOCK_CUSTOM; memset(&dummysock, 0, sizeof(bNodeSocket)); dummysock.typeinfo = &dummyst; |