[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55301] trunk/blender/source: code cleanup : missed these last commit

Campbell Barton ideasman42 at gmail.com
Fri Mar 15 12:07:37 CET 2013


Revision: 55301
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55301
Author:   campbellbarton
Date:     2013-03-15 11:07:36 +0000 (Fri, 15 Mar 2013)
Log Message:
-----------
code cleanup: missed these last commit

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/image.c
    trunk/blender/source/blender/blenkernel/intern/rigidbody.c
    trunk/blender/source/blender/blenkernel/intern/softbody.c
    trunk/blender/source/blender/collada/AnimationExporter.h
    trunk/blender/source/blender/collada/TransformWriter.cpp
    trunk/blender/source/blender/collada/collada.h
    trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h

Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c	2013-03-15 10:48:48 UTC (rev 55300)
+++ trunk/blender/source/blender/blenkernel/intern/image.c	2013-03-15 11:07:36 UTC (rev 55301)
@@ -1946,7 +1946,7 @@
 	else if (imtype == R_IMF_IMTYPE_DPX) {
 		ibuf->ftype = DPX;
 		if (imf->cineon_flag & R_IMF_CINEON_FLAG_LOG) {
-		  ibuf->ftype |= CINEON_LOG;
+			ibuf->ftype |= CINEON_LOG;
 		}
 		if (imf->depth == R_IMF_CHAN_DEPTH_16) {
 			ibuf->ftype |= CINEON_16BIT;

Modified: trunk/blender/source/blender/blenkernel/intern/rigidbody.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/rigidbody.c	2013-03-15 10:48:48 UTC (rev 55300)
+++ trunk/blender/source/blender/blenkernel/intern/rigidbody.c	2013-03-15 11:07:36 UTC (rev 55301)
@@ -637,12 +637,12 @@
 						RB_constraint_set_limits_6dof(rbc->physics_constraint, RB_LIMIT_ANG_Z, 0.0f, -1.0f);
 					break;
 				case RBC_TYPE_MOTOR:
-				    rbc->physics_constraint = RB_constraint_new_motor(loc, rot, rb1, rb2);
+					rbc->physics_constraint = RB_constraint_new_motor(loc, rot, rb1, rb2);
 
-				    RB_constraint_set_enable_motor(rbc->physics_constraint, rbc->flag & RBC_FLAG_USE_MOTOR_LIN, rbc->flag & RBC_FLAG_USE_MOTOR_ANG);
+					RB_constraint_set_enable_motor(rbc->physics_constraint, rbc->flag & RBC_FLAG_USE_MOTOR_LIN, rbc->flag & RBC_FLAG_USE_MOTOR_ANG);
 					RB_constraint_set_max_impulse_motor(rbc->physics_constraint, rbc->motor_lin_max_impulse, rbc->motor_ang_max_impulse);
 					RB_constraint_set_target_velocity_motor(rbc->physics_constraint, rbc->motor_lin_target_velocity, rbc->motor_ang_target_velocity);
-				    break;
+					break;
 			}
 		}
 		else { /* can't create constraint without both rigid bodies */

Modified: trunk/blender/source/blender/blenkernel/intern/softbody.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/softbody.c	2013-03-15 10:48:48 UTC (rev 55300)
+++ trunk/blender/source/blender/blenkernel/intern/softbody.c	2013-03-15 11:07:36 UTC (rev 55301)
@@ -200,18 +200,18 @@
 	SoftBody *sb= ob->soft;	/* is supposed to be there */
 	if (sb) {
 		return(sb->physics_speed);
-		/*hrms .. this could be IPO as well :)
-		 estimated range [0.001 sluggish slug - 100.0 very fast (i hope ODE solver can handle that)]
-		 1 approx = a unit 1 pendulum at g = 9.8 [earth conditions]  has period 65 frames
-		 theory would give a 50 frames period .. so there must be something inaccurate .. looking for that (BM)
+		/* hrms .. this could be IPO as well :)
+		 * estimated range [0.001 sluggish slug - 100.0 very fast (i hope ODE solver can handle that)]
+		 * 1 approx = a unit 1 pendulum at g = 9.8 [earth conditions]  has period 65 frames
+		 * theory would give a 50 frames period .. so there must be something inaccurate .. looking for that (BM)
 		 */
 	}
 	return (1.0f);
 	/*
-	this would be frames/sec independent timing assuming 25 fps is default
-	but does not work very well with NLA
-		return (25.0f/scene->r.frs_sec)
-	*/
+	 * this would be frames/sec independent timing assuming 25 fps is default
+	 * but does not work very well with NLA
+	 * return (25.0f/scene->r.frs_sec)
+	 */
 }
 /*--- frame based timing ---*/
 
@@ -1305,7 +1305,7 @@
 						normalize_v3(d_nvect);
 						if (
 							/* isect_line_tri_v3(nv1, nv3, face_v1, face_v2, face_v3, &t, NULL) ||
-							 we did that edge already */
+							 * we did that edge already */
 							isect_line_tri_v3(nv3, nv4, face_v1, face_v2, face_v3, &t, NULL) ||
 							isect_line_tri_v3(nv4, nv1, face_v1, face_v2, face_v3, &t, NULL) ) {
 							Vec3PlusStVec(force, -0.5f, d_nvect);

Modified: trunk/blender/source/blender/collada/AnimationExporter.h
===================================================================
--- trunk/blender/source/blender/collada/AnimationExporter.h	2013-03-15 10:48:48 UTC (rev 55300)
+++ trunk/blender/source/blender/collada/AnimationExporter.h	2013-03-15 11:07:36 UTC (rev 55301)
@@ -141,7 +141,7 @@
 	std::string get_semantic_suffix(COLLADASW::InputSemantic::Semantics semantic);
 
 	void add_source_parameters(COLLADASW::SourceBase::ParameterNameList& param,
-							   COLLADASW::InputSemantic::Semantics semantic, bool is_rot, const char *axis, bool transform);
+	                           COLLADASW::InputSemantic::Semantics semantic, bool is_rot, const char *axis, bool transform);
 	
 	void get_source_values(BezTriple *bezt, COLLADASW::InputSemantic::Semantics semantic, bool rotation, float *values, int *length);
 	

Modified: trunk/blender/source/blender/collada/TransformWriter.cpp
===================================================================
--- trunk/blender/source/blender/collada/TransformWriter.cpp	2013-03-15 10:48:48 UTC (rev 55300)
+++ trunk/blender/source/blender/collada/TransformWriter.cpp	2013-03-15 11:07:36 UTC (rev 55301)
@@ -56,8 +56,9 @@
 		// XXX Why are joints handled differently ?
 		node.addMatrix("transform", dmat);
 	}
-	else
-	  add_transform(node, loc, rot, scale);
+	else {
+		add_transform(node, loc, rot, scale);
+	}
 }
 
 void TransformWriter::add_node_transform_ob(COLLADASW::Node& node, Object *ob, BC_export_transformation_type transformation_type)

Modified: trunk/blender/source/blender/collada/collada.h
===================================================================
--- trunk/blender/source/blender/collada/collada.h	2013-03-15 10:48:48 UTC (rev 55300)
+++ trunk/blender/source/blender/collada/collada.h	2013-03-15 11:07:36 UTC (rev 55301)
@@ -54,8 +54,8 @@
  * both return 1 on success, 0 on error
  */
 int collada_import(bContext *C,
-				   const char *filepath,
-				   int import_units);
+                   const char *filepath,
+                   int import_units);
 
 int collada_export(Scene *sce,
                    const char *filepath,
@@ -68,10 +68,10 @@
                    int include_shapekeys,
                    int deform_bones_only,
 
-				   int active_uv_only,
-				   int include_uv_textures,
-				   int include_material_textures,
-				   int use_texture_copies,
+                   int active_uv_only,
+                   int include_uv_textures,
+                   int include_material_textures,
+                   int use_texture_copies,
 
                    int triangulate,
                    int use_object_instantiation,

Modified: trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h	2013-03-15 10:48:48 UTC (rev 55300)
+++ trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h	2013-03-15 11:07:36 UTC (rev 55301)
@@ -64,7 +64,7 @@
 	}
 
 	KX_EnumInputs ToNative(unsigned short incode) {
-		 return ConvertKeyCode(incode);
+		return ConvertKeyCode(incode);
 	}
 
 	virtual bool	IsPressed(SCA_IInputDevice::KX_EnumInputs inputcode)=0;




More information about the Bf-blender-cvs mailing list