[Bf-blender-cvs] [c51a5b204cc] master: Fix T85048: Cycles sculpt vertex color issues after recent changes

[Brecht Van Lommel]

Commit: c51a5b204cc15d079dd319bd95296f5ebe4922c9
Author: Brecht Van Lommel
Date:   Tue Jan 26 15:14:29 2021 +0100
Branches: master
https://developer.blender.org/rBc51a5b204cc15d079dd319bd95296f5ebe4922c9

Fix T85048: Cycles sculpt vertex color issues after recent changes

Attribute fields were not fully copied.

Ref D10208

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

M	intern/cycles/render/attribute.cpp

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

diff --git a/intern/cycles/render/attribute.cpp b/intern/cycles/render/attribute.cpp
index 6a3fbb7772f..ce4ae6e4295 100644
--- a/intern/cycles/render/attribute.cpp
+++ b/intern/cycles/render/attribute.cpp
@@ -661,15 +661,8 @@ void AttributeSet::update(AttributeSet &&new_attributes)
 {
   /* add or update old_attributes based on the new_attributes */
   foreach (Attribute &attr, new_attributes.attributes) {
-    Attribute *nattr = nullptr;
-
-    if (attr.std != ATTR_STD_NONE) {
-      nattr = add(attr.std, attr.name);
-    }
-    else {
-      nattr = add(attr.name, attr.type, attr.element);
-    }
-
+    Attribute *nattr = add(attr.name, attr.type, attr.element);
+    nattr->std = attr.std;
     nattr->set_data_from(std::move(attr));
   }