[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48969] trunk/blender/source/blender/ blenkernel: use calculated spline resoltion rather then fixed at 32.

[Campbell Barton]

Revision: 48969
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48969
Author:   campbellbarton
Date:     2012-07-16 14:17:01 +0000 (Mon, 16 Jul 2012)
Log Message:
-----------
use calculated spline resoltion rather then fixed at 32.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_mask.h
    trunk/blender/source/blender/blenkernel/intern/mask.c
    trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c

Modified: trunk/blender/source/blender/blenkernel/BKE_mask.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_mask.h	2012-07-16 13:13:27 UTC (rev 48968)
+++ trunk/blender/source/blender/blenkernel/BKE_mask.h	2012-07-16 14:17:01 UTC (rev 48969)
@@ -64,6 +64,9 @@
 /* splines */
 struct MaskSpline *BKE_mask_spline_add(struct MaskLayer *masklay);
 
+int BKE_mask_spline_resolution(struct MaskSpline *spline, int width, int height);
+int BKE_mask_spline_feather_resolution(struct MaskSpline *spline, int width, int height);
+
 int BKE_mask_spline_differentiate_calc_total(const struct MaskSpline *spline, const int resol);
 
 float (*BKE_mask_spline_differentiate(struct MaskSpline *spline, int *tot_diff_point))[2];

Modified: trunk/blender/source/blender/blenkernel/intern/mask.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mask.c	2012-07-16 13:13:27 UTC (rev 48968)
+++ trunk/blender/source/blender/blenkernel/intern/mask.c	2012-07-16 14:17:01 UTC (rev 48969)
@@ -246,7 +246,7 @@
 	return spline;
 }
 
-static int BKE_mask_spline_resolution(MaskSpline *spline, int width, int height)
+int BKE_mask_spline_resolution(MaskSpline *spline, int width, int height)
 {
 	float max_segment = 0.01f;
 	int i, resol = 1;
@@ -284,7 +284,7 @@
 	return resol;
 }
 
-static int BKE_mask_spline_feather_resolution(MaskSpline *spline, int width, int height)
+int BKE_mask_spline_feather_resolution(MaskSpline *spline, int width, int height)
 {
 	const float max_segment = 0.005;
 	int resol = BKE_mask_spline_resolution(spline, width, height);

Modified: trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c	2012-07-16 13:13:27 UTC (rev 48968)
+++ trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c	2012-07-16 14:17:01 UTC (rev 48969)
@@ -471,7 +471,6 @@
                                    const short do_feather)
 {
 	const rctf default_bounds = {0.0f, 1.0f, 0.0f, 1.0f};
-	const int resol = SPLINE_RESOL;  /* TODO: real size */
 	const float pixel_size = 1.0f / MIN2(width, height);
 
 	const float zvec[3] = {0.0f, 0.0f, 1.0f};
@@ -522,6 +521,10 @@
 			float (*diff_feather_points)[2];
 			int tot_diff_feather_points;
 
+			const int resol_a = BKE_mask_spline_resolution(spline, width, height) / 4;
+			const int resol_b = BKE_mask_spline_feather_resolution(spline, width, height) / 4;
+			const int resol = CLAMPIS(MAX2(resol_a, resol_b), 4, 512);
+
 			diff_points = BKE_mask_spline_differentiate_with_resolution_ex(
 			                  spline, resol, &tot_diff_point);