Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2014-11-27 22:12:46 +0300
committerAntony Riakiotakis <kalast@gmail.com>2014-11-27 22:12:46 +0300
commitf4f5f3b209e1f1309966ca007370225a06ef86fe (patch)
tree1e55a8070f13c4d4393c7d84f7bf33b9ab5058d5 /source/blender/blenkernel/intern/cdderivedmesh.c
parent2e8ba179f71131779899df5a916252922f029e43 (diff)
Addition/correction to previous commit:
subsurf needs the same modifications in its derived mesh function or materials don't get updated at all anymore.
Diffstat (limited to 'source/blender/blenkernel/intern/cdderivedmesh.c')
-rw-r--r--source/blender/blenkernel/intern/cdderivedmesh.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 52261714ab1..7f49fc60bde 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -880,11 +880,11 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm,
draw_option = DM_DRAW_OPTION_NORMAL;
}
else if (drawParamsMapped) {
- draw_option = drawParamsMapped(userData, orig, actualFace);
+ draw_option = drawParamsMapped(userData, orig, mf[actualFace].mat_nr);
}
}
else if (drawParamsMapped) {
- draw_option = drawParamsMapped(userData, actualFace, actualFace);
+ draw_option = drawParamsMapped(userData, actualFace, mf[actualFace].mat_nr);
}
}