[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58013] trunk/blender/source/blender: correct typo in previous commit & minor changes.

[Campbell Barton]

Revision: 58013
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58013
Author:   campbellbarton
Date:     2013-07-05 00:13:14 +0000 (Fri, 05 Jul 2013)
Log Message:
-----------
correct typo in previous commit & minor changes.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
    trunk/blender/source/blender/blenkernel/intern/particle_system.c
    trunk/blender/source/blender/editors/interface/resources.c
    trunk/blender/source/blender/render/intern/source/convertblender.c

Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2013-07-04 23:52:02 UTC (rev 58012)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2013-07-05 00:13:14 UTC (rev 58013)
@@ -1945,7 +1945,7 @@
 static void editbmesh_calc_modifiers(Scene *scene, Object *ob, BMEditMesh *em, DerivedMesh **cage_r,
                                      DerivedMesh **final_r,
                                      CustomDataMask dataMask)
-	{
+{
 	ModifierData *md, *previewmd = NULL;
 	float (*deformedVerts)[3] = NULL;
 	CustomDataMask mask, previewmask = 0, append_mask = 0;

Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c	2013-07-04 23:52:02 UTC (rev 58012)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c	2013-07-05 00:13:14 UTC (rev 58013)
@@ -4313,7 +4313,7 @@
 				/* SPH_SOLVER_CLASSICAL */
 				/* Apply SPH forces using classical algorithm (due to Gingold
 				 * and Monaghan). Note that, unlike double-density relaxation,
-				 * this algorthim is separated into distinct loops. */
+				 * this algorithm is separated into distinct loops. */
 
 				#pragma omp parallel for firstprivate (sphdata) private (pa) schedule(dynamic,5)
 				LOOP_DYNAMIC_PARTICLES {

Modified: trunk/blender/source/blender/editors/interface/resources.c
===================================================================
--- trunk/blender/source/blender/editors/interface/resources.c	2013-07-04 23:52:02 UTC (rev 58012)
+++ trunk/blender/source/blender/editors/interface/resources.c	2013-07-05 00:13:14 UTC (rev 58013)
@@ -2094,8 +2094,7 @@
 
 		if (U.ndof_sensitivity == 0.0f) {
 			U.ndof_sensitivity = 1.0f;
-			U.ndof_flag = NDOF_LOCK_HORIZON |
-						  NDOF_SHOULD_PAN | NDOF_SHOULD_ZOOM | NDOF_SHOULD_ROTATE;
+			U.ndof_flag = (NDOF_LOCK_HORIZON | NDOF_SHOULD_PAN | NDOF_SHOULD_ZOOM | NDOF_SHOULD_ROTATE);
 		}
 		
 		if (U.ndof_orbit_sensitivity == 0.0f) {

Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c	2013-07-04 23:52:02 UTC (rev 58012)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c	2013-07-05 00:13:14 UTC (rev 58013)
@@ -5248,7 +5248,7 @@
 	re->scene= scene;
 	re->lay= lay;
 
-	if(re->r.scemode & R_VIEWPORT_PREVIEW)
+	if (re->r.scemode & R_VIEWPORT_PREVIEW)
 		re->scene_color_manage = BKE_scene_check_color_management_enabled(scene);
 	
 	/* scene needs to be set to get camera */