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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-06-13 21:22:10 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-06-13 21:26:13 +0300
commit0b40af97f41137b083dedbf64b0685f9f0fb1987 (patch)
treeaab5ffe9d12c147be22af84c454cd955cc1606d4 /source/blender/draw/intern/draw_cache_impl_mesh.c
parent45145e746d0b414b0d9d2db6182e26f226950efa (diff)
Fix T59275: generated texture coordinates don't stick to mesh for shape keys
No need for this optimization in Eevee anymore, instead the modifier stack will only compute CD_ORCO when needed.
Diffstat (limited to 'source/blender/draw/intern/draw_cache_impl_mesh.c')
-rw-r--r--source/blender/draw/intern/draw_cache_impl_mesh.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c
index 17c680bbcde..961602625f0 100644
--- a/source/blender/draw/intern/draw_cache_impl_mesh.c
+++ b/source/blender/draw/intern/draw_cache_impl_mesh.c
@@ -4931,10 +4931,9 @@ void DRW_mesh_batch_cache_create_requested(
}
if (batch_requested & (MBC_SURFACE | MBC_SURF_PER_MAT | MBC_WIRE_LOOPS_UVS)) {
- /* Optimization : Only create orco layer if mesh is deformed. */
+ /* Modifiers will only generate an orco layer if the mesh is deformed. */
if (cache->cd_needed.orco != 0) {
- CustomData *cd_vdata = (me->edit_mesh) ? &me->edit_mesh->bm->vdata : &me->vdata;
- if (CustomData_get_layer(cd_vdata, CD_ORCO) != NULL && ob->modifiers.first != NULL) {
+ if (CustomData_get_layer(&me->vdata, CD_ORCO) != NULL) {
/* Orco layer is needed. */
}
else if (cache->cd_needed.tan_orco == 0) {