[Bf-blender-cvs] [3dd8514] temp-tangent-refactor: Merge branch 'master' into temp-tangent-refactor

[Antony Riakiotakis]

Commit: 3dd851421ecbecc3610a5ad78a6ec0dbf0cb98fe
Author: Antony Riakiotakis
Date:   Mon Jul 27 14:46:49 2015 +0200
Branches: temp-tangent-refactor
https://developer.blender.org/rB3dd851421ecbecc3610a5ad78a6ec0dbf0cb98fe

Merge branch 'master' into temp-tangent-refactor

Conflicts:
	source/blender/blenkernel/intern/DerivedMesh.c

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



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

diff --cc source/blender/blenkernel/intern/DerivedMesh.c
index 63766b7,b06cd72..935fc11
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@@ -3224,10 -3222,14 +3228,14 @@@ void DM_vertex_attributes_from_gpu(Deri
  		DM_calc_auto_bump_scale(dm);
  
  	/* add a tangent layer if necessary */
- 	for (b = 0; b < gattribs->totlayer; b++)
- 		if (gattribs->layer[b].type == CD_TANGENT)
- 			if (CustomData_get_layer_index(ldata, CD_TANGENT) == -1)
+ 	for (b = 0; b < gattribs->totlayer; b++) {
+ 		if (gattribs->layer[b].type == CD_TANGENT) {
 -			if (CustomData_get_layer_index(fdata, CD_TANGENT) == -1) {
++			if (CustomData_get_layer_index(ldata, CD_TANGENT) == -1) {
  				DM_add_tangent_layer(dm);
+ 				break;
+ 			}
+ 		}
+ 	}
  
  	for (b = 0; b < gattribs->totlayer; b++) {
  		if (gattribs->layer[b].type == CD_MTFACE) {