diff options
| author | Julian Eisel <julian@blender.org> | 2022-09-13 16:45:25 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2022-09-13 16:45:25 +0300 |
| commit | 22580aff76db27c233f9986db54aafc440c7596f (patch) | |
| tree | a4c1b5fc171b33123a040fc35e4671e139f47129 /source/blender/editors/curve/editfont_undo.c | |
| parent | 15ad4334fc95824296f0a617927d1ec5e54a3bc7 (diff) | |
| parent | b6ebd5591c7f0e7037a2af66b5e1d96125834949 (diff) | |
Merge branch 'master' into asset-browser-grid-view
Diffstat (limited to 'source/blender/editors/curve/editfont_undo.c')
| -rw-r--r-- | source/blender/editors/curve/editfont_undo.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/curve/editfont_undo.c b/source/blender/editors/curve/editfont_undo.c index 09e5428b0f9..06d2357dc89 100644 --- a/source/blender/editors/curve/editfont_undo.c +++ b/source/blender/editors/curve/editfont_undo.c @@ -19,6 +19,7 @@ #include "DNA_scene_types.h" #include "BKE_context.h" +#include "BKE_layer.h" #include "BKE_main.h" #include "BKE_undo_system.h" #include "BKE_vfont.h" @@ -308,7 +309,7 @@ static void undofont_free_data(UndoFont *uf) static Object *editfont_object_from_context(bContext *C) { ViewLayer *view_layer = CTX_data_view_layer(C); - Object *obedit = OBEDIT_FROM_VIEW_LAYER(view_layer); + Object *obedit = BKE_view_layer_edit_object_get(view_layer); if (obedit && obedit->type == OB_FONT) { Curve *cu = obedit->data; EditFont *ef = cu->editfont; |