Commit: 432d274990d46f54d2d27cb0a8a351ecd2de4491
Author: Campbell Barton
Date: Sun Sep 14 17:26:45 2014 +1000
Branches: master
https://developer.blender.org/rB432d274990d46f54d2d27cb0a8a351ecd2de4491
Cleanup & typo in assignment
===================================================================
M source/blender/blenlib/intern/convexhull2d.c
M source/blender/blenlib/intern/polyfill2d.c
M source/blender/editors/interface/interface_handlers.c
M source/blender/windowmanager/intern/wm_event_system.c
M source/blender/windowmanager/intern/wm_keymap.c
===================================================================
diff --git a/source/blender/blenlib/intern/convexhull2d.c
b/source/blender/blenlib/intern/convexhull2d.c
index 34ee39d..361e4b4 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 dd829e5..40390b0 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 d3c8897..33bb46c 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 ab4b21d..2f8ee1c 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 f2eaa8d..748303f 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
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
