diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-02-25 04:14:30 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-02-25 04:20:23 +0300 |
commit | 3ed6d9f9662118d80ed1c66c277045cd6a26254c (patch) | |
tree | 6d9cce2d211f939269d98881e33c42ba30c2ce72 /source/blender/editors/curve | |
parent | 72370b92be0db6c7726e1b74e73c393ed1d00538 (diff) |
Cleanup: use low level edit-object access functions for undo
Use OBEDIT_FROM_VIEW_LAYER macro for curve & fonts (matching edit-mesh).
While the difference isn't significant at the moment,
there are no reason these should be different between undo systems.
Diffstat (limited to 'source/blender/editors/curve')
-rw-r--r-- | source/blender/editors/curve/editcurve_undo.c | 3 | ||||
-rw-r--r-- | source/blender/editors/curve/editfont_undo.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/editors/curve/editcurve_undo.c b/source/blender/editors/curve/editcurve_undo.c index 681f387e83e..61106667d8f 100644 --- a/source/blender/editors/curve/editcurve_undo.c +++ b/source/blender/editors/curve/editcurve_undo.c @@ -173,7 +173,8 @@ static void undocurve_free_data(UndoCurve *uc) static Object *editcurve_object_from_context(bContext *C) { - Object *obedit = CTX_data_edit_object(C); + ViewLayer *view_layer = CTX_data_view_layer(C); + Object *obedit = OBEDIT_FROM_VIEW_LAYER(view_layer); if (obedit && ELEM(obedit->type, OB_CURVE, OB_SURF)) { Curve *cu = obedit->data; if (BKE_curve_editNurbs_get(cu) != NULL) { diff --git a/source/blender/editors/curve/editfont_undo.c b/source/blender/editors/curve/editfont_undo.c index 88f3ed0582c..8f7eb19dfe8 100644 --- a/source/blender/editors/curve/editfont_undo.c +++ b/source/blender/editors/curve/editfont_undo.c @@ -28,6 +28,7 @@ #include "DNA_curve_types.h" #include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BKE_context.h" #include "BKE_font.h" @@ -314,7 +315,8 @@ static void undofont_free_data(UndoFont *uf) static Object *editfont_object_from_context(bContext *C) { - Object *obedit = CTX_data_edit_object(C); + ViewLayer *view_layer = CTX_data_view_layer(C); + Object *obedit = OBEDIT_FROM_VIEW_LAYER(view_layer); if (obedit && obedit->type == OB_FONT) { Curve *cu = obedit->data; EditFont *ef = cu->editfont; |