diff options
| author | Sergey Sharybin <sergey@blender.org> | 2020-08-04 13:08:09 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey@blender.org> | 2020-08-04 13:08:09 +0300 |
| commit | 778f0aca5263f9fd37ef1f7a1162af0328630cf8 (patch) | |
| tree | 7a8ac9bc98b1c3986db73ebb7e8e7e4560536d02 /source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.h | |
| parent | 03c2439d96e8f366646bf20095514c057593aa24 (diff) | |
| parent | 8d3b8bc83589eccee10fcc0da4233b3adcf0cdde (diff) | |
Merge branch 'blender-v2.90-release'
Diffstat (limited to 'source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.h')
| -rw-r--r-- | source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.h b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.h index 04d7fb1bc22..a10f15634ce 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.h +++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.h @@ -24,6 +24,9 @@ #pragma once #include "DNA_object_types.h" +#include "DNA_session_uuid_types.h" + +#include "BLI_session_uuid.h" #include "intern/eval/deg_eval_runtime_backup_modifier.h" #include "intern/eval/deg_eval_runtime_backup_pose.h" @@ -54,7 +57,7 @@ class ObjectRuntimeBackup { short base_flag; unsigned short base_local_view_bits; ModifierRuntimeDataBackup modifier_runtime_data; - Map<bPoseChannel *, bPoseChannel_Runtime> pose_channel_runtime_data; + Map<SessionUUID, bPoseChannel_Runtime> pose_channel_runtime_data; }; } // namespace deg |