From 18bff53c997f5bfac0435b8a03ee967eed8c9e20 Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Mon, 29 Jun 2020 14:29:05 +0200 Subject: BLI: remove blender::Optional in favor of std::optional `std::optional` can be used now, because we switched to C++17. --- .../blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.cc') 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 runtime = pose_channel_runtime_data.pop_try( + optional runtime = pose_channel_runtime_data.pop_try( pchan->orig_pchan); if (runtime.has_value()) { - pchan->runtime = runtime.extract(); + pchan->runtime = *runtime; } } } -- cgit v1.2.3