Merge branch 'blender2.7'

2019-04-25 14:31:45 +02:00
parent 10c4bde792 2adf4b401e
commit b77c10b45c
1 changed files with 3 additions and 0 deletions
--- a/intern/cycles/render/attribute.cpp
+++ b/intern/cycles/render/attribute.cpp
@@ -251,6 +251,9 @@ void Attribute::add_with_weight(void *dst, void *src, float weight)
  else if (same_storage(type, TypeDesc::TypeFloat)) {
    *((float *)dst) += *((float *)src) * weight;
  }
+  else if (same_storage(type, TypeFloat2)) {
+    *((float2 *)dst) += *((float2 *)src) * weight;
+  }
  else if (same_storage(type, TypeDesc::TypeVector)) {
    *((float4 *)dst) += *((float4 *)src) * weight;
  }