diff options
author | Brecht Van Lommel <brecht@blender.org> | 2020-02-20 02:52:50 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-02-26 20:13:14 +0300 |
commit | d675cf20a13ac09a55ce04d6a30105eaf87f5ebe (patch) | |
tree | b084bb14d8b97f14290be3ae2efdc04a18277444 /intern/cycles/blender/blender_volume.cpp | |
parent | 78391def6e41f994e9089b346332c909b9ccc58a (diff) |
Cleanup: add ImageKey to avoid longer argument lists and duplicated code
Diffstat (limited to 'intern/cycles/blender/blender_volume.cpp')
-rw-r--r-- | intern/cycles/blender/blender_volume.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/intern/cycles/blender/blender_volume.cpp b/intern/cycles/blender/blender_volume.cpp index ae70e60d60e..47259d4945c 100644 --- a/intern/cycles/blender/blender_volume.cpp +++ b/intern/cycles/blender/blender_volume.cpp @@ -51,18 +51,13 @@ static void sync_smoke_volume(Scene *scene, BL::Object &b_ob, Mesh *mesh, float Attribute *attr = mesh->attributes.add(std); VoxelAttribute *volume_data = attr->data_voxel(); ImageMetaData metadata; - bool animated = false; + + ImageKey key; + key.filename = Attribute::standard_name(std); + key.builtin_data = b_ob.ptr.data; volume_data->manager = image_manager; - volume_data->slot = image_manager->add_image(Attribute::standard_name(std), - b_ob.ptr.data, - animated, - frame, - INTERPOLATION_LINEAR, - EXTENSION_CLIP, - IMAGE_ALPHA_AUTO, - u_colorspace_raw, - metadata); + volume_data->slot = image_manager->add_image(key, frame, metadata); } /* Create a matrix to transform from object space to mesh texture space. |