Differential D5349 Diff 16616 source/blender/editors/gpencil/gpencil_merge.c

Changeset View

Standalone View

Show First 20 Lines • Show All 92 Lines • ▼ Show 20 Lines	for (int i = 0; i < totpoints; i++) {
pt_dst->uv_rot = 0;		pt_dst->uv_rot = 0;
pt_dst->flag \|= GP_SPOINT_SELECT;		pt_dst->flag \|= GP_SPOINT_SELECT;
}		}
}		}

static bGPDstroke gpencil_prepare_stroke(bContext C, wmOperator *op, int totpoints)		static bGPDstroke gpencil_prepare_stroke(bContext C, wmOperator *op, int totpoints)
{		{
ToolSettings *ts = CTX_data_tool_settings(C);		ToolSettings *ts = CTX_data_tool_settings(C);
Depsgraph *depsgraph = CTX_data_depsgraph(C);
Object *ob = CTX_data_active_object(C);		Object *ob = CTX_data_active_object(C);
bGPDlayer *gpl = CTX_data_active_gpencil_layer(C);		bGPDlayer *gpl = CTX_data_active_gpencil_layer(C);

int cfra_eval = (int)DEG_get_ctime(depsgraph);		Scene *scene = CTX_data_scene(C);
		int cfra_eval = CFRA;

const bool back = RNA_boolean_get(op->ptr, "back");		const bool back = RNA_boolean_get(op->ptr, "back");
const bool additive = RNA_boolean_get(op->ptr, "additive");		const bool additive = RNA_boolean_get(op->ptr, "additive");
const bool cyclic = RNA_boolean_get(op->ptr, "cyclic");		const bool cyclic = RNA_boolean_get(op->ptr, "cyclic");

Paint *paint = &ts->gp_paint->paint;		Paint *paint = &ts->gp_paint->paint;
/* if not exist, create a new one */		/* if not exist, create a new one */
if ((paint->brush == NULL) \|\| (paint->brush->gpencil_settings == NULL)) {		if ((paint->brush == NULL) \|\| (paint->brush->gpencil_settings == NULL)) {
▲ Show 20 Lines • Show All 457 Lines • Show Last 20 Lines