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:
Falk David
2024-11-11 14:13:42 +01:00
parent 4c6f0bb60d 4ba7950c2c
commit eca092b225
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2216,10 +2216,12 @@ void BKE_grease_pencil_duplicate_drawing_array(const GreasePencil *grease_pencil
{
using namespace blender;
grease_pencil_dst->drawing_array_num = grease_pencil_src->drawing_array_num;
grease_pencil_dst->drawing_array = MEM_cnew_array<GreasePencilDrawingBase *>(
grease_pencil_src->drawing_array_num, __func__);
bke::greasepencil::copy_drawing_array(grease_pencil_src->drawings(),
grease_pencil_dst->drawings());
if (grease_pencil_dst->drawing_array_num > 0) {
grease_pencil_dst->drawing_array = MEM_cnew_array<GreasePencilDrawingBase *>(
grease_pencil_src->drawing_array_num, __func__);
bke::greasepencil::copy_drawing_array(grease_pencil_src->drawings(),
grease_pencil_dst->drawings());
}
}
/** \} */

3
source/blender/editors/grease_pencil/intern/grease_pencil_select.cc
View File

@@ -777,12 +777,13 @@ static void GREASE_PENCIL_OT_select_similar(wmOperatorType *ot)
ot->idname = "GREASE_PENCIL_OT_select_similar";
ot->description = "Select all strokes with similar characteristics";
ot->invoke = WM_menu_invoke;
ot->exec = select_similar_exec;
ot->poll = editable_grease_pencil_point_selection_poll;
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
RNA_def_enum(
ot->prop = RNA_def_enum(
ot->srna, "mode", select_similar_mode_items, int(SelectSimilarMode::LAYER), "Mode", "");
RNA_def_float(ot->srna, "threshold", 0.1f, 0.0f, FLT_MAX, "Threshold", "", 0.0f, 10.0f);

4
source/blender/editors/screen/screen_ops.cc
View File

@@ -2075,6 +2075,10 @@ static int area_move_modal(bContext *C, wmOperator *op, const wmEvent *event)
area_move_apply(C, op);
break;
}
case RIGHTMOUSE: {
area_move_cancel(C, op);
return OPERATOR_CANCELLED;
}
case EVT_MODAL_MAP: {
switch (event->val) {
case KM_MODAL_APPLY:

3
source/blender/editors/sculpt_paint/grease_pencil_draw_ops.cc
View File

@@ -1428,7 +1428,8 @@ static bool grease_pencil_apply_fill(bContext &C, wmOperator &op, const wmEvent
WM_cursor_modal_restore(&win);
/* Save extend value for next operation. */
brush.gpencil_settings->fill_extend_fac = op_data.extension_length;
brush.gpencil_settings->fill_extend_fac = op_data.extension_length /
bke::greasepencil::LEGACY_RADIUS_CONVERSION_FACTOR;
BKE_brush_tag_unsaved_changes(&brush);
return true;