diff options
Diffstat (limited to 'source/blender')
20 files changed, 5 insertions, 39 deletions
diff --git a/source/blender/editors/armature/armature_utils.c b/source/blender/editors/armature/armature_utils.c index cf7f6699e5e..34f2b4f12be 100644 --- a/source/blender/editors/armature/armature_utils.c +++ b/source/blender/editors/armature/armature_utils.c @@ -392,7 +392,7 @@ void armature_tag_unselect(bArmature *arm) void ED_armature_ebone_transform_mirror_update(bArmature *arm, EditBone *ebo, bool check_select) { /* TODO When this function is called by property updates, - * cancelling the value change will not restore mirrored bone correctly. */ + * canceling the value change will not restore mirrored bone correctly. */ /* Currently check_select==true when this function is called from a transform operator, * eg. from 3d viewport. */ diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 336f942ad8c..42feda0e1bc 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -10892,7 +10892,7 @@ static void ui_popup_handler_remove(bContext *C, void *userdata) /* More correct would be to expect UI_RETURN_CANCEL here, but not wanting to * cancel when removing handlers because of file exit is a rare exception. * So instead of setting cancel flag for all menus before removing handlers, - * just explicitly flag menu with UI_RETURN_OK to avoid cancelling it. */ + * just explicitly flag menu with UI_RETURN_OK to avoid canceling it. */ if ((menu->menuretval & UI_RETURN_OK) == 0 && menu->cancel_func) { menu->cancel_func(C, menu->popup_arg); } diff --git a/source/blender/editors/sculpt_paint/sculpt_transform.c b/source/blender/editors/sculpt_paint/sculpt_transform.c index 2eb1191b950..59a4695ce18 100644 --- a/source/blender/editors/sculpt_paint/sculpt_transform.c +++ b/source/blender/editors/sculpt_paint/sculpt_transform.c @@ -199,7 +199,7 @@ void ED_sculpt_end_transform(struct bContext *C) } /* Force undo push to happen even inside transform operator, since the sculpt * undo system works separate from regular undo and this is require to properly - * finish an undo step also when cancelling. */ + * finish an undo step also when canceling. */ const bool use_nested_undo = true; SCULPT_undo_push_end_ex(use_nested_undo); SCULPT_flush_update_done(C, ob, SCULPT_UPDATE_COORDS); diff --git a/source/blender/editors/transform/transform_constraints.c b/source/blender/editors/transform/transform_constraints.c index 0347522b8e8..838c1880881 100644 --- a/source/blender/editors/transform/transform_constraints.c +++ b/source/blender/editors/transform/transform_constraints.c @@ -42,7 +42,6 @@ #include "BLI_utildefines.h" #include "BKE_context.h" -#include "BKE_scene.h" #include "ED_view3d.h" diff --git a/source/blender/editors/transform/transform_convert.c b/source/blender/editors/transform/transform_convert.c index 898e03a974d..064057990e0 100644 --- a/source/blender/editors/transform/transform_convert.c +++ b/source/blender/editors/transform/transform_convert.c @@ -55,7 +55,6 @@ #include "DEG_depsgraph_build.h" #include "transform.h" -#include "transform_mode.h" #include "transform_snap.h" /* Own include. */ diff --git a/source/blender/editors/transform/transform_convert_action.c b/source/blender/editors/transform/transform_convert_action.c index 267acd5cb04..b9292aa151c 100644 --- a/source/blender/editors/transform/transform_convert_action.c +++ b/source/blender/editors/transform/transform_convert_action.c @@ -36,7 +36,6 @@ #include "BKE_key.h" #include "BKE_mask.h" #include "BKE_nla.h" -#include "BKE_report.h" #include "ED_anim_api.h" #include "ED_keyframes_edit.h" diff --git a/source/blender/editors/transform/transform_convert_curve.c b/source/blender/editors/transform/transform_convert_curve.c index 5340f5f092f..6c03f86f883 100644 --- a/source/blender/editors/transform/transform_convert_curve.c +++ b/source/blender/editors/transform/transform_convert_curve.c @@ -64,7 +64,7 @@ static int bezt_select_to_transform_triple_flag(const BezTriple *bezt, const boo * When a center point is being moved without the handles, * leaving the handles stationary makes no sense and only causes strange behavior, * where one handle is arbitrarily anchored, the other one is aligned and lengthened - * based on where the center point is moved. Also a bug when cancelling, see: T52007. + * based on where the center point is moved. Also a bug when canceling, see: T52007. * * A more 'correct' solution could be to store handle locations in 'TransDataCurveHandleFlags'. * However that doesn't resolve odd behavior, so best transform the handles in this case. diff --git a/source/blender/editors/transform/transform_convert_mask.c b/source/blender/editors/transform/transform_convert_mask.c index 7be0d43d854..66c27bca207 100644 --- a/source/blender/editors/transform/transform_convert_mask.c +++ b/source/blender/editors/transform/transform_convert_mask.c @@ -30,7 +30,6 @@ #include "BKE_context.h" #include "BKE_mask.h" -#include "BKE_report.h" #include "ED_clip.h" #include "ED_image.h" diff --git a/source/blender/editors/transform/transform_convert_nla.c b/source/blender/editors/transform/transform_convert_nla.c index 03da979bbd3..241e65f3251 100644 --- a/source/blender/editors/transform/transform_convert_nla.c +++ b/source/blender/editors/transform/transform_convert_nla.c @@ -31,7 +31,6 @@ #include "BKE_context.h" #include "BKE_nla.h" -#include "BKE_report.h" #include "ED_anim_api.h" #include "ED_markers.h" diff --git a/source/blender/editors/transform/transform_convert_tracking.c b/source/blender/editors/transform/transform_convert_tracking.c index 36c6116b575..c3f48adca68 100644 --- a/source/blender/editors/transform/transform_convert_tracking.c +++ b/source/blender/editors/transform/transform_convert_tracking.c @@ -31,7 +31,6 @@ #include "BKE_context.h" #include "BKE_movieclip.h" #include "BKE_node.h" -#include "BKE_report.h" #include "BKE_tracking.h" #include "ED_clip.h" diff --git a/source/blender/editors/transform/transform_gizmo_2d.c b/source/blender/editors/transform/transform_gizmo_2d.c index c63e90ac2b7..dacdb72806c 100644 --- a/source/blender/editors/transform/transform_gizmo_2d.c +++ b/source/blender/editors/transform/transform_gizmo_2d.c @@ -26,14 +26,12 @@ #include "BLI_math.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" #include "DNA_view3d_types.h" #include "BKE_context.h" -#include "BKE_editmesh.h" #include "BKE_layer.h" #include "RNA_access.h" @@ -44,7 +42,6 @@ #include "WM_api.h" #include "WM_message.h" #include "WM_types.h" -#include "wm.h" /* XXX */ #include "ED_gizmo_library.h" #include "ED_gizmo_utils.h" diff --git a/source/blender/editors/transform/transform_gizmo_3d.c b/source/blender/editors/transform/transform_gizmo_3d.c index 4c561037986..3878103fa4e 100644 --- a/source/blender/editors/transform/transform_gizmo_3d.c +++ b/source/blender/editors/transform/transform_gizmo_3d.c @@ -39,7 +39,6 @@ #include "BLI_array_utils.h" #include "BLI_listbase.h" #include "BLI_math.h" -#include "BLI_string.h" #include "BLI_utildefines.h" #include "BKE_action.h" @@ -48,25 +47,20 @@ #include "BKE_editmesh.h" #include "BKE_global.h" #include "BKE_gpencil.h" -#include "BKE_lattice.h" #include "BKE_layer.h" #include "BKE_object.h" #include "BKE_paint.h" -#include "BKE_particle.h" #include "BKE_pointcache.h" #include "BKE_scene.h" -#include "BKE_workspace.h" #include "DEG_depsgraph.h" #include "WM_api.h" #include "WM_message.h" -#include "WM_toolsystem.h" #include "WM_types.h" #include "wm.h" #include "ED_armature.h" -#include "ED_curve.h" #include "ED_gizmo_library.h" #include "ED_gizmo_utils.h" #include "ED_gpencil.h" @@ -90,8 +84,6 @@ #include "GPU_state.h" -#include "DEG_depsgraph_query.h" - /* return codes for select, and drawing flags */ #define MAN_TRANS_X (1 << 0) diff --git a/source/blender/editors/transform/transform_gizmo_extrude_3d.c b/source/blender/editors/transform/transform_gizmo_extrude_3d.c index e6e74668c2c..7f6f3e53bc3 100644 --- a/source/blender/editors/transform/transform_gizmo_extrude_3d.c +++ b/source/blender/editors/transform/transform_gizmo_extrude_3d.c @@ -38,7 +38,6 @@ #include "ED_gizmo_utils.h" #include "ED_screen.h" #include "ED_transform.h" -#include "ED_view3d.h" #include "UI_resources.h" diff --git a/source/blender/editors/transform/transform_mode.c b/source/blender/editors/transform/transform_mode.c index e1fd22f06be..f028044809f 100644 --- a/source/blender/editors/transform/transform_mode.c +++ b/source/blender/editors/transform/transform_mode.c @@ -39,8 +39,6 @@ #include "RNA_access.h" -#include "ED_screen.h" - #include "UI_interface.h" #include "BLT_translation.h" diff --git a/source/blender/editors/transform/transform_mode_timetranslate.c b/source/blender/editors/transform/transform_mode_timetranslate.c index c514df497bc..28eaff8c136 100644 --- a/source/blender/editors/transform/transform_mode_timetranslate.c +++ b/source/blender/editors/transform/transform_mode_timetranslate.c @@ -29,7 +29,6 @@ #include "BLI_string.h" #include "BKE_context.h" -#include "BKE_nla.h" #include "BKE_unit.h" #include "ED_screen.h" diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c index d643244e6ca..95249f4d17b 100644 --- a/source/blender/editors/transform/transform_ops.c +++ b/source/blender/editors/transform/transform_ops.c @@ -20,7 +20,6 @@ #include "MEM_guardedalloc.h" -#include "DNA_mesh_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -32,7 +31,6 @@ #include "BKE_context.h" #include "BKE_editmesh.h" #include "BKE_global.h" -#include "BKE_layer.h" #include "BKE_report.h" #include "BKE_scene.h" diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c index cd170b144d8..493b52495db 100644 --- a/source/blender/editors/transform/transform_orientations.c +++ b/source/blender/editors/transform/transform_orientations.c @@ -32,7 +32,6 @@ #include "DNA_screen_types.h" #include "DNA_space_types.h" #include "DNA_view3d_types.h" -#include "DNA_workspace_types.h" #include "BLI_listbase.h" #include "BLI_math.h" @@ -47,7 +46,6 @@ #include "BKE_layer.h" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_workspace.h" #include "BLT_translation.h" diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index 4f942221f79..b508507cd4e 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -28,7 +28,6 @@ #include "PIL_time.h" -#include "DNA_meshdata_types.h" /* Temporary, for snapping to other unselected meshes */ #include "DNA_node_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -45,10 +44,8 @@ #include "GPU_state.h" #include "BKE_context.h" -#include "BKE_duplilist.h" #include "BKE_editmesh.h" #include "BKE_layer.h" -#include "BKE_main.h" #include "BKE_object.h" #include "BKE_sequencer.h" @@ -57,15 +54,12 @@ #include "WM_types.h" #include "ED_gizmo_library.h" -#include "ED_image.h" #include "ED_markers.h" #include "ED_node.h" #include "ED_transform_snap_object_context.h" #include "ED_uvedit.h" #include "ED_view3d.h" -#include "DEG_depsgraph.h" - #include "UI_resources.h" #include "UI_view2d.h" diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c index c30b8d59dc0..08ef5109a74 100644 --- a/source/blender/editors/transform/transform_snap_object.c +++ b/source/blender/editors/transform/transform_snap_object.c @@ -44,7 +44,6 @@ #include "BKE_duplilist.h" #include "BKE_editmesh.h" #include "BKE_layer.h" -#include "BKE_main.h" #include "BKE_mesh.h" #include "BKE_mesh_runtime.h" #include "BKE_object.h" @@ -56,8 +55,6 @@ #include "ED_transform_snap_object_context.h" #include "ED_view3d.h" -#include "ED_transform.h" - /* -------------------------------------------------------------------- */ /** \name Internal Data Types * \{ */ diff --git a/source/blender/windowmanager/gizmo/WM_gizmo_types.h b/source/blender/windowmanager/gizmo/WM_gizmo_types.h index 346ed131c59..3863e3bd797 100644 --- a/source/blender/windowmanager/gizmo/WM_gizmo_types.h +++ b/source/blender/windowmanager/gizmo/WM_gizmo_types.h @@ -371,7 +371,7 @@ typedef struct wmGizmoType { /** Activate a gizmo state when the user clicks on it. */ wmGizmoFnInvoke invoke; - /** Called when gizmo tweaking is done - used to free data and reset property when cancelling. */ + /** Called when gizmo tweaking is done - used to free data and reset property when canceling. */ wmGizmoFnExit exit; wmGizmoFnCursorGet cursor_get; |