diff options
author | Jacques Lucke <jacques@blender.org> | 2020-06-29 15:29:05 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-06-29 15:30:06 +0300 |
commit | 18bff53c997f5bfac0435b8a03ee967eed8c9e20 (patch) | |
tree | b0d3b788a7e2a64f746ba96e3456f01d7b274ca2 /source/blender/depsgraph/intern/eval | |
parent | 4fc5233467b1c273cdb82b221d8faa53249b99c6 (diff) |
BLI: remove blender::Optional in favor of std::optional
`std::optional` can be used now, because we switched to C++17.
Diffstat (limited to 'source/blender/depsgraph/intern/eval')
-rw-r--r-- | source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.cc b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.cc index 975887ae7bf..71301ed45e5 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.cc @@ -172,10 +172,10 @@ void ObjectRuntimeBackup::restore_pose_channel_runtime_data(Object *object) LISTBASE_FOREACH (bPoseChannel *, pchan, &object->pose->chanbase) { /* This is nullptr in Edit mode. */ if (pchan->orig_pchan != nullptr) { - Optional<bPoseChannel_Runtime> runtime = pose_channel_runtime_data.pop_try( + optional<bPoseChannel_Runtime> runtime = pose_channel_runtime_data.pop_try( pchan->orig_pchan); if (runtime.has_value()) { - pchan->runtime = runtime.extract(); + pchan->runtime = *runtime; } } } |