[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60182] branches/soc-2013-paint/source/ blender/editors/sculpt_paint: * Fix uninitialized variable in previous commit, made blur image float

[Antony Riakiotakis]

Revision: 60182
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60182
Author:   psy-fi
Date:     2013-09-17 02:03:25 +0000 (Tue, 17 Sep 2013)
Log Message:
-----------
* Fix uninitialized variable in previous commit, made blur image float
on the canvas.

Modified Paths:
--------------
    branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_image_2d.c

Modified: branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
--- branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_image.c	2013-09-17 01:34:56 UTC (rev 60181)
+++ branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_image.c	2013-09-17 02:03:25 UTC (rev 60182)
@@ -501,6 +501,7 @@
 	kernel->side = pixel_len * 2 + 1;
 	kernel->side_squared = kernel->side * kernel->side;
 	kernel->wdata = MEM_mallocN(sizeof(float) * kernel->side_squared, "blur kernel data");
+	kernel->pixel_len = pixel_len;
 
 	switch (type) {
 		case KERNEL_BOX:

Modified: branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_image_2d.c
===================================================================
--- branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_image_2d.c	2013-09-17 01:34:56 UTC (rev 60181)
+++ branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_image_2d.c	2013-09-17 02:03:25 UTC (rev 60182)
@@ -851,8 +851,8 @@
 
 			for (yk = 0; yk < kernel->side; yk++) {
 				for (xk = 0; xk < kernel->side; xk++) {
-					count += paint_2d_ibuf_add_if(ibuf, xi - (xk - kernel->pixel_len),
-					                               yi - (yk - kernel->pixel_len), outrgb, is_torus,
+					count += paint_2d_ibuf_add_if(ibuf, xi + xk - kernel->pixel_len,
+					                               yi + yk - kernel->pixel_len, outrgb, is_torus,
 					                               kernel->wdata[xk + yk * kernel->side]);
 				}
 			}