forked from bartvdbraak/blender
Merge branch 'blender-v2.92-release'
This commit is contained in:
commit
95af2e39f6
@ -101,7 +101,7 @@ struct ListBase *ED_image_paint_tile_list_get(void);
|
|||||||
|
|
||||||
/* paint_curve_undo.c */
|
/* paint_curve_undo.c */
|
||||||
void ED_paintcurve_undo_push_begin(const char *name);
|
void ED_paintcurve_undo_push_begin(const char *name);
|
||||||
void ED_paintcurve_undo_push_end(void);
|
void ED_paintcurve_undo_push_end(struct bContext *C);
|
||||||
|
|
||||||
void ED_paintcurve_undosys_type(struct UndoType *ut);
|
void ED_paintcurve_undosys_type(struct UndoType *ut);
|
||||||
|
|
||||||
|
@ -241,7 +241,7 @@ static void paintcurve_point_add(bContext *C, wmOperator *op, const int loc[2])
|
|||||||
pcp[add_index].bez.h1 = HD_ALIGN;
|
pcp[add_index].bez.h1 = HD_ALIGN;
|
||||||
}
|
}
|
||||||
|
|
||||||
ED_paintcurve_undo_push_end();
|
ED_paintcurve_undo_push_end(C);
|
||||||
|
|
||||||
WM_paint_cursor_tag_redraw(window, region);
|
WM_paint_cursor_tag_redraw(window, region);
|
||||||
}
|
}
|
||||||
@ -352,7 +352,7 @@ static int paintcurve_delete_point_exec(bContext *C, wmOperator *op)
|
|||||||
|
|
||||||
#undef DELETE_TAG
|
#undef DELETE_TAG
|
||||||
|
|
||||||
ED_paintcurve_undo_push_end();
|
ED_paintcurve_undo_push_end(C);
|
||||||
|
|
||||||
WM_paint_cursor_tag_redraw(window, region);
|
WM_paint_cursor_tag_redraw(window, region);
|
||||||
|
|
||||||
@ -463,12 +463,12 @@ static bool paintcurve_point_select(
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!pcp) {
|
if (!pcp) {
|
||||||
ED_paintcurve_undo_push_end();
|
ED_paintcurve_undo_push_end(C);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ED_paintcurve_undo_push_end();
|
ED_paintcurve_undo_push_end(C);
|
||||||
|
|
||||||
WM_paint_cursor_tag_redraw(window, region);
|
WM_paint_cursor_tag_redraw(window, region);
|
||||||
|
|
||||||
@ -614,7 +614,7 @@ static int paintcurve_slide_modal(bContext *C, wmOperator *op, const wmEvent *ev
|
|||||||
if (event->type == psd->event && event->val == KM_RELEASE) {
|
if (event->type == psd->event && event->val == KM_RELEASE) {
|
||||||
MEM_freeN(psd);
|
MEM_freeN(psd);
|
||||||
ED_paintcurve_undo_push_begin(op->type->name);
|
ED_paintcurve_undo_push_begin(op->type->name);
|
||||||
ED_paintcurve_undo_push_end();
|
ED_paintcurve_undo_push_end(C);
|
||||||
return OPERATOR_FINISHED;
|
return OPERATOR_FINISHED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -177,10 +177,10 @@ void ED_paintcurve_undo_push_begin(const char *name)
|
|||||||
BKE_undosys_step_push_init_with_type(ustack, C, name, BKE_UNDOSYS_TYPE_PAINTCURVE);
|
BKE_undosys_step_push_init_with_type(ustack, C, name, BKE_UNDOSYS_TYPE_PAINTCURVE);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ED_paintcurve_undo_push_end(void)
|
void ED_paintcurve_undo_push_end(bContext *C)
|
||||||
{
|
{
|
||||||
UndoStack *ustack = ED_undo_stack_get();
|
UndoStack *ustack = ED_undo_stack_get();
|
||||||
BKE_undosys_step_push(ustack, NULL, NULL);
|
BKE_undosys_step_push(ustack, C, NULL);
|
||||||
BKE_undosys_stack_limit_steps_and_memory_defaults(ustack);
|
BKE_undosys_stack_limit_steps_and_memory_defaults(ustack);
|
||||||
WM_file_tag_modified();
|
WM_file_tag_modified();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user