Commit: 0b40af97f41137b083dedbf64b0685f9f0fb1987
Author: Brecht Van Lommel
Date: Thu Jun 13 20:22:10 2019 +0200
Branches: master
https://developer.blender.org/rB0b40af97f41137b083dedbf64b0685f9f0fb1987
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.
===================================================================
M source/blender/draw/intern/draw_cache_impl_mesh.c
===================================================================
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) {
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
