blender
/
blender
134
400
Fork 583
Code Issues 6.3k Pull Requests 759 Projects 19 Wiki Activity

WIP: Brush assets project #106303

Draft
Julian Eisel wants to merge 358 commits from brush-assets-project into main
pull from: brush-assets-project
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 8 Commits 358 Files Changed 123 +6 -1
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 619d83d5ea - Show all commits

7
source/blender/blenkernel/intern/geometry_fields.cc
View File

@ -766,7 +766,8 @@ bool try_capture_field_on_geometry(GeometryComponent &component,
const fn::Field<bool> &selection,
const fn::GField &field)
{
if (component.type() == GeometryComponent::Type::GreasePencil &&
const GeometryComponent::Type component_type = component.type();
if (component_type == GeometryComponent::Type::GreasePencil &&
ELEM(domain, AttrDomain::Point, AttrDomain::Curve))
{
/* Capture the field on every layer individually. */
@ -798,6 +799,10 @@ bool try_capture_field_on_geometry(GeometryComponent &component,
});
return any_success;
}
if (component_type == GeometryComponent::Type::GreasePencil && domain != AttrDomain::Layer) {
/* The remaining code only handles the layer domain for grease pencil geometries. */
return false;
}
MutableAttributeAccessor attributes = *component.attributes_for_write();
const GeometryFieldContext field_context{component, domain};