Merge branch 'master' into temp-legacy-mesh-format-optiontemp-legacy-mesh-format-option

1 files changed, 6 insertions, 8 deletions

diff --git a/source/blender/depsgraph/intern/builder/deg_builder.h b/source/blender/depsgraph/intern/builder/deg_builder.h
index 8fbe255ed9d..950ebfb35ba 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder.h
@@ -13,8 +13,7 @@ struct Main;
 struct Object;
 struct bPoseChannel;
 
-namespace blender {
-namespace deg {
+namespace blender::deg {
 
 struct Depsgraph;
 class DepsgraphBuilderCache;
@@ -23,11 +22,11 @@ class DepsgraphBuilder {
  public:
   virtual ~DepsgraphBuilder() = default;
 
-  virtual bool need_pull_base_into_graph(Base *base);
+  virtual bool need_pull_base_into_graph(const Base *base);
 
-  virtual bool check_pchan_has_bbone(Object *object, const bPoseChannel *pchan);
-  virtual bool check_pchan_has_bbone_segments(Object *object, const bPoseChannel *pchan);
-  virtual bool check_pchan_has_bbone_segments(Object *object, const char *bone_name);
+  virtual bool check_pchan_has_bbone(const Object *object, const bPoseChannel *pchan);
+  virtual bool check_pchan_has_bbone_segments(const Object *object, const bPoseChannel *pchan);
+  virtual bool check_pchan_has_bbone_segments(const Object *object, const char *bone_name);
 
  protected:
   /* NOTE: The builder does NOT take ownership over any of those resources. */
@@ -43,5 +42,4 @@ bool deg_check_id_in_depsgraph(const Depsgraph *graph, ID *id_orig);
 bool deg_check_base_in_depsgraph(const Depsgraph *graph, Base *base);
 void deg_graph_build_finalize(Main *bmain, Depsgraph *graph);
 
-}  // namespace deg
-}  // namespace blender
+}  // namespace blender::deg