Differential D35 Diff 104 source/blender/editors/mask/mask_ops.c

Changeset View

Standalone View

source/blender/editors/mask/mask_ops.c

Context not available.
	#include "BKE_depsgraph.h"	#include "BKE_depsgraph.h"
	#include "BKE_main.h"	#include "BKE_main.h"
	#include "BKE_mask.h"	#include "BKE_mask.h"
		#include "BKE_report.h"

	#include "DNA_scene_types.h"	#include "DNA_scene_types.h"
	#include "DNA_mask_types.h"	#include "DNA_mask_types.h"
Context not available.
	}	}
	}	}

	static int delete_exec(bContext C, wmOperator UNUSED(op))	static int delete_exec(bContext C, wmOperator op)
	{	{
	Scene *scene = CTX_data_scene(C);	Scene *scene = CTX_data_scene(C);
	Mask *mask = CTX_data_edit_mask(C);	Mask *mask = CTX_data_edit_mask(C);
	MaskLayer *masklay;	MaskLayer *masklay;
		int num_deleted = 0;

	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {	for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
	MaskSpline *spline;	MaskSpline *spline;
Context not available.
	}	}

	if (count == 0) {	if (count == 0) {

	/* delete the whole spline */	/* delete the whole spline */
	BLI_remlink(&masklay->splines, spline);	BLI_remlink(&masklay->splines, spline);
	BKE_mask_spline_free(spline);	BKE_mask_spline_free(spline);
Context not available.
	}	}

	BKE_mask_layer_shape_changed_remove(masklay, mask_layer_shape_ofs, tot_point_orig);	BKE_mask_layer_shape_changed_remove(masklay, mask_layer_shape_ofs, tot_point_orig);

		num_deleted++;
	}	}
	else {	else {
	MaskSplinePoint *new_points;	MaskSplinePoint *new_points;
Context not available.
	spline->tot_point--;	spline->tot_point--;

	BKE_mask_layer_shape_changed_remove(masklay, mask_layer_shape_ofs + j, 1);	BKE_mask_layer_shape_changed_remove(masklay, mask_layer_shape_ofs + j, 1);

		num_deleted++;
	}	}
	}	}

Context not available.
	}	}
	}	}

		brechtUnsubmitted Not Done Inline Actions Here we should check if anything was actually modified, in fact the calls to BKE_mask_update_display and WM_event_add_notifier can be skipped in that case too, and the operator can return OPERATOR_CANCELLED; brecht: Here we should check if anything was actually modified, in fact the calls to…
	/* TODO: only update edited splines */	if (num_deleted == 0) {
	BKE_mask_update_display(mask, CFRA);	return OPERATOR_CANCELLED;
		}
		else {
		/* TODO: only update edited splines */
		BKE_mask_update_display(mask, CFRA);

	WM_event_add_notifier(C, NC_MASK \| NA_EDITED, mask);	WM_event_add_notifier(C, NC_MASK \| NA_EDITED, mask);

	return OPERATOR_FINISHED;	BKE_reportf(op->reports, RPT_INFO, "Deleted selected control points from mask '%s'", mask->id.name);

		return OPERATOR_FINISHED;
		}
	}	}

	void MASK_OT_delete(wmOperatorType *ot)	void MASK_OT_delete(wmOperatorType *ot)
Context not available.
	ot->idname = "MASK_OT_delete";	ot->idname = "MASK_OT_delete";

	/* api callbacks */	/* api callbacks */
	ot->invoke = WM_operator_confirm;
	ot->exec = delete_exec;	ot->exec = delete_exec;
	ot->poll = ED_maskedit_mask_poll;	ot->poll = ED_maskedit_mask_poll;

Context not available.