[Bf-blender-cvs] [80fdc928f20] cycles-x: Merge branch 'master' into cycles-x

[Sergey Sharybin]

Commit: 80fdc928f20534705480de65d1d9e274ca595f03
Author: Sergey Sharybin
Date:   Tue Aug 31 11:09:35 2021 +0200
Branches: cycles-x
https://developer.blender.org/rB80fdc928f20534705480de65d1d9e274ca595f03

Merge branch 'master' into cycles-x

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



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

diff --cc source/blender/blenloader/intern/versioning_300.c
index 695872e559e,136ea786903..644ea3044f8
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -398,20 -636,20 +636,34 @@@ static void do_version_constraints_spli
    }
  }
  
+ static bNodeSocket *do_version_replace_float_size_with_vector(bNodeTree *ntree,
+                                                               bNode *node,
+                                                               bNodeSocket *socket)
+ {
+   const bNodeSocketValueFloat *socket_value = (const bNodeSocketValueFloat *)socket->default_value;
+   const float old_value = socket_value->value;
+   nodeRemoveSocket(ntree, node, socket);
+   bNodeSocket *new_socket = nodeAddSocket(
+       ntree, node, SOCK_IN, nodeStaticSocketType(SOCK_VECTOR, PROP_TRANSLATION), "Size", "Size");
+   bNodeSocketValueVector *value_vector = (bNodeSocketValueVector *)new_socket->default_value;
+   copy_v3_fl(value_vector->value, old_value);
+   return new_socket;
+ }
+ 
 +static void do_version_subsurface_methods(bNode *node)
 +{
 +  if (node->type == SH_NODE_SUBSURFACE_SCATTERING) {
 +    if (node->custom1 != SHD_SUBSURFACE_RANDOM_WALK) {
 +      node->custom1 = SHD_SUBSURFACE_RANDOM_WALK_FIXED_RADIUS;
 +    }
 +  }
 +  else if (node->type == SH_NODE_BSDF_PRINCIPLED) {
 +    if (node->custom2 != SHD_SUBSURFACE_RANDOM_WALK) {
 +      node->custom2 = SHD_SUBSURFACE_RANDOM_WALK_FIXED_RADIUS;
 +    }
 +  }
 +}
 +
  /* NOLINTNEXTLINE: readability-function-size */
  void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain)
  {