summaryrefslogtreecommitdiff
path: root/numpy/ma/core.py
diff options
context:
space:
mode:
Diffstat (limited to 'numpy/ma/core.py')
-rw-r--r--numpy/ma/core.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/numpy/ma/core.py b/numpy/ma/core.py
index 0bf97b46e..5c38ff92b 100644
--- a/numpy/ma/core.py
+++ b/numpy/ma/core.py
@@ -1214,8 +1214,9 @@ class MaskedArray(numeric.ndarray):
else:
_data._mask = umath.logical_or(mask, _data._mask)
_data._sharedmask = False
-
# Update fill_value.......
+ if fill_value is None:
+ fill_value = getattr(data,'_fill_value', None)
_data._fill_value = _check_fill_value(fill_value, _data.dtype)
# Process extra options ..
_data._hardmask = hard_mask