blender
/
blender
133
398
Fork 579
Code Issues 6.3k Pull Requests 747 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 +22
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 30abf241bb - Show all commits

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

@ -153,6 +153,15 @@ class Layer : public TreeNode, public ::GreasePencilLayer {
const Vector<LayerMask> &masks() const;
Vector<LayerMask> &masks_for_write();
/**
Hans Goudey commented 2023-05-03 16:10:32 +02:00
Outdated
Review
Copy Link

Better to return a span here maybe?

Better to return a span here maybe?
* \return true if the layer is visible.
*/
bool is_visible() const;
/**
* \return true if the layer is locked.
*/
bool is_locked() const;
Falk David commented 2023-04-12 10:39:55 +02:00
Outdated
Review
Copy Link

Put out of line.

Put out of line.
/**
* Inserts the frame into the layer. Fails if there exists a frame at \a frame_number already.
Hans Goudey commented 2023-05-03 16:11:22 +02:00
Outdated
Review
Copy Link

The function is "is_locked" and the comment says "return if it is locked". This sort of comment doesn't add anything IMO, just wastes space. If there is a comment, maybe it should use a different word besides "locked" to describe the state. Or there doesn't need to be a comment at all.

The function is "is_locked" and the comment says "return if it is locked". This sort of comment doesn't add anything IMO, just wastes space. If there is a comment, maybe it should use a different word besides "locked" to describe the state. Or there doesn't need to be a comment at all.
* \returns true on success.

13
source/blender/blenkernel/intern/grease_pencil.cc
View File

@ -390,6 +390,16 @@ Vector<LayerMask> &Layer::masks_for_write()
return this->masks_;
}
bool Layer::is_visible() const
{
return (this->flag & GP_LAYER_TREE_NODE_HIDE) == 0;
}
bool Layer::is_locked() const
{
return (this->flag & GP_LAYER_TREE_NODE_LOCKED) != 0;
}
bool Layer::insert_frame(int frame_number, GreasePencilFrame &frame)
{
return this->frames_for_write().add(frame_number, frame);
@ -1153,6 +1163,9 @@ void GreasePencil::foreach_visible_drawing(
blender::Span<GreasePencilDrawingBase *> drawings = this->drawings();
for (const Layer *layer : this->layers()) {
if (!layer->is_visible()) {
continue;
}
int index = layer->drawing_index_at(frame);
if (index == -1) {
continue;