3 Commits

Author	SHA1	Message	Date
FeRD (Frank Dana)	cf89891bf0	Finish conflict resolution	2020-10-19 17:42:12 -04:00
Jonathan Thomas	b3ad76ddf7	Fixing some regressions on image merging	2020-10-19 16:05:01 -04:00
Jonathan Thomas	8387b124ad	Large refactor of Timeline, TimelineBase, ClipBase, and Clip, to allow a Clip access to the parent timeline instance (if available), and thus, certain properties (preview size, timeline FPS, etc...). This allows for a simpler rendering of Clip keyframes (during the Clip::GetFrame method), and a simpler Timeline class, that can change the preview window size dynamically and no longer requires a Singleton Settings class. ... - Also removed "crop" from Clip class, as it was never implmeneted correctly, and we have a fully functional "crop" effect when needed - Added caching to Clip class, to optimize previewing of cached frames (much faster than previous)	2020-10-19 16:05:01 -04:00