[Bf-blender-cvs] [6278b48ea18] master: Merge branch 'blender-v2.83-release'

[Bastien Montagne]

Commit: 6278b48ea18cc93cc49eb1515d937fd1edc84537
Author: Bastien Montagne
Date:   Tue Apr 28 15:37:19 2020 +0200
Branches: master
https://developer.blender.org/rB6278b48ea18cc93cc49eb1515d937fd1edc84537

Merge branch 'blender-v2.83-release'

Conflicts:
	source/blender/blenkernel/intern/lib_query.c
	source/blender/depsgraph/intern/builder/deg_builder_relations.cc

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



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

diff --cc source/blender/blenkernel/intern/lib_query.c
index bddf8c0f819,c93aade7cfa..5b952072735
--- a/source/blender/blenkernel/intern/lib_query.c
+++ b/source/blender/blenkernel/intern/lib_query.c
@@@ -205,40 -182,6 +183,41 @@@ static void library_foreach_idpropertie
    FOREACH_FINALIZE_VOID;
  }
  
 +static void library_foreach_node_socket(LibraryForeachIDData *data, bNodeSocket *sock)
 +{
-   library_foreach_idproperty_ID_link(data, sock->prop, IDWALK_CB_USER);
++  IDP_foreach_property(
++      sock->prop, IDP_TYPE_FILTER_ID, library_foreach_idpropertiesForeachIDLink, &data);
 +
 +  switch ((eNodeSocketDatatype)sock->type) {
 +    case SOCK_OBJECT: {
 +      bNodeSocketValueObject *default_value = sock->default_value;
 +      FOREACH_CALLBACK_INVOKE_ID_PP(data, (ID **)&default_value->value, IDWALK_CB_USER);
 +      break;
 +    }
 +    case SOCK_IMAGE: {
 +      bNodeSocketValueImage *default_value = sock->default_value;
 +      FOREACH_CALLBACK_INVOKE_ID_PP(data, (ID **)&default_value->value, IDWALK_CB_USER);
 +      break;
 +    }
 +    case SOCK_FLOAT:
 +    case SOCK_VECTOR:
 +    case SOCK_RGBA:
 +    case SOCK_BOOLEAN:
 +    case SOCK_INT:
 +    case SOCK_STRING:
 +    case __SOCK_MESH:
 +    case SOCK_CUSTOM:
 +    case SOCK_SHADER:
 +    case SOCK_EMITTERS:
 +    case SOCK_EVENTS:
 +    case SOCK_FORCES:
 +    case SOCK_CONTROL_FLOW:
 +      break;
 +  }
 +
 +  FOREACH_FINALIZE_VOID;
 +}
 +
  static void library_foreach_rigidbodyworldSceneLooper(struct RigidBodyWorld *UNUSED(rbw),
                                                        ID **id_pointer,
                                                        void *user_data,
@@@ -1058,12 -1006,15 +1041,13 @@@ static void library_foreach_ID_link(Mai
          for (node = ntree->nodes.first; node; node = node->next) {
            CALLBACK_INVOKE_ID(node->id, IDWALK_CB_USER);
  
-           library_foreach_idproperty_ID_link(&data, node->prop, IDWALK_CB_USER);
+           IDP_foreach_property(
+               node->prop, IDP_TYPE_FILTER_ID, library_foreach_idpropertiesForeachIDLink, &data);
 -          for (sock = node->inputs.first; sock; sock = sock->next) {
 -            IDP_foreach_property(
 -                sock->prop, IDP_TYPE_FILTER_ID, library_foreach_idpropertiesForeachIDLink, &data);
 +          LISTBASE_FOREACH (bNodeSocket *, sock, &node->inputs) {
 +            library_foreach_node_socket(&data, sock);
            }
 -          for (sock = node->outputs.first; sock; sock = sock->next) {
 -            IDP_foreach_property(
 -                sock->prop, IDP_TYPE_FILTER_ID, library_foreach_idpropertiesForeachIDLink, &data);
 +          LISTBASE_FOREACH (bNodeSocket *, sock, &node->outputs) {
 +            library_foreach_node_socket(&data, sock);
            }
          }
  
diff --cc source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 14ce8dc1552,4caea4b8aee..d0c9c04d36a
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@@ -2346,14 -2393,11 +2394,15 @@@ void DepsgraphRelationBuilder::build_te
      return;
    }
    /* texture itself */
 +  ComponentKey texture_key(&texture->id, NodeType::GENERIC_DATABLOCK);
+   build_idproperties(texture->id.properties);
    build_animdata(&texture->id);
    build_parameters(&texture->id);
 +
    /* texture's nodetree */
    build_nodetree(texture->nodetree);
 +  build_nested_nodetree(&texture->id, texture->nodetree);
 +
    /* Special cases for different IDs which texture uses. */
    if (texture->type == TEX_IMAGE) {
      if (texture->ima != nullptr) {