blender
/
blender
135
420
Fork 603
Code Issues 6.3k Pull Requests 753 Projects 19 Wiki Activity

Initial Grease Pencil 3.0 stage #106848

Merged
Falk David merged 224 commits from filedescriptor/blender:grease-pencil-v3 into main 2023-05-30 11:14:22 +02:00
Conversation 8 Commits 224 Files Changed 94 +4 -4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6c38afd07d - Show all commits

8
source/blender/blenkernel/BKE_grease_pencil.hh
View File

@ -273,20 +273,20 @@ class Layer : public TreeNode, ::GreasePencilLayer {
bool insert_frame(int frame_number, int index) bool insert_frame(int frame_number, int index)
{ {
sorted_keys_cache_.tag_dirty(); sorted_keys_cache_.tag_dirty();
return frames_.add(frame_number, index); return frames_for_write().add(frame_number, index);
} }
bool overwrite_frame(int frame_number, int index) bool overwrite_frame(int frame_number, int index)
{ {
sorted_keys_cache_.tag_dirty(); sorted_keys_cache_.tag_dirty();
return frames_.add_overwrite(frame_number, index); return frames_for_write().add_overwrite(frame_number, index);
} }
Span<int> sorted_keys() Span<int> sorted_keys()
{ {
sorted_keys_cache_.ensure([&](Vector<int> &r_data) { sorted_keys_cache_.ensure([&](Vector<int> &r_data) {
r_data.reserve(frames_.size()); r_data.reserve(frames().size());
for (int64_t key : frames_.keys()) { for (int64_t key : frames().keys()) {
r_data.append(key); r_data.append(key);
} }
std::sort(r_data.begin(), r_data.end()); std::sort(r_data.begin(), r_data.end());