diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-02-03 23:40:58 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-02-07 14:18:15 +0300 |
| commit | d809853513c1333c9d9a22ab6ba35617b5ed2b8c (patch) | |
| tree | 6c159a81df1f72c587a247ed31219705399a3788 /intern/cycles/render/attribute.h | |
| parent | d9c5f0d25fc91b069158ae1ab4fddc21bfd85846 (diff) | |
Cleanup: simplify Cycles primitive attribute map storage
Diffstat (limited to 'intern/cycles/render/attribute.h')
| -rw-r--r-- | intern/cycles/render/attribute.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/intern/cycles/render/attribute.h b/intern/cycles/render/attribute.h index d4bf630aeb6..f1fd30fd85a 100644 --- a/intern/cycles/render/attribute.h +++ b/intern/cycles/render/attribute.h @@ -170,12 +170,11 @@ class Attribute { class AttributeSet { public: - Mesh *triangle_mesh; - Mesh *subd_mesh; - Hair *hair; + Geometry *geometry; + AttributePrimitive prim; list<Attribute> attributes; - AttributeSet(); + AttributeSet(Geometry *geometry, AttributePrimitive prim); ~AttributeSet(); Attribute *add(ustring name, TypeDesc type, AttributeElement element); @@ -206,8 +205,8 @@ class AttributeRequest { AttributeStandard std; /* temporary variables used by GeometryManager */ - TypeDesc triangle_type, curve_type, subd_type; - AttributeDescriptor triangle_desc, curve_desc, subd_desc; + TypeDesc type, subd_type; + AttributeDescriptor desc, subd_desc; explicit AttributeRequest(ustring name_); explicit AttributeRequest(AttributeStandard std); |