Commit: d1f9fcaabcc64f224467523bb1258c59ebfb8209
Author: Campbell Barton
Date: Mon Apr 13 22:08:51 2015 +1000
Branches: master
https://developer.blender.org/rBd1f9fcaabcc64f224467523bb1258c59ebfb8209
Cleanup: style
===================================================================
M intern/cycles/render/camera.cpp
M intern/ghost/GHOST_C-api.h
M source/blender/blenfont/intern/blf_thumbs.c
M source/blender/editors/mesh/editmesh_utils.c
M source/blender/makesrna/intern/rna_ID.c
===================================================================
diff --git a/intern/cycles/render/camera.cpp b/intern/cycles/render/camera.cpp
index 9e3a17b..65953a4 100644
--- a/intern/cycles/render/camera.cpp
+++ b/intern/cycles/render/camera.cpp
@@ -400,7 +400,7 @@ BoundBox Camera::viewplane_bounds_get()
bounds.grow(transform_raster_to_world((float)width,
(float)height));
bounds.grow(transform_raster_to_world((float)width, 0.0f));
if(type == CAMERA_PERSPECTIVE) {
- /* Center point has the most distancei in local Z axis,
+ /* Center point has the most distance in local Z axis,
* use it to construct bounding box/
*/
bounds.grow(transform_raster_to_world(0.5f*width,
0.5f*height));
diff --git a/intern/ghost/GHOST_C-api.h b/intern/ghost/GHOST_C-api.h
index 5f01a13..8a80a51 100644
--- a/intern/ghost/GHOST_C-api.h
+++ b/intern/ghost/GHOST_C-api.h
@@ -660,7 +660,7 @@ extern GHOST_TSuccess
GHOST_SetWindowOrder(GHOST_WindowHandle windowhandle,
/**
* Swaps front and back buffers of a window.
* \param windowhandle The handle to the window
- * \return An intean success indicator.
+ * \return A success indicator.
*/
extern GHOST_TSuccess GHOST_SwapWindowBuffers(GHOST_WindowHandle windowhandle);
@@ -688,7 +688,7 @@ extern GHOST_TUns16
GHOST_GetNumOfAASamples(GHOST_WindowHandle windowhandle);
/**
* Activates the drawing context of this window.
* \param windowhandle The handle to the window
- * \return An intean success indicator.
+ * \return A success indicator.
*/
extern GHOST_TSuccess GHOST_ActivateWindowDrawingContext(GHOST_WindowHandle
windowhandle);
@@ -752,7 +752,7 @@ extern void GHOST_SetRectangle(GHOST_RectangleHandle
rectanglehandle,
* Returns whether this rectangle is empty.
* Empty rectangles are rectangles that have width==0 and/or height==0.
* \param rectanglehandle The handle to the rectangle
- * \return intean value (true == empty rectangle)
+ * \return Success value (true == empty rectangle)
*/
extern GHOST_TSuccess GHOST_IsEmptyRectangle(GHOST_RectangleHandle
rectanglehandle);
@@ -760,7 +760,7 @@ extern GHOST_TSuccess
GHOST_IsEmptyRectangle(GHOST_RectangleHandle rectanglehand
* Returns whether this rectangle is valid.
* Valid rectangles are rectangles that have m_l <= m_r and m_t <= m_b. Thus,
empty rectangles are valid.
* \param rectanglehandle The handle to the rectangle
- * \return intean value (true == valid rectangle)
+ * \return Success value (true == valid rectangle)
*/
extern GHOST_TSuccess GHOST_IsValidRectangle(GHOST_RectangleHandle
rectanglehandle);
@@ -798,7 +798,7 @@ extern void GHOST_UnionPointRectangle(GHOST_RectangleHandle
rectanglehandle,
* \param rectanglehandle The handle to the rectangle
* \param x x-coordinate of point to test.
* \param y y-coordinate of point to test.
- * \return intean value (true if point is inside).
+ * \return Success value (true if point is inside).
*/
extern GHOST_TSuccess GHOST_IsInsideRectangle(GHOST_RectangleHandle
rectanglehandle,
GHOST_TInt32 x,
diff --git a/source/blender/blenfont/intern/blf_thumbs.c
b/source/blender/blenfont/intern/blf_thumbs.c
index 3c400d0..7c0a43e 100644
--- a/source/blender/blenfont/intern/blf_thumbs.c
+++ b/source/blender/blenfont/intern/blf_thumbs.c
@@ -66,7 +66,7 @@ void BLF_thumb_preview(
/* shrink 1/th each line */
int font_shrink = 4;
- FontBLF* font;
+ FontBLF *font;
int i;
/* Create a new blender font obj and fill it with default values */
diff --git a/source/blender/editors/mesh/editmesh_utils.c
b/source/blender/editors/mesh/editmesh_utils.c
index 1875689..4706f04 100644
--- a/source/blender/editors/mesh/editmesh_utils.c
+++ b/source/blender/editors/mesh/editmesh_utils.c
@@ -865,7 +865,8 @@ UvElementMap *BM_uv_element_map_create(BMesh *bm, const
bool selected, const boo
sub_v2_v2v2(uvdiff, uv2, uv);
if (fabsf(uvdiff[0]) < STD_UV_CONNECT_LIMIT &&
fabsf(uvdiff[1]) < STD_UV_CONNECT_LIMIT &&
- winding[BM_elem_index_get(iterv->l->f)] ==
winding[BM_elem_index_get(v->l->f)]) {
+ winding[BM_elem_index_get(iterv->l->f)] ==
winding[BM_elem_index_get(v->l->f)])
+ {
if (lastv) lastv->next = next;
else vlist = next;
iterv->next = newvlist;
diff --git a/source/blender/makesrna/intern/rna_ID.c
b/source/blender/makesrna/intern/rna_ID.c
index 34ef4cc..db25786 100644
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@ -566,7 +566,9 @@ static void rna_def_ID(BlenderRNA *brna)
prop = RNA_def_property(srna, "tag", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", LIB_DOIT);
RNA_def_property_flag(prop, PROP_LIB_EXCEPTION);
- RNA_def_property_ui_text(prop, "Tag", "Tools can use this to tag data
for their own purposes (initial state is undefined).");
+ RNA_def_property_ui_text(prop, "Tag",
+ "Tools can use this to tag data for their own
purposes "
+ "(initial state is undefined)");
prop = RNA_def_property(srna, "is_updated", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", LIB_ID_RECALC);
@@ -608,7 +610,9 @@ static void rna_def_ID(BlenderRNA *brna)
func = RNA_def_function(srna, "update_tag", "rna_ID_update_tag");
RNA_def_function_flag(func, FUNC_USE_REPORTS);
- RNA_def_function_ui_description(func, "Tag the ID to update its display
data, e.g. when calling :class:`bpy.types.Scene.update`");
+ RNA_def_function_ui_description(func,
+ "Tag the ID to update its display data,
"
+ "e.g. when calling
:class:`bpy.types.Scene.update`");
RNA_def_enum_flag(func, "refresh", update_flag_items, 0, "", "Type of
updates to perform");
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
