Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: simplify Cycles primitive attribute map storage

Browse Source
This commit is contained in:
Brecht Van Lommel
2020-02-03 21:40:58 +01:00
parent d9c5f0d25f
commit d809853513
9 changed files with 88 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
intern/cycles/render/attribute.h
View File

@@ -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);