[Bf-blender-cvs] [897df6e8a9e] greasepencil-object: GPencil: Tag main to update after creating a new object
Antonio Vazquez
noreply at git.blender.org
Thu Apr 9 18:56:33 CEST 2020
Commit: 897df6e8a9e19b5ccf84d321c745f66d84ca88ae
Author: Antonio Vazquez
Date: Wed Apr 8 20:05:16 2020 +0200
Branches: greasepencil-object
https://developer.blender.org/rB897df6e8a9e19b5ccf84d321c745f66d84ca88ae
GPencil: Tag main to update after creating a new object
===================================================================
M source/blender/editors/gpencil/gpencil_mesh.c
M source/blender/editors/gpencil/gpencil_trace_ops.c
===================================================================
diff --git a/source/blender/editors/gpencil/gpencil_mesh.c b/source/blender/editors/gpencil/gpencil_mesh.c
index 7706db4b4a6..4ad5d36a312 100644
--- a/source/blender/editors/gpencil/gpencil_mesh.c
+++ b/source/blender/editors/gpencil/gpencil_mesh.c
@@ -189,10 +189,12 @@ static int gp_bake_mesh_animation_exec(bContext *C, wmOperator *op)
const int project_type = RNA_enum_get(op->ptr, "project_type");
/* Create a new grease pencil object in origin. */
+ bool newob = false;
if (STREQ(target, "*NEW")) {
ushort local_view_bits = (v3d && v3d->localvd) ? v3d->local_view_uuid : 0;
float loc[3] = {0.0f, 0.0f, 0.0f};
ob_gpencil = ED_gpencil_add_object(C, loc, local_view_bits);
+ newob = true;
}
else {
ob_gpencil = BLI_findstring(&bmain->objects, target, offsetof(ID, name) + 2);
@@ -315,6 +317,9 @@ static int gp_bake_mesh_animation_exec(bContext *C, wmOperator *op)
}
/* notifiers */
+ if (newob) {
+ DEG_relations_tag_update(bmain);
+ }
DEG_id_tag_update(&scene->id, ID_RECALC_SELECT);
WM_event_add_notifier(C, NC_OBJECT | NA_ADDED, NULL);
WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, scene);
diff --git a/source/blender/editors/gpencil/gpencil_trace_ops.c b/source/blender/editors/gpencil/gpencil_trace_ops.c
index 6960269f35f..348dc2faba8 100644
--- a/source/blender/editors/gpencil/gpencil_trace_ops.c
+++ b/source/blender/editors/gpencil/gpencil_trace_ops.c
@@ -107,10 +107,12 @@ static int gp_trace_image_exec(bContext *C, wmOperator *op)
param->turdsize = 0;
/* Create a new grease pencil object in origin. */
+ bool newob = false;
if (STREQ(target, "*NEW")) {
ushort local_view_bits = (v3d && v3d->localvd) ? v3d->local_view_uuid : 0;
float loc[3] = {0.0f, 0.0f, 0.0f};
ob_gpencil = ED_gpencil_add_object(C, loc, local_view_bits);
+ newob = true;
}
else {
ob_gpencil = BLI_findstring(&bmain->objects, target, offsetof(ID, name) + 2);
@@ -173,6 +175,9 @@ static int gp_trace_image_exec(bContext *C, wmOperator *op)
}
/* notifiers */
+ if (newob) {
+ DEG_relations_tag_update(bmain);
+ }
DEG_id_tag_update(&scene->id, ID_RECALC_SELECT);
DEG_id_tag_update(&gpd->id, ID_RECALC_GEOMETRY | ID_RECALC_COPY_ON_WRITE);
@@ -204,8 +209,9 @@ void GPENCIL_OT_trace_image(wmOperatorType *ot)
"",
"Target grease pencil object name. Leave empty for new object");
RNA_def_int(ot->srna, "frame_target", 1, 1, 100000, "Frame Target", "", 1, 100000);
+
RNA_def_float_factor(ot->srna,
- "thershold",
+ "threshold",
0.5f,
0.0f,
1.0f,
More information about the Bf-blender-cvs
mailing list