[Bf-blender-cvs] [66a6ac3] mesh-transfer-data: Merge branch 'master' into mesh-transfer-data

[Bastien Montagne]

Commit: 66a6ac3572016c6936785bce995533a57beed799
Author: Bastien Montagne
Date:   Mon Dec 1 17:13:14 2014 +0100
Branches: mesh-transfer-data
https://developer.blender.org/rB66a6ac3572016c6936785bce995533a57beed799

Merge branch 'master' into mesh-transfer-data

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



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

diff --cc source/blender/blenkernel/intern/customdata.c
index e98de99,5e86ca5..856f893
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@@ -2307,10 -2261,10 +2310,10 @@@ int CustomData_get_n_offset(const Custo
  bool CustomData_set_layer_name(const CustomData *data, int type, int n, const char *name)
  {
  	/* get the layer index of the first layer of type */
 -	int layer_index = CustomData_get_layer_index_n(data, type, n);
 +	const int layer_index = CustomData_get_layer_index_n(data, type, n);
  
- 	if (layer_index == -1) return false;
- 	if (!name) return false;
+ 	if ((layer_index == -1) || !name)
+ 		return false;
  	
  	BLI_strncpy(data->layers[layer_index].name, name, sizeof(data->layers[layer_index].name));