griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.3-release'

Browse Source
This commit is contained in:
Pratik Borhade
2024-11-06 20:28:26 +05:30
parent 9b2356ae47 496023691c
commit 2d37a3a1a7
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,10 +22,7 @@ void validate_drawing_vertex_groups(GreasePencil &grease_pencil);
int ensure_vertex_group(const StringRef name, ListBase &vertex_group_names);
/** Assign selected vertices to the vertex group. */
void assign_to_vertex_group(GreasePencil &grease_pencil,
Drawing &drawing,
StringRef name,
float weight);
void assign_to_vertex_group(Drawing &drawing, StringRef name, float weight);
void assign_to_vertex_group_from_mask(CurvesGeometry &curves,
const IndexMask &mask,
@@ -42,8 +39,7 @@ bool remove_from_vertex_group(GreasePencil &grease_pencil, StringRef name, bool
void clear_vertex_groups(GreasePencil &grease_pencil);
/** Select or deselect vertices assigned to this group. */
void select_from_group(GreasePencil &grease_pencil,
Drawing &drawing,
void select_from_group(Drawing &drawing,
const AttrDomain selection_domain,
StringRef name,
bool select);

9
source/blender/blenkernel/intern/grease_pencil_vertex_groups.cc
View File

@@ -95,10 +95,7 @@ void assign_to_vertex_group_from_mask(bke::CurvesGeometry &curves,
});
}
void assign_to_vertex_group(GreasePencil & /*grease_pencil*/,
Drawing &drawing,
const StringRef name,
const float weight)
void assign_to_vertex_group(Drawing &drawing, const StringRef name, const float weight)
{
bke::CurvesGeometry &curves = drawing.strokes_for_write();
@@ -190,8 +187,12 @@ void clear_vertex_groups(GreasePencil &grease_pencil)
}
}
<<<<<<< HEAD
void select_from_group(GreasePencil & /*grease_pencil*/,
Drawing &drawing,
=======
void select_from_group(Drawing &drawing,
>>>>>>> blender-v4.3-release
const AttrDomain selection_domain,
const StringRef name,
const bool select)

5
source/blender/editors/object/object_vgroup.cc
View File

@@ -1106,7 +1106,7 @@ static void vgroup_select_verts(const ToolSettings &tool_settings,
Vector<MutableDrawingInfo> drawings = retrieve_editable_drawings(scene, *grease_pencil);
for (MutableDrawingInfo info : drawings) {
bke::greasepencil::select_from_group(
*grease_pencil, info.drawing, selection_domain, def_group->name, bool(select));
info.drawing, selection_domain, def_group->name, bool(select));
}
}
DEG_id_tag_update(&grease_pencil->id, ID_RECALC_GEOMETRY);
@@ -2317,8 +2317,7 @@ static void vgroup_assign_verts(Object *ob, Scene &scene, const float weight)
using namespace ed::greasepencil;
Vector<MutableDrawingInfo> drawings = retrieve_editable_drawings(scene, *grease_pencil);
for (MutableDrawingInfo info : drawings) {
bke::greasepencil::assign_to_vertex_group(
*grease_pencil, info.drawing, defgroup->name, weight);
bke::greasepencil::assign_to_vertex_group(info.drawing, defgroup->name, weight);
}
}
}