[Bf-blender-cvs] [b6754b82b4e] cycles_procedural_api: encapsulate DataStore.time_sampling
Kévin Dietrich
noreply at git.blender.org
Sun Dec 6 06:26:28 CET 2020
Commit: b6754b82b4ea3a83c2efc455505fefb160ea5f8d
Author: Kévin Dietrich
Date: Thu Dec 3 15:31:08 2020 +0100
Branches: cycles_procedural_api
https://developer.blender.org/rBb6754b82b4ea3a83c2efc455505fefb160ea5f8d
encapsulate DataStore.time_sampling
===================================================================
M intern/cycles/render/alembic.cpp
M intern/cycles/render/alembic.h
===================================================================
diff --git a/intern/cycles/render/alembic.cpp b/intern/cycles/render/alembic.cpp
index 1a489d54617..6825d0660b4 100644
--- a/intern/cycles/render/alembic.cpp
+++ b/intern/cycles/render/alembic.cpp
@@ -685,7 +685,7 @@ void AlembicObject::setup_transform_cache()
// TODO(@kevindietrich) : proper time sampling, but is it possible for the hierarchy to have
// different time sampling for each xform ?
- cached_data.transforms.set_time_sampling(cached_data.vertices.time_sampling);
+ cached_data.transforms.set_time_sampling(cached_data.vertices.get_time_sampling());
}
AttributeRequestSet AlembicObject::get_requested_attributes()
diff --git a/intern/cycles/render/alembic.h b/intern/cycles/render/alembic.h
index a371d6f53d1..fcb98caea07 100644
--- a/intern/cycles/render/alembic.h
+++ b/intern/cycles/render/alembic.h
@@ -51,15 +51,19 @@ template<typename T> class DataStore {
};
vector<DataTimePair> data{};
-
- public:
Alembic::AbcCoreAbstract::TimeSampling time_sampling{};
+ public:
void set_time_sampling(Alembic::AbcCoreAbstract::TimeSampling time_sampling_)
{
time_sampling = time_sampling_;
}
+ Alembic::AbcCoreAbstract::TimeSampling get_time_sampling() const
+ {
+ return time_sampling;
+ }
+
T *data_for_time(double time)
{
if (size() == 0) {
More information about the Bf-blender-cvs
mailing list