[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54444] trunk/blender: style cleanup: also some typos

Campbell Barton ideasman42 at gmail.com
Mon Feb 11 01:49:01 CET 2013


Revision: 54444
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54444
Author:   campbellbarton
Date:     2013-02-11 00:49:00 +0000 (Mon, 11 Feb 2013)
Log Message:
-----------
style cleanup: also some typos

Modified Paths:
--------------
    trunk/blender/intern/bsp/intern/CSG_BooleanOps.cpp
    trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
    trunk/blender/source/blender/blenlib/intern/fileops.c
    trunk/blender/source/blender/blenlib/intern/math_rotation.c
    trunk/blender/source/blender/blenlib/intern/math_vector_inline.c
    trunk/blender/source/blender/bmesh/bmesh_class.h
    trunk/blender/source/blender/bmesh/intern/bmesh_core.c
    trunk/blender/source/blender/bmesh/intern/bmesh_iterators_inline.h
    trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
    trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
    trunk/blender/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
    trunk/blender/source/blender/collada/collada_utils.cpp
    trunk/blender/source/blender/editors/io/io_collada.c
    trunk/blender/source/blender/editors/render/render_view.c
    trunk/blender/source/blender/editors/screen/screen_ops.c
    trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
    trunk/blender/source/blender/editors/space_buttons/buttons_header.c
    trunk/blender/source/blender/render/intern/source/multires_bake.c
    trunk/blender/source/blender/windowmanager/intern/wm_draw.c
    trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
    trunk/blender/source/blender/windowmanager/intern/wm_operators.c
    trunk/blender/source/creator/creator.c
    trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp

Modified: trunk/blender/intern/bsp/intern/CSG_BooleanOps.cpp
===================================================================
--- trunk/blender/intern/bsp/intern/CSG_BooleanOps.cpp	2013-02-10 23:23:00 UTC (rev 54443)
+++ trunk/blender/intern/bsp/intern/CSG_BooleanOps.cpp	2013-02-11 00:49:00 UTC (rev 54444)
@@ -88,16 +88,16 @@
 
 	BoolOpType boolType;
 	
-	switch( op_type ) {
-	case e_csg_union:
-		boolType = BOP_UNION;
-		break;
-	case e_csg_difference:
-		boolType = BOP_DIFFERENCE;
-		break;
-	default:
-		boolType = BOP_INTERSECTION;
-		break;
+	switch (op_type) {
+		case e_csg_union:
+			boolType = BOP_UNION;
+			break;
+		case e_csg_difference:
+			boolType = BOP_DIFFERENCE;
+			break;
+		default:
+			boolType = BOP_INTERSECTION;
+			break;
 	}
 
 	BoolOpState boolOpResult;

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm	2013-02-10 23:23:00 UTC (rev 54443)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm	2013-02-11 00:49:00 UTC (rev 54444)
@@ -1028,8 +1028,7 @@
 	if (!validWindow(window)) {
 		return GHOST_kFailure;
 	}
-		switch(eventType) 
-		{
+		switch (eventType) {
 			case GHOST_kEventWindowClose:
 				pushEvent( new GHOST_Event(getMilliSeconds(), GHOST_kEventWindowClose, window) );
 				break;
@@ -1086,8 +1085,7 @@
 	if (!validWindow(window)) {
 		return GHOST_kFailure;
 	}
-	switch(eventType) 
-	{
+	switch (eventType) {
 		case GHOST_kEventDraggingEntered:
 		case GHOST_kEventDraggingUpdated:
 		case GHOST_kEventDraggingExited:

Modified: trunk/blender/source/blender/blenlib/intern/fileops.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/fileops.c	2013-02-10 23:23:00 UTC (rev 54443)
+++ trunk/blender/source/blender/blenlib/intern/fileops.c	2013-02-11 00:49:00 UTC (rev 54444)
@@ -111,7 +111,7 @@
 	return rval;
 }
 
-/* gzip the file in from_file and write it to memery to_mem, at most size bytes.
+/* gzip the file in from_file and write it to memory to_mem, at most size bytes.
  * return the unziped size
  */
 char *BLI_file_ungzip_to_mem(const char *from_file, int *size_r)
@@ -283,7 +283,7 @@
 {
 	int err;
 
-	/* windows doesn't support moveing to a directory
+	/* windows doesn't support moving to a directory
 	 * it has to be 'mv filename filename' and not
 	 * 'mv filename destdir' */
 

Modified: trunk/blender/source/blender/blenlib/intern/math_rotation.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_rotation.c	2013-02-10 23:23:00 UTC (rev 54443)
+++ trunk/blender/source/blender/blenlib/intern/math_rotation.c	2013-02-11 00:49:00 UTC (rev 54444)
@@ -1662,7 +1662,7 @@
 		axis = axis - 3;
 
 	/* there are 2 possible up-axis for each axis used, the 'quat_track' applies so the first
-	 * up axis is used X->Y, Y->X, Z->X, if this first up axis isn used then rotate 90d
+	 * up axis is used X->Y, Y->X, Z->X, if this first up axis isn't used then rotate 90d
 	 * the strange bit shift below just find the low axis {X:Y, Y:X, Z:X} */
 	if (upflag != (2 - axis) >> 1) {
 		float q[4] = {M_SQRT1_2, 0.0, 0.0, 0.0}; /* assign 90d rotation axis */

Modified: trunk/blender/source/blender/blenlib/intern/math_vector_inline.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_vector_inline.c	2013-02-10 23:23:00 UTC (rev 54443)
+++ trunk/blender/source/blender/blenlib/intern/math_vector_inline.c	2013-02-11 00:49:00 UTC (rev 54444)
@@ -663,7 +663,7 @@
 	float d = dot_v3v3(a, a);
 
 	/* a larger value causes normalize errors in a
-	 * scaled down models with camera xtreme close */
+	 * scaled down models with camera extreme close */
 	if (d > 1.0e-35f) {
 		d = sqrtf(d);
 		mul_v3_v3fl(r, a, 1.0f / d);
@@ -681,7 +681,7 @@
 	double d = n[0] * n[0] + n[1] * n[1] + n[2] * n[2];
 
 	/* a larger value causes normalize errors in a
-	 * scaled down models with camera xtreme close */
+	 * scaled down models with camera extreme close */
 	if (d > 1.0e-35) {
 		double mul;
 

Modified: trunk/blender/source/blender/bmesh/bmesh_class.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh_class.h	2013-02-10 23:23:00 UTC (rev 54443)
+++ trunk/blender/source/blender/bmesh/bmesh_class.h	2013-02-11 00:49:00 UTC (rev 54444)
@@ -45,7 +45,7 @@
  * pointers. this is a requirement of mempool's method of
  * iteration.
  *
- * hrm. it doesn't but stull works ok, remove the comment above? - campbell.
+ * hrm. it doesn't but still works ok, remove the comment above? - campbell.
  */
 
 // #pragma GCC diagnostic error "-Wpadded"

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_core.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_core.c	2013-02-10 23:23:00 UTC (rev 54443)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_core.c	2013-02-11 00:49:00 UTC (rev 54444)
@@ -2103,7 +2103,7 @@
 }
 
 /**
- * \brief Unglue Region Make Vert (URMV)
+ * \brief Un-glue Region Make Vert (URMV)
  *
  * Disconnects a face from its vertex fan at loop \a sl
  *

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_iterators_inline.h
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_iterators_inline.h	2013-02-10 23:23:00 UTC (rev 54443)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_iterators_inline.h	2013-02-11 00:49:00 UTC (rev 54444)
@@ -35,7 +35,7 @@
 /**
  * \brief Iterator Step
  *
- * Calls an iterators step fucntion to return the next element.
+ * Calls an iterators step function to return the next element.
  */
 BLI_INLINE void *BM_iter_step(BMIter *iter)
 {

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_queries.c	2013-02-10 23:23:00 UTC (rev 54443)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_queries.c	2013-02-11 00:49:00 UTC (rev 54444)
@@ -472,7 +472,7 @@
  * The function takes a vertex at the center of a fan and returns the opposite edge in the fan.
  * All edges in the fan must be manifold, otherwise return NULL.
  *
- * \note This could (probably) be done more effieiently.
+ * \note This could (probably) be done more efficiently.
  */
 BMEdge *BM_vert_other_disk_edge(BMVert *v, BMEdge *e_first)
 {

Modified: trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c	2013-02-10 23:23:00 UTC (rev 54443)
+++ trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c	2013-02-11 00:49:00 UTC (rev 54444)
@@ -165,7 +165,7 @@
 	}
 
 	/* apply the new difference to the rest of the shape keys,
-	 * note that this dosn't take rotations into account, we _could_ support
+	 * note that this doesn't take rotations into account, we _could_ support
 	 * this by getting the normals and coords for each shape key and
 	 * re-calculate the smooth value for each but this is quite involved.
 	 * for now its ok to simply apply the difference IMHO - campbell */

Modified: trunk/blender/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c	2013-02-10 23:23:00 UTC (rev 54443)
+++ trunk/blender/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c	2013-02-11 00:49:00 UTC (rev 54444)
@@ -189,7 +189,7 @@
 
 	int iter_step;
 
-	/* if tag_only is set, we assyme the caller knows what verts to tag
+	/* if tag_only is set, we assume the caller knows what verts to tag
 	 * needed for the operator */
 	if (tag_only == false) {
 		BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {

Modified: trunk/blender/source/blender/collada/collada_utils.cpp
===================================================================
--- trunk/blender/source/blender/collada/collada_utils.cpp	2013-02-10 23:23:00 UTC (rev 54443)
+++ trunk/blender/source/blender/collada/collada_utils.cpp	2013-02-11 00:49:00 UTC (rev 54444)
@@ -329,15 +329,18 @@
 
 	float bl_scale;
 	
-	switch(type) {
-		case USER_UNIT_NONE :	bl_scale = 1.0; // map 1 Blender unit to 1 Meter
-								break;
-		case USER_UNIT_METRIC : bl_scale = RNA_property_float_get(&unit_settings, scale_ptr);
-								break;
-		default :				bl_scale = RNA_property_float_get(&unit_settings, scale_ptr);
-								// it looks like the conversion to Imperial is done implicitly.
-								// So nothing to do here.
-								break;
+	switch (type) {
+		case USER_UNIT_NONE:
+			bl_scale = 1.0; // map 1 Blender unit to 1 Meter
+			break;
+		case USER_UNIT_METRIC:
+			bl_scale = RNA_property_float_get(&unit_settings, scale_ptr);
+			break;
+		default:
+			bl_scale = RNA_property_float_get(&unit_settings, scale_ptr);
+			// it looks like the conversion to Imperial is done implicitly.
+			// So nothing to do here.
+			break;
 	}
 	
 	float size_mat3[3][3];

Modified: trunk/blender/source/blender/editors/io/io_collada.c
===================================================================
--- trunk/blender/source/blender/editors/io/io_collada.c	2013-02-10 23:23:00 UTC (rev 54443)
+++ trunk/blender/source/blender/editors/io/io_collada.c	2013-02-11 00:49:00 UTC (rev 54444)
@@ -367,8 +367,9 @@
 	                               WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY);
 
 	RNA_def_boolean(ot->srna,
-					"import_units", 0, "Import Units",
-					"If disabled match import to Blender's current Unit settings. Otherwise use the settings from the Imported scene.");
+	                "import_units", 0, "Import Units",
+	                "If disabled match import to Blender's current Unit settings. "
+	                "Otherwise use the settings from the Imported scene");
 
 }
 #endif

Modified: trunk/blender/source/blender/editors/render/render_view.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_view.c	2013-02-10 23:23:00 UTC (rev 54443)
+++ trunk/blender/source/blender/editors/render/render_view.c	2013-02-11 00:49:00 UTC (rev 54444)
@@ -291,7 +291,8 @@

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list