diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-09-15 05:46:25 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-09-15 05:46:25 +0400 |
commit | 506db730329a1e78c78391cc973a35265df6b169 (patch) | |
tree | 1a36d166ea0b6a9545ee82993226679f657748de /source/blender | |
parent | 809cb5e478a881b62896fbb0050efded9b6939b6 (diff) |
- update bl_run_operators.py for change in blender.
- rename curve delete operator vertices enum to match mesh delete operator.
- add missing NULL checks to view3d_lock_poll() to prevent crashes when called outside a view3d.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/curve/editcurve.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index ce0881b2e11..d2eab3e8dea 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -6245,7 +6245,7 @@ static int curve_delete_exec(bContext *C, wmOperator *op) } static EnumPropertyItem curve_delete_type_items[] = { - {CURVE_VERTEX, "VERTICES", 0, "Vertices", ""}, + {CURVE_VERTEX, "VERT", 0, "Vertices", ""}, {CURVE_SEGMENT, "SEGMENT", 0, "Segments", ""}, {0, NULL, 0, NULL, NULL} }; diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index d0d1a48e832..4765ff6364a 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -1012,9 +1012,13 @@ static int view3d_camera_user_poll(bContext *C) static int view3d_lock_poll(bContext *C) { View3D *v3d = CTX_wm_view3d(C); - RegionView3D *rv3d = CTX_wm_region_view3d(C); - - return ED_view3d_offset_lock_check(v3d, rv3d); + if (v3d) { + RegionView3D *rv3d = CTX_wm_region_view3d(C); + if (rv3d) { + return ED_view3d_offset_lock_check(v3d, rv3d); + } + } + return false; } static int viewrotate_cancel(bContext *C, wmOperator *op) |