Cleanup: take includes out of 'extern "C"' blocks
authorJacques Lucke <jacques@blender.org>
Fri, 8 May 2020 16:16:39 +0000 (18:16 +0200)
committerJacques Lucke <jacques@blender.org>
Fri, 8 May 2020 16:22:41 +0000 (18:22 +0200)
Surrounding includes with an 'extern "C"' block is not necessary anymore.
Also that made it harder to add any C++ code to some headers, or include headers
that have "optional" C++ code like `MEM_guardedalloc.h`.

I tested compilation on linux and windows (and got help from @LazyDodo).
If this still breaks compilation due to some linker error, the header containing
the symbol in question is probably missing an 'extern "C"' block.

Differential Revision: https://developer.blender.org/D7653

260 files changed:
source/blender/blenkernel/BKE_action.h
source/blender/blenkernel/BKE_anim_data.h
source/blender/blenkernel/BKE_animsys.h
source/blender/blenkernel/BKE_armature.h
source/blender/blenkernel/BKE_blender_version.h
source/blender/blenkernel/BKE_context.h
source/blender/blenkernel/BKE_curve.h
source/blender/blenkernel/BKE_customdata.h
source/blender/blenkernel/BKE_data_transfer.h
source/blender/blenkernel/BKE_dynamicpaint.h
source/blender/blenkernel/BKE_fcurve.h
source/blender/blenkernel/BKE_fcurve_driver.h
source/blender/blenkernel/BKE_image.h
source/blender/blenkernel/BKE_lib_id.h
source/blender/blenkernel/BKE_lib_remap.h
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/BKE_light.h
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/BKE_paint.h
source/blender/blenkernel/BKE_report.h
source/blender/blenkernel/BKE_text_suggestions.h
source/blender/blenlib/BLI_bitmap.h
source/blender/blenlib/BLI_blenlib.h
source/blender/blenlib/BLI_fileops.h
source/blender/blenlib/BLI_hash.h
source/blender/blenlib/BLI_heap.h
source/blender/blenlib/BLI_math_base.h
source/blender/blenlib/BLI_math_bits.h
source/blender/blenlib/BLI_math_color.h
source/blender/blenlib/BLI_math_color_blend.h
source/blender/blenlib/BLI_math_geom.h
source/blender/blenlib/BLI_math_matrix.h
source/blender/blenlib/BLI_math_solvers.h
source/blender/blenlib/BLI_math_statistics.h
source/blender/blenlib/BLI_math_vector.h
source/blender/blenlib/BLI_memarena.h
source/blender/blenlib/BLI_memblock.h
source/blender/blenlib/BLI_memiter.h
source/blender/blenlib/BLI_mempool.h
source/blender/blenlib/BLI_path_util.h
source/blender/blenlib/BLI_string.h
source/blender/blenlib/BLI_string_utf8.h
source/blender/blenlib/BLI_string_utils.h
source/blender/blenlib/BLI_task.h
source/blender/blenlib/BLI_threads.h
source/blender/blenlib/BLI_utildefines.h
source/blender/blenlib/intern/math_base_inline.c
source/blender/bmesh/bmesh.h
source/blender/bmesh/intern/bmesh_operator_api.h
source/blender/bmesh/tools/bmesh_bevel.h
source/blender/compositor/COM_compositor.h
source/blender/compositor/intern/COM_Converter.cpp
source/blender/compositor/intern/COM_ExecutionSystem.cpp
source/blender/compositor/intern/COM_MemoryBuffer.h
source/blender/compositor/intern/COM_Node.cpp
source/blender/compositor/intern/COM_NodeConverter.cpp
source/blender/compositor/intern/COM_NodeGraph.cpp
source/blender/compositor/intern/COM_NodeGraph.h
source/blender/compositor/intern/COM_NodeOperation.h
source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
source/blender/compositor/intern/COM_WorkScheduler.h
source/blender/compositor/intern/COM_compositor.cpp
source/blender/compositor/nodes/COM_CornerPinNode.h
source/blender/compositor/nodes/COM_ImageNode.h
source/blender/compositor/nodes/COM_KeyingScreenNode.cpp
source/blender/compositor/nodes/COM_MaskNode.cpp
source/blender/compositor/nodes/COM_MovieClipNode.cpp
source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp
source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h
source/blender/compositor/nodes/COM_Stabilize2dNode.cpp
source/blender/compositor/nodes/COM_TimeNode.cpp
source/blender/compositor/nodes/COM_TrackPositionNode.cpp
source/blender/compositor/operations/COM_AntiAliasOperation.cpp
source/blender/compositor/operations/COM_BilateralBlurOperation.cpp
source/blender/compositor/operations/COM_BlurBaseOperation.cpp
source/blender/compositor/operations/COM_BokehBlurOperation.cpp
source/blender/compositor/operations/COM_CalculateMeanOperation.cpp
source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp
source/blender/compositor/operations/COM_ColorCurveOperation.cpp
source/blender/compositor/operations/COM_ColorRampOperation.cpp
source/blender/compositor/operations/COM_CompositorOperation.cpp
source/blender/compositor/operations/COM_ConvertColorProfileOperation.cpp
source/blender/compositor/operations/COM_ConvertOperation.cpp
source/blender/compositor/operations/COM_CurveBaseOperation.cpp
source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
source/blender/compositor/operations/COM_GlareThresholdOperation.cpp
source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp
source/blender/compositor/operations/COM_ImageOperation.cpp
source/blender/compositor/operations/COM_ImageOperation.h
source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
source/blender/compositor/operations/COM_KeyingScreenOperation.h
source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp
source/blender/compositor/operations/COM_MaskOperation.cpp
source/blender/compositor/operations/COM_MathBaseOperation.cpp
source/blender/compositor/operations/COM_MixOperation.cpp
source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp
source/blender/compositor/operations/COM_MovieClipOperation.cpp
source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
source/blender/compositor/operations/COM_MovieDistortionOperation.h
source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
source/blender/compositor/operations/COM_OutputFileOperation.cpp
source/blender/compositor/operations/COM_PlaneCornerPinOperation.cpp
source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cpp
source/blender/compositor/operations/COM_PlaneTrackOperation.cpp
source/blender/compositor/operations/COM_PreviewOperation.cpp
source/blender/compositor/operations/COM_RenderLayersProg.cpp
source/blender/compositor/operations/COM_RenderLayersProg.h
source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
source/blender/compositor/operations/COM_SplitOperation.cpp
source/blender/compositor/operations/COM_TextureOperation.cpp
source/blender/compositor/operations/COM_TextureOperation.h
source/blender/compositor/operations/COM_TonemapOperation.cpp
source/blender/compositor/operations/COM_TrackPositionOperation.cpp
source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
source/blender/compositor/operations/COM_VectorBlurOperation.cpp
source/blender/compositor/operations/COM_VectorCurveOperation.cpp
source/blender/compositor/operations/COM_ViewerOperation.cpp
source/blender/depsgraph/DEG_depsgraph_build.h
source/blender/depsgraph/intern/builder/deg_builder_cache.cc
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/depsgraph/intern/builder/deg_builder_relations_impl.h
source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
source/blender/depsgraph/intern/builder/deg_builder_rna.cc
source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc
source/blender/depsgraph/intern/debug/deg_debug_stats_gnuplot.cc
source/blender/depsgraph/intern/depsgraph.cc
source/blender/depsgraph/intern/depsgraph_build.cc
source/blender/depsgraph/intern/depsgraph_debug.cc
source/blender/depsgraph/intern/depsgraph_eval.cc
source/blender/depsgraph/intern/depsgraph_physics.cc
source/blender/depsgraph/intern/depsgraph_query.cc
source/blender/depsgraph/intern/depsgraph_query_iter.cc
source/blender/depsgraph/intern/depsgraph_tag.cc
source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
source/blender/depsgraph/intern/eval/deg_eval_flush.cc
source/blender/depsgraph/intern/node/deg_node_component.cc
source/blender/depsgraph/intern/node/deg_node_id.cc
source/blender/draw/DRW_engine.h
source/blender/editors/include/ED_keyframes_edit.h
source/blender/editors/include/ED_keyframing.h
source/blender/editors/include/ED_object.h
source/blender/editors/include/UI_resources.h
source/blender/editors/uvedit/uvedit_parametrizer.h
source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h
source/blender/freestyle/intern/geometry/Grid.h
source/blender/freestyle/intern/image/GaussianFilter.h
source/blender/freestyle/intern/scene_graph/NodeViewLayer.h
source/blender/freestyle/intern/stroke/Canvas.cpp
source/blender/freestyle/intern/stroke/StrokeRep.h
source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
source/blender/gpu/GPU_context.h
source/blender/gpu/GPU_draw.h
source/blender/gpu/GPU_init_exit.h
source/blender/gpu/intern/gpu_batch_private.h
source/blender/gpu/intern/gpu_context_private.h
source/blender/ikplugin/intern/itasc_plugin.cpp
source/blender/imbuf/intern/IMB_allocimbuf.h
source/blender/imbuf/intern/IMB_colormanagement_intern.h
source/blender/imbuf/intern/cineon/cineonlib.h
source/blender/imbuf/intern/cineon/dpxlib.h
source/blender/imbuf/intern/dds/dds_api.cpp
source/blender/imbuf/intern/dds/dds_api.h
source/blender/imbuf/intern/oiio/openimageio_api.cpp
source/blender/imbuf/intern/oiio/openimageio_api.h
source/blender/imbuf/intern/openexr/openexr_api.cpp
source/blender/imbuf/intern/openexr/openexr_api.h
source/blender/io/alembic/intern/abc_customdata.cc
source/blender/io/alembic/intern/abc_exporter.cc
source/blender/io/alembic/intern/abc_reader_archive.cc
source/blender/io/alembic/intern/abc_reader_camera.cc
source/blender/io/alembic/intern/abc_reader_curves.cc
source/blender/io/alembic/intern/abc_reader_mesh.cc
source/blender/io/alembic/intern/abc_reader_nurbs.cc
source/blender/io/alembic/intern/abc_reader_object.cc
source/blender/io/alembic/intern/abc_reader_object.h
source/blender/io/alembic/intern/abc_reader_points.cc
source/blender/io/alembic/intern/abc_reader_transform.cc
source/blender/io/alembic/intern/abc_util.cc
source/blender/io/alembic/intern/abc_writer_archive.cc
source/blender/io/alembic/intern/abc_writer_camera.cc
source/blender/io/alembic/intern/abc_writer_curves.cc
source/blender/io/alembic/intern/abc_writer_hair.cc
source/blender/io/alembic/intern/abc_writer_mball.cc
source/blender/io/alembic/intern/abc_writer_mesh.cc
source/blender/io/alembic/intern/abc_writer_nurbs.cc
source/blender/io/alembic/intern/abc_writer_object.cc
source/blender/io/alembic/intern/abc_writer_object.h
source/blender/io/alembic/intern/abc_writer_points.cc
source/blender/io/alembic/intern/abc_writer_transform.cc
source/blender/io/alembic/intern/alembic_capi.cc
source/blender/io/collada/AnimationExporter.h
source/blender/io/collada/AnimationImporter.h
source/blender/io/collada/ArmatureExporter.cpp
source/blender/io/collada/ArmatureImporter.cpp
source/blender/io/collada/ArmatureImporter.h
source/blender/io/collada/BCAnimationCurve.h
source/blender/io/collada/BCAnimationSampler.cpp
source/blender/io/collada/BCAnimationSampler.h
source/blender/io/collada/BCMath.h
source/blender/io/collada/BCSampleData.h
source/blender/io/collada/BlenderContext.h
source/blender/io/collada/CameraExporter.cpp
source/blender/io/collada/CameraExporter.h
source/blender/io/collada/ControllerExporter.cpp
source/blender/io/collada/DocumentExporter.cpp
source/blender/io/collada/DocumentExporter.h
source/blender/io/collada/DocumentImporter.cpp
source/blender/io/collada/EffectExporter.cpp
source/blender/io/collada/ExportSettings.h
source/blender/io/collada/GeometryExporter.cpp
source/blender/io/collada/ImageExporter.cpp
source/blender/io/collada/InstanceWriter.cpp
source/blender/io/collada/MaterialExporter.h
source/blender/io/collada/Materials.h
source/blender/io/collada/MeshImporter.cpp
source/blender/io/collada/MeshImporter.h
source/blender/io/collada/SceneExporter.cpp
source/blender/io/collada/SceneExporter.h
source/blender/io/collada/collada.cpp
source/blender/io/collada/collada.h
source/blender/io/collada/collada_utils.cpp
source/blender/io/collada/collada_utils.h
source/blender/io/usd/intern/abstract_hierarchy_iterator.cc
source/blender/io/usd/intern/usd_capi.cc
source/blender/io/usd/intern/usd_hierarchy_iterator.cc
source/blender/io/usd/intern/usd_writer_abstract.h
source/blender/io/usd/intern/usd_writer_camera.cc
source/blender/io/usd/intern/usd_writer_hair.cc
source/blender/io/usd/intern/usd_writer_light.cc
source/blender/io/usd/intern/usd_writer_mesh.cc
source/blender/io/usd/intern/usd_writer_metaball.cc
source/blender/io/usd/intern/usd_writer_transform.cc
source/blender/io/usd/usd.h
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/DNA_anim_types.h
source/blender/makesdna/DNA_customdata_types.h
source/blender/makesdna/DNA_defaults.h
source/blender/makesdna/DNA_layer_types.h
source/blender/makesdna/DNA_movieclip_types.h
source/blender/makesdna/DNA_object_force_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/physics/intern/BPH_mass_spring.cpp
source/blender/physics/intern/hair_volume.cpp
source/blender/python/BPY_extern.h
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/extern/include/RE_shader_ext.h
source/blender/windowmanager/WM_types.h

index 5f4f3f35b8297abfe1de3b867e99f92c48cb9e11..104582be93202e31f7b732003a525eb234c34702 100644 (file)
  * \brief Blender kernel action and pose functionality.
  */
 
+#include "DNA_listBase.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "DNA_listBase.h"
-
 /* The following structures are defined in DNA_action_types.h, and DNA_anim_types.h */
 struct FCurve;
 struct Main;
index 071254be7832a0ed59e0fcf7f8de32285629637c..8809fadd55ca6cb02b029dcdf5bb1ed4d2300940 100644 (file)
  * \ingroup bke
  */
 
+#include "BLI_sys_types.h" /* for bool */
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_sys_types.h" /* for bool */
-
 struct AnimData;
 struct ID;
 struct Main;
index 4076bca3b192f48de6641255766e2cd508dc7f3f..4a2ad28f90f4afe0f54bf1db8d2415be1b7054d2 100644 (file)
  * \ingroup bke
  */
 
+#include "BLI_sys_types.h" /* for bool */
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_sys_types.h" /* for bool */
-
 struct AnimData;
 struct Depsgraph;
 struct FCurve;
index e59d572835097a42177a1e083efb687947e09b7d..5238853a105ade35d9a472b88c4eac7144e8e091 100644 (file)
 /** \file
  * \ingroup bke
  */
+#include "BLI_listbase.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_listbase.h"
-
 struct Bone;
 struct Depsgraph;
 struct ListBase;
index bc64f78ffaeb561e189ecf5cec72d863eb5f753a..4b917beee171919fc71ed614577d35726955a28e 100644 (file)
 #ifndef __BKE_BLENDER_VERSION_H__
 #define __BKE_BLENDER_VERSION_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /** \file
  * \ingroup bke
  */
@@ -43,4 +47,8 @@
 /** Defined in from blender.c */
 extern char versionstr[];
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_BLENDER_VERSION_H__ */
index c4fb19ea35585e2509d56d43c826b2d537f26c1e..70ca29d5795e911074df5936c5a9b52668bb031d 100644 (file)
@@ -25,6 +25,7 @@
  */
 
 #include "DNA_listBase.h"
+#include "DNA_object_enums.h"
 #include "RNA_types.h"
 
 #ifdef __cplusplus
@@ -66,8 +67,6 @@ struct bScreen;
 struct wmWindow;
 struct wmWindowManager;
 
-#include "DNA_object_enums.h"
-
 /* Structs */
 
 struct bContext;
index 3524be99d0a1dec1ac165a660a37aceb8dcba0ed..2b17cb7a8753ba1eaade81ac14c34adc0112242a 100644 (file)
  * \ingroup bke
  */
 
+#include "DNA_scene_types.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "DNA_scene_types.h"
-
 struct BezTriple;
 struct Curve;
 struct Depsgraph;
index a4a36343ca3a26d18dce8f2d92612e93d62f9c88..1a919a33034cd11e48719830c08053bc711a1080 100644 (file)
 #ifndef __BKE_CUSTOMDATA_H__
 #define __BKE_CUSTOMDATA_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "BLI_sys_types.h"
 #include "BLI_utildefines.h"
 
 #include "DNA_customdata_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct BMesh;
 struct CustomData;
 struct CustomData_MeshMasks;
index 79ef512bc1f5d1df4a0cbf349f54868f65c0bc72..463c672ca4766011f16c92a63eaf0bcd01b0eac7 100644 (file)
 #ifndef __BKE_DATA_TRANSFER_H__
 #define __BKE_DATA_TRANSFER_H__
 
+#include "BKE_customdata.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BKE_customdata.h"
-
 struct Depsgraph;
 struct Object;
 struct ReportList;
index 0dc133e34b3d805e1c0b67f4a7b2144e16e59048..5e3603a8339381a94ce404c1ea052440e437911e 100644 (file)
  * \ingroup bke
  */
 
+#include "BLI_utildefines.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_utildefines.h"
-
 struct Depsgraph;
 struct DynamicPaintCanvasSettings;
 struct DynamicPaintModifierData;
index e620beb6ccc355d9741a0d279e48ebf8b5cfcc77..21a9b7b8b04d43ebfa7258f4791da93393f63d3a 100644 (file)
@@ -24,6 +24,8 @@
  * \ingroup bke
  */
 
+#include "DNA_curve_types.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -42,8 +44,6 @@ struct StructRNA;
 struct bAction;
 struct bContext;
 
-#include "DNA_curve_types.h"
-
 /* ************** Keyframe Tools ***************** */
 
 typedef struct CfraElem {
index ee531abfb720fa6e76692c7f973ce8298abde000..563ed408ed7e62892fc017a76903f843b69368ab 100644 (file)
@@ -24,6 +24,8 @@
  * \ingroup bke
  */
 
+#include "DNA_curve_types.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -36,8 +38,6 @@ struct PathResolvedRNA;
 struct PointerRNA;
 struct PropertyRNA;
 
-#include "DNA_curve_types.h"
-
 /* ************** F-Curve Drivers ***************** */
 
 /* With these iterators for convenience, the variables "tarIndex" and "dtar" can be
index 370829476877f0251ab4cc6aa566a5b9c85cd01c..1e5573ab0149245828533d79e1dba2995d5d3408 100644 (file)
  * \ingroup bke
  */
 
+#include "BLI_utildefines.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_utildefines.h"
-
 struct Depsgraph;
 struct ID;
 struct ImBuf;
index 0c91ba6231bf58893464ca1c66aa7333ca96177a..1f89edf905a04a08ba2544d37fc1111d1499ee9c 100644 (file)
  * specific cases requiring advanced (and potentially dangerous) handling.
  */
 
+#include "BLI_compiler_attrs.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_compiler_attrs.h"
-
 struct GHash;
 struct ID;
 struct Library;
index 72c5f1d1b0e30f4157d7d597a622d3d7e1b1fbe2..8129b9dbafb6825b2b9fb94aff453e42815a0c2c 100644 (file)
  * - `BKE_lib_remap_callback_` should be used for functions managing remapping callbacks.
  */
 
+#include "BLI_compiler_attrs.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_compiler_attrs.h"
-
 struct wmWindowManager;
 
 /* BKE_libblock_free, delete are declared in BKE_lib_id.h for convenience. */
index 5bc3d50bf8da6066ffa3a5d3e4db14394a15aa9f..7883d740b0a7d421e698cce36de4aaf6700d7821 100644 (file)
  * API to manage `Library` data-blocks.
  */
 
+#include "BLI_compiler_attrs.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_compiler_attrs.h"
-
 struct Library;
 struct Main;
 
index a6f0fdbc8a3bbe1494c0bd5c863ad6b5f00ad489..17f7a8596bf1dcb707731c5418f6dcb0e22ee7a7 100644 (file)
  * \ingroup bke
  * \brief General operations, lookup, etc. for blender lights.
  */
+
+#include "BLI_compiler_attrs.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_compiler_attrs.h"
-
 struct Light;
 struct Main;
 
index 70a44d6d8cec1a30a58351919d06617e58079157..3710ec810ce1764a4b1230e587dc4b7ae6810a09 100644 (file)
  * \ingroup bke
  * \brief General operations, lookup, etc. for blender objects.
  */
+
+#include "BLI_compiler_attrs.h"
+
+#include "DNA_object_enums.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_compiler_attrs.h"
-
 struct Base;
 struct BoundBox;
 struct Depsgraph;
@@ -46,8 +49,6 @@ struct ShaderFxData;
 struct View3D;
 struct ViewLayer;
 
-#include "DNA_object_enums.h"
-
 void BKE_object_workob_clear(struct Object *workob);
 void BKE_object_workob_calc_parent(struct Depsgraph *depsgraph,
                                    struct Scene *scene,
index 7822f285c3b43c4c94f7169c89005bcd055b1ea8..5c126ed08d47c865805e57fa36b41b5911007e48 100644 (file)
@@ -24,6 +24,9 @@
  * \ingroup bke
  */
 
+#include "BLI_utildefines.h"
+#include "DNA_object_enums.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -65,9 +68,6 @@ struct tPaletteColorHSV;
 
 enum eOverlayFlags;
 
-#include "BLI_utildefines.h"
-#include "DNA_object_enums.h"
-
 extern const char PAINT_CURSOR_SCULPT[3];
 extern const char PAINT_CURSOR_VERTEX_PAINT[3];
 extern const char PAINT_CURSOR_WEIGHT_PAINT[3];
index d7ce9625548421f07e5cb9c168774023f21992fd..063c0831a0d767a2329ee4d13b4220f2ca6c2d67 100644 (file)
  * \ingroup bke
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <stdio.h>
 
 #include "BLI_compiler_attrs.h"
 #include "BLI_utildefines.h"
 #include "DNA_windowmanager_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Reporting Information and Errors
  *
  * These functions also accept NULL in case no error reporting
index dc908ee52324027342cf8aa706c67dc40859d910..d618fcd6d11a600f339c66f5a7452a5e69cd6129 100644 (file)
  * \ingroup bke
  */
 
+#include "DNA_text_types.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "DNA_text_types.h"
-
 /* ****************************************************************************
  * Suggestions should be added in sorted order although a linear sorting method is
  * implemented. The list is then divided up based on the prefix provided by
index d67fbabd11c44019fa92e72df9fef91a096b409e..2b811e50efb386be9a2085b32d85d54fe92ebfc5 100644 (file)
  * \ingroup bli
  */
 
+#include "BLI_utildefines.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_utildefines.h"
-
 typedef unsigned int BLI_bitmap;
 
 /* warning: the bitmap does not keep track of its own size or check
index 41603bb4f06675dfa2c2e6883b344ec949322aaa..6dd1abacf782cee5ce78e60f5d18f03aa108a353 100644 (file)
 
 #include <stdlib.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "BLI_listbase.h"
 
 #include "BLI_string.h"
@@ -68,8 +64,4 @@ extern "C" {
 
 #include "BLI_rect.h"
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
index 4eb6f184a7659da7fb54b9f7bc63e84d79c1066b..fe4600b9121ab11cbaacdb27984cbce9f7ab6168 100644 (file)
 #include <stdio.h>
 #include <sys/stat.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* for size_t (needed on windows) */
 #include <stddef.h>
 
@@ -41,6 +37,10 @@ extern "C" {
 #include "BLI_compiler_attrs.h"
 #include "BLI_utildefines.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifndef PATH_MAX
 #  define PATH_MAX 4096
 #endif
index 3871ddf956a355ccde159575e7dbc628aa743fd2..96111ffaf5aba7ba1915958a5c3c7070bdda73ed 100644 (file)
  * \ingroup bli
  */
 
+#include "BLI_utildefines.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_utildefines.h"
-
 BLI_INLINE unsigned int BLI_hash_int_2d(unsigned int kx, unsigned int ky)
 {
 #define rot(x, k) (((x) << (k)) | ((x) >> (32 - (k))))
index fa8e49ef376b448cabbde8153959d5b3c6bb8e89..ca5edcbead5afe252657643bb347929a70aad5a4 100644 (file)
  * \brief A min-heap / priority queue ADT
  */
 
+#include "BLI_math.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_math.h"
-
 struct Heap;
 struct HeapNode;
 typedef struct Heap Heap;
index ae9617d2f1627cd278334c42a503ef98fcdd129f..3d91a9e98cf6b006d45c6779415d0d9753fefea2 100644 (file)
@@ -92,6 +92,10 @@ static const int NAN_INT = 0x7FC00000;
 #  pragma GCC diagnostic ignored "-Wredundant-decls"
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /******************************* Float ******************************/
 
 MINLINE float pow2f(float x);
@@ -281,4 +285,8 @@ double double_round(double x, int ndigits);
 #  define BLI_ASSERT_UNIT_M3(m) (void)(m)
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BLI_MATH_BASE_H__ */
index 71e2d2d9e2c8d64bc9601ef697efb0523128c76e..842fce22f91ba38358828c359d289093cb8dbd0d 100644 (file)
  * \ingroup bli
  */
 
+#include "BLI_math_inline.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_math_inline.h"
-
 /* Search the value from LSB to MSB for a set bit. Returns index of this bit. */
 MINLINE int bitscan_forward_i(int a);
 MINLINE unsigned int bitscan_forward_uint(unsigned int a);
index 97d0eb1ddda7f2570ba652bc6c85a49296191360..f247e09a83bf37f758cf87fc006b038167441c4a 100644 (file)
  * \ingroup bli
  */
 
+#include "BLI_math_inline.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_math_inline.h"
-
 /* YCbCr */
 #define BLI_YCC_ITU_BT601 0
 #define BLI_YCC_ITU_BT709 1
index 47bafff3a490ab6e19d5b4954c693935e34a68ae..60ada1e45096cd03375053fb3c42d622fcedfa70 100644 (file)
  * \ingroup bli
  */
 
+#include "BLI_math_inline.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_math_inline.h"
-
 /******************** Blending Modes **********************
  * - byte function assume straight alpha
  * - float functions assume premultiplied alpha
index 2049f36857845db42f9007b4d82debf8da805a75..563bcad5d145f25fef18d974b25f9e05e0941b24 100644 (file)
  * \ingroup bli
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "BLI_compiler_attrs.h"
 #include "BLI_math_inline.h"
 
@@ -39,6 +35,10 @@ extern "C" {
 #  pragma GCC diagnostic ignored "-Wredundant-decls"
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /********************************** Polygons *********************************/
 
 float normal_tri_v3(float r[3], const float a[3], const float b[3], const float c[3]);
index 1221ecfb7b1cf8c60406b0109a88c87e5b491159..2d11797bc341bf9849d3b9f7666add4071c5fabd 100644 (file)
  * \ingroup bli
  */
 
+#include "BLI_compiler_attrs.h"
+#include "BLI_sys_types.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_compiler_attrs.h"
-#include "BLI_sys_types.h"
-
 /********************************* Init **************************************/
 
 void zero_m2(float R[2][2]);
index 4bd1a46bb781e3ac9e2aecbd96c588f6ac15e04d..193bbdd4e8c427a76a8931cacd6fb9e828a3c574 100644 (file)
  * \ingroup bli
  */
 
+#include "BLI_compiler_attrs.h"
+#include "BLI_math_inline.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_compiler_attrs.h"
-#include "BLI_math_inline.h"
-
 #ifdef BLI_MATH_GCC_WARN_PRAGMA
 #  pragma GCC diagnostic push
 #  pragma GCC diagnostic ignored "-Wredundant-decls"
index b2cc6568abb5b6050fd007d9e4ac59c43d60c1c6..a9f9ae39506fa1224a2f8d236cdce15c98e30c6d 100644 (file)
  * \ingroup bli
  */
 
+#include "BLI_compiler_attrs.h"
+#include "BLI_math_inline.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_compiler_attrs.h"
-#include "BLI_math_inline.h"
-
 #ifdef BLI_MATH_GCC_WARN_PRAGMA
 #  pragma GCC diagnostic push
 #  pragma GCC diagnostic ignored "-Wredundant-decls"
index a171ff1bb1ceee3f3ef874556bd0ed4579bb9bfb..af28e826e84a85ba9f530d56a860f601d77f20ba 100644 (file)
  * \ingroup bli
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "BLI_compiler_attrs.h"
 #include "BLI_math_inline.h"
 #include "BLI_utildefines.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /************************************* Init ***********************************/
 
 #ifdef BLI_MATH_GCC_WARN_PRAGMA
index 5440bdfef60be0c14131f9029b8d3b13530ea8a8..e0aff82e874bdcb808f29c6cdbfa594544e5ad54 100644 (file)
 #ifndef __BLI_MEMARENA_H__
 #define __BLI_MEMARENA_H__
 
+#include "BLI_compiler_attrs.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_compiler_attrs.h"
-
 /* A reasonable standard buffer size, big
  * enough to not cause much internal fragmentation,
  * small enough not to waste resources
index 8bd8642a4e8901ea80dea3b9c86af5feccd0b337..8f66ee3b9cb4d142e3f4ed530accaf07ae66fbce 100644 (file)
  * \ingroup bli
  */
 
+#include "BLI_compiler_attrs.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_compiler_attrs.h"
-
 #define BLI_MEM_BLOCK_CHUNK_SIZE (1 << 15) /* 32KiB */
 
 struct BLI_memblock;
index fb4a79a491b6f25494549fb9fe18ef9c5e3b618d..4aa9cdb6b6c18f25d709e9dd8d6613e86b6a31a4 100644 (file)
  * \ingroup bli
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "BLI_compiler_attrs.h"
 #include "BLI_compiler_compat.h"
 #include "BLI_sys_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* 512kb, good default for small elems. */
 #define BLI_MEMITER_DEFAULT_SIZE (1 << 19)
 
index 6491180c2fdffb41f6d75f3448d06e0a2cbce1be..3749f9e1b7631b3016353a022ac1142c83390dc0 100644 (file)
  * \ingroup bli
  */
 
+#include "BLI_compiler_attrs.h"
+#include "BLI_utildefines.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_compiler_attrs.h"
-#include "BLI_utildefines.h"
-
 struct BLI_mempool;
 struct BLI_mempool_chunk;
 
index 9a6a14547d2328ede023f85cf33b4aa7f3bb90d3..30823773d6cdbf4e66b0fc209552f1ea64e8d91f 100644 (file)
  * \ingroup bli
  */
 
+#include "BLI_compiler_attrs.h"
+#include "BLI_utildefines.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_compiler_attrs.h"
-#include "BLI_utildefines.h"
-
 void BLI_setenv(const char *env, const char *val) ATTR_NONNULL(1);
 void BLI_setenv_if_new(const char *env, const char *val) ATTR_NONNULL(1);
 const char *BLI_getenv(const char *env) ATTR_NONNULL(1);
index 6d3f38c7a523a57af70cc12eff634c025c6dde96..00e4e3485d1189d5c53b7fcb44c854378fd19c0b 100644 (file)
 #include <inttypes.h>
 #include <stdarg.h>
 
+#include "BLI_compiler_attrs.h"
+#include "BLI_utildefines.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_compiler_attrs.h"
-#include "BLI_utildefines.h"
-
 char *BLI_strdupn(const char *str, const size_t len) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT
     ATTR_NONNULL();
 
index 8d986d45a17c6b245fc0a4601d0af4c268beec03..78e7113b6ef6b1fd0716573f692fa0505d8d7fe5 100644 (file)
  * \ingroup bli
  */
 
+#include "BLI_compiler_attrs.h"
+#include "BLI_sys_types.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_compiler_attrs.h"
-#include "BLI_sys_types.h"
-
 char *BLI_strncpy_utf8(char *__restrict dst, const char *__restrict src, size_t maxncpy)
     ATTR_NONNULL();
 size_t BLI_strncpy_utf8_rlen(char *__restrict dst, const char *__restrict src, size_t maxncpy)
index 7b0dd13e0c73387979345d7b767d52d1c5dc6e47..857b22540e9df26658e0e53ac6a0c3558c0abc1d 100644 (file)
 
 #include <stdarg.h>
 
+#include "BLI_compiler_attrs.h"
+#include "BLI_utildefines.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_compiler_attrs.h"
-#include "BLI_utildefines.h"
-
 struct ListBase;
 
 typedef bool (*UniquenameCheckCallback)(void *arg, const char *name);
index ee087600a312223e23221f42899b9bfed309db66..ce18d5d765e618aa4dcd5e4b74bf358057b25019 100644 (file)
@@ -25,13 +25,13 @@ struct ListBase;
  * \ingroup bli
  */
 
+#include "BLI_threads.h"
+#include "BLI_utildefines.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_threads.h"
-#include "BLI_utildefines.h"
-
 struct BLI_mempool;
 
 /* Task Scheduler
index 243efedebf99b3e95faeb49899c6c73eefd3be72..c199417017badde80aeca1bf42f6a9d726063db2 100644 (file)
@@ -23,9 +23,6 @@
 /** \file
  * \ingroup bli
  */
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 #include <pthread.h>
 
@@ -35,6 +32,10 @@ extern "C" {
 #  include <libkern/OSAtomic.h>
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* for tables, button in UI, etc */
 #define BLENDER_MAX_THREADS 1024
 
index fb5dbf668193195dc0b229acc34c3b6a5249d094..1f28f7e80c5ceee865ad68c39f2ec16de8b26330 100644 (file)
  * \ingroup bli
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* avoid many includes for now */
 #include "BLI_compiler_compat.h"
 #include "BLI_sys_types.h"
@@ -39,6 +35,10 @@ extern "C" {
 /* include after _VA_NARGS macro */
 #include "BLI_compiler_typecheck.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* -------------------------------------------------------------------- */
 /** \name Min/Max Macros
  * \{ */
index e0cac508d28f20da62563549646f15f1b36237f1..d5105a7cefc7e64e7214df24b7844e63ba1c098f 100644 (file)
 
 #include "BLI_math_base.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* copied from BLI_utildefines.h */
 #ifdef __GNUC__
 #  define UNLIKELY(x) __builtin_expect(!!(x), 0)
@@ -793,4 +797,8 @@ MINLINE unsigned char unit_ushort_to_uchar(unsigned short val)
   } \
   ((void)0)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __MATH_BASE_INLINE_C__ */
index 7d2100c0f65a123e583c6a43ecc9a50d9b6d8285..9b5072e8e162fd44d668b72d4305cfc5e3c1787d 100644 (file)
  * - Use two different iterator types for BMO map/buffer types.
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "DNA_customdata_types.h" /* BMesh struct in bmesh_class.h uses */
 #include "DNA_listBase.h"         /* selection history uses */
 
@@ -199,6 +195,10 @@ extern "C" {
 #include <stdio.h>
 #include <stdlib.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "bmesh_class.h"
 
 /* include the rest of the API */
index dbd2bf076c648bf997d5d67040ca36ad8ff21c9c..5af812d1b1d48be001d3e183553b59dc2a1c49d2 100644 (file)
  * \ingroup bmesh
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "BLI_ghash.h"
 
 #include <stdarg.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * operators represent logical, executable mesh modules.  all topological
  * operations involving a bmesh has to go through them.
index 479a8a3f6d655138cf7031f5532e2602f25bbac3..8562e584ec9a109415002fe367b4e663c1074014 100644 (file)
@@ -47,4 +47,5 @@ void BM_mesh_bevel(BMesh *bm,
                    const bool use_custom_profile,
                    const struct CurveProfile *custom_profile,
                    const int vmesh_method);
+
 #endif /* __BMESH_BEVEL_H__ */
index 1d7c2b6b34972c29abdeb3032179ff79b98974df..a24904551c6bfd34b1bb9d06dbd05002c31e9b44 100644 (file)
 #ifndef __COM_COMPOSITOR_H__
 #define __COM_COMPOSITOR_H__
 
+#include "DNA_color_types.h"
+#include "DNA_node_types.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "DNA_color_types.h"
-#include "DNA_node_types.h"
-
 /* Keep ascii art. */
 /* clang-format off */
 /**
index e8474ba83181c0c1db8e761f6661f64ab46ebf6f..edfeb3a3a04643fcf2c3964bb3e59414f718a72b 100644 (file)
 
 #include <string.h>
 
-extern "C" {
 #include "DNA_node_types.h"
 
 #include "BKE_node.h"
-}
 
 #include "COM_NodeOperation.h"
 #include "COM_NodeOperationBuilder.h"
index fa40f15033564a9221eb99e73c28839e9daa6512..34682aae2fd319c870d9a346ce5fd4f93fadc207 100644 (file)
@@ -20,9 +20,8 @@
 
 #include "BLI_utildefines.h"
 #include "PIL_time.h"
-extern "C" {
+
 #include "BKE_node.h"
-}
 
 #include "BLT_translation.h"
 
index 7e5b0264aa3d111024c66b4a5567488531fa2d98..6ba8f1444828030ee9217ed5f9815f06e6bf2d7d 100644 (file)
@@ -25,10 +25,8 @@ class MemoryBuffer;
 #include "COM_MemoryProxy.h"
 #include "COM_SocketReader.h"
 
-extern "C" {
 #include "BLI_math.h"
 #include "BLI_rect.h"
-}
 
 /**
  * \brief state of a memory buffer
index df5a8e690d3933aaa19119e42ab97b70a61ee691..31535c5851f5026c45fa7039ff0cb24bdb27b900 100644 (file)
 
 #include <string.h>
 
-extern "C" {
 #include "BKE_node.h"
 
 #include "RNA_access.h"
-}
 
 #include "COM_ExecutionSystem.h"
 #include "COM_NodeOperation.h"
index eff825b075d4bbe02aa5b158b104e77c510b0341..2db31bd4133e8d0d9ecbddb22b575d9b06a6d200 100644 (file)
@@ -16,9 +16,7 @@
  * Copyright 2013, Blender Foundation.
  */
 
-extern "C" {
 #include "BLI_utildefines.h"
-}
 
 #include "COM_Debug.h"
 
index 6640f144518fa78baa2292f89f72f9cb2584e466..cb27fa21b4d5209129eaa6ad29689bd9b212c2f1 100644 (file)
 
 #include <cstring>
 
-extern "C" {
 #include "BLI_listbase.h"
 #include "BLI_utildefines.h"
 
 #include "DNA_node_types.h"
 
 #include "BKE_node.h"
-}
 
 #include "COM_CompositorContext.h"
 #include "COM_Converter.h"
index b005149c839b50fd7c97c82f9bb87de6b7d93cbb..531832c2c65a154d4bc615b73b801b1c6c91503d 100644 (file)
@@ -23,9 +23,7 @@
 #include <set>
 #include <vector>
 
-extern "C" {
 #include "DNA_node_types.h"
-}
 
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
index b2c4961ca35ab4e5bd48c93ede4ad65e1d577c99..07f482f9e5f1e0f38a17884ce72cf59971e8a9fe 100644 (file)
 #include <sstream>
 #include <string>
 
-extern "C" {
 #include "BLI_math_color.h"
 #include "BLI_math_vector.h"
 #include "BLI_threads.h"
-}
 
 #include "COM_MemoryBuffer.h"
 #include "COM_MemoryProxy.h"
index 9f6b91915e00cc4f517af567ddf595780d17bca1..5ce6ca34b3424dd5945ae01fcaca4cbb5f6818fe 100644 (file)
@@ -16,9 +16,7 @@
  * Copyright 2013, Blender Foundation.
  */
 
-extern "C" {
 #include "BLI_utildefines.h"
-}
 
 #include "COM_Converter.h"
 #include "COM_Debug.h"
index 5e0675f18337c512edabc039e83171a5cb4940dd..3a1b4c533bdbcde74aa65a84e0545158b6fa6e01 100644 (file)
@@ -20,9 +20,9 @@
 #define __COM_WORKSCHEDULER_H__
 
 #include "COM_ExecutionGroup.h"
-extern "C" {
+
 #include "BLI_threads.h"
-}
+
 #include "COM_Device.h"
 #include "COM_WorkPackage.h"
 #include "COM_defines.h"
index 1793abae134650713e2469197a30dd3b499b0bc4..bccdd026ead93b253df5424f2da054e58db5c00b 100644 (file)
  * Copyright 2011, Blender Foundation.
  */
 
-extern "C" {
-#include "BKE_node.h"
 #include "BLI_threads.h"
-}
 
 #include "BLT_translation.h"
 
+#include "BKE_node.h"
 #include "BKE_scene.h"
 
 #include "COM_ExecutionSystem.h"
index ea62dea12de27f4f1f8c0e28c89279b7f30220b9..a8e88a0ef4f439042322385a23544b65aa703361 100644 (file)
@@ -20,9 +20,7 @@
 
 #include "COM_Node.h"
 
-extern "C" {
 #include "DNA_node_types.h"
-}
 
 /**
  * \brief CornerPinNode
index 6ed9acd58b807be7ee9f64d954b774999658230d..7883f4d7ab3a0cd5d4dbf32bdc6f15628044141b 100644 (file)
@@ -23,9 +23,8 @@
 #include "COM_defines.h"
 #include "DNA_image_types.h"
 #include "DNA_node_types.h"
-extern "C" {
+
 #include "RE_engine.h"
-}
 
 /**
  * \brief ImageNode
index 6a005b2b71253a9e81181678826aa8cf116a71d8..93a9a071226776e62119181c1b50fa968622d35d 100644 (file)
@@ -20,9 +20,7 @@
 #include "COM_ExecutionSystem.h"
 #include "COM_KeyingScreenOperation.h"
 
-extern "C" {
 #include "DNA_movieclip_types.h"
-}
 
 KeyingScreenNode::KeyingScreenNode(bNode *editorNode) : Node(editorNode)
 {
index cceeef6b437e476b530251212e501c7055eb0768..b28b849521cf3620702fc6659cbeb353f159f9d8 100644 (file)
@@ -20,9 +20,7 @@
 #include "COM_ExecutionSystem.h"
 #include "COM_MaskOperation.h"
 
-extern "C" {
 #include "DNA_mask_types.h"
-}
 
 MaskNode::MaskNode(bNode *editorNode) : Node(editorNode)
 {
index 29fd47f33b3d05edd7a362598a9a6196b7db6af2..3366a8c20d61a9cc5256a57e91ff28d8afb801d0 100644 (file)
 #include "COM_MovieClipOperation.h"
 #include "COM_SetValueOperation.h"
 
-extern "C" {
 #include "BKE_movieclip.h"
 #include "BKE_tracking.h"
+
 #include "DNA_movieclip_types.h"
+
 #include "IMB_imbuf.h"
-}
 
 MovieClipNode::MovieClipNode(bNode *editorNode) : Node(editorNode)
 {
index 39616bba4f959c5520ab6ce863e84593d2b9b323..6b9b51631ec4b38596f51049585a9b9a907bcdd3 100644 (file)
 
 #include "COM_PlaneTrackOperation.h"
 
-extern "C" {
 #include "BKE_movieclip.h"
 #include "BKE_node.h"
 #include "BKE_tracking.h"
-}
 
 PlaneTrackDeformNode::PlaneTrackDeformNode(bNode *editorNode) : Node(editorNode)
 {
index 6ee73e22af05b9bf6f94da17d417c2c10b20e1bd..2c17739a220de879a74c03d38908069e420bcc44 100644 (file)
 
 #include "COM_Node.h"
 
-extern "C" {
 #include "DNA_movieclip_types.h"
 #include "DNA_node_types.h"
-}
 
 /**
  * \brief PlaneTrackDeformNode
index 0b6cb97b0497570028501ab746a8da5baec05f24..7a308ac47b9db6e745d494e09ec94236cdd75d4b 100644 (file)
 #include "COM_SetSamplerOperation.h"
 #include "COM_TranslateOperation.h"
 
-extern "C" {
 #include "BKE_tracking.h"
+
 #include "DNA_movieclip_types.h"
-}
 
 Stabilize2dNode::Stabilize2dNode(bNode *editorNode) : Node(editorNode)
 {
index b6927fb837371930585b922b3e3977e8957cb71a..9722ead071631a851154e13ef396f58be49bd4bb 100644 (file)
@@ -19,9 +19,9 @@
 #include "COM_TimeNode.h"
 #include "COM_ExecutionSystem.h"
 #include "COM_SetValueOperation.h"
-extern "C" {
+
 #include "BKE_colortools.h"
-}
+
 #include "BLI_utildefines.h"
 
 TimeNode::TimeNode(bNode *editorNode) : Node(editorNode)
index da9f50a590b0654b6bea6f88f72bf91b62f9b989..52e7f7d832b6d461e41b65a35617a71006f98794 100644 (file)
 #include "COM_ExecutionSystem.h"
 #include "COM_TrackPositionOperation.h"
 
-extern "C" {
 #include "DNA_movieclip_types.h"
 
 #include "BKE_node.h"
-}
 
 TrackPositionNode::TrackPositionNode(bNode *editorNode) : Node(editorNode)
 {
index de7c43a87511fdc8d1ac945129ac882468abdf12..85725cc1d37b3dbc794631d182e4ebf09d1c46b7 100644 (file)
@@ -22,9 +22,7 @@
 
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "RE_render_ext.h"
-}
 
 /* An implementation of the Scale3X edge-extrapolation algorithm.
  *
index 44cb4056c99ac11605833d82ca3202ccb443160c..8168867a5221f4c104d422872000abc29ec9412f 100644 (file)
@@ -19,9 +19,7 @@
 #include "COM_BilateralBlurOperation.h"
 #include "BLI_math.h"
 
-extern "C" {
 #include "RE_pipeline.h"
-}
 
 BilateralBlurOperation::BilateralBlurOperation() : NodeOperation()
 {
index 24c68ddbec762f1e916b1eeaa196c47afbda2c83..ef0f259c592e5c495771c880bbef647541fa36f4 100644 (file)
@@ -20,9 +20,7 @@
 #include "BLI_math.h"
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "RE_pipeline.h"
-}
 
 BlurBaseOperation::BlurBaseOperation(DataType data_type) : NodeOperation()
 {
index 4d8589347966812f47a1669a2c612f39e2e64577..c00ef2468c0206b3891bc7ef63eb09a29180db1d 100644 (file)
@@ -20,9 +20,7 @@
 #include "BLI_math.h"
 #include "COM_OpenCLDevice.h"
 
-extern "C" {
 #include "RE_pipeline.h"
-}
 
 BokehBlurOperation::BokehBlurOperation() : NodeOperation()
 {
index 5d01154bbda0b4f8f47965c235be3f348433ef91..ecd61e95f43bcc711ef139dd4bf762a2100e6117 100644 (file)
@@ -20,9 +20,7 @@
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
 
-extern "C" {
 #include "IMB_colormanagement.h"
-}
 
 CalculateMeanOperation::CalculateMeanOperation() : NodeOperation()
 {
index dfe1a936c9c1bf8fe22530a4bf124275b79899dd..059040d6f052e905194613bbea926581842821e7 100644 (file)
@@ -20,9 +20,7 @@
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
 
-extern "C" {
 #include "IMB_colormanagement.h"
-}
 
 CalculateStandardDeviationOperation::CalculateStandardDeviationOperation()
     : CalculateMeanOperation()
index 31567398d988c4ec0dced2d8d85419545da561fb..39ffb690328f55c6582b50008df5375b81ce851a 100644 (file)
@@ -19,9 +19,7 @@
 #include "COM_ColorCorrectionOperation.h"
 #include "BLI_math.h"
 
-extern "C" {
 #include "IMB_colormanagement.h"
-}
 
 ColorCorrectionOperation::ColorCorrectionOperation() : NodeOperation()
 {
index 90d3a60abd0b208609dbaabe94bcb3d73249535b..9d514c872f7b900d70e8b16179240257a04dabc4 100644 (file)
 
 #include "COM_ColorCurveOperation.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 #include "BKE_colortools.h"
-#ifdef __cplusplus
-}
-#  include "MEM_guardedalloc.h"
-#endif
+
+#include "MEM_guardedalloc.h"
 
 ColorCurveOperation::ColorCurveOperation() : CurveBaseOperation()
 {
index f2c153c5d30233c549205c4d2a732380a24d4efb..95e0bd2d82b3c3ef5abc581c457d4e48cadfdfa5 100644 (file)
 
 #include "COM_ColorRampOperation.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 #include "BKE_colorband.h"
-#ifdef __cplusplus
-}
-#endif
 
 ColorRampOperation::ColorRampOperation() : NodeOperation()
 {
index cb41071e6f0a607ef9efcc683e189b68156e7b75..71cef9dc4da33fe5a6f481c8403f95947e99ddbf 100644 (file)
 #include "BLI_listbase.h"
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "BLI_threads.h"
+
 #include "RE_pipeline.h"
 #include "RE_render_ext.h"
 #include "RE_shader_ext.h"
+
 #include "render_types.h"
-}
+
 #include "PIL_time.h"
 
 CompositorOperation::CompositorOperation() : NodeOperation()
index 59a605a77c9683e664c53ad319fdf8f8fe22d22b..6a4c5db856c3936c7d6a2c195e2563356fb9436d 100644 (file)
@@ -18,9 +18,8 @@
 
 #include "COM_ConvertColorProfileOperation.h"
 
-extern "C" {
 #include "IMB_imbuf.h"
-}
+
 ConvertColorProfileOperation::ConvertColorProfileOperation() : NodeOperation()
 {
   this->addInputSocket(COM_DT_COLOR);
index 6caccb890466491723401dc8aa7178f31ac3dc1c..0bd3f5b8796938b76819b20d994733d618a3c84a 100644 (file)
@@ -18,9 +18,7 @@
 
 #include "COM_ConvertOperation.h"
 
-extern "C" {
 #include "IMB_colormanagement.h"
-}
 
 ConvertBaseOperation::ConvertBaseOperation()
 {
index 858931ad46def013e10773a89de80301832d0073..b18e77cf0e3d4a70b78bf77be3b4781cd52294ee 100644 (file)
 
 #include "COM_CurveBaseOperation.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 #include "BKE_colortools.h"
-#ifdef __cplusplus
-}
-#endif
 
 CurveBaseOperation::CurveBaseOperation() : NodeOperation()
 {
index 1b590c0c3925c134cba72bc6fc198bb11736360a..31eb74fbc4237a7137ee58f5d94ae457a7d28c76 100644 (file)
  */
 
 #include "COM_DirectionalBlurOperation.h"
-#include "BLI_math.h"
 #include "COM_OpenCLDevice.h"
-extern "C" {
+
+#include "BLI_math.h"
+
 #include "RE_pipeline.h"
-}
 
 DirectionalBlurOperation::DirectionalBlurOperation() : NodeOperation()
 {
index c6239dba60478af347e73f87b338345625a6e68c..c028a2c0e4cd35d7435b77f1ad0d7011f51ae1b3 100644 (file)
@@ -20,9 +20,7 @@
 #include "BLI_math.h"
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "RE_pipeline.h"
-}
 
 GaussianAlphaXBlurOperation::GaussianAlphaXBlurOperation() : BlurBaseOperation(COM_DT_VALUE)
 {
index 37109b4a03ecd47ef500f0ba1472d60da7c837a6..35abe4cd47b1416c4e9625f702ce0b57b4700cd1 100644 (file)
@@ -20,9 +20,7 @@
 #include "BLI_math.h"
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "RE_pipeline.h"
-}
 
 GaussianAlphaYBlurOperation::GaussianAlphaYBlurOperation() : BlurBaseOperation(COM_DT_VALUE)
 {
index 318c182fdffd74242fc0588f7cfbbb1f5912514a..43e571c4bb716fa98c5ad396d12207b021abf484 100644 (file)
@@ -19,9 +19,8 @@
 #include "COM_GaussianBokehBlurOperation.h"
 #include "BLI_math.h"
 #include "MEM_guardedalloc.h"
-extern "C" {
+
 #include "RE_pipeline.h"
-}
 
 GaussianBokehBlurOperation::GaussianBokehBlurOperation() : BlurBaseOperation(COM_DT_COLOR)
 {
index 68cde0d365fe978debd9e0a990b34d73a919ed20..32ad04827916729382ca7d441d2f990b07702f8c 100644 (file)
@@ -21,9 +21,7 @@
 #include "COM_OpenCLDevice.h"
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "RE_pipeline.h"
-}
 
 GaussianXBlurOperation::GaussianXBlurOperation() : BlurBaseOperation(COM_DT_COLOR)
 {
index eeddd98d4a4113145a97ca5ec928958b5fdcd506..3ffa797c0c188aa6773ac3a70be38b88ba8b41fe 100644 (file)
@@ -21,9 +21,7 @@
 #include "COM_OpenCLDevice.h"
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "RE_pipeline.h"
-}
 
 GaussianYBlurOperation::GaussianYBlurOperation() : BlurBaseOperation(COM_DT_COLOR)
 {
index 142c51122a160be6654394dc17c8e43a891df939..d050d9b58a9d872888706f3de5661ab5524b3199 100644 (file)
@@ -19,9 +19,7 @@
 #include "COM_GlareThresholdOperation.h"
 #include "BLI_math.h"
 
-extern "C" {
 #include "IMB_colormanagement.h"
-}
 
 GlareThresholdOperation::GlareThresholdOperation() : NodeOperation()
 {
index fae280249de968a61ceba91f3fde90477572df4c..8292413f6f1beb3d9851351599b260dccea2d0f3 100644 (file)
 
 #include "BLI_math.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 #include "BKE_colortools.h"
-#ifdef __cplusplus
-}
-#endif
 
 HueSaturationValueCorrectOperation::HueSaturationValueCorrectOperation() : CurveBaseOperation()
 {
index d70cab4ad2a484ea1c9073e52f8125acb728e651..38d2fbf9ed468106d7c2ab57156d9e521eb6452d 100644 (file)
 #include "BLI_math.h"
 #include "DNA_image_types.h"
 
-extern "C" {
 #include "IMB_colormanagement.h"
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 #include "RE_pipeline.h"
 #include "RE_render_ext.h"
 #include "RE_shader_ext.h"
-}
 
 BaseImageOperation::BaseImageOperation() : NodeOperation()
 {
index 57656d03092f2455824bbcfef54972e6ee5d704e..3e081ee0000ceda68cdb1caf42b27a9336e3ab2a 100644 (file)
 #include "BLI_utildefines.h"
 #include "COM_NodeOperation.h"
 #include "MEM_guardedalloc.h"
-extern "C" {
+
 #include "RE_pipeline.h"
 #include "RE_render_ext.h"
 #include "RE_shader_ext.h"
-}
 
 /**
  * \brief Base class for all image operations
index ab9ef0335e06e5c9685af7e11f8e556d98c9b874..082091411fb962aedd3559e2a62203008d344f22 100644 (file)
 #include "BLI_math.h"
 #include "BLI_math_color.h"
 
-extern "C" {
 #include "BKE_movieclip.h"
 #include "BKE_tracking.h"
 
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
-}
 
 KeyingScreenOperation::KeyingScreenOperation() : NodeOperation()
 {
index 860a358e79d20b7a0303bc329c57dc01dfab5aa3..593e902117bf7eaaf384e96ef8228dd04a7ffc94 100644 (file)
@@ -28,9 +28,7 @@
 #include "BLI_listbase.h"
 #include "BLI_string.h"
 
-extern "C" {
 #include "BLI_voronoi_2d.h"
-}
 
 /**
  * Class with implementation of green screen gradient rasterization
index 30ad954e0bc8ddfb5e05ba463ee079b22ae7cb82..936ac00a0e84b975655c95a53d7780c131831851 100644 (file)
@@ -19,9 +19,7 @@
 #include "COM_LuminanceMatteOperation.h"
 #include "BLI_math.h"
 
-extern "C" {
 #include "IMB_colormanagement.h"
-}
 
 LuminanceMatteOperation::LuminanceMatteOperation() : NodeOperation()
 {
index 88a3a5c535c4452ed8e16eec15d165ad5ccd0c67..bdc954ac081027d43af8bc0f91579094cb2fec10 100644 (file)
@@ -23,9 +23,7 @@
 #include "BLI_listbase.h"
 #include "BLI_math.h"
 
-extern "C" {
 #include "BKE_mask.h"
-}
 
 MaskOperation::MaskOperation() : NodeOperation()
 {
index 524812ac99210eeedb033a1204b97f3099bc79de..1363b75433aac139b74e43580bb640d545aca7a1 100644 (file)
@@ -17,9 +17,8 @@
  */
 
 #include "COM_MathBaseOperation.h"
-extern "C" {
+
 #include "BLI_math.h"
-}
 
 MathBaseOperation::MathBaseOperation() : NodeOperation()
 {
index 6b8a0caa13b0d305283356ede89245c4d3020eca..371da20044f990d28de8400a4084f7d9b9e743f3 100644 (file)
@@ -18,9 +18,7 @@
 
 #include "COM_MixOperation.h"
 
-extern "C" {
 #include "BLI_math.h"
-}
 
 /* ******** Mix Base Operation ******** */
 
index 4f5d7f6f00b512bf8519690c81d6ea927edc6981..34773a1e4f8f702fc425cf8f29fb5c0faf79bc07 100644 (file)
  */
 
 #include "COM_MovieClipAttributeOperation.h"
-extern "C" {
+
 #include "BKE_movieclip.h"
 #include "BKE_tracking.h"
-}
+
 MovieClipAttributeOperation::MovieClipAttributeOperation() : NodeOperation()
 {
   this->addOutputSocket(COM_DT_VALUE);
index c5757274143b8d33b0312178fec111aa0a054a07..17794ae879ecc28fd7692e4dbeb3fcc57e28a9bb 100644 (file)
 
 #include "BLI_listbase.h"
 #include "BLI_math.h"
-extern "C" {
+
+#include "BKE_image.h"
 #include "BKE_movieclip.h"
+
 #include "IMB_imbuf.h"
-}
-#include "BKE_image.h"
 
 MovieClipBaseOperation::MovieClipBaseOperation() : NodeOperation()
 {
index fe2943419c56df43afce69c49a89066ebfa4b1a9..67491d5154794893f03562e43a99272ff60cb194 100644 (file)
 
 #include "COM_MovieDistortionOperation.h"
 
-extern "C" {
 #include "BKE_movieclip.h"
 #include "BKE_tracking.h"
+
 #include "BLI_linklist.h"
-}
 
 MovieDistortionOperation::MovieDistortionOperation(bool distortion) : NodeOperation()
 {
index 3ca9fe16b1ededcaf1258bc42bbc2ded8ae4b248..799c6385a103086d977283f6ea7d1b52de753839 100644 (file)
@@ -23,9 +23,7 @@
 #include "DNA_movieclip_types.h"
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "BKE_tracking.h"
-}
 
 class MovieDistortionOperation : public NodeOperation {
  private:
index 9876c31994409a6bf763b6b4b88b2a5f4bd606af..8878b05ade7d0d89659f01f432f46b0b7fec0530 100644 (file)
  */
 
 #include "COM_MultilayerImageOperation.h"
-extern "C" {
+
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
-}
 
 MultilayerBaseOperation::MultilayerBaseOperation(int passindex, int view) : BaseImageOperation()
 {
index 65f4eeeb8bb49bf1007a004238ea547328141480..c0fe7237687f19b708948fb8b7510002e12ba023 100644 (file)
 #include "DNA_color_types.h"
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "IMB_colormanagement.h"
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
-}
 
 /************************************ OpenEXR Singlelayer Multiview ******************************/
 
index efe01d0b5cc382869e9a9c151b421e9431da1e12..ee3779edcb444ed0c80dc8e7d71aadb1ca25b55e 100644 (file)
 #include "DNA_color_types.h"
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "IMB_colormanagement.h"
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
-}
 
 void add_exr_channels(void *exrhandle,
                       const char *layerName,
index 676601d82da0cee6d702c9853e64babced337f68..eae576ceb5648c1922d9e9a3d632ac580d463778 100644 (file)
@@ -24,9 +24,7 @@
 #include "BLI_math.h"
 #include "BLI_math_color.h"
 
-extern "C" {
 #include "BKE_node.h"
-}
 
 static bool check_corners(float corners[4][2])
 {
index 07053d01d430d174bbd812a4921e78f21ecb6323..e7574e80c2ff0e7282dd257013ce97431d62f009 100644 (file)
@@ -20,7 +20,6 @@
 
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "BLI_jitter_2d.h"
 #include "BLI_listbase.h"
 #include "BLI_math.h"
@@ -29,7 +28,6 @@ extern "C" {
 #include "BKE_movieclip.h"
 #include "BKE_node.h"
 #include "BKE_tracking.h"
-}
 
 /* ******** PlaneDistort WarpImage ******** */
 
index cbf5a25fa311249c7ae64d91b0a9e25cd4607ded..ed9a776d0a328ce89951c6aac43c1841fb115450 100644 (file)
 #include "BLI_math.h"
 #include "BLI_math_color.h"
 
-extern "C" {
 #include "BKE_movieclip.h"
 #include "BKE_node.h"
 #include "BKE_tracking.h"
-}
 
 /* ******** PlaneTrackCommon ******** */
 
index e9e1b4a8cd9cfd1f53f236e3b0880305d6fa6c5f..30fe2ca824d9c6ceb0d78b881f2b663b8ff162c4 100644 (file)
 #include "PIL_time.h"
 #include "WM_api.h"
 #include "WM_types.h"
-extern "C" {
+
 #include "BKE_node.h"
 #include "IMB_colormanagement.h"
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
-}
 
 PreviewOperation::PreviewOperation(const ColorManagedViewSettings *viewSettings,
                                    const ColorManagedDisplaySettings *displaySettings)
index 722aab329d7231df2ee25bb25955dc5946be795f..c8a68c70c4dee188a436a34803eaabfc7476e259 100644 (file)
 #include "BLI_listbase.h"
 #include "DNA_scene_types.h"
 
-extern "C" {
 #include "RE_pipeline.h"
 #include "RE_render_ext.h"
 #include "RE_shader_ext.h"
-}
 
 /* ******** Render Layers Base Prog ******** */
 
index cb47725b7492f3294cdf1fcb8b3309eebf4091ba..079376c0ce1c06cd73963fe2fc4e7fdfb93b041c 100644 (file)
@@ -24,9 +24,8 @@
 #include "COM_NodeOperation.h"
 #include "DNA_scene_types.h"
 #include "MEM_guardedalloc.h"
-extern "C" {
+
 #include "RE_pipeline.h"
-}
 
 /**
  * Base class for all renderlayeroperations
index 1afc6d9477fb1750be48f778a02ace96f50a06bf..738c51fc719c4eaee246a00f490a5abb460dd868 100644 (file)
 
 #include "COM_ScreenLensDistortionOperation.h"
 
-extern "C" {
 #include "BLI_math.h"
 #include "BLI_rand.h"
 #include "BLI_utildefines.h"
+
 #include "PIL_time.h"
-}
 
 ScreenLensDistortionOperation::ScreenLensDistortionOperation() : NodeOperation()
 {
index 1862fde2d401b0c2af1413e3353f295a3e700186..3eddf033cf45216d1134eda79af5ca04ed38b475 100644 (file)
 #include "BLI_utildefines.h"
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
-}
 
 SplitOperation::SplitOperation() : NodeOperation()
 {
index 0a27a6916b7bf79ee0743d24304b9bfe7a0dd595..07316280bbc52f55ccfed8fd366cbe67723e88ec 100644 (file)
 #include "COM_WorkScheduler.h"
 
 #include "BKE_image.h"
+#include "BKE_node.h"
+
 #include "BLI_listbase.h"
 #include "BLI_threads.h"
 
-extern "C" {
-#include "BKE_node.h"
-}
-
 TextureBaseOperation::TextureBaseOperation() : NodeOperation()
 {
   this->addInputSocket(COM_DT_VECTOR);  // offset
index 0d06ac0bc27a30d503cdec366c6d583ff31ff2f0..ebfdbb6513a6987843ac4b190cdaeb063cc5fe41 100644 (file)
 #include "COM_NodeOperation.h"
 #include "DNA_texture_types.h"
 #include "MEM_guardedalloc.h"
-extern "C" {
+
 #include "RE_pipeline.h"
 #include "RE_render_ext.h"
 #include "RE_shader_ext.h"
-}
 
 /**
  * Base class for all renderlayeroperations
index 6b408a0a791cf340e38ed683de171984b1adcd0a..417fe8713ed47bfcdb7a134098685d9196d86304 100644 (file)
@@ -20,9 +20,7 @@
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
 
-extern "C" {
 #include "IMB_colormanagement.h"
-}
 
 TonemapOperation::TonemapOperation() : NodeOperation()
 {
index e497d58732b0a866cc9eea9087411e9e591c602e..5c4f3b99f5852bc75d1d782e465d41ce6e493a72 100644 (file)
 #include "BLI_math.h"
 #include "BLI_math_color.h"
 
-extern "C" {
 #include "BKE_movieclip.h"
 #include "BKE_node.h"
 #include "BKE_tracking.h"
-}
 
 TrackPositionOperation::TrackPositionOperation() : NodeOperation()
 {
index 02f13effc8f21c5b05d35337778874b6f4ad33a5..057dc553f7feb021d47f32558b2af0c9e7bfae26 100644 (file)
@@ -20,9 +20,7 @@
 #include "BLI_math.h"
 #include "COM_OpenCLDevice.h"
 
-extern "C" {
 #include "RE_pipeline.h"
-}
 
 VariableSizeBokehBlurOperation::VariableSizeBokehBlurOperation() : NodeOperation()
 {
index 83ae1a0526de65b811cdf20b00aac5fd95b57a09..7a34c84827e1c76f75c9fd112004a5231897536f 100644 (file)
  * Copyright 2011, Blender Foundation.
  */
 
-#include "BLI_math.h"
-#include "MEM_guardedalloc.h"
 #include <string.h>
-extern "C" {
+
+#include "MEM_guardedalloc.h"
+
 #include "BLI_jitter_2d.h"
-}
+#include "BLI_math.h"
+
 #include "COM_VectorBlurOperation.h"
 
 /* Defined */
index 6996c7ecb71ccad15f1c53680f09d901d4e990ba..61312355a394b5bba96fd5bc9d899789de73833a 100644 (file)
 
 #include "COM_VectorCurveOperation.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 #include "BKE_colortools.h"
-#ifdef __cplusplus
-}
-#endif
 
 VectorCurveOperation::VectorCurveOperation() : CurveBaseOperation()
 {
index 5c32b9962f46d6aab3cb157e20acbe79967523c6..fc26d6219e10c9567634d2dafbd2d07a0448dffb 100644 (file)
 #include "WM_api.h"
 #include "WM_types.h"
 
-extern "C" {
 #include "IMB_colormanagement.h"
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
-}
 
 ViewerOperation::ViewerOperation() : NodeOperation()
 {
index e24fa9e8996f2fb474615dc226c42cd86f697fff..19e9c5c26b140cee27432c443b8619442b33c9dc 100644 (file)
@@ -42,12 +42,12 @@ struct Scene;
 struct ViewLayer;
 struct bNodeTree;
 
+#include "BLI_sys_types.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_sys_types.h"
-
 /* Graph Building -------------------------------- */
 
 /* Build depsgraph for the given scene, and dump results in given graph container. */
index fe1886c67e8c73ca8730db112d1d85ac8dc2a4a6..ba0238b43c7cf8f37fb22b32b51c6ebe45c808a8 100644 (file)
@@ -29,9 +29,7 @@
 
 #include "BLI_utildefines.h"
 
-extern "C" {
 #include "BKE_animsys.h"
-}
 
 namespace DEG {
 
index f43a1de3b01741424bd298f1eb70f4517e067f27..0f25bc0e9ef96b73c6435c8435244abb92eae794 100644 (file)
@@ -34,7 +34,6 @@
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
 
-extern "C" {
 #include "DNA_action_types.h"
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
@@ -105,7 +104,6 @@ extern "C" {
 
 #include "RNA_access.h"
 #include "RNA_types.h"
-} /* extern "C" */
 
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_build.h"
index 7a05ae36ea42acb9c585e0233eeebb1b570023a0..0055c141b715f263fbeb947e3db735db26f757ac 100644 (file)
@@ -34,7 +34,6 @@
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
 
-extern "C" {
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
 #include "DNA_constraint_types.h"
@@ -44,7 +43,6 @@ extern "C" {
 #include "BKE_action.h"
 #include "BKE_armature.h"
 #include "BKE_constraint.h"
-} /* extern "C" */
 
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_build.h"
index 1aa3c5bf61364223e5a8bd290aac4f7818c06a43..58cfb36b4aba04478a2ff0bfe19826b374833704 100644 (file)
@@ -34,7 +34,6 @@
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
 
-extern "C" {
 #include "DNA_freestyle_types.h"
 #include "DNA_layer_types.h"
 #include "DNA_linestyle_types.h"
@@ -45,7 +44,6 @@ extern "C" {
 #include "BKE_layer.h"
 #include "BKE_main.h"
 #include "BKE_node.h"
-} /* extern "C" */
 
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_build.h"
index 20b8ed5b35bddab445b401d1c694829b38103571..6bdb7500b4a27eef5fe4e9ff206eda1674474d0b 100644 (file)
@@ -34,7 +34,6 @@
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
 
-extern "C" {
 #include "DNA_action_types.h"
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
@@ -99,7 +98,6 @@ extern "C" {
 
 #include "RNA_access.h"
 #include "RNA_types.h"
-} /* extern "C" */
 
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_build.h"
index eeeb58100b011991d42ca4f4a4da3300ea98df40..5983627fafcce50ff10b3126a834fec7e1a20aca 100644 (file)
 
 #include "intern/node/deg_node_id.h"
 
-extern "C" {
 #include "DNA_ID.h"
 #include "DNA_object_types.h"
-}
 
 namespace DEG {
 
index b75252aa32578756d6fe6c952c5692109cef52cc..fe9adecbf0a95c38c640ef1c499fb752521f7492 100644 (file)
@@ -34,7 +34,6 @@
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
 
-extern "C" {
 #include "DNA_action_types.h"
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
@@ -45,7 +44,6 @@ extern "C" {
 #include "BKE_action.h"
 #include "BKE_armature.h"
 #include "BKE_constraint.h"
-} /* extern "C" */
 
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_build.h"
index d3bdaccd404e5ce79607db71acfe9d158521b786..e132ba30e67b88535a0f15749a71e06a35410c2d 100644 (file)
@@ -34,7 +34,6 @@
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
 
-extern "C" {
 #include "DNA_linestyle_types.h"
 #include "DNA_node_types.h"
 #include "DNA_object_types.h"
@@ -43,7 +42,6 @@ extern "C" {
 #include "BKE_layer.h"
 #include "BKE_main.h"
 #include "BKE_node.h"
-} /* extern "C" */
 
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_build.h"
index a35b69df60dfe08bdc8b1fa9a4ca675a1b1e0181..9fa663b9b6d84aca145f786e4be8e8cc2e014d54 100644 (file)
 #include "BLI_listbase.h"
 #include "BLI_utildefines.h"
 
-extern "C" {
 #include "DNA_action_types.h"
 #include "DNA_armature_types.h"
 #include "DNA_constraint_types.h"
 #include "DNA_key_types.h"
 #include "DNA_object_types.h"
 #include "DNA_sequence_types.h"
-}
 
 #include "BKE_constraint.h"
 
index 14a095fdb8e2f3aba8b5fdf2bce18061e35e53fa..bde48affc280a0cd8ab21c5413c36d2533f3b689 100644 (file)
@@ -27,9 +27,7 @@
 
 #include "BLI_utildefines.h"
 
-extern "C" {
 #include "DNA_listBase.h"
-} /* extern "C" */
 
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_debug.h"
index c37188bc3ca2c7ca95c51a6f23c5b513a3bbaf3a..7bef5fda6369fa9b896c1c28e4726b5c4669c457 100644 (file)
@@ -32,9 +32,7 @@
 #include "intern/depsgraph.h"
 #include "intern/node/deg_node_id.h"
 
-extern "C" {
 #include "DNA_ID.h"
-} /* extern "C" */
 
 #define NL "\r\n"
 
index faf375155b59fe96f9a896dfee92a82aeaf3f940..d4a6b0a8b76f25ba8b0a1ab20654c4bb040321ee 100644 (file)
 #include "BLI_hash.h"
 #include "BLI_utildefines.h"
 
-extern "C" {
 #include "BKE_global.h"
 #include "BKE_idtype.h"
 #include "BKE_scene.h"
-}
 
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_debug.h"
index 59065ea671a7d0ffc48801b235d832d5d25b5c4d..9e12d00b42f844a99f48608b81a9f0f80dd0b028 100644 (file)
 #include "PIL_time.h"
 #include "PIL_time_utildefines.h"
 
-extern "C" {
 #include "DNA_cachefile_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
 #include "BKE_main.h"
 #include "BKE_scene.h"
-} /* extern "C" */
 
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_build.h"
index 8b6984c9870c287efce0f0c310a4a8df257beb32..8dbcb9534ebcef0b37a7685fb947f09e844cc2a7 100644 (file)
@@ -25,9 +25,7 @@
 
 #include "BLI_utildefines.h"
 
-extern "C" {
 #include "DNA_scene_types.h"
-} /* extern "C" */
 
 #include "DNA_object_types.h"
 
index c5628a4f8b944caaeae8eed04ecdc84d4bc1c276..b6c6129e9ba39f073d1888005e8f342d92bb589d 100644 (file)
 #include "BLI_listbase.h"
 #include "BLI_utildefines.h"
 
-extern "C" {
 #include "BKE_scene.h"
 
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
-} /* extern "C" */
 
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_query.h"
index 380e6e99c5e9f82d12bd9148a935fc9c2d8514b2..a9391e5fe8b5e48a5d4c4163e0da38b949ab1987 100644 (file)
 #include "BLI_compiler_compat.h"
 #include "BLI_listbase.h"
 
-extern "C" {
 #include "BKE_collision.h"
 #include "BKE_effect.h"
 #include "BKE_modifier.h"
-} /* extern "C" */
 
 #include "DNA_collection_types.h"
 #include "DNA_object_force_types.h"
index b64b6c0e715f8ffb6454e997ccc0673f20540a8a..3c760e711974a0636ac5470bc80bdb3f2b35f917 100644 (file)
@@ -25,7 +25,6 @@
 
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include <string.h>  // XXX: memcpy
 
 #include "BLI_listbase.h"
@@ -36,8 +35,6 @@ extern "C" {
 #include "BKE_idtype.h"
 #include "BKE_main.h"
 
-} /* extern "C" */
-
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
index c4b53bd817696f849ccf8c2621aa59bfe8ef5fe7..1eb072064658a99a97371680cb38a4196623f55e 100644 (file)
 
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "BKE_duplilist.h"
 #include "BKE_idprop.h"
 #include "BKE_layer.h"
 #include "BKE_node.h"
 #include "BKE_object.h"
+
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
-} /* extern "C" */
 
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
index ff7d9ee017059675857e10d0ce72c40650681567..0ee86088e43a2cb8f07496def5ae3ce38354e0f1 100644 (file)
@@ -33,7 +33,6 @@
 #include "BLI_task.h"
 #include "BLI_utildefines.h"
 
-extern "C" {
 #include "DNA_anim_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_key_types.h"
@@ -54,7 +53,6 @@ extern "C" {
 #define new new_
 #include "BKE_screen.h"
 #undef new
-} /* extern "C" */
 
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_debug.h"
index b87a877ae9916584db7576f148fe3152f78b51a5..2f2e05d410e35356fbe8d6157fc7ba15d7b2d5ca 100644 (file)
@@ -53,7 +53,6 @@
 
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "DNA_ID.h"
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
@@ -92,7 +91,6 @@ extern "C" {
 #include "BKE_pointcache.h"
 #include "BKE_sequencer.h"
 #include "BKE_sound.h"
-}
 
 #include "intern/builder/deg_builder.h"
 #include "intern/builder/deg_builder_nodes.h"
index 5ff1b31b07c4ad2352249ba167684926e27a41d0..ee543dcf25dbf67ccd9a0bdfa04cac8b911e2089 100644 (file)
 #include "BKE_object.h"
 #include "BKE_scene.h"
 
-extern "C" {
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
 #include "DRW_engine.h"
-} /* extern "C" */
 
 #include "DEG_depsgraph.h"
 
index 9c142cdc97b3954a394911b00c765f90fdbe2bd1..e2c1f74ec467318bf2a82f2464b9c7345bc7956f 100644 (file)
 
 #include "BLI_utildefines.h"
 
-extern "C" {
 #include "DNA_object_types.h"
 
 #include "BKE_action.h"
-} /* extern "C" */
 
 #include "intern/node/deg_node_factory.h"
 #include "intern/node/deg_node_id.h"
index 4e998fb095acff40f195f2350cfe5275c5b0daee..4a7e5c4568ba9c652a9eb6365146450165b657e9 100644 (file)
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
 
-extern "C" {
 #include "DNA_ID.h"
 #include "DNA_anim_types.h"
 
 #include "BKE_lib_id.h"
-}
 
 #include "DEG_depsgraph.h"
 
index 6e7654aed02b72bd8e3cc6abdba77c730f6e2579..6c835c6d7ae70e5d7e3f6402705ecf37efec54d2 100644 (file)
 #ifndef __DRW_ENGINE_H__
 #define __DRW_ENGINE_H__
 
+#include "BLI_sys_types.h" /* for bool */
+
+#include "DNA_object_enums.h"
+
+#include "DRW_engine_types.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_sys_types.h" /* for bool */
-
 struct ARegion;
 struct DRWInstanceDataList;
 struct Depsgraph;
@@ -47,9 +51,6 @@ struct ViewLayer;
 struct bContext;
 struct rcti;
 
-#include "DNA_object_enums.h"
-#include "DRW_engine_types.h"
-
 void DRW_engines_register(void);
 void DRW_engines_free(void);
 
index 3ae864721e8b12e52eac114b8db1dbafc0b5d7f7..28bc0b22790afcd334f6b5385d218d5aec50cfdd 100644 (file)
 #ifndef __ED_KEYFRAMES_EDIT_H__
 #define __ED_KEYFRAMES_EDIT_H__
 
+#include "ED_anim_api.h" /* for enum eAnimFilter_Flags */
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "ED_anim_api.h" /* for enum eAnimFilter_Flags */
-
 struct BezTriple;
 struct FCurve;
 struct Scene;
index 4225ecc6f3d4d330a284eabb149cdfcdaa6ecd6c..5635ef2800ac52da25d264af7f95159822c640b2 100644 (file)
@@ -24,6 +24,9 @@
 #ifndef __ED_KEYFRAMING_H__
 #define __ED_KEYFRAMING_H__
 
+#include "DNA_anim_types.h"
+#include "RNA_types.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -50,9 +53,6 @@ struct PropertyRNA;
 
 struct NlaKeyframingContext;
 
-#include "DNA_anim_types.h"
-#include "RNA_types.h"
-
 /* ************ Keyframing Management **************** */
 
 /* Get the active settings for keyframing settings from context (specifically the given scene)
index 9d25fff477d9ef847a17e3e8ca7cfb813753276c..32e62a6436cafbdd4b796e4b397f2a24dce9c512 100644 (file)
@@ -24,6 +24,9 @@
 #ifndef __ED_OBJECT_H__
 #define __ED_OBJECT_H__
 
+#include "BLI_compiler_attrs.h"
+#include "DNA_object_enums.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -54,9 +57,6 @@ struct wmOperator;
 struct wmOperatorType;
 struct wmWindowManager;
 
-#include "BLI_compiler_attrs.h"
-#include "DNA_object_enums.h"
-
 /* object_edit.c */
 /* context.object */
 struct Object *ED_object_context(struct bContext *C);
index b099525097984a158f63389bfbffbc86ea64aaaf..c5c4ca79f14aa456ddfd753bbbf58774564ea3c5 100644 (file)
 
 #include "BLI_sys_types.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Define icon enum. */
 #define DEF_ICON(name) ICON_##name,
 #define DEF_ICON_VECTOR(name) ICON_##name,
@@ -47,6 +43,10 @@ typedef enum {
 /* use to denote intentionally unset theme color */
 #define TH_UNDEFINED -1
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef enum ThemeColorID {
   TH_REDALERT,
 
index 2b80241e6e36b4267df531b1bbbfb0d1b79d5433..53188ea42bb7870b5ee868e51f58b290f93e35d0 100644 (file)
  * \ingroup eduv
  */
 
+#include "BLI_sys_types.h"  // for intptr_t support
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_sys_types.h"  // for intptr_t support
-
 typedef void ParamHandle;  /* handle to a set of charts */
 typedef intptr_t ParamKey; /* (hash) key for identifying verts and faces */
 typedef enum ParamBool {
index b8f3a27be9c8fcb4516c0afe9380206976c2bd0e..a53df06e8c955d4e86d338089cbe53d5d049407d 100644 (file)
@@ -25,7 +25,6 @@
 
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "RNA_access.h"
 #include "RNA_types.h"
 
@@ -64,7 +63,6 @@ extern "C" {
 #include "RE_pipeline.h"
 
 #include "render_types.h"
-}
 
 #include <limits.h>
 
index a4beb1c119c2d5d0b0be83538cbb509c452c991b..95612a427225f0e4828a25609ca4d8233692b7b3 100644 (file)
 #include "../stroke/StyleModule.h"
 #include "../system/PythonInterpreter.h"
 
-extern "C" {
 #include "BLI_utildefines.h"  // BLI_assert()
 
 struct Text;
-}
 
 namespace Freestyle {
 
index 0a9fa5dc85a29b5e5135b59e6b1cbc3da0a05dab..c1a8dcdb370a2a75a44acdf4d9d337b35e39148b 100644 (file)
@@ -33,9 +33,7 @@
 
 #include "../system/FreestyleConfig.h"
 
-extern "C" {
 #include "BLI_utildefines.h"
-}
 
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
index f8e2524fa4fe076d164432064316628e10bacff8..625e357eddf34e2b54e8c27ac0a22ad8de925890 100644 (file)
@@ -27,9 +27,7 @@
 
 #include "../system/FreestyleConfig.h"
 
-extern "C" {
 #include "BLI_math.h"
-}
 
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
index f220bbfd6f1e5dc21bd7b80810acdec0549cfee2..2339abe9aed801d871890ed7924574d143be41ae 100644 (file)
@@ -24,9 +24,7 @@
 
 #include "Node.h"
 
-extern "C" {
 #include "DNA_scene_types.h" /* for Scene and ViewLayer */
-}
 
 using namespace std;
 
index 7d04a55c5d901a67cd50dbb9a16754f0a94c852d..4386e64345f00f7b0a790943064008b337f29cc2 100644 (file)
 // soc #include <qimage.h>
 // soc #include <QString>
 
-extern "C" {
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
-}
 
 using namespace std;
 
index b2bfb805ee6c9afc5e5c86879cb483aad86aef87..d6ee1d01279e57b65ff7b01c7deb1e0c4fe4c212 100644 (file)
 #  include "MEM_guardedalloc.h"
 #endif
 
-extern "C" {
 #include "DNA_material_types.h"  // for MAX_MTEX
 struct bNodeTree;
-}
 
 namespace Freestyle {
 
index a6a72bfa31442d24e0be3b38f50ec0c25bc5e38a..efda4b7fd2a62efdab2ae4127be679e84b2572ed 100644 (file)
 #include "BKE_global.h"
 #include "BLI_math.h"
 
-extern "C" {
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
-}
 
 namespace Freestyle {
 
index dd7611fe2fcd46fa13b378728aa2fc30ef55590c..9876aa6998c3b9b53c69a86fe9656181d75959a2 100644 (file)
 #ifndef __GPU_CONTEXT_H__
 #define __GPU_CONTEXT_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "GPU_batch.h"
 #include "GPU_common.h"
 #include "GPU_shader_interface.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct GPUContext GPUContext;
 
 GPUContext *GPU_context_create(GLuint default_framebuffer);
index f521fa3c7021a5e19dd04615ef518adbee4c6bd5..e5a6a8ffde858fc7f11a57f5753c7f9eb4ada795 100644 (file)
@@ -24,6 +24,9 @@
 #ifndef __GPU_DRAW_H__
 #define __GPU_DRAW_H__
 
+#include "BLI_utildefines.h"
+#include "DNA_object_enums.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -34,9 +37,6 @@ struct Image;
 struct ImageUser;
 struct Main;
 
-#include "BLI_utildefines.h"
-#include "DNA_object_enums.h"
-
 /* OpenGL drawing functions related to shading. */
 
 /* Initialize
index 0046eaa942bb698d345f25bfbd5d30edaf88bf4b..3e30a1ddcf51dbe33eb8d624b94129055c81cf5f 100644 (file)
 #ifndef __GPU_INIT_EXIT_H__
 #define __GPU_INIT_EXIT_H__
 
+#include "BLI_utildefines.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_utildefines.h"
-
 void GPU_init(void);
 void GPU_exit(void);
 bool GPU_is_initialized(void);
index 42cfc1e2a5c4020bd7aa2edb2dda035f1d9d8e66..58d1810ac7abbed928bf037f5bc1dac9482c9b30 100644 (file)
 #ifndef __GPU_BATCH_PRIVATE_H__
 #define __GPU_BATCH_PRIVATE_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "GPU_batch.h"
 #include "GPU_context.h"
 #include "GPU_shader_interface.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void gpu_batch_remove_interface_ref(GPUBatch *batch, const GPUShaderInterface *interface);
 
 #ifdef __cplusplus
index c9379e5433f8a3ab869c3a2271b7b0aae84ec927..f64cdf439a13e0f2e9dce4aaf10cbc8adf78a453 100644 (file)
 #ifndef __GPU_CONTEXT_PRIVATE_H__
 #define __GPU_CONTEXT_PRIVATE_H__
 
+#include "GPU_context.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "GPU_context.h"
-
 struct GPUFrameBuffer;
 
 GLuint GPU_vao_default(void);
index 19a4390598f94569ca557ca02b52f45dd244508e..66ed0dd0fa5e6aab54b513b2cb56ad9d5bbfc20f 100644 (file)
@@ -40,7 +40,6 @@
 
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "BIK_api.h"
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
@@ -55,7 +54,6 @@ extern "C" {
 #include "DNA_constraint_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
-};
 
 #include "itasc_plugin.h"
 
index c252a9a63f8144a033bd8945dadc0ab46d332fc3..9f89969cf1ce0d3b25e0d709002d202a7d590fc7 100644 (file)
 #ifndef __IMB_ALLOCIMBUF_H__
 #define __IMB_ALLOCIMBUF_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ImBuf;
 
 void imb_refcounter_lock_init(void);
@@ -44,4 +48,8 @@ void imb_mmap_unlock(void);
 bool imb_addencodedbufferImBuf(struct ImBuf *ibuf);
 bool imb_enlargeencodedbufferImBuf(struct ImBuf *ibuf);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
index f0e599c1375739d9cde4dd511ffc110672c9faf4..79abe8472b9a9c158caee3edac0bd88bab6b9a6d 100644 (file)
 #include "BLI_sys_types.h"
 #include "DNA_listBase.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ImBuf;
 struct OCIO_ConstProcessorRcPtr;
 
@@ -123,4 +127,8 @@ void colorspace_set_default_role(char *colorspace, int size, int role);
 void colormanage_imbuf_set_default_spaces(struct ImBuf *ibuf);
 void colormanage_imbuf_make_linear(struct ImBuf *ibuf, const char *from_colorspace);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __IMB_COLORMANAGEMENT_INTERN_H__ */
index 461407fcf252148cf19409b8d69d103986a4738e..040435e44ee4ab96cd9eccf9873fe85bde58fbe4 100644 (file)
 #ifndef __CINEONLIB_H__
 #define __CINEONLIB_H__
 
+#include "logImageCore.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "logImageCore.h"
-
 #define CINEON_FILE_MAGIC 0x802A5FD7
 #define CINEON_UNDEFINED_U8 0xFF
 #define CINEON_UNDEFINED_U16 0xFFFF
index bf07b8e329d4641f58ba2291749894914ef401ec..3a7ebe9dddfe9fc668341978bf2cc1ec26a17d6c 100644 (file)
 #ifndef __DPXLIB_H__
 #define __DPXLIB_H__
 
+#include "logImageCore.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "logImageCore.h"
-
 #define DPX_FILE_MAGIC 0x53445058
 #define DPX_UNDEFINED_U8 0xFF
 #define DPX_UNDEFINED_U16 0xFFFF
index 832b380bbc2523f38e46431f53c240676e3944ae..83d304203a02a158b1d132967f863a9ec5ddf629 100644 (file)
@@ -18,9 +18,7 @@
  * \ingroup imbdds
  */
 
-extern "C" {
 #include "BLI_utildefines.h"
-}
 
 #include <DirectDrawSurface.h>
 #include <FlipDXT.h>
@@ -34,8 +32,6 @@ extern "C" {
 #  include "utfconv.h"
 #endif
 
-extern "C" {
-
 #include "IMB_allocimbuf.h"
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
@@ -44,6 +40,8 @@ extern "C" {
 #include "IMB_colormanagement.h"
 #include "IMB_colormanagement_intern.h"
 
+extern "C" {
+
 int imb_save_dds(struct ImBuf *ibuf, const char *name, int /*flags*/)
 {
   return (0); /* todo: finish this function */
index 12db8aa64169da0b6e9de24bdc46e5916b53a4a1..e6782e217fc0293e722b38a2d9bdd42e7025aca6 100644 (file)
 #ifndef __DDS_API_H__
 #define __DDS_API_H__
 
+#include "../../IMB_imbuf.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "../../IMB_imbuf.h"
-
 int imb_is_a_dds(const unsigned char *mem); /* use only first 32 bytes of mem */
 int imb_save_dds(struct ImBuf *ibuf, const char *name, int flags);
 struct ImBuf *imb_load_dds(const unsigned char *mem,
index 6d3234771e713f6f5ec6ef8c3c268d774666ed69..df51aada5f09cdc12290f6e58e782e1979a278a3 100644 (file)
@@ -35,7 +35,6 @@
 
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "BLI_blenlib.h"
 
 #include "IMB_allocimbuf.h"
@@ -43,7 +42,6 @@ extern "C" {
 #include "IMB_colormanagement_intern.h"
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
-}
 
 OIIO_NAMESPACE_USING
 
index 520ad0c5da5660347f5cc26936e44f4cafa70475..3dd089d65cbc8d22208fa7abf8277f214bfa16ab 100644 (file)
 #ifndef __OPENIMAGEIO_API_H__
 #define __OPENIMAGEIO_API_H__
 
+#include <stdio.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <stdio.h>
-
 struct ImBuf;
 
 int imb_is_a_photoshop(const char *name);
index a1719895853a68cec70dd491b0905959abf9f591..62cc2e605e5329d8679c772d93e6033ceb027544 100644 (file)
@@ -75,7 +75,7 @@ _CRTIMP void __cdecl _invalid_parameter_noinfo(void)
 {
 }
 #endif
-
+}
 #include "BLI_blenlib.h"
 #include "BLI_math_color.h"
 #include "BLI_threads.h"
@@ -84,17 +84,13 @@ _CRTIMP void __cdecl _invalid_parameter_noinfo(void)
 #include "BKE_image.h"
 
 #include "IMB_allocimbuf.h"
+#include "IMB_colormanagement.h"
+#include "IMB_colormanagement_intern.h"
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 #include "IMB_metadata.h"
 
 #include "openexr_multi.h"
-}
-
-extern "C" {
-#include "IMB_colormanagement.h"
-#include "IMB_colormanagement_intern.h"
-}
 
 using namespace Imf;
 using namespace Imath;
index df03d0d205ffd6209873baebc698855239170122..b0835e5082e2cc1a5c867fd1e1ab72a80976fdea 100644 (file)
 #ifndef __OPENEXR_API_H__
 #define __OPENEXR_API_H__
 
+#include <stdio.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <stdio.h>
-
 void imb_initopenexr(void);
 void imb_exitopenexr(void);
 
index c5f60ac3e29f2c39319966a68aed61396c6b899d..64f8f9c81a8a37022b91f321694c33cd5738b548 100644 (file)
@@ -27,7 +27,6 @@
 #include <algorithm>
 #include <unordered_map>
 
-extern "C" {
 #include "DNA_customdata_types.h"
 #include "DNA_meshdata_types.h"
 
@@ -35,7 +34,6 @@ extern "C" {
 #include "BLI_utildefines.h"
 
 #include "BKE_customdata.h"
-}
 
 /* NOTE: for now only UVs and Vertex Colors are supported for streaming.
  * Although Alembic only allows for a single UV layer per {I|O}Schema, and does
index f661083b0a70ba33739689673362ba1fd567407a..dbf24452b78718729cb57c6dc551d74c316175ea 100644 (file)
@@ -33,7 +33,6 @@
 #include "abc_writer_points.h"
 #include "abc_writer_transform.h"
 
-extern "C" {
 #include "DNA_camera_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_fluid_types.h"
@@ -62,7 +61,6 @@ extern "C" {
 #include "BKE_scene.h"
 
 #include "DEG_depsgraph_query.h"
-}
 
 using Alembic::Abc::OBox3dProperty;
 using Alembic::Abc::TimeSamplingPtr;
index 6ad44553701fa4c0fdb1a6498671b5e4e422d83a..ea8478f7b5627426cede5d7d51c611b4483f5f5d 100644 (file)
 
 #include "abc_reader_archive.h"
 
-extern "C" {
 #include "BKE_main.h"
 
 #include "BLI_path_util.h"
 #include "BLI_string.h"
-}
 
 #ifdef WIN32
 #  include "utfconv.h"
index ab506f32cbee0144046d5b687ea06ac36844f82a..0752534f8c2a8a7b39a26f5f5c8bdfd9fdd15146 100644 (file)
@@ -22,7 +22,6 @@
 #include "abc_reader_transform.h"
 #include "abc_util.h"
 
-extern "C" {
 #include "DNA_camera_types.h"
 #include "DNA_object_types.h"
 
@@ -30,7 +29,6 @@ extern "C" {
 #include "BKE_object.h"
 
 #include "BLI_math.h"
-}
 
 using Alembic::AbcGeom::CameraSample;
 using Alembic::AbcGeom::ICamera;
index 9fdc8b2b93f96e16db3fce355d331cbb25fd07da..1fda102a3cdb052ec24dc08b677e27b157868423 100644 (file)
@@ -30,7 +30,6 @@
 
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "DNA_curve_types.h"
 #include "DNA_object_types.h"
 
@@ -39,7 +38,6 @@ extern "C" {
 #include "BKE_curve.h"
 #include "BKE_mesh.h"
 #include "BKE_object.h"
-}
 
 using Alembic::Abc::FloatArraySamplePtr;
 using Alembic::Abc::Int32ArraySamplePtr;
index a5c893a262a0fa48663bd3214641017911577205..f22f2a53a78cb74d65ba8af5cb03f59b520351c8 100644 (file)
@@ -27,7 +27,6 @@
 
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
@@ -40,7 +39,6 @@ extern "C" {
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_object.h"
-}
 
 using Alembic::Abc::Int32ArraySamplePtr;
 using Alembic::Abc::P3fArraySamplePtr;
index a57a1f55608eabe9100b9373a06c820ad50409a2..10d9a35a8e1a56adb49d2d8fffb9a00e7fabc1bc 100644 (file)
@@ -25,7 +25,6 @@
 
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "DNA_curve_types.h"
 #include "DNA_object_types.h"
 
@@ -34,7 +33,6 @@ extern "C" {
 
 #include "BKE_curve.h"
 #include "BKE_object.h"
-}
 
 using Alembic::AbcGeom::FloatArraySamplePtr;
 using Alembic::AbcGeom::kWrapExisting;
index c40421da8c2910734b08472d7134ce2fa0243d5b..e5bd0771a42277ac64a0d4b57e6cf9a8ef29cd4e 100644 (file)
@@ -22,7 +22,6 @@
 #include "abc_axis_conversion.h"
 #include "abc_util.h"
 
-extern "C" {
 #include "DNA_cachefile_types.h"
 #include "DNA_constraint_types.h"
 #include "DNA_modifier_types.h"
@@ -37,7 +36,6 @@ extern "C" {
 #include "BLI_math_geom.h"
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
-}
 
 using Alembic::AbcGeom::IObject;
 using Alembic::AbcGeom::IXform;
index 94923df2df98181cb58226e8e7b620820a26ea51..dcc2697e0b575db38c8cfa041bef1f2679ecb4b1 100644 (file)
@@ -24,9 +24,7 @@
 #include <Alembic/Abc/All.h>
 #include <Alembic/AbcGeom/All.h>
 
-extern "C" {
 #include "DNA_ID.h"
-}
 
 struct CacheFile;
 struct Main;
index e4dc345f86816dbd34494c9a393a85a8e5f0dc0b..2b82dadbcbc33afc283e782f8d997ad48e04cd69 100644 (file)
 #include "abc_reader_transform.h"
 #include "abc_util.h"
 
-extern "C" {
 #include "DNA_mesh_types.h"
 #include "DNA_object_types.h"
 
 #include "BKE_customdata.h"
 #include "BKE_mesh.h"
 #include "BKE_object.h"
-}
 
 using Alembic::AbcGeom::kWrapExisting;
 using Alembic::AbcGeom::N3fArraySamplePtr;
index ce569a9ccb54e3eb2f62ba7352444e5b37e64f59..3df391f8432f851d1df0ae2159dbe6ea88b77524 100644 (file)
 #include "abc_reader_transform.h"
 #include "abc_util.h"
 
-extern "C" {
 #include "DNA_object_types.h"
 
 #include "BLI_utildefines.h"
 
 #include "BKE_object.h"
-}
 
 using Alembic::Abc::ISampleSelector;
 
index 6b27c389363429e81a7a338e9e3cb7cd1225c0e7..1f3bd2a1aaa6be9472c759696a19687c39c9afc1 100644 (file)
 
 #include <algorithm>
 
-extern "C" {
 #include "DNA_object_types.h"
 
 #include "BLI_math_geom.h"
 
 #include "PIL_time.h"
-}
 
 std::string get_id_name(const Object *const ob)
 {
index af18d480a1802ebce21271fd25039ad30398a7ac..ea0d684347d70fb464339dfd9d38b93efddee2e9 100644 (file)
  */
 
 #include "abc_writer_archive.h"
-extern "C" {
+
 #include "BKE_blender_version.h"
 
 #include "BLI_path_util.h"
 #include "BLI_string.h"
 
 #include "DNA_scene_types.h"
-}
 
 #ifdef WIN32
 #  include "utfconv.h"
index e705e5ba911eaa1f7538d31d0dc870378ee60980..07ae81e584fefb5ffa35231b0daa12cb1458d137 100644 (file)
 #include "abc_writer_camera.h"
 #include "abc_writer_transform.h"
 
-extern "C" {
 #include "DNA_camera_types.h"
 #include "DNA_object_types.h"
-}
 
 using Alembic::AbcGeom::OCamera;
 using Alembic::AbcGeom::OFloatProperty;
index 8cb40c4ffab8d507fa749572fa1e4e60adfc2c33..0deda76e1238d51b6ac23c6c09e166a4b0c97b28 100644 (file)
 #include "abc_reader_curves.h"
 #include "abc_writer_transform.h"
 
-extern "C" {
 #include "DNA_curve_types.h"
 #include "DNA_object_types.h"
 
 #include "BKE_curve.h"
 #include "BKE_mesh.h"
 #include "BKE_object.h"
-}
 
 using Alembic::AbcGeom::OCompoundProperty;
 using Alembic::AbcGeom::OCurves;
index dd1203de8358c88cc95d36bd9e89de5ac2e81ef7..ed62889b03d8df30b67cb20f35279898823a6ac7 100644 (file)
@@ -24,7 +24,6 @@
 
 #include <cstdio>
 
-extern "C" {
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
@@ -35,7 +34,6 @@ extern "C" {
 #include "BKE_mesh.h"
 #include "BKE_mesh_runtime.h"
 #include "BKE_particle.h"
-}
 
 using Alembic::Abc::P3fArraySamplePtr;
 
index 151848674f9bf1e59b85508109a0c201c356a375..3593acf18b0375282a11ff09e5e75dd93c02a30f 100644 (file)
@@ -21,7 +21,6 @@
 #include "abc_writer_mball.h"
 #include "abc_writer_mesh.h"
 
-extern "C" {
 #include "DNA_mesh_types.h"
 #include "DNA_meta_types.h"
 #include "DNA_object_types.h"
@@ -33,7 +32,6 @@ extern "C" {
 #include "BKE_object.h"
 
 #include "BLI_utildefines.h"
-}
 
 AbcMBallWriter::AbcMBallWriter(Main *bmain,
                                Object *ob,
index 38939d15c85fc2dc7c7589d4f4acbcd974044ba4..d5ab4e348280e5dad6b10eea0d7cba40f85ee47d 100644 (file)
@@ -22,7 +22,6 @@
 #include "abc_axis_conversion.h"
 #include "abc_writer_transform.h"
 
-extern "C" {
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
@@ -40,7 +39,6 @@ extern "C" {
 #include "bmesh_tools.h"
 
 #include "DEG_depsgraph_query.h"
-}
 
 using Alembic::Abc::FloatArraySample;
 using Alembic::Abc::Int32ArraySample;
index 3521c62075f1a0692a68639aee7a6d656c0c0534..8b4a1050d3300bb8aadf739a7f80e10467d4a41f 100644 (file)
 #include "abc_axis_conversion.h"
 #include "abc_writer_transform.h"
 
-extern "C" {
 #include "DNA_curve_types.h"
 #include "DNA_object_types.h"
 
 #include "BLI_listbase.h"
 
 #include "BKE_curve.h"
-}
 
 using Alembic::AbcGeom::FloatArraySample;
 using Alembic::AbcGeom::OBoolProperty;
index 75dc93bd08e1b7ec68126762fe2eb0a0f58413bf..f4a3587f54db067ea739fd5fb91bb5d968763e41 100644 (file)
 
 #include "abc_writer_object.h"
 
-extern "C" {
 #include "DNA_object_types.h"
 
 #include "BKE_object.h"
-}
 
 AbcObjectWriter::AbcObjectWriter(Object *ob,
                                  uint32_t time_sampling,
index c35115663722a1eab6585a0cca5ccfa5443bd633..830c4aee903024fb19af5f43b752cbd2193209c3 100644 (file)
@@ -26,9 +26,7 @@
 
 #include "abc_exporter.h"
 
-extern "C" {
 #include "DNA_ID.h"
-}
 
 class AbcTransformWriter;
 
index 70a1ead239a0109ca9e51ee63244a3143c181509..7b5cf47431c31987f21cb2f6e2d638ca3e88d993 100644 (file)
@@ -26,7 +26,6 @@
 #include "abc_writer_mesh.h"
 #include "abc_writer_transform.h"
 
-extern "C" {
 #include "DNA_object_types.h"
 #include "DNA_particle_types.h"
 
@@ -36,7 +35,6 @@ extern "C" {
 #include "BLI_math.h"
 
 #include "DEG_depsgraph_query.h"
-}
 
 using Alembic::AbcGeom::kVertexScope;
 using Alembic::AbcGeom::OPoints;
index 18f4487cf05edcce45fbb0ca47071c7aa5bb9633..1ec7db0a1c6254c6e7a35bc9bd81aafb9a6e752d 100644 (file)
 
 #include <OpenEXR/ImathBoxAlgo.h>
 
-extern "C" {
 #include "DNA_object_types.h"
 
 #include "BLI_math.h"
 
 #include "DEG_depsgraph_query.h"
-}
 
 using Alembic::AbcGeom::OObject;
 using Alembic::AbcGeom::OXform;
index ced5791e0e8f2973738f82bb7d7969956af28f22..987a3cacb3b9ab8ea68351d03fe5315dc3f3f07d 100644 (file)
@@ -40,7 +40,6 @@
 
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "DNA_cachefile_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_modifier_types.h"
@@ -74,7 +73,6 @@ extern "C" {
 
 #include "WM_api.h"
 #include "WM_types.h"
-}
 
 using Alembic::Abc::Int32ArraySamplePtr;
 using Alembic::Abc::ObjectHeader;
index 3e40a485ddf4b6ee9fc5c6773f4cf194573289b4..b4564eb7b2d3d1c2c53ef7796772e2c38f1fab2c 100644 (file)
@@ -23,7 +23,6 @@
 
 #include "BCAnimationCurve.h"
 
-extern "C" {
 #include "DNA_action_types.h"
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
@@ -48,7 +47,6 @@ extern "C" {
 #include "BKE_object.h"
 #include "BKE_scene.h"
 #include "ED_object.h"
-}
 
 #include "MEM_guardedalloc.h"
 
index 263a130d1ebd36bde4b95e7673e0776ede802ede..51041c6ee3eb98e01751099d86e6b310afd09ba6 100644 (file)
 #include "COLLADAFWNode.h"
 #include "COLLADAFWUniqueId.h"
 
-extern "C" {
 #include "BKE_context.h"
+
 #include "DNA_anim_types.h"
+
 #include "DNA_camera_types.h"
 #include "DNA_light_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
-}
 
 //#include "ArmatureImporter.h"
 #include "TransformReader.h"
index 660917c2aa1c7e93d8356f771b83901e33b23a84..fc697e1617ba0c0cbccd408aff2654d4c835a081 100644 (file)
 
 #include "BKE_action.h"
 #include "BKE_armature.h"
-
-extern "C" {
 #include "BKE_global.h"
 #include "BKE_mesh.h"
-}
 
 #include "ED_armature.h"
 
index 4e9f31182f126e0e6496b3ae6600bcbf3772076d..2d5107058fe97f13a5a2f215a4e8a4d31d7a7c79 100644 (file)
 
 #include "COLLADAFWUniqueId.h"
 
-extern "C" {
 #include "BKE_action.h"
 #include "BKE_armature.h"
 #include "BKE_object.h"
 #include "BLI_listbase.h"
 #include "BLI_string.h"
 #include "ED_armature.h"
-}
 
 #include "DEG_depsgraph.h"
 
index bafa10ca804ee922908d3d82f8c29780a721f08e..7393b882f4b1373f3fe860c30d4a370633319a25 100644 (file)
@@ -25,7 +25,6 @@
 #include "COLLADAFWNode.h"
 #include "COLLADAFWUniqueId.h"
 
-extern "C" {
 #include "BKE_context.h"
 #include "BKE_key.h"
 
@@ -35,7 +34,6 @@ extern "C" {
 #include "DNA_scene_types.h"
 
 #include "ED_armature.h"
-}
 
 #include "AnimationImporter.h"
 #include "ExtraTags.h"
index 71640ff30139bc22324cf2940354de536f76aafc..e0216ee6849df5b2025698907b249b0cc93eb8ec 100644 (file)
 
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "BKE_armature.h"
 #include "BKE_fcurve.h"
 #include "BKE_material.h"
+
 #include "ED_anim_api.h"
 #include "ED_keyframes_edit.h"
 #include "ED_keyframing.h"
-}
 
 typedef float(TangentPoint)[2];
 
index 0c19ce9a4c7029dfb810762bbbf9937d97f46606..fc23a58ccbc650020aa89da83fc512d007f549e2 100644 (file)
 #include "ExportSettings.h"
 #include "collada_utils.h"
 
-extern "C" {
 #include "BKE_action.h"
 #include "BKE_constraint.h"
 #include "BKE_key.h"
 #include "BKE_lib_id.h"
 #include "BKE_main.h"
 #include "BKE_material.h"
+
 #include "BLI_listbase.h"
+
 #include "DNA_anim_types.h"
 #include "DNA_constraint_types.h"
 #include "DNA_key_types.h"
 #include "DNA_scene_types.h"
+
 #include "ED_object.h"
-}
 
 static std::string EMPTY_STRING;
 static BCAnimationCurveMap BCEmptyAnimationCurves;
index 96138d0cbcaa409cb80cd6fc61c469e2cf415501..3273ac8e0a03ae362eb332601c46914d360aa37b 100644 (file)
 #include "BCSampleData.h"
 #include "collada_utils.h"
 
-extern "C" {
 #include "BKE_action.h"
 #include "BKE_lib_id.h"
+
 #include "BLI_math_rotation.h"
+
 #include "DNA_action_types.h"
-}
 
 /* Collection of animation curves */
 class BCAnimation {
index 9ecea85b08c906a6aff895de8d96072aa1f77a6e..381587517407ce19061b39caee3708fb9d8666f7 100644 (file)
 
 #include "BlenderTypes.h"
 
-extern "C" {
 #include "BKE_object.h"
+
 #include "BLI_math.h"
-}
 
 class BCQuat {
  private:
index 877fb49981a2590756141a0ae95b8102425d2fc8..6f3ca9135b3e3d95fc722e6fcc37944e1670fe52 100644 (file)
 #include "BCSampleData.h"
 #include "ExportSettings.h"
 
-extern "C" {
 #include "BKE_object.h"
+
 #include "BLI_math_rotation.h"
+
 #include "DNA_armature_types.h"
 #include "DNA_camera_types.h"
 #include "DNA_light_types.h"
 #include "DNA_material_types.h"
 #include "DNA_object_types.h"
-}
 
 typedef std::map<Bone *, BCMatrix *> BCBoneMatrixMap;
 
index 15ebd671b1a9d867c9b29b14b5857b50964427e5..bf6fde134fa620ea01eecfa0004a85302d38ad30 100644 (file)
 #ifndef __BLENDERCONTEXT_H__
 #define __BLENDERCONTEXT_H__
 
-#ifdef __cplusplus
-
-extern "C" {
-#endif
-
 #include "BKE_context.h"
 #include "BKE_main.h"
 #include "BLI_linklist.h"
@@ -35,6 +30,10 @@ extern "C" {
 #include "DNA_layer_types.h"
 #include "DNA_object_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 static const BC_global_forward_axis BC_DEFAULT_FORWARD = BC_GLOBAL_FORWARD_Y;
 static const BC_global_up_axis BC_DEFAULT_UP = BC_GLOBAL_UP_Z;
 
index 74862c44270aaa9bb8abb0628a6eeb4bc23e43c8..246a454eb6625d87cb9c7ef2e3cef2a77897f496 100644 (file)
@@ -22,9 +22,8 @@
 
 #include "COLLADASWCamera.h"
 
-extern "C" {
 #include "DNA_camera_types.h"
-}
+
 #include "CameraExporter.h"
 
 #include "collada_internal.h"
index e4df994354c7b5a86c9583063b62cb6f534228eb..0dda6392d03b5924a93ea810e4e51fdefd1030f2 100644 (file)
 #include "COLLADASWLibraryCameras.h"
 #include "COLLADASWStreamWriter.h"
 
-extern "C" {
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
-}
 
 #include "DNA_camera_types.h"
 #include "ExportSettings.h"
index c26647d4747aee6788ccf022ca1165ed7d71e7b1..1b8c859f443d8632abea5552e60faf2dc1095d84 100644 (file)
 
 #include "BKE_action.h"
 #include "BKE_armature.h"
-
-extern "C" {
 #include "BKE_global.h"
 #include "BKE_idprop.h"
 #include "BKE_lib_id.h"
 #include "BKE_mesh.h"
-}
 
 #include "ED_armature.h"
 
index 7565aa881fdeb42c5af7e07bed62f69e1946963f..b890d4cf018bdbb7d5faee96d48565c2625d28c3 100644 (file)
@@ -58,7 +58,6 @@
 
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "DNA_action_types.h"
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
@@ -96,13 +95,12 @@ extern "C" {
 
 #include "ED_keyframing.h"
 #ifdef WITH_BUILDINFO
-extern char build_commit_date[];
-extern char build_commit_time[];
-extern char build_hash[];
+extern "C" char build_commit_date[];
+extern "C" char build_commit_time[];
+extern "C" char build_hash[];
 #endif
 
 #include "RNA_access.h"
-}
 
 #include "DocumentExporter.h"
 #include "collada_internal.h"
index f024befbd17b61efab59233bbd4c86c2edd0b2e3..1fe52420534daa628500cb48ef8f1cfcffe29587 100644 (file)
@@ -25,9 +25,7 @@
 #include "collada.h"
 #include "collada_utils.h"
 
-extern "C" {
 #include "DNA_customdata_types.h"
-}
 
 class DocumentExporter {
  public:
index 281786bb45f9aee2de14ccd25fc900370d8f23a8..2305072a6eb32ad6798ea7f0589769f4dde24ac2 100644 (file)
@@ -45,7 +45,6 @@
 
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "BLI_fileops.h"
 #include "BLI_listbase.h"
 #include "BLI_math.h"
@@ -72,7 +71,6 @@ extern "C" {
 
 #include "WM_api.h"
 #include "WM_types.h"
-}
 
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_build.h"
index f21ea57c91cab8b2f8b29f8a5e820a884f16d6fd..7f6d3cbdc6f0937ab2ba6f1a206f8146671af3aa 100644 (file)
@@ -31,7 +31,6 @@
 #include "collada_internal.h"
 #include "collada_utils.h"
 
-extern "C" {
 #include "DNA_mesh_types.h"
 #include "DNA_world_types.h"
 
@@ -39,7 +38,6 @@ extern "C" {
 #include "BKE_customdata.h"
 #include "BKE_material.h"
 #include "BKE_mesh.h"
-}
 
 static std::string getActiveUVLayerName(Object *ob)
 {
index 69e260a1e915f61a9c0410882e6e8cefb7f6cf98..477f0b8b678eb8e12ec9715fc93df9dc7613f872 100644 (file)
@@ -21,6 +21,9 @@
 #ifndef __EXPORTSETTINGS_H__
 #define __EXPORTSETTINGS_H__
 
+#include "BLI_linklist.h"
+#include "BlenderContext.h"
+
 #ifdef __cplusplus
 #  include "BCMath.h"
 #  include <vector>
@@ -28,9 +31,6 @@
 extern "C" {
 #endif
 
-#include "BLI_linklist.h"
-#include "BlenderContext.h"
-
 typedef enum BC_export_mesh_type {
   BC_MESH_TYPE_VIEW,
   BC_MESH_TYPE_RENDER,
index 469d8601a8bfc1c1f42cd5526e26121c5db9491c..c7fcc51d42f38c58320c4bf4eb10e3b561d07d93 100644 (file)
@@ -29,7 +29,6 @@
 
 #include "DNA_meshdata_types.h"
 
-extern "C" {
 #include "BLI_utildefines.h"
 
 #include "BKE_customdata.h"
@@ -37,7 +36,6 @@ extern "C" {
 #include "BKE_lib_id.h"
 #include "BKE_material.h"
 #include "BKE_mesh.h"
-}
 
 #include "collada_internal.h"
 #include "collada_utils.h"
index 1cd3301b8a8a076439f1579e108be983c6ef3554..1c897e37a4ae19c3a874f50bddec942f985e6a2d 100644 (file)
@@ -21,7 +21,6 @@
 #include "COLLADABUURI.h"
 #include "COLLADASWImage.h"
 
-extern "C" {
 #include "DNA_image_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_texture_types.h"
@@ -37,7 +36,6 @@ extern "C" {
 #include "BLI_string.h"
 
 #include "IMB_imbuf_types.h"
-}
 
 #include "ImageExporter.h"
 #include "MaterialExporter.h"
index a0bea16adfb938eaaefad784537b8987e282bd6c..6c197823ec2df5a9a3be8d1364ac31a86889bd43 100644 (file)
 
 #include "COLLADASWInstanceMaterial.h"
 
-extern "C" {
 #include "BKE_customdata.h"
 #include "BKE_material.h"
+
 #include "DNA_mesh_types.h"
-}
 
 #include "InstanceWriter.h"
 #include "collada_internal.h"
index 8b3d1130fe9f24b3ee940eb6ab9df567fcfccbf7..babb113567f58166265ecad515d89243aad93058 100644 (file)
 #include "COLLADASWLibraryMaterials.h"
 #include "COLLADASWStreamWriter.h"
 
-extern "C" {
 #include "BKE_material.h"
+
 #include "DNA_material_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
-}
 
 #include "ExportSettings.h"
 #include "GeometryExporter.h"
index 86fc4c00073b175a23e5003e225b682f99afcbe2..e1d12246a2b5bed1a2aec22beeeaa706a715c04b 100644 (file)
 #include <map>
 #include <string>
 
-extern "C" {
 #include "BKE_context.h"
 #include "BKE_node.h"
 #include "BLI_listbase.h"
 #include "DNA_material_types.h"
 #include "DNA_node_types.h"
-}
 
 #include "COLLADAFWEffectCommon.h"
 #include "collada_utils.h"
index 6ac87d3d3946fdd1212ed6117908a3549e232c7a..6683f07bf654dfc7984b12469770452b0d0cbf62 100644 (file)
@@ -30,7 +30,6 @@
 
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "BKE_customdata.h"
 #include "BKE_displist.h"
 #include "BKE_global.h"
@@ -43,7 +42,6 @@ extern "C" {
 #include "BLI_listbase.h"
 #include "BLI_math.h"
 #include "BLI_string.h"
-}
 
 #include "ArmatureImporter.h"
 #include "MeshImporter.h"
index 5ad2fb17fcefd0f0a9ebc3d463bf03d37a08b1db..2f2a18ff11a918347929b61f51edc82009bbd3e1 100644 (file)
 #include "ArmatureImporter.h"
 #include "collada_utils.h"
 
-extern "C" {
 #include "BLI_edgehash.h"
+
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
-}
 
 /* only for ArmatureImporter to "see" MeshImporter::get_object_by_geom_uid */
 class MeshImporterBase {
index 2f70bc1c26ba7e06185e4b530b5878f1405e2a3d..1b3bc1b66ea4717284e409ca99eb7657ccb2742c 100644 (file)
  * \ingroup collada
  */
 
-extern "C" {
 #include "BKE_collection.h"
 #include "BKE_lib_id.h"
 #include "BKE_object.h"
 #include "BLI_listbase.h"
 #include "BLI_utildefines.h"
-}
 
 #include "BCSampleData.h"
 #include "SceneExporter.h"
index 6effb54fd481235eed099efe5ecdb73b4ccf3d1d..3ea6a9fac8ef1281b6187773485eb64d4614950d 100644 (file)
@@ -25,7 +25,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-extern "C" {
 #include "DNA_action_types.h"
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
@@ -47,7 +46,6 @@ extern "C" {
 #include "BLI_fileops.h"
 #include "BLI_path_util.h"
 #include "ED_keyframing.h"
-}
 
 #include "COLLADASWAsset.h"
 #include "COLLADASWBaseInputElement.h"
index 683e64b264786244a389b00f588f66e2f40569db..bf1ebbfa669034371fbc8eedf6794760804fe7a2 100644 (file)
@@ -27,7 +27,6 @@
 #include "ImportSettings.h"
 #include "collada.h"
 
-extern "C" {
 #include "BKE_context.h"
 #include "BKE_scene.h"
 #include "DEG_depsgraph.h"
@@ -37,6 +36,8 @@ extern "C" {
 #include "BLI_fileops.h"
 #include "BLI_linklist.h"
 
+extern "C" {
+
 static void print_import_header(ImportSettings &import_settings)
 {
   fprintf(stderr, "+-- Collada Import parameters------\n");
index deadbcffcaf8c704bb78a6b39bacf188456b8946..d8e498ef4b28881d7970e888688cdf6d54fe7f4a 100644 (file)
 #include "ExportSettings.h"
 #include "ImportSettings.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "BLI_linklist.h"
 #include "BLI_path_util.h"
 #include "RNA_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct bContext;
 
 /*
index 1df82ed3038ac07c51efe99f8f69ac19566a2d33..d2e05c7ae5ba7526fbdae9e384fd42c36bbf59a7 100644 (file)
@@ -30,7 +30,6 @@
 
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "DNA_armature_types.h"
 #include "DNA_constraint_types.h"
 #include "DNA_customdata_types.h"
@@ -75,7 +74,6 @@ extern "C" {
 #if 0
 #  include "NOD_common.h"
 #endif
-}
 
 #include "BlenderContext.h"
 #include "ExportSettings.h"
index 54ba80736791135d358620841cb1b9569f026527..b1ec2c8b81ae6b75f7e00d0043f2027128b4e31b 100644 (file)
@@ -33,7 +33,6 @@
 #include <set>
 #include <vector>
 
-extern "C" {
 #include "DNA_anim_types.h"
 #include "DNA_camera_types.h"
 #include "DNA_constraint_types.h"
@@ -57,7 +56,6 @@ extern "C" {
 #include "BKE_node.h"
 #include "BKE_object.h"
 #include "BKE_scene.h"
-}
 
 #include "DEG_depsgraph_query.h"
 
index 9d1632228634296b4e08c3549208abc72a72ee5e..e382fa6bb1d969b3adb326aeaa0670be7a09263d 100644 (file)
@@ -24,7 +24,6 @@
 #include <stdio.h>
 #include <string>
 
-extern "C" {
 #include "BKE_anim_data.h"
 #include "BKE_duplilist.h"
 #include "BKE_key.h"
@@ -41,7 +40,6 @@ extern "C" {
 #include "DNA_particle_types.h"
 
 #include "DEG_depsgraph_query.h"
-}
 
 namespace USD {
 
index 60ab36768477f4e53ffa3e4767d4cf5791aae617..f8e0a03abfa3c2f26c1cd84a2bcaf78f20be2057 100644 (file)
@@ -26,7 +26,6 @@
 
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_build.h"
 #include "DEG_depsgraph_query.h"
@@ -44,7 +43,6 @@ extern "C" {
 
 #include "WM_api.h"
 #include "WM_types.h"
-}
 
 namespace USD {
 
index 47f09af7442e56ec9f5513030456a3639c72fca0..56e367dd8776aeb41c5ffd1a5d3c12a28b81b758 100644 (file)
@@ -31,7 +31,6 @@
 
 #include <pxr/base/tf/stringUtils.h>
 
-extern "C" {
 #include "BKE_duplilist.h"
 
 #include "BLI_assert.h"
@@ -41,7 +40,6 @@ extern "C" {
 #include "DNA_ID.h"
 #include "DNA_layer_types.h"
 #include "DNA_object_types.h"
-}
 
 namespace USD {
 
index cf0f7e9d4374cfb0519df6e3fc7ba982214ac94e..01b53f4c916b70a2da6646d3efb0bcbd8c2311e2 100644 (file)
 
 #include <vector>
 
-extern "C" {
 #include "DEG_depsgraph_query.h"
+
 #include "DNA_material_types.h"
-}
 
 struct Material;
 struct Object;
index 9b85d69559c66379e73efdaa7aaf04b455a304ab..ea551a43c9f861819b46733e7d3797621d175c7a 100644 (file)
 #include <pxr/usd/usdGeom/camera.h>
 #include <pxr/usd/usdGeom/tokens.h>
 
-extern "C" {
 #include "BKE_camera.h"
 #include "BLI_assert.h"
 
 #include "DNA_camera_types.h"
 #include "DNA_scene_types.h"
-}
 
 namespace USD {
 
index 9251425c0b83044f2eb3682ea9e74fdf3554993b..d38c10329697069afc36cebdfb7d6aa25bf90de1 100644 (file)
 #include <pxr/usd/usdGeom/basisCurves.h>
 #include <pxr/usd/usdGeom/tokens.h>
 
-extern "C" {
 #include "BKE_particle.h"
 
 #include "DNA_particle_types.h"
-}
 
 namespace USD {
 
index e13e2c58a7915144863a42af8011813156d3099b..0ce3ee5f8ce6b5963af842515546703d6a23b76f 100644 (file)
 #include <pxr/usd/usdLux/rectLight.h>
 #include <pxr/usd/usdLux/sphereLight.h>
 
-extern "C" {
 #include "BLI_assert.h"
 #include "BLI_utildefines.h"
 
 #include "DNA_light_types.h"
 #include "DNA_object_types.h"
-}
 
 namespace USD {
 
index fa43d80538ab502cfdea8851abc0b67b84205687..909869d2af1a113af602c08fcf68f52f7e329bad 100644 (file)
@@ -23,7 +23,6 @@
 #include <pxr/usd/usdShade/material.h>
 #include <pxr/usd/usdShade/materialBindingAPI.h>
 
-extern "C" {
 #include "BLI_assert.h"
 #include "BLI_math_vector.h"
 
@@ -42,7 +41,6 @@ extern "C" {
 #include "DNA_modifier_types.h"
 #include "DNA_object_fluidsim_types.h"
 #include "DNA_particle_types.h"
-}
 
 namespace USD {
 
index 25b216d20f3ee2e6c1e1fc20fd07734fe2055b4e..96bf854d327ee4ea7e9d6e8dd6ee7e710d8695e1 100644 (file)
@@ -23,7 +23,6 @@
 #include <pxr/usd/usdShade/material.h>
 #include <pxr/usd/usdShade/materialBindingAPI.h>
 
-extern "C" {
 #include "BLI_assert.h"
 
 #include "BKE_displist.h"
@@ -34,7 +33,6 @@ extern "C" {
 
 #include "DNA_mesh_types.h"
 #include "DNA_meta_types.h"
-}
 
 namespace USD {
 
index 321b516221a65f56e6b5bd1528cf7c28e829169e..038f2b17b1a440e4079b682f158950abc5c80183 100644 (file)
 #include <pxr/base/gf/matrix4f.h>
 #include <pxr/usd/usdGeom/xform.h>
 
-extern "C" {
 #include "BKE_object.h"
 
 #include "BLI_math_matrix.h"
 
 #include "DNA_layer_types.h"
-}
 
 namespace USD {
 
index 8a5575d53cf71b6cd2ee20be7050128de87723a1..eee985212891ca87b115749210c603c09a926851 100644 (file)
 #ifndef __USD_H__
 #define __USD_H__
 
+#include "DEG_depsgraph.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "DEG_depsgraph.h"
-
 struct Scene;
 struct bContext;
 
index 289f8c7a7b9c1eb19d8a077d702bf6eaad99f2ea..39f22fb9555caef394663fb5fe121eb6a9914c45 100644 (file)
 #ifndef __DNA_ID_H__
 #define __DNA_ID_H__
 
+#include "DNA_defs.h"
 #include "DNA_listBase.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "DNA_defs.h"
-
 struct FileData;
 struct GHash;
 struct GPUTexture;
index 40c25d39cad8680a415a6928f13d6033d3729d53..c95a701a78a61912bcb8ec07312beb77705aa8b3 100644 (file)
 #ifndef __DNA_ACTION_TYPES_H__
 #define __DNA_ACTION_TYPES_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "DNA_ID.h"
 #include "DNA_listBase.h"
 #include "DNA_userdef_types.h" /* ThemeWireColor */
 #include "DNA_vec_types.h"
 #include "DNA_view2d_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Collection;
 struct GHash;
 struct Object;
index fbffa039ee9b1a5d814c44afba6e0774ab466621..6a024ec9e7e82c599dffba7b5a12069a5e2712f7 100644 (file)
 #ifndef __DNA_ANIM_TYPES_H__
 #define __DNA_ANIM_TYPES_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "DNA_ID.h"
 #include "DNA_action_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_listBase.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* ************************************************ */
 /* F-Curve DataTypes */
 
index 5ee16c2631d97c537b77b95c3d84a9fb01342e4c..e99d7fd5609489b6276d689d5a8da0ec8490fd3a 100644 (file)
 #ifndef __DNA_CUSTOMDATA_TYPES_H__
 #define __DNA_CUSTOMDATA_TYPES_H__
 
+#include "DNA_defs.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "DNA_defs.h"
-
 /** Descriptor and storage for a custom data layer. */
 typedef struct CustomDataLayer {
   /** Type of data in layer. */
index 9b4a05034df5dde379b3c241884c415babd37c4e..ca5ac649e3333aae1d4cf107b30232db73fc737a 100644 (file)
 
 #include "BLI_utildefines.h"
 
+#include "dna_type_offsets.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "dna_type_offsets.h"
-
 extern const void *DNA_default_table[SDNA_TYPE_MAX];
 
 char *_DNA_struct_default_alloc_impl(const char *data_src, size_t size, const char *alloc_str);
index ef129a92699974c4d0c998f4572b7c7d62565f7a..6348dc5f03df6a3006197cfde6508ddab83099d6 100644 (file)
 #ifndef __DNA_LAYER_TYPES_H__
 #define __DNA_LAYER_TYPES_H__
 
+#include "DNA_freestyle_types.h"
+#include "DNA_listBase.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "DNA_freestyle_types.h"
-#include "DNA_listBase.h"
-
 /**
  * Render-passes for EEVEE.
  * #ViewLayerEEVEE.render_passes
index 557e069a4a64ebbca30a710299b8572185e88de1..94d1109510882dc406032a4128efde1919622e8f 100644 (file)
 #ifndef __DNA_MOVIECLIP_TYPES_H__
 #define __DNA_MOVIECLIP_TYPES_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "DNA_ID.h"
 #include "DNA_color_types.h" /* for color management */
 #include "DNA_tracking_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct AnimData;
 struct ImBuf;
 struct MovieClipProxy;
index daa3a629d274f50c666ebc2c330e22ecd2f46ad5..73cfcddf984d8ec4d7dd0613b7900312687b22df 100644 (file)
 #ifndef __DNA_OBJECT_FORCE_TYPES_H__
 #define __DNA_OBJECT_FORCE_TYPES_H__
 
+#include "DNA_defs.h"
+#include "DNA_listBase.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "DNA_defs.h"
-#include "DNA_listBase.h"
-
 /* pd->forcefield:  Effector Fields types */
 typedef enum ePFieldType {
   /** (this is used for general effector weight). */
index 357c1158b47d64f2d32beaba150f2771002a14fd..3ed9ce1ea06d1182fb21f58baa81b59b2928042f 100644 (file)
 /* XXX, temp feature - campbell */
 #define DURIAN_CAMERA_SWITCH
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "DNA_ID.h"
 #include "DNA_collection_types.h"
 #include "DNA_color_types.h" /* color management */
@@ -46,6 +42,10 @@ extern "C" {
 #include "DNA_vec_types.h"
 #include "DNA_view3d_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct AnimData;
 struct Brush;
 struct Collection;
index 76f0f8c8b55e5f296d64ebf3421bd5c17a709b27..6a95151973055608c4a09b9c9c34eebed9e5b7ea 100644 (file)
@@ -23,7 +23,6 @@
 
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "DNA_cloth_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
@@ -38,7 +37,6 @@ extern "C" {
 #include "BKE_cloth.h"
 #include "BKE_collision.h"
 #include "BKE_effect.h"
-}
 
 #include "BPH_mass_spring.h"
 #include "implicit.h"
index b8783c51fe8ffe37e1a0686c2c9b45409cd539c9..6246bf54f75fda367e2171e6cb6a57a060b4a34a 100644 (file)
 
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
 
 #include "DNA_texture_types.h"
 
 #include "BKE_effect.h"
-}
 
 #include "eigen_utils.h"
 #include "implicit.h"
index d4e57f0beb692e0cd3fe59a28abbec87e4ccfb39..18d4c7da53470df645692539a592c25d58225063 100644 (file)
@@ -35,12 +35,12 @@ struct bContext;
 struct bContextDataResult;
 struct bPythonConstraint; /* DNA_constraint_types.h */
 
+#include "BLI_utildefines.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "BLI_utildefines.h"
-
 void BPY_pyconstraint_exec(struct bPythonConstraint *con,
                            struct bConstraintOb *cob,
                            struct ListBase *targets);
index 54296e1683405c8d97c455ec45f04054cafec05f..b963021dfd9096fb171717546d63f27eab35ebc6 100644 (file)
@@ -40,6 +40,10 @@ struct StampData;
 struct ViewLayer;
 struct bMovieHandle;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 /* this include is what is exposed of render to outside world */
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -386,4 +390,8 @@ struct RenderView *RE_RenderViewGetByName(struct RenderResult *res, const char *
 
 RenderResult *RE_DuplicateRenderResult(RenderResult *rr);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __RE_PIPELINE_H__ */
index 792b2b7e07189d07546edb1cb5d64cd4343beb0c..f69ae4dfd5c94aa6e4212d5f6ed44b85001f9af9 100644 (file)
 #ifndef __RE_SHADER_EXT_H__
 #define __RE_SHADER_EXT_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 /* this include is for texture exports                        */
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -75,4 +79,8 @@ int multitex_nodes(struct Tex *tex,
                    struct MTex *mtex,
                    struct ImagePool *pool);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __RE_SHADER_EXT_H__ */
index 7ce34dd1af4c80bbc8b2723251b97aee3eaa4708..4acce7937072d1b1c947f3b0c8a3ec92646b177f 100644 (file)
 #ifndef __WM_TYPES_H__
 #define __WM_TYPES_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct ID;
 struct ImBuf;
 struct bContext;
@@ -133,6 +129,10 @@ struct wmWindowManager;
 /* Include external gizmo API's */
 #include "gizmo/WM_gizmo_api.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct wmGenericUserData {
   void *data;
   /** When NULL, use #MEM_freeN. */