[Bf-blender-cvs] [a18d88213fb] master: Cleanup: Converted draw_color_management to CPP.
Jeroen Bakker
noreply at git.blender.org
Tue Aug 31 14:27:51 CEST 2021
Commit: a18d88213fbf0d123c254643e220f3db82f1f7b6
Author: Jeroen Bakker
Date: Tue Aug 31 12:20:28 2021 +0200
Branches: master
https://developer.blender.org/rBa18d88213fbf0d123c254643e220f3db82f1f7b6
Cleanup: Converted draw_color_management to CPP.
===================================================================
M source/blender/draw/CMakeLists.txt
M source/blender/draw/intern/draw_cache.h
R100 source/blender/draw/intern/draw_color_management.c source/blender/draw/intern/draw_color_management.cc
M source/blender/draw/intern/draw_color_management.h
M source/blender/draw/intern/draw_manager.h
===================================================================
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index 257eb80ae0b..8bf74dae7f8 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -91,7 +91,7 @@ set(SRC
intern/draw_cache_impl_particles.c
intern/draw_cache_impl_pointcloud.c
intern/draw_cache_impl_volume.c
- intern/draw_color_management.c
+ intern/draw_color_management.cc
intern/draw_common.c
intern/draw_debug.c
intern/draw_fluid.c
diff --git a/source/blender/draw/intern/draw_cache.h b/source/blender/draw/intern/draw_cache.h
index c58dd85b6ed..6b2b0a173fe 100644
--- a/source/blender/draw/intern/draw_cache.h
+++ b/source/blender/draw/intern/draw_cache.h
@@ -22,6 +22,10 @@
#pragma once
+#ifdef __cplusplus
+extern "C" {
+#endif
+
struct GPUBatch;
struct GPUMaterial;
struct ModifierData;
@@ -263,3 +267,7 @@ struct GPUBatch *DRW_cache_gpencil_face_wireframe_get(struct Object *ob);
struct bGPDstroke *DRW_cache_gpencil_sbuffer_stroke_data_get(struct Object *ob);
void DRW_cache_gpencil_sbuffer_clear(struct Object *ob);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/draw/intern/draw_color_management.c b/source/blender/draw/intern/draw_color_management.cc
similarity index 100%
rename from source/blender/draw/intern/draw_color_management.c
rename to source/blender/draw/intern/draw_color_management.cc
diff --git a/source/blender/draw/intern/draw_color_management.h b/source/blender/draw/intern/draw_color_management.h
index 3150ec72138..771da80e120 100644
--- a/source/blender/draw/intern/draw_color_management.h
+++ b/source/blender/draw/intern/draw_color_management.h
@@ -22,4 +22,12 @@
#pragma once
+#ifdef __cplusplus
+extern "C" {
+#endif
+
void DRW_transform_none(struct GPUTexture *tex);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/draw/intern/draw_manager.h b/source/blender/draw/intern/draw_manager.h
index a7015b25770..33e1a57198c 100644
--- a/source/blender/draw/intern/draw_manager.h
+++ b/source/blender/draw/intern/draw_manager.h
@@ -43,6 +43,10 @@
#include "draw_instance_data.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
struct DupliObject;
struct Object;
@@ -626,3 +630,7 @@ void drw_uniform_attrs_pool_update(struct GHash *table,
struct Object *ob,
struct Object *dupli_parent,
struct DupliObject *dupli_source);
+
+#ifdef __cplusplus
+}
+#endif
More information about the Bf-blender-cvs
mailing list