[Bf-blender-cvs] [b6d7cdd3cee] master: Fix T51701: Alembic cache screws up mesh.

[Bastien Montagne]

Commit: b6d7cdd3cee9312156e20783248a3b12420b7a53
Author: Bastien Montagne
Date:   Tue Aug 8 18:21:08 2017 +0200
Branches: master
https://developer.blender.org/rBb6d7cdd3cee9312156e20783248a3b12420b7a53

Fix T51701: Alembic cache screws up mesh.

Use same trick as in DataTransfer modifier e.g. to avoid modifying
existing mesh's data.

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

M       source/blender/modifiers/intern/MOD_meshsequencecache.c

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

diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.c 
b/source/blender/modifiers/intern/MOD_meshsequencecache.c
index f0edcc31a10..411779c508c 100644
--- a/source/blender/modifiers/intern/MOD_meshsequencecache.c
+++ b/source/blender/modifiers/intern/MOD_meshsequencecache.c
@@ -25,12 +25,14 @@
  */
 
 #include "DNA_cachefile_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
 #include "BKE_cachefile.h"
 #include "BKE_DerivedMesh.h"
+#include "BKE_cdderivedmesh.h"
 #include "BKE_global.h"
 #include "BKE_library.h"
 #include "BKE_library_query.h"
@@ -95,11 +97,15 @@ static bool isDisabled(ModifierData *md, int 
UNUSED(useRenderParams))
 
 static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
                                   DerivedMesh *dm,
-                                  ModifierApplyFlag flag)
+                                  ModifierApplyFlag UNUSED(flag))
 {
 #ifdef WITH_ALEMBIC
        MeshSeqCacheModifierData *mcmd = (MeshSeqCacheModifierData *) md;
 
+       /* Only used to check wehther we are operating on org data or not... */
+       Mesh *me = (ob->type == OB_MESH) ? ob->data : NULL;
+       DerivedMesh *org_dm = dm;
+
        Scene *scene = md->scene;
        const float frame = BKE_scene_frame_get(scene);
        const float time = BKE_cachefile_time_offset(mcmd->cache_file, frame, 
FPS);
@@ -121,6 +127,16 @@ static DerivedMesh *applyModifier(ModifierData *md, Object 
*ob,
                }
        }
 
+       if (me != NULL) {
+               MVert *mvert = dm->getVertArray(dm);
+               MEdge *medge = dm->getEdgeArray(dm);
+               MPoly *mpoly = dm->getPolyArray(dm);
+               if ((me->mvert == mvert) || (me->medge == medge) || (me->mpoly 
== mpoly)) {
+                       /* We need to duplicate data here, otherwise we'll 
modify org mesh, see T51701. */
+                       dm = CDDM_copy(dm);
+               }
+       }
+
        DerivedMesh *result = ABC_read_mesh(mcmd->reader,
                                            ob,
                                            dm,
@@ -132,11 +148,15 @@ static DerivedMesh *applyModifier(ModifierData *md, 
Object *ob,
                modifier_setError(md, "%s", err_str);
        }
 
+       if (!ELEM(result, NULL, dm) && (dm != org_dm)) {
+               dm->release(dm);
+               dm = org_dm;
+       }
+
        return result ? result : dm;
-       UNUSED_VARS(flag);
 #else
        return dm;
-       UNUSED_VARS(md, ob, flag);
+       UNUSED_VARS(md, ob);
 #endif
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs