[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58809] branches/soc-2013-paint: Merge trunk -r58805 into soc-2013-paint

[Antony Riakiotakis]

Revision: 58809
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58809
Author:   psy-fi
Date:     2013-08-01 17:18:22 +0000 (Thu, 01 Aug 2013)
Log Message:
-----------
Merge trunk -r58805 into soc-2013-paint

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58805

Modified Paths:
--------------
    branches/soc-2013-paint/extern/libmv/libmv-capi.cc
    branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_stroke.c

Modified: branches/soc-2013-paint/extern/libmv/libmv-capi.cc
===================================================================
--- branches/soc-2013-paint/extern/libmv/libmv-capi.cc	2013-08-01 17:18:17 UTC (rev 58808)
+++ branches/soc-2013-paint/extern/libmv/libmv-capi.cc	2013-08-01 17:18:22 UTC (rev 58809)
@@ -1014,6 +1014,7 @@
 	*principal_y = camera_intrinsics->principal_point_y();
 	*k1 = camera_intrinsics->k1();
 	*k2 = camera_intrinsics->k2();
+	*k3 = camera_intrinsics->k3();
 }
 
 void libmv_cameraIntrinsicsUndistortByte(const struct libmv_CameraIntrinsics *libmv_intrinsics,

Modified: branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_stroke.c
===================================================================
--- branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_stroke.c	2013-08-01 17:18:17 UTC (rev 58808)
+++ branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_stroke.c	2013-08-01 17:18:22 UTC (rev 58809)
@@ -419,13 +419,13 @@
 
 	/* apply spacing pressure */
 	if (stroke->brush->flag & BRUSH_SPACING_PRESSURE)
-		spacing = max_ff(1.0f, spacing * (1.5f - spacing_pressure));
+		spacing = spacing * (1.5f - spacing_pressure);
 
 	/* stroke system is used for 2d paint too, so we need to account for
 	 * the fact that brush can be scaled there. */
 	spacing *= stroke->zoom_2d;
 
-	return (size_clamp * spacing / 50.0f);
+	return max_ff(1.0, size_clamp * spacing / 50.0f);
 }