# HG changeset patch
# User Andreas Weber <address@hidden>
# Date 1378836718 -7200
# Node ID 0ee87f296f7d77e448ff82678489db29ffe578d4
# Parent  6643f21e27f30fb8a239ab1d5e14f0af13bce227
__scatter__.m: Fix handling of NaNs in marker size param.

diff -r 6643f21e27f3 -r 0ee87f296f7d scripts/plot/private/__scatter__.m
--- a/scripts/plot/private/__scatter__.m	Tue Sep 10 07:28:20 2013 -0700
+++ b/scripts/plot/private/__scatter__.m	Tue Sep 10 20:11:58 2013 +0200
@@ -31,14 +31,36 @@
   istart = 6;
 
   if (nd == 3)
+    istart = 7;
+  endif
+  if (istart <= nargin)
+    s = varargin{istart}(:);
+    if (isempty (s) || ischar (s))
+      s = 6;
+    endif
+    if (! ischar (varargin{istart}))
+      istart++;
+    endif
+  else
+    s = 6;
+  endif
+  
+  if (nd == 3)
     z = varargin{6}(:);
     idx = isnan (x) | isnan (y) | isnan (z);
+    if (numel (s) > 0)
+      idx = idx | isnan (s);
+      s (idx) = [];
+    endif  
     x (idx) = [];
     y (idx) = [];
     z (idx) = [];
-    istart = 7;
   else
     idx = isnan (x) | isnan (y);
+    if (numel (s) > 0)
+      idx = idx | isnan (s);
+      s (idx) = [];
+    endif  
     x (idx) = [];
     y (idx) = [];
     z = zeros (length (x), 0);
@@ -52,18 +74,6 @@
     endif
   endfor
 
-  if (istart <= nargin)
-    s = varargin{istart};
-    if (isempty (s) || ischar (s))
-      s = 6;
-    endif
-    if (! ischar (varargin{istart}))
-      istart++;
-    endif
-  else
-    s = 6;
-  endif
-
   if (istart <= nargin && firstnonnumeric > istart)
     c = varargin{istart};
     if (isvector (c))