Cleanup: Move draw_pbvh.h to C++

source/blender/draw/CMakeLists.txt

@@ -250,7 +250,7 @@ set(SRC
   intern/draw_manager_testing.h
   intern/draw_manager_text.h
   intern/draw_pass.hh
-  intern/draw_pbvh.h
+  intern/draw_pbvh.hh
   intern/draw_resource.hh
   intern/draw_sculpt.hh
   intern/draw_shader.h

source/blender/draw/intern/draw_manager_data.cc

@@ -10,7 +10,7 @@
 
 #include "draw_attributes.hh"
 #include "draw_manager.h"
-#include "draw_pbvh.h"
+#include "draw_pbvh.hh"
 
 #include "BKE_curve.hh"
 #include "BKE_duplilist.h"

source/blender/draw/intern/draw_pbvh.cc

@@ -52,7 +52,7 @@
 
 #include "attribute_convert.hh"
 #include "bmesh.h"
-#include "draw_pbvh.h"
+#include "draw_pbvh.hh"
 #include "gpu_private.h"
 
 #define MAX_PBVH_BATCH_KEY 512

source/blender/draw/intern/draw_pbvh.hh

@@ -6,10 +6,6 @@
 
 #include "DNA_customdata_types.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct PBVHBatches;
 
 enum {
@@ -19,8 +15,4 @@ enum {
   CD_PBVH_MASK_TYPE = CD_NUMTYPES + 3
 };
 
-int drw_pbvh_material_index_get(struct PBVHBatches *batches);
-
-#ifdef __cplusplus
-}
-#endif
+int drw_pbvh_material_index_get(PBVHBatches *batches);

source/blender/draw/intern/draw_sculpt.cc

@@ -9,7 +9,7 @@
 #include "draw_sculpt.hh"
 
 #include "draw_attributes.hh"
-#include "draw_pbvh.h"
+#include "draw_pbvh.hh"
 
 #include "BKE_mesh_types.hh"
 #include "BKE_paint.hh"