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:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-06-04 16:11:09 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-06-04 16:17:16 +0300
commit07f004620397fd818d2684d08ff67422d76a92cf (patch)
tree5a0db889de90d702a3b6814ede41f497faddfdda /source/blender/makesdna/DNA_object_types.h
parent1dc31f5b982559bbe875d469950ee7404e9a4a3c (diff)
Fix crash when making objects to share same mesh
Make it more reliable and predictable way of getting pointer to an original mesh which came from copy-on-write engine. Related change: made it (hopefully) more clear name for flags.
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
-rw-r--r--source/blender/makesdna/DNA_object_types.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index daff6ab0baa..c9db5fbbdfb 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -145,6 +145,11 @@ typedef struct ObjectDisplay {
/* Not saved in file! */
typedef struct Object_Runtime {
+ /* Original mesh pointer, before object->data was changed to point
+ * to mesh_eval.
+ * Is assigned by dependency craph's copy-on-write evaluation.
+ */
+ struct Mesh *mesh_orig;
/* Mesh structure created during object evaluation.
* It has all modifiers applied.
*/