Commit: 72565fbf30378f1100da4c24e4e365b017fa447a
Author: Campbell Barton
Date: Mon Jul 6 14:18:03 2015 +1000
Branches: master
https://developer.blender.org/rB72565fbf30378f1100da4c24e4e365b017fa447a
Cleanup: style, spelling
===================================================================
M intern/ghost/test/gears/GHOST_Test.cpp
M source/blender/blenloader/intern/versioning_260.c
M source/blender/editors/interface/interface.c
M source/blender/editors/object/object_vgroup.c
M source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
M
source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.cpp
M source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h
M source/blender/freestyle/intern/system/BaseObject.h
M source/blender/makesrna/intern/rna_material.c
M source/blender/python/intern/bpy_props.c
===================================================================
diff --git a/intern/ghost/test/gears/GHOST_Test.cpp
b/intern/ghost/test/gears/GHOST_Test.cpp
index d6c8f25..f58a220 100644
--- a/intern/ghost/test/gears/GHOST_Test.cpp
+++ b/intern/ghost/test/gears/GHOST_Test.cpp
@@ -698,19 +698,19 @@ int main(int /*argc*/, char ** /*argv*/)
KEY_ALL_ACCESS);
if (lresult == ERROR_SUCCESS)
- printf("Succesfully opened key\n");
+ printf("Successfully opened key\n");
#if 0
lresult = regkey.QueryValue(&keyValue, "StereoEnable");
if (lresult == ERROR_SUCCESS)
- printf("Succesfully queried key\n");
+ printf("Successfully queried key\n");
#endif
lresult = regkey.SetValue(HKEY_LOCAL_MACHINE, "SOFTWARE\\NVIDIA
Corporation\\Global\\Stereo3D\\StereoEnable",
"1");
if (lresult == ERROR_SUCCESS)
- printf("Succesfully set value for key\n");
+ printf("Successfully set value for key\n");
regkey.Close();
if (lresult == ERROR_SUCCESS)
- printf("Succesfully closed key\n");
+ printf("Successfully closed key\n");
// regkey.Write("2");
}
#endif // WIN32
diff --git a/source/blender/blenloader/intern/versioning_260.c
b/source/blender/blenloader/intern/versioning_260.c
index 72a3202..c66b9d1 100644
--- a/source/blender/blenloader/intern/versioning_260.c
+++ b/source/blender/blenloader/intern/versioning_260.c
@@ -275,7 +275,7 @@ static void
do_versions_nodetree_multi_file_output_format_2_62_1(Scene *sce, bNo
BLI_snprintf(sockpath, sizeof(sockpath),
"%s_Image", filename);
sock = ntreeCompositOutputFileAddSocket(ntree,
node, sockpath, &nimf->format);
- /* XXX later do_versions copies path from
socket name, need to set this explicitely */
+ /* XXX later do_versions copies path from
socket name, need to set this explicitly */
BLI_strncpy(sock->name, sockpath,
sizeof(sock->name));
if (old_image->link) {
old_image->link->tosock = sock;
@@ -284,7 +284,7 @@ static void
do_versions_nodetree_multi_file_output_format_2_62_1(Scene *sce, bNo
BLI_snprintf(sockpath, sizeof(sockpath),
"%s_Z", filename);
sock = ntreeCompositOutputFileAddSocket(ntree,
node, sockpath, &nimf->format);
- /* XXX later do_versions copies path from
socket name, need to set this explicitely */
+ /* XXX later do_versions copies path from
socket name, need to set this explicitly */
BLI_strncpy(sock->name, sockpath,
sizeof(sock->name));
if (old_z->link) {
old_z->link->tosock = sock;
@@ -293,7 +293,7 @@ static void
do_versions_nodetree_multi_file_output_format_2_62_1(Scene *sce, bNo
}
else {
sock = ntreeCompositOutputFileAddSocket(ntree,
node, filename, &nimf->format);
- /* XXX later do_versions copies path from
socket name, need to set this explicitely */
+ /* XXX later do_versions copies path from
socket name, need to set this explicitly */
BLI_strncpy(sock->name, filename,
sizeof(sock->name));
if (old_image->link) {
old_image->link->tosock = sock;
diff --git a/source/blender/editors/interface/interface.c
b/source/blender/editors/interface/interface.c
index e788f10..d11c195 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -975,7 +975,8 @@ static bool ui_but_event_operator_string(const bContext *C,
uiBut *but, char *bu
IDP_AssignString(prop_menu_name, mt->idname,
sizeof(mt->idname));
- if (WM_key_event_operator_string(C, "WM_OT_call_menu",
WM_OP_INVOKE_REGION_WIN, prop_menu, true, buf_len, buf))
+ if (WM_key_event_operator_string(C, "WM_OT_call_menu",
WM_OP_INVOKE_REGION_WIN, prop_menu,
+ true, buf_len, buf))
{
found = true;
}
diff --git a/source/blender/editors/object/object_vgroup.c
b/source/blender/editors/object/object_vgroup.c
index f2b2923..d52031e 100644
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@@ -1844,7 +1844,7 @@ static void vgroup_smooth_subset(
MVert *v_other =
&me->mvert[i_other];
if ((source ==
WEIGHT_SMOOTH_ALL) ||
- (source ==
((v_other->flag & SELECT) != 0)))
+ (source == ((v_other->flag
& SELECT) != 0)))
{
WEIGHT_ACCUMULATE;
}
diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
index 1d51bf2..39919b4 100644
--- a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
@@ -387,7 +387,7 @@ PyDoc_STRVAR(SVertex_curvatures_doc,
"directions, i.e. the directions of the normal plane where the\n"
"curvature takes its maximum and minimum values, respectively; and Kr,\n"
"er and dKr are the radial curvature, radial direction, and the\n"
-"derivative of the radial curvature at this SVertex, repectively.\n"
+"derivative of the radial curvature at this SVertex, respectively.\n"
"\n"
":type: tuple");
diff --git
a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.cpp
b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.cpp
index 517b07f..041bb60 100644
---
a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.cpp
+++
b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.cpp
@@ -63,7 +63,7 @@ static char GetDirectionalViewMapDensityF1D___doc__[] =
"\n"
" Returns the density evaluated for an Interface1D in of the steerable\n"
" viewmaps image. The direction telling which Directional map to choose\n"
-" is explicitely specified by the user. The density is evaluated for a\n"
+" is explicitly specified by the user. The density is evaluated for a\n"
" set of points along the Interface1D (using the\n"
" :class:`freestyle.functions.ReadSteerableViewMapPixelF0D` functor) and\n"
" then integrated into a single value using a user-defined integration\n"
diff --git a/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h
b/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h
index cbdff4e..9df690c 100644
--- a/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h
+++ b/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h
@@ -168,7 +168,7 @@ private:
// GetDirectionalViewMapDensity
/*! Returns the density evaluated for an Interface1D in of the steerable
viewmaps image.
- * The direction telling which Directional map to choose is explicitely
specified by the user.
+ * The direction telling which Directional map to choose is explicitly
specified by the user.
* The density is evaluated for a set of points along the Interface1D (using
the ReadSteerableViewMapPixelF0D functor)
* and then integrated into a single value using a user-defined integration
method.
*/
diff --git a/source/blender/freestyle/intern/system/BaseObject.h
b/source/blender/freestyle/intern/system/BaseObject.h
index 8cabd91..945c2c8 100644
--- a/source/blender/freestyle/intern/system/BaseObject.h
+++ b/source/blender/freestyle/intern/system/BaseObject.h
@@ -46,7 +46,7 @@ public:
virtual ~BaseObject() {}
/*! At least makes a release on this.
- * The BaseObject::destroy method must be explicitely called at the
end of any overloaded destroy
+ * The BaseObject::destroy method must be explicitly called at the end
of any overloaded destroy
*/
virtual int destroy()
{
diff --git a/source/blender/makesrna/intern/rna_material.c
b/source/blender/makesrna/intern/rna_material.c
index e356c2e..a1fa6ab 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -834,11 +834,11 @@ static void rna_def_material_gamesettings(BlenderRNA
*brna)
{GEMAT_ADD, "ADD", 0, "Add", "Render face transparent and add
color of face"},
{GEMAT_CLIP, "CLIP", 0, "Alpha Clip", "Use the image alpha
values clipped with no blending (binary alpha)"},
{GEMAT_ALPHA, "ALPHA", 0, "Alpha Blend",
- "Render polygon transparent, depending on alpha
channel of the texture"},
+ "Render polygon transparent, depending on alpha channel of the
texture"},
{GEMAT_ALPHA_SORT, "ALPHA_SORT", 0, "Alpha Sort",
- "Sort faces for correct alpha drawing (slow,
use Alpha Clip instead when possible)"},
+ "Sort faces for correct alpha drawing (slow, use Alpha Clip
instead when possible)"},
{GEMAT_ALPHA_TO_COVERAGE, "ALPHA_ANTIALIASING", 0, "Alpha
Anti-Aliasing",
- "Use textures alpha as anti-aliasing mask,
requires multi-sample OpenGL display"},
+ "Use textures alpha as anti-aliasing mask, requires
multi-sample OpenGL display"},
{0, NULL, 0, NULL, NULL}
};
diff --git a/source/blender/python/intern/bpy_props.c
b/source/blender/python/intern/bpy_props.c
index b0fae24..4dcd642 100644
--- a/source/blender/python/intern/bpy_props.c
+++ b/source/blender/python/intern/bpy_props.c
@@ -2696,7 +2696,7 @@ static PyObject *BPy_EnumProperty(PyObject *self,
PyObject *args, PyObject *kw)
}
if (def == Py_None) {
- /* This allows to get same behavior when explicitely
passing None as default value,
+ /* This allows to get same behavior when explicitly
passing None as default value,
* and not defining a default value at all! */
def = NULL;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
