diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-07-27 15:18:45 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-07-27 16:19:36 +0300 |
| commit | 4c5537ed428f33b2996f1965b93945a1c9d491b4 (patch) | |
| tree | 98f6fb87e52eac11046cfd5740d98e36a6dc153a /source/blender/blenkernel/intern/object_update.c | |
| parent | 7d014bca9156ebc2d08b7c041a109d28df50cdec (diff) | |
Copy on write: Make sure freeing evaluated mesh does not cause crash when re-evaluating the object
Diffstat (limited to 'source/blender/blenkernel/intern/object_update.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object_update.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c index a478671d8a0..0bbfbb8a4e7 100644 --- a/source/blender/blenkernel/intern/object_update.c +++ b/source/blender/blenkernel/intern/object_update.c @@ -377,6 +377,11 @@ void BKE_object_eval_uber_data(EvaluationContext *eval_ctx, /* NOTE: Watch out, some tools might need it! * So keep around for now.. */ + /* Store original ID as a pointer in evaluated ID. + * This way we can restore original object data when we are freeing + * evaluated mesh. + */ + new_mesh->id.newid = &mesh->id; } #if 0 if (ob->derivedFinal != NULL) { |