[Bf-blender-cvs] [743739f] master: Cleanup: style/spelling
Campbell Barton
noreply at git.blender.org
Fri Apr 1 01:17:29 CEST 2016
Commit: 743739f9dc3b6bdc5c726475cebedbbd48b8649a
Author: Campbell Barton
Date: Fri Apr 1 10:02:59 2016 +1100
Branches: master
https://developer.blender.org/rB743739f9dc3b6bdc5c726475cebedbbd48b8649a
Cleanup: style/spelling
===================================================================
M build_files/buildbot/master.cfg
M source/blender/blenkernel/BKE_library_query.h
M source/blender/blenkernel/intern/mesh_evaluate.c
M source/blender/editors/interface/interface_anim.c
M source/blender/editors/interface/interface_eyedropper.c
M source/blender/editors/space_graph/graph_buttons.c
===================================================================
diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg
index a66032c..70dcbfb 100644
--- a/build_files/buildbot/master.cfg
+++ b/build_files/buildbot/master.cfg
@@ -87,7 +87,7 @@ c['change_source'] = GitPoller(
# CODEBASES
#
-# Allow to controll separately things like branches for each repo and submodules.
+# Allow to control separately things like branches for each repo and submodules.
all_repositories = {
r'git://git.blender.org/blender.git': 'blender',
diff --git a/source/blender/blenkernel/BKE_library_query.h b/source/blender/blenkernel/BKE_library_query.h
index 86628ea..2e73be5 100644
--- a/source/blender/blenkernel/BKE_library_query.h
+++ b/source/blender/blenkernel/BKE_library_query.h
@@ -59,7 +59,7 @@ enum {
/**
* Call a callback for each ID link which the given ID uses.
*
- * \return a set of flags to controll further iteration (0 to keep going).
+ * \return a set of flags to control further iteration (0 to keep going).
*/
typedef int (*LibraryIDLinkCallback) (void *user_data, struct ID *id_self, struct ID **id_pointer, int cd_flag);
diff --git a/source/blender/blenkernel/intern/mesh_evaluate.c b/source/blender/blenkernel/intern/mesh_evaluate.c
index f200e85..83e020c 100644
--- a/source/blender/blenkernel/intern/mesh_evaluate.c
+++ b/source/blender/blenkernel/intern/mesh_evaluate.c
@@ -3293,7 +3293,7 @@ void BKE_mesh_polygon_flip(MPoly *mpoly, MLoop *mloop, CustomData *ldata)
/**
* Flip (invert winding of) all polygons (used to inverse their normals).
*
- * \note Invalidates tessalation, caller must handle that.
+ * \note Invalidates tessellation, caller must handle that.
*/
void BKE_mesh_polygons_flip(
MPoly *mpoly, MLoop *mloop, CustomData *ldata, int totpoly)
diff --git a/source/blender/editors/interface/interface_anim.c b/source/blender/editors/interface/interface_anim.c
index 4696774..0683157 100644
--- a/source/blender/editors/interface/interface_anim.c
+++ b/source/blender/editors/interface/interface_anim.c
@@ -259,7 +259,7 @@ void ui_but_anim_autokey(bContext *C, uiBut *but, Scene *scene, float cfra)
WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
}
}
- else {
+ else {
id = but->rnapoin.id.data;
/* TODO: this should probably respect the keyingset only option for anim */
diff --git a/source/blender/editors/interface/interface_eyedropper.c b/source/blender/editors/interface/interface_eyedropper.c
index 1684c95..2cbc56b 100644
--- a/source/blender/editors/interface/interface_eyedropper.c
+++ b/source/blender/editors/interface/interface_eyedropper.c
@@ -1093,8 +1093,8 @@ static bool driverdropper_init(bContext *C, wmOperator *op)
if ((ddr->ptr.data == NULL) ||
(ddr->prop == NULL) ||
(RNA_property_editable(&ddr->ptr, ddr->prop) == false) ||
- (RNA_property_animateable(&ddr->ptr, ddr->prop) == false) ||
- (but->flag & UI_BUT_DRIVEN))
+ (RNA_property_animateable(&ddr->ptr, ddr->prop) == false) ||
+ (but->flag & UI_BUT_DRIVEN))
{
return false;
}
diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c
index b244d85..39b1741 100644
--- a/source/blender/editors/space_graph/graph_buttons.c
+++ b/source/blender/editors/space_graph/graph_buttons.c
@@ -537,7 +537,7 @@ static void driver_dvar_invalid_name_query_cb(bContext *C, void *dvar_v, void *U
uiItemL(layout,
"It cannot start with a special character,"
" including '$', '@', '!', '~', '+', '-', '_', '.', or ' '",
- ICON_NONE);
+ ICON_NONE);
}
if (dvar->flag & DVAR_FLAG_INVALID_HAS_SPACE) {
uiItemL(layout, "It cannot contain spaces (e.g. 'a space')", ICON_ERROR);
More information about the Bf-blender-cvs
mailing list