archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cycles: Added Float2 attribute type.

Browse Source 
Float2 are now a new type for attributes in Cycles. Before, the choices
for attribute storage were float and float3, the latter padded to
float4. This meant that UV maps were inflated to twice the size
necessary.

Reviewers: brecht, sergey

Reviewed By: brecht

Subscribers: #cycles

Tags: #cycles

Differential Revision: https://developer.blender.org/D4409
This commit is contained in:
Brecht Van Lommel
2019-03-05 14:54:54 +01:00
committed by Stefan Werner
parent a325bc6bf3
commit db7f9a70b0
20 changed files with 454 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
intern/cycles/render/mesh_subdivision.cpp
View File

@@ -231,6 +231,9 @@ public:
if(attr.same_storage(attr.type, TypeDesc::TypeFloat)) {
primvar_refiner.Interpolate(i+1, (OsdValue<float>*)src, (OsdValue<float>*&)dest);
}
else if(attr.same_storage(attr.type, TypeFloat2)) {
primvar_refiner.Interpolate(i+1, (OsdValue<float2>*)src, (OsdValue<float2>*&)dest);
}
else {
primvar_refiner.Interpolate(i+1, (OsdValue<float4>*)src, (OsdValue<float4>*&)dest);
}
@@ -243,6 +246,10 @@ public:
patch_table->ComputeLocalPointValues((OsdValue<float>*)&attr.buffer[0],
(OsdValue<float>*)&attr.buffer[num_refiner_verts * attr.data_sizeof()]);
}
else if(attr.same_storage(attr.type, TypeFloat2)) {
patch_table->ComputeLocalPointValues((OsdValue<float2>*)&attr.buffer[0],
(OsdValue<float2>*)&attr.buffer[num_refiner_verts * attr.data_sizeof()]);
}
else {
patch_table->ComputeLocalPointValues((OsdValue<float4>*)&attr.buffer[0],
(OsdValue<float4>*)&attr.buffer[num_refiner_verts * attr.data_sizeof()]);