diff options
| author | Julian Eisel <julian@blender.org> | 2022-07-20 18:25:31 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2022-07-20 18:25:31 +0300 |
| commit | 9dbcefb10e53cc809eb2e99333376b2a881c0863 (patch) | |
| tree | 9ea058c2877c472aba82650e24e5927e3f03eded /intern/cycles/scene/attribute.h | |
| parent | e1ced645fa208b3b77e07c99cb289cf7fa659ad3 (diff) | |
| parent | 85f0b2ef5d5bfb67c245da0a52aeec44e63445fa (diff) | |
Merge branch 'asset-browser-grid-view' into file-browser-grid-view
Diffstat (limited to 'intern/cycles/scene/attribute.h')
| -rw-r--r-- | intern/cycles/scene/attribute.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/scene/attribute.h b/intern/cycles/scene/attribute.h index fd13b8ff6de..7f8cbf32049 100644 --- a/intern/cycles/scene/attribute.h +++ b/intern/cycles/scene/attribute.h @@ -194,6 +194,7 @@ class AttributeSet { void remove(AttributeStandard std); Attribute *find(AttributeRequest &req); + Attribute *find_matching(const Attribute &other); void remove(Attribute *attribute); |