Commit: 83e0534781b2e62ba01d9fa2a873243e9a45ba26
Author: Antony Riakiotakis
Date: Wed Jul 22 12:39:36 2015 +0200
Branches: temp-tangent-refactor
https://developer.blender.org/rB83e0534781b2e62ba01d9fa2a873243e9a45ba26
Fix merge conflict caused by own smartness failing
===================================================================
M source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c
b/source/blender/blenkernel/intern/DerivedMesh.c
index e71c865..63766b7 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -3208,11 +3208,7 @@ void DM_calc_auto_bump_scale(DerivedMesh *dm)
void DM_vertex_attributes_from_gpu(DerivedMesh *dm, GPUVertexAttribs
*gattribs, DMVertexAttribs *attribs)
{
-<<<<<<< HEAD
- CustomData *vdata;
-=======
CustomData *vdata, *ldata;
->>>>>>> campbell_tangents
int a, b, layer;
/* From the layers requested by the GLSL shader, figure out which ones
are
@@ -3221,10 +3217,7 @@ void DM_vertex_attributes_from_gpu(DerivedMesh *dm,
GPUVertexAttribs *gattribs,
memset(attribs, 0, sizeof(DMVertexAttribs));
vdata = &dm->vertData;
-<<<<<<< HEAD
-=======
ldata = dm->getLoopDataLayout(dm);
->>>>>>> campbell_tangents
/* calc auto bump scale if necessary */
if (dm->auto_bump_scale <= 0.0f)
@@ -3232,15 +3225,10 @@ void DM_vertex_attributes_from_gpu(DerivedMesh *dm,
GPUVertexAttribs *gattribs,
/* add a tangent layer if necessary */
for (b = 0; b < gattribs->totlayer; b++)
-<<<<<<< HEAD
- if (gattribs->layer[b].type == CD_TANGENT) {
- CustomData *ldata = dm->getLoopDataLayout(dm);
-=======
if (gattribs->layer[b].type == CD_TANGENT)
->>>>>>> campbell_tangents
if (CustomData_get_layer_index(ldata, CD_TANGENT) == -1)
DM_add_tangent_layer(dm);
- }
+
for (b = 0; b < gattribs->totlayer; b++) {
if (gattribs->layer[b].type == CD_MTFACE) {
/* uv coordinates */
@@ -3336,11 +3324,6 @@ void DM_vertex_attributes_from_gpu(DerivedMesh *dm,
GPUVertexAttribs *gattribs,
}
}
else if (gattribs->layer[b].type == CD_TANGENT) {
-<<<<<<< HEAD
- /* tangents */
- CustomData *ldata = dm->getLoopDataLayout(dm);
-=======
->>>>>>> campbell_tangents
layer = CustomData_get_layer_index(ldata, CD_TANGENT);
attribs->tottang = 1;
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
