diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-09-14 11:26:45 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-09-14 11:27:31 +0400 |
commit | 432d274990d46f54d2d27cb0a8a351ecd2de4491 (patch) | |
tree | 08f260bae583a369b6b47e96f6753af90e3d16ac | |
parent | 1c9b80320f9fb203f8f7c71814c5e5efa80e28f3 (diff) |
Cleanup & typo in assignment
-rw-r--r-- | source/blender/blenlib/intern/convexhull2d.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/polyfill2d.c | 10 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_keymap.c | 2 |
5 files changed, 8 insertions, 10 deletions
diff --git a/source/blender/blenlib/intern/convexhull2d.c b/source/blender/blenlib/intern/convexhull2d.c index 34ee39d8a9b..361e4b4eadb 100644 --- a/source/blender/blenlib/intern/convexhull2d.c +++ b/source/blender/blenlib/intern/convexhull2d.c @@ -187,7 +187,7 @@ static int pointref_cmp_yx(const void *a_, const void *b_) * \param points An array of 2D points. * \param n The number of points in points. * \param r_points An array of the convex hull vertex indices (max is n). - * _must_ be allocated as ``n * 2`` becauise of how its used internally, + * _must_ be allocated as ``n * 2`` because of how its used internally, * even though the final result will be no more then \a n in size. * \returns the number of points in r_points. */ diff --git a/source/blender/blenlib/intern/polyfill2d.c b/source/blender/blenlib/intern/polyfill2d.c index dd829e5d80a..40390b0e173 100644 --- a/source/blender/blenlib/intern/polyfill2d.c +++ b/source/blender/blenlib/intern/polyfill2d.c @@ -661,12 +661,12 @@ static PolyIndex *pf_ear_tip_find( static bool pf_ear_tip_check(PolyFill *pf, PolyIndex *pi_ear_tip) { - /* localize */ - PolyIndex *pi_curr; - const float (*coords)[2] = pf->coords; - #ifndef USE_KDTREE const float *v1, *v2, *v3; +#else + /* localize */ + const float (*coords)[2] = pf->coords; + PolyIndex *pi_curr; #endif #if defined(USE_CONVEX_SKIP) && !defined(USE_KDTREE) @@ -711,8 +711,6 @@ static bool pf_ear_tip_check(PolyFill *pf, PolyIndex *pi_ear_tip) return false; } } - (void)pi_curr; - (void)coords; #else v1 = coords[pi_ear_tip->prev->index]; diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index d3c889713fb..33bb46ced7f 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -1967,7 +1967,7 @@ static int ui_text_position_from_hidden(uiBut *but, int pos) static int ui_text_position_to_hidden(uiBut *but, int pos) { - const char *butstr = butstr = (but->editstr) ? but->editstr : but->drawstr; + const char *butstr = (but->editstr) ? but->editstr : but->drawstr; return BLI_strnlen_utf8(butstr, pos); } diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index ab4b21d5e33..2f8ee1ca141 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -1557,7 +1557,7 @@ static int wm_handler_operator_call(bContext *C, ListBase *handlers, wmEventHand wmOperatorType *ot = op->type; if (!wm_operator_check_locked_interface(C, ot)) { - /* Interface is locked and pperator is not allowed to run, + /* Interface is locked and operator is not allowed to run, * nothing to do in this case. */ } diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index f2eaa8d50bd..748303f9082 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -1426,7 +1426,7 @@ wmKeyMap *WM_keymap_guess_opname(const bContext *C, const char *opname) * BOID_OT * BUTTONS_OT * CONSTRAINT_OT - * DPAINT_OT + * PAINT_OT * ED_OT * FLUID_OT * TEXTURE_OT |