diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-04-25 15:31:45 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-04-25 15:31:45 +0300 |
| commit | b77c10b45c3f46320977e2c64116aca5ac979fdb (patch) | |
| tree | a75820f2054a8c9f2e1d3bdd8b0161b9bfbd19ac /intern | |
| parent | 10c4bde79272add4ae4a26c18ee1013032d277a0 (diff) | |
| parent | 2adf4b401ed289a3f9f3863b1bf5abb52d61f148 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/render/attribute.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/render/attribute.cpp b/intern/cycles/render/attribute.cpp index dad6cb4fe6d..f1341d50b9d 100644 --- 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; } |