[Bf-blender-cvs] [a8a0007] gooseberry: Removed remaining 1 frame difference in archive storage.
Lukas Tönne
noreply at git.blender.org
Mon Mar 23 13:01:44 CET 2015
Commit: a8a00074c10ef866989238a695f4a0df615bbc3d
Author: Lukas Tönne
Date: Thu Feb 26 15:50:39 2015 +0100
Branches: gooseberry
https://developer.blender.org/rBa8a00074c10ef866989238a695f4a0df615bbc3d
Removed remaining 1 frame difference in archive storage.
This was an artifact from the previous way of mapping non-0 start frame
to time 0.0. Now we start at times > 0.0 to match with the start frame.
Both ways are possible, can be changed later if needed.
===================================================================
M source/blender/pointcache/alembic/abc_frame_mapper.cpp
===================================================================
diff --git a/source/blender/pointcache/alembic/abc_frame_mapper.cpp b/source/blender/pointcache/alembic/abc_frame_mapper.cpp
index 3788861..951e434 100644
--- a/source/blender/pointcache/alembic/abc_frame_mapper.cpp
+++ b/source/blender/pointcache/alembic/abc_frame_mapper.cpp
@@ -47,12 +47,12 @@ FrameMapper::FrameMapper(Scene *scene)
chrono_t FrameMapper::frame_to_time(float frame) const
{
- return (double)(frame - 1.0f) * m_sec_per_frame;
+ return (double)frame * m_sec_per_frame;
}
float FrameMapper::time_to_frame(chrono_t time) const
{
- return (float)(time * m_frames_per_sec) + 1.0f;
+ return (float)(time * m_frames_per_sec);
}
#endif /* WITH_ALEMBIC */
More information about the Bf-blender-cvs
mailing list