[Bf-blender-cvs] [5eea19d] gooseberry: Merge branch 'master' into gooseberry

[Antony Riakiotakis]

Commit: 5eea19da4f0e6782d14cbf717c28b256b590d47e
Author: Antony Riakiotakis
Date:   Fri Apr 24 11:38:40 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB5eea19da4f0e6782d14cbf717c28b256b590d47e

Merge branch 'master' into gooseberry

Conflicts:
	source/blender/editors/space_view3d/view3d_edit.c

===================================================================



===================================================================

diff --cc source/blender/python/bmesh/bmesh_py_types_customdata.c
index 1d5f0d7,3adf37f..eb3067d
--- a/source/blender/python/bmesh/bmesh_py_types_customdata.c
+++ b/source/blender/python/bmesh/bmesh_py_types_customdata.c
@@@ -987,8 -987,8 +987,9 @@@ PyObject *BPy_BMLayerItem_GetItem(BPy_B
  			ret = BPy_BMDeformVert_CreatePyObject(value);
  			break;
  		}
 +		case CD_PAINT_MASK:
  		case CD_PROP_FLT:
+ 		case CD_PAINT_MASK:
  		{
  			ret = PyFloat_FromDouble(*(float *)value);
  			break;
@@@ -1065,8 -1065,8 +1066,9 @@@ int BPy_BMLayerItem_SetItem(BPy_BMElem 
  			ret = BPy_BMDeformVert_AssignPyObject(value, py_value);
  			break;
  		}
 +		case CD_PAINT_MASK:
  		case CD_PROP_FLT:
+ 		case CD_PAINT_MASK:
  		{
  			float tmp_val = PyFloat_AsDouble(py_value);
  			if (UNLIKELY(tmp_val == -1 && PyErr_Occurred())) {