Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Fuller <mistaed>2019-04-25 15:04:31 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-04-25 15:05:33 +0300
commit2adf4b401ed289a3f9f3863b1bf5abb52d61f148 (patch)
tree347ab2995922d16d48cb7d354340579712cefb0b /intern/cycles/render/attribute.cpp
parentc07bce5bf2b35d66a5574b40f8d9378086e9117f (diff)
Fix for Cycles UV adaptive subdivision after float2 changes.
Differential Revision: https://developer.blender.org/D4717
Diffstat (limited to 'intern/cycles/render/attribute.cpp')
-rw-r--r--intern/cycles/render/attribute.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/render/attribute.cpp b/intern/cycles/render/attribute.cpp
index f7788b6a490..57c74067dbf 100644
--- a/intern/cycles/render/attribute.cpp
+++ b/intern/cycles/render/attribute.cpp
@@ -254,6 +254,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;
}