blender
/
blender
138
428
Fork 616
Code Issues 6.3k Pull Requests 789 Projects 19 Wiki Activity

Fix #116734: Measure Tool Undo crash. #116751

Merged
Bastien Montagne merged 3 commits from mont29/blender:tmp-116734 into main 2024-01-12 11:13:51 +01:00
Conversation 3 Commits 3 Files Changed 1 +20 -4
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/editors/space_view3d/view3d_gizmo_ruler.cc
View File

@ -515,11 +515,25 @@ static RulerItem *gzgroup_ruler_item_first_get(wmGizmoGroup *gzgroup)
}
#define RULER_ID "RulerData3D"
static bool view3d_ruler_to_gpencil(bContext *C, wmGizmoGroup *gzgroup)
/* GP data creation has to happen before the undo step is stored.
mont29 marked this conversation as resolved Outdated
Campbell Barton commented 2024-01-11 11:47:59 +01:00
Outdated
Review
Copy Link

Worth referencing #116734.

Worth referencing #116734.
* See also #116734. */
static void view3d_ruler_gpencil_ensure(bContext *C)
{
// RulerInfo *ruler_info = gzgroup->customdata;
Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);
if (scene->gpd == nullptr) {
scene->gpd = BKE_gpencil_data_addnew(bmain, "Annotations");
ideasman42 marked this conversation as resolved
Campbell Barton commented 2024-01-11 11:34:43 +01:00
Review
Copy Link

Note why this is needed.

Note why this is needed.
Bastien Montagne commented 2024-01-11 12:54:15 +01:00
Review
Copy Link

Not sure what you mean? We are creating a new ID, and linking it to another ID, so we need to tag the modified ID for update... This is done in thousands of places all over our codebase, I would not expect to have to document this.

Actually, I also forgot to tag for relations update here.

Not sure what you mean? We are creating a new ID, and linking it to another ID, so we need to tag the modified ID for update... This is done in thousands of places all over our codebase, I would not expect to have to document this. Actually, I also forgot to tag for relations update here.
Campbell Barton commented 2024-01-11 22:47:00 +01:00
Review
Copy Link

Ah, no need then, I thought this might relate to undo (as tagging wasn't done before).

Ah, no need then, I thought this might relate to undo (as tagging wasn't done before).
👍 1
DEG_id_tag_update_ex(bmain, &scene->id, ID_RECALC_COPY_ON_WRITE);
DEG_relations_tag_update(bmain);
}
}
static bool view3d_ruler_to_gpencil(bContext *C, wmGizmoGroup *gzgroup)
{
// RulerInfo *ruler_info = gzgroup->customdata;
Scene *scene = CTX_data_scene(C);
bGPdata *gpd;
bGPDlayer *gpl;
@ -529,9 +543,7 @@ static bool view3d_ruler_to_gpencil(bContext *C, wmGizmoGroup *gzgroup)
const char *ruler_name = RULER_ID;
bool changed = false;
if (scene->gpd == nullptr) {
scene->gpd = BKE_gpencil_data_addnew(bmain, "Annotations");
}
BLI_assert(scene->gpd != nullptr);
gpd = scene->gpd;
gpl = view3d_ruler_layer_get(gpd);
@ -1191,6 +1203,9 @@ static int gizmo_ruler_invoke(bContext *C, wmGizmo *gz, const wmEvent *event)
ruler_info->item_active = ruler_item_pick;
/* Ensures there is a valid GPencil data in current scene. */
view3d_ruler_gpencil_ensure(C);
return OPERATOR_RUNNING_MODAL;
}
@ -1419,6 +1434,7 @@ static int view3d_ruler_remove_invoke(bContext *C, wmOperator *op, const wmEvent
}
/* Update the annotation layer. */
view3d_ruler_gpencil_ensure(C);
view3d_ruler_to_gpencil(C, gzgroup);
ED_region_tag_redraw_editor_overlays(region);