[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48817] trunk/blender/source/blender/ compositor/operations: fix for Tiles bug - opencl:

[Monique Dewanchand]

Revision: 48817
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48817
Author:   mdewanchand
Date:     2012-07-10 20:33:24 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
fix for Tiles bug - opencl:
[#31981] Bokeh Blur Node - Size input socket does not accept input from Value Input node, Values smaller than 0.1 will produce black output

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/operations/COM_OpenCLKernels.cl
    trunk/blender/source/blender/compositor/operations/COM_OpenCLKernels.cl.h

Modified: trunk/blender/source/blender/compositor/operations/COM_OpenCLKernels.cl
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_OpenCLKernels.cl	2012-07-10 20:21:13 UTC (rev 48816)
+++ trunk/blender/source/blender/compositor/operations/COM_OpenCLKernels.cl	2012-07-10 20:33:24 UTC (rev 48817)
@@ -21,7 +21,7 @@
 
 	tempBoundingBox = read_imagef(boundingBox, SAMPLER_NEAREST, coords).s0;
 
-	if (tempBoundingBox > 0.0f) {
+	if (tempBoundingBox > 0.0f && radius > 0 ) {
 		const int2 bokehImageDim = get_image_dim(bokehImage);
 		const int2 bokehImageCenter = bokehImageDim/2;
 		const int2 minXY = max(realCoordinate - radius, zero);

Modified: trunk/blender/source/blender/compositor/operations/COM_OpenCLKernels.cl.h
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_OpenCLKernels.cl.h	2012-07-10 20:21:13 UTC (rev 48816)
+++ trunk/blender/source/blender/compositor/operations/COM_OpenCLKernels.cl.h	2012-07-10 20:33:24 UTC (rev 48817)
@@ -23,7 +23,7 @@
 "\n" \
 "	tempBoundingBox = read_imagef(boundingBox, SAMPLER_NEAREST, coords).s0;\n" \
 "\n" \
-"	if (tempBoundingBox > 0.0f) {\n" \
+"	if (tempBoundingBox > 0.0f && radius > 0 ) {\n" \
 "		const int2 bokehImageDim = get_image_dim(bokehImage);\n" \
 "		const int2 bokehImageCenter = bokehImageDim/2;\n" \
 "		const int2 minXY = max(realCoordinate - radius, zero);\n" \