[Bf-blender-cvs] [5c15a74d63b] temp-test-point-cloud-simulation-depsgraph-integration: copy object/image pointer in node_socket_copy_default_value

[Jacques Lucke]

Commit: 5c15a74d63ba8728d3df1c21abf3f3bd2d52a605
Author: Jacques Lucke
Date:   Thu Apr 9 11:12:16 2020 +0200
Branches: temp-test-point-cloud-simulation-depsgraph-integration
https://developer.blender.org/rB5c15a74d63ba8728d3df1c21abf3f3bd2d52a605

copy object/image pointer in node_socket_copy_default_value

===================================================================

M	source/blender/nodes/intern/node_socket.c

===================================================================

diff --git a/source/blender/nodes/intern/node_socket.c b/source/blender/nodes/intern/node_socket.c
index af492c42d78..4433038acf9 100644
--- a/source/blender/nodes/intern/node_socket.c
+++ b/source/blender/nodes/intern/node_socket.c
@@ -30,6 +30,7 @@
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
 
+#include "BKE_lib_id.h"
 #include "BKE_node.h"
 
 #include "RNA_access.h"
@@ -334,15 +335,17 @@ void node_socket_copy_default_value(bNodeSocket *to, const bNodeSocket *from)
       break;
     }
     case SOCK_OBJECT: {
-      /* Not sure how to handle user count here yet. For now just don't copy the pointer. */
       bNodeSocketValueObject *toval = to->default_value;
-      toval->value = NULL;
+      bNodeSocketValueObject *fromval = from->default_value;
+      *toval = *fromval;
+      id_us_plus(&toval->value->id);
       break;
     }
     case SOCK_IMAGE: {
-      /* Not sure how to handle user count here yet. For now just don't copy the pointer. */
       bNodeSocketValueImage *toval = to->default_value;
-      toval->value = NULL;
+      bNodeSocketValueImage *fromval = from->default_value;
+      *toval = *fromval;
+      id_us_plus(&toval->value->id);
       break;
     }
   }