[Bf-blender-cvs] [2adf4b401ed] blender2.7: Fix for Cycles UV adaptive subdivision after float2 changes.
Alex Fuller
noreply at git.blender.org
Thu Apr 25 14:21:43 CEST 2019
Commit: 2adf4b401ed289a3f9f3863b1bf5abb52d61f148
Author: Alex Fuller
Date: Thu Apr 25 14:04:31 2019 +0200
Branches: blender2.7
https://developer.blender.org/rB2adf4b401ed289a3f9f3863b1bf5abb52d61f148
Fix for Cycles UV adaptive subdivision after float2 changes.
Differential Revision: https://developer.blender.org/D4717
===================================================================
M intern/cycles/render/attribute.cpp
===================================================================
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;
}
More information about the Bf-blender-cvs
mailing list