BLI: remove blender::Optional in favor of std::optional

`std::optional` can be used now, because we switched to C++17.

2 files changed, 3 insertions, 3 deletions

diff --git a/source/blender/depsgraph/intern/depsgraph_type.h b/source/blender/depsgraph/intern/depsgraph_type.h
index 12150320391..5439a9dd31c 100644
--- a/source/blender/depsgraph/intern/depsgraph_type.h
+++ b/source/blender/depsgraph/intern/depsgraph_type.h
@@ -54,7 +54,6 @@ namespace DEG {
 
 /* Commonly used types. */
 using blender::Map;
-using blender::Optional;
 using blender::Set;
 using blender::Span;
 using blender::StringRef;
@@ -62,6 +61,7 @@ using blender::StringRefNull;
 using blender::Vector;
 using blender::VectorSet;
 using std::deque;
+using std::optional;
 using std::pair;
 using std::string;
 using std::unique_ptr;
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;
         }
       }
     }