diff --git a/intern/audaspace/intern/AUD_PyInit.cpp b/intern/audaspace/intern/AUD_PyInit.cpp index 294875c21bc..82994fefd95 100644 --- a/intern/audaspace/intern/AUD_PyInit.cpp +++ b/intern/audaspace/intern/AUD_PyInit.cpp @@ -12,9 +12,7 @@ #include #include -extern "C" { extern void *BKE_sound_get_factory(void *sound); -} static PyObject *AUD_getSoundFromPointer(PyObject *self, PyObject *args) { diff --git a/source/blender/blenkernel/BKE_action.hh b/source/blender/blenkernel/BKE_action.hh index 807670d733c..98e53dcb49e 100644 --- a/source/blender/blenkernel/BKE_action.hh +++ b/source/blender/blenkernel/BKE_action.hh @@ -7,9 +7,6 @@ * \ingroup bke * \brief Blender kernel action and pose functionality. */ -#ifndef __cplusplus -# error This is a C++ only header. -#endif #include "BLI_compiler_attrs.h" #include "BLI_function_ref.hh" diff --git a/source/blender/blenkernel/BKE_addon.h b/source/blender/blenkernel/BKE_addon.h index e03779460d2..1b65cd32a66 100644 --- a/source/blender/blenkernel/BKE_addon.h +++ b/source/blender/blenkernel/BKE_addon.h @@ -7,10 +7,6 @@ * \ingroup bke */ -#ifdef __cplusplus -extern "C" { -#endif - struct ListBase; struct bAddon; @@ -39,7 +35,3 @@ struct bAddon *BKE_addon_find(const struct ListBase *addon_list, const char *mod struct bAddon *BKE_addon_ensure(struct ListBase *addon_list, const char *module); bool BKE_addon_remove_safe(struct ListBase *addon_list, const char *module); void BKE_addon_free(struct bAddon *addon); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_anim_path.h b/source/blender/blenkernel/BKE_anim_path.h index dd334ca655e..42a0b0d0f3c 100644 --- a/source/blender/blenkernel/BKE_anim_path.h +++ b/source/blender/blenkernel/BKE_anim_path.h @@ -7,10 +7,6 @@ * \ingroup bke */ -#ifdef __cplusplus -extern "C" { -#endif - struct CurveCache; struct Object; @@ -42,7 +38,3 @@ bool BKE_where_on_path(const struct Object *ob, float r_quat[4], float *r_radius, float *r_weight); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_anim_visualization.h b/source/blender/blenkernel/BKE_anim_visualization.h index 4625d365320..e27b26fd078 100644 --- a/source/blender/blenkernel/BKE_anim_visualization.h +++ b/source/blender/blenkernel/BKE_anim_visualization.h @@ -7,10 +7,6 @@ * \ingroup bke */ -#ifdef __cplusplus -extern "C" { -#endif - struct BlendDataReader; struct BlendWriter; struct Object; @@ -59,7 +55,3 @@ struct bMotionPath *animviz_verify_motionpaths(struct ReportList *reports, void animviz_motionpath_blend_write(struct BlendWriter *writer, struct bMotionPath *mpath); void animviz_motionpath_blend_read_data(struct BlendDataReader *reader, struct bMotionPath *mpath); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_animsys.h b/source/blender/blenkernel/BKE_animsys.h index 0825dd5c839..0b25f4ea501 100644 --- a/source/blender/blenkernel/BKE_animsys.h +++ b/source/blender/blenkernel/BKE_animsys.h @@ -12,10 +12,6 @@ #include "BLI_span.hh" #include "BLI_sys_types.h" /* for bool */ -#ifdef __cplusplus -extern "C" { -#endif - struct AnimData; struct BlendDataReader; struct BlendWriter; @@ -348,7 +344,3 @@ void BKE_animsys_eval_driver(struct Depsgraph *depsgraph, void BKE_animsys_update_driver_array(struct ID *id); /* ************************************* */ - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index ff0d1e8adfe..c18f64e27a3 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -5,10 +5,6 @@ #include -#ifdef __cplusplus -extern "C" { -#endif - /** \file * \ingroup bke */ @@ -69,7 +65,3 @@ void BKE_blender_version_blendfile_string_from_values(char *str_buff, const size_t str_buff_maxncpy, const short file_version, const short file_subversion); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_boids.h b/source/blender/blenkernel/BKE_boids.h index c97c01166c3..ce7c938fc84 100644 --- a/source/blender/blenkernel/BKE_boids.h +++ b/source/blender/blenkernel/BKE_boids.h @@ -8,10 +8,6 @@ * \ingroup bke */ -#ifdef __cplusplus -extern "C" { -#endif - struct BoidSettings; struct BoidState; struct Object; @@ -51,7 +47,3 @@ struct BoidState *boid_duplicate_state(struct BoidSettings *boids, struct BoidSt void boid_free_settings(struct BoidSettings *boids); struct BoidSettings *boid_copy_settings(const struct BoidSettings *boids); struct BoidState *boid_get_current_state(struct BoidSettings *boids); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_camera.h b/source/blender/blenkernel/BKE_camera.h index 9c6cfd3a16d..d6256333469 100644 --- a/source/blender/blenkernel/BKE_camera.h +++ b/source/blender/blenkernel/BKE_camera.h @@ -10,9 +10,6 @@ * \ingroup bke * \brief Camera data-block and utility functions. */ -#ifdef __cplusplus -extern "C" { -#endif struct Camera; struct Depsgraph; @@ -181,7 +178,3 @@ struct CameraBGImage *BKE_camera_background_image_copy(const struct CameraBGImag int flag); void BKE_camera_background_image_remove(struct Camera *cam, struct CameraBGImage *bgpic); void BKE_camera_background_image_clear(struct Camera *cam); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_constraint.h b/source/blender/blenkernel/BKE_constraint.h index d8f8e82e51e..a3dd1319f0b 100644 --- a/source/blender/blenkernel/BKE_constraint.h +++ b/source/blender/blenkernel/BKE_constraint.h @@ -20,9 +20,6 @@ struct bConstraintTarget; struct bPoseChannel; /* ---------------------------------------------------------------------------- */ -#ifdef __cplusplus -extern "C" { -#endif /* special struct for use in constraint evaluation */ typedef struct bConstraintOb { @@ -375,7 +372,3 @@ void BKE_constraint_blend_write(struct BlendWriter *writer, struct ListBase *con void BKE_constraint_blend_read_data(struct BlendDataReader *reader, struct ID *id_owner, struct ListBase *lb); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_cryptomatte.h b/source/blender/blenkernel/BKE_cryptomatte.h index 9c8d3c1ef4f..2fb607afaf8 100644 --- a/source/blender/blenkernel/BKE_cryptomatte.h +++ b/source/blender/blenkernel/BKE_cryptomatte.h @@ -11,10 +11,6 @@ #include "BLI_sys_types.h" #include "DNA_layer_types.h" -#ifdef __cplusplus -extern "C" { -#endif - /* Forward declarations. */ struct CryptomatteSession; struct Material; @@ -60,7 +56,3 @@ void BKE_cryptomatte_matte_id_to_entries(struct NodeCryptomatte *node_storage, void BKE_cryptomatte_store_metadata(const struct CryptomatteSession *session, struct RenderResult *render_result); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_curveprofile.h b/source/blender/blenkernel/BKE_curveprofile.h index 746279283cc..680d81e6b65 100644 --- a/source/blender/blenkernel/BKE_curveprofile.h +++ b/source/blender/blenkernel/BKE_curveprofile.h @@ -10,10 +10,6 @@ #include "DNA_curveprofile_types.h" -#ifdef __cplusplus -extern "C" { -#endif - struct BlendDataReader; struct BlendWriter; struct CurveProfile; @@ -156,7 +152,3 @@ void BKE_curveprofile_blend_write(struct BlendWriter *writer, const struct Curve * Expects that the curve profile itself has been read already. */ void BKE_curveprofile_blend_read(struct BlendDataReader *reader, struct CurveProfile *profile); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_curves.h b/source/blender/blenkernel/BKE_curves.h index c8c65dd1ed3..53449068d50 100644 --- a/source/blender/blenkernel/BKE_curves.h +++ b/source/blender/blenkernel/BKE_curves.h @@ -13,10 +13,6 @@ * \brief Low-level operations for curves that cannot be defined in the C++ header yet. */ -#ifdef __cplusplus -extern "C" { -#endif - struct Curves; struct Depsgraph; struct Main; @@ -46,7 +42,3 @@ void BKE_curves_batch_cache_free(struct Curves *curves); extern void (*BKE_curves_batch_cache_dirty_tag_cb)(struct Curves *curves, int mode); extern void (*BKE_curves_batch_cache_free_cb)(struct Curves *curves); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_customdata_file.h b/source/blender/blenkernel/BKE_customdata_file.h index 03c0e2e9bcb..61fa0c267e1 100644 --- a/source/blender/blenkernel/BKE_customdata_file.h +++ b/source/blender/blenkernel/BKE_customdata_file.h @@ -10,10 +10,6 @@ #include -#ifdef __cplusplus -extern "C" { -#endif - #define CDF_TYPE_IMAGE 0 #define CDF_TYPE_MESH 1 @@ -45,7 +41,3 @@ void cdf_remove(const char *filepath); CDataFileLayer *cdf_layer_find(CDataFile *cdf, int type, const char *name); CDataFileLayer *cdf_layer_add(CDataFile *cdf, int type, const char *name, size_t datasize); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_data_transfer.h b/source/blender/blenkernel/BKE_data_transfer.h index 3877ecc032a..d74706dd87e 100644 --- a/source/blender/blenkernel/BKE_data_transfer.h +++ b/source/blender/blenkernel/BKE_data_transfer.h @@ -8,10 +8,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - struct Depsgraph; struct Object; struct ReportList; @@ -187,7 +183,3 @@ bool BKE_object_data_transfer_ex(struct Depsgraph *depsgraph, const char *vgroup_name, bool invert_vgroup, struct ReportList *reports); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_displist.h b/source/blender/blenkernel/BKE_displist.h index 67eea399f4c..cf140119468 100644 --- a/source/blender/blenkernel/BKE_displist.h +++ b/source/blender/blenkernel/BKE_displist.h @@ -9,10 +9,6 @@ * \brief display list (or rather multi purpose list) stuff. */ -#ifdef __cplusplus -extern "C" { -#endif - /** #DispList.type */ enum { /** A closed polygon (that can be filled). */ @@ -92,7 +88,3 @@ float BKE_displist_calc_taper(struct Depsgraph *depsgraph, int tot); void BKE_displist_minmax(const struct ListBase *dispbase, float min[3], float max[3]); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_dynamicpaint.h b/source/blender/blenkernel/BKE_dynamicpaint.h index d84d148e7c6..f73f8a127d7 100644 --- a/source/blender/blenkernel/BKE_dynamicpaint.h +++ b/source/blender/blenkernel/BKE_dynamicpaint.h @@ -8,10 +8,6 @@ * \ingroup bke */ -#ifdef __cplusplus -extern "C" { -#endif - struct Depsgraph; struct DynamicPaintCanvasSettings; struct DynamicPaintModifierData; @@ -143,7 +139,3 @@ void dynamicPaint_outputSurfaceImage(struct DynamicPaintSurface *surface, #define DPAINT_WAVE_NONE 0 #define DPAINT_WAVE_OBSTACLE 1 #define DPAINT_WAVE_REFLECT_ONLY 2 - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_editlattice.h b/source/blender/blenkernel/BKE_editlattice.h index d265cbb831c..639d06cff96 100644 --- a/source/blender/blenkernel/BKE_editlattice.h +++ b/source/blender/blenkernel/BKE_editlattice.h @@ -8,16 +8,8 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - struct Object; void BKE_editlattice_free(struct Object *ob); void BKE_editlattice_make(struct Object *obedit); void BKE_editlattice_load(struct Object *obedit); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_effect.h b/source/blender/blenkernel/BKE_effect.h index 233ec7a906c..6669fe85494 100644 --- a/source/blender/blenkernel/BKE_effect.h +++ b/source/blender/blenkernel/BKE_effect.h @@ -7,10 +7,6 @@ * \ingroup bke */ -#ifdef __cplusplus -extern "C" { -#endif - struct Collection; struct Depsgraph; struct ListBase; @@ -276,7 +272,3 @@ void BKE_sim_debug_data_remove_element(unsigned int hash); void BKE_sim_debug_data_clear(void); void BKE_sim_debug_data_clear_category(const char *category); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_fcurve_driver.h b/source/blender/blenkernel/BKE_fcurve_driver.h index fa90cdf89a6..9e46025aa2a 100644 --- a/source/blender/blenkernel/BKE_fcurve_driver.h +++ b/source/blender/blenkernel/BKE_fcurve_driver.h @@ -8,10 +8,6 @@ * \ingroup bke */ -#ifdef __cplusplus -extern "C" { -#endif - struct AnimationEvalContext; struct ChannelDriver; struct DriverTarget; @@ -185,7 +181,3 @@ float evaluate_driver(struct PathResolvedRNA *anim_rna, struct ChannelDriver *driver, struct ChannelDriver *driver_orig, const struct AnimationEvalContext *anim_eval_context); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_fluid.h b/source/blender/blenkernel/BKE_fluid.h index 9f8d22b1005..464b91938b4 100644 --- a/source/blender/blenkernel/BKE_fluid.h +++ b/source/blender/blenkernel/BKE_fluid.h @@ -8,10 +8,6 @@ * \ingroup bke */ -#ifdef __cplusplus -extern "C" { -#endif - struct Depsgraph; struct FluidDomainSettings; struct FluidEffectorSettings; @@ -86,7 +82,3 @@ void BKE_fluid_fields_sanitize(struct FluidDomainSettings *settings); void BKE_fluid_flow_behavior_set(struct Object *object, struct FluidFlowSettings *settings, int behavior); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_freestyle.h b/source/blender/blenkernel/BKE_freestyle.h index c5697b8468c..b12dd995725 100644 --- a/source/blender/blenkernel/BKE_freestyle.h +++ b/source/blender/blenkernel/BKE_freestyle.h @@ -8,10 +8,6 @@ * \ingroup bke */ -#ifdef __cplusplus -extern "C" { -#endif - struct FreestyleConfig; struct FreestyleLineSet; struct FreestyleModuleConfig; @@ -51,7 +47,3 @@ short BKE_freestyle_lineset_get_active_index(struct FreestyleConfig *config); void BKE_freestyle_lineset_set_active_index(struct FreestyleConfig *config, short index); void BKE_freestyle_lineset_unique_name(struct FreestyleConfig *config, struct FreestyleLineSet *lineset); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_gpencil_legacy.h b/source/blender/blenkernel/BKE_gpencil_legacy.h index 148aedb416f..e48f3dacb41 100644 --- a/source/blender/blenkernel/BKE_gpencil_legacy.h +++ b/source/blender/blenkernel/BKE_gpencil_legacy.h @@ -8,10 +8,6 @@ * \ingroup bke */ -#ifdef __cplusplus -extern "C" { -#endif - struct BlendDataReader; struct Brush; struct CurveMapping; @@ -291,7 +287,3 @@ void BKE_gpencil_stroke_weights_duplicate(struct bGPDstroke *gps_src, struct bGP void BKE_gpencil_palette_ensure(struct Main *bmain, struct Scene *scene); void BKE_gpencil_blend_read_data(struct BlendDataReader *reader, struct bGPdata *gpd); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_gpencil_modifier_legacy.h b/source/blender/blenkernel/BKE_gpencil_modifier_legacy.h index a93c967ba8b..595ca6c0245 100644 --- a/source/blender/blenkernel/BKE_gpencil_modifier_legacy.h +++ b/source/blender/blenkernel/BKE_gpencil_modifier_legacy.h @@ -11,10 +11,6 @@ #include "BKE_lib_query.hh" /* For LibraryForeachIDCallbackFlag enum. */ -#ifdef __cplusplus -extern "C" { -#endif - struct BlendDataReader; struct GpencilModifierData; struct ID; @@ -53,7 +49,3 @@ void BKE_gpencil_modifiers_foreach_ID_link(struct Object *ob, void BKE_gpencil_modifier_blend_read_data(struct BlendDataReader *reader, struct ListBase *lb, struct Object *ob); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_grease_pencil.h b/source/blender/blenkernel/BKE_grease_pencil.h index 2b658a99cbc..7d0ffaf288c 100644 --- a/source/blender/blenkernel/BKE_grease_pencil.h +++ b/source/blender/blenkernel/BKE_grease_pencil.h @@ -11,10 +11,6 @@ * \brief Low-level operations for grease pencil that cannot be defined in the C++ header yet. */ -#ifdef __cplusplus -extern "C" { -#endif - enum { BKE_GREASEPENCIL_BATCH_DIRTY_ALL = 0, }; @@ -24,7 +20,3 @@ extern void (*BKE_grease_pencil_batch_cache_free_cb)(GreasePencil *grease_pencil void BKE_grease_pencil_batch_cache_dirty_tag(GreasePencil *grease_pencil, int mode); void BKE_grease_pencil_batch_cache_free(GreasePencil *grease_pencil); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_icons.h b/source/blender/blenkernel/BKE_icons.h index 2ae9c913ce4..c4102b719e0 100644 --- a/source/blender/blenkernel/BKE_icons.h +++ b/source/blender/blenkernel/BKE_icons.h @@ -15,11 +15,6 @@ * different design need to be introduced. */ -#ifdef __cplusplus - -extern "C" { -#endif - #include "BLI_compiler_attrs.h" #include "BLI_sys_types.h" @@ -152,7 +147,3 @@ void BKE_icon_geom_invert_lightness(struct Icon_Geom *geom); int BKE_icon_ensure_studio_light(struct StudioLight *sl, int id_type); #define ICON_RENDER_DEFAULT_HEIGHT 32 - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_ipo.h b/source/blender/blenkernel/BKE_ipo.h index de8572885a5..31e5fe0dd89 100644 --- a/source/blender/blenkernel/BKE_ipo.h +++ b/source/blender/blenkernel/BKE_ipo.h @@ -7,10 +7,6 @@ * \ingroup bke */ -#ifdef __cplusplus -extern "C" { -#endif - struct Main; /** @@ -37,7 +33,3 @@ struct Main; void do_versions_ipos_to_layered_actions(struct Main *bmain); /* --------------------- xxx stuff ------------------------ */ - -#ifdef __cplusplus -}; -#endif diff --git a/source/blender/blenkernel/BKE_kelvinlet.h b/source/blender/blenkernel/BKE_kelvinlet.h index 9f940f05da2..5f8eabf5330 100644 --- a/source/blender/blenkernel/BKE_kelvinlet.h +++ b/source/blender/blenkernel/BKE_kelvinlet.h @@ -7,10 +7,6 @@ * \ingroup bke */ -#ifdef __cplusplus -extern "C" { -#endif - /* Regularized Kelvinlets: Sculpting Brushes based on Fundamental Solutions of Elasticity * Pixar Technical Memo #17-03 */ @@ -59,7 +55,3 @@ void BKE_kelvinlet_twist(float radius_elem_disp[3], const float elem_orig_co[3], const float brush_location[3], const float surface_normal[3]); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_keyconfig.h b/source/blender/blenkernel/BKE_keyconfig.h index 9d7448e1919..986acb83385 100644 --- a/source/blender/blenkernel/BKE_keyconfig.h +++ b/source/blender/blenkernel/BKE_keyconfig.h @@ -9,10 +9,6 @@ #include "BLI_sys_types.h" -#ifdef __cplusplus -extern "C" { -#endif - /** Based on #BKE_addon_pref_type_init and friends */ struct UserDef; @@ -71,7 +67,3 @@ void BKE_keyconfig_pref_filter_items(struct UserDef *userdef, const struct wmKeyConfigFilterItemParams *params, bool (*filter_fn)(struct wmKeyMapItem *kmi, void *user_data), void *user_data); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_light.h b/source/blender/blenkernel/BKE_light.h index 1deb33436f8..0d4fd85ea05 100644 --- a/source/blender/blenkernel/BKE_light.h +++ b/source/blender/blenkernel/BKE_light.h @@ -11,10 +11,6 @@ #include "BLI_compiler_attrs.h" -#ifdef __cplusplus -extern "C" { -#endif - struct Depsgraph; struct Light; struct Main; @@ -22,7 +18,3 @@ struct Main; struct Light *BKE_light_add(struct Main *bmain, const char *name) ATTR_WARN_UNUSED_RESULT; void BKE_light_eval(struct Depsgraph *depsgraph, struct Light *la); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_light_linking.h b/source/blender/blenkernel/BKE_light_linking.h index fa8ab29d22c..8ec445e5eb7 100644 --- a/source/blender/blenkernel/BKE_light_linking.h +++ b/source/blender/blenkernel/BKE_light_linking.h @@ -12,10 +12,6 @@ #include "DNA_collection_types.h" /* eCollectionLightLinkingState */ -#ifdef __cplusplus -extern "C" { -#endif - struct ID; struct Main; struct Object; @@ -116,7 +112,3 @@ void BKE_light_linking_select_receivers_of_emitter(struct Scene *scene, struct ViewLayer *view_layer, struct Object *emitter, LightLinkingType link_type); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_lightprobe.h b/source/blender/blenkernel/BKE_lightprobe.h index 0ad17473f7a..93f150ee7cb 100644 --- a/source/blender/blenkernel/BKE_lightprobe.h +++ b/source/blender/blenkernel/BKE_lightprobe.h @@ -11,10 +11,6 @@ #include "BLI_sys_types.h" -#ifdef __cplusplus -extern "C" { -#endif - struct LightProbe; struct Main; struct BlendWriter; @@ -70,7 +66,3 @@ void BKE_lightprobe_cache_free(struct Object *object); * This depends on the light cache type. */ int64_t BKE_lightprobe_grid_cache_frame_sample_count(const struct LightProbeGridCacheFrame *cache); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_mask.h b/source/blender/blenkernel/BKE_mask.h index 12955fb3402..a7bb7a61d41 100644 --- a/source/blender/blenkernel/BKE_mask.h +++ b/source/blender/blenkernel/BKE_mask.h @@ -8,10 +8,6 @@ * \ingroup bke */ -#ifdef __cplusplus -extern "C" { -#endif - struct Depsgraph; struct Image; struct ImageUser; @@ -412,7 +408,3 @@ void BKE_maskrasterize_buffer(MaskRasterHandle *mr_handle, float *buffer); /** \} */ - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_movieclip.h b/source/blender/blenkernel/BKE_movieclip.h index 3437134a0e3..e4453a2c3e1 100644 --- a/source/blender/blenkernel/BKE_movieclip.h +++ b/source/blender/blenkernel/BKE_movieclip.h @@ -8,10 +8,6 @@ * \ingroup bke */ -#ifdef __cplusplus -extern "C" { -#endif - struct Depsgraph; struct ImBuf; struct Main; @@ -142,7 +138,3 @@ void BKE_movieclip_eval_update(struct Depsgraph *depsgraph, #define MOVIECLIP_DISABLE_GREEN (1 << 1) #define MOVIECLIP_DISABLE_BLUE (1 << 2) #define MOVIECLIP_PREVIEW_GRAYSCALE (1 << 3) - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_object_deform.h b/source/blender/blenkernel/BKE_object_deform.h index 23b8741ba18..cc7cae890be 100644 --- a/source/blender/blenkernel/BKE_object_deform.h +++ b/source/blender/blenkernel/BKE_object_deform.h @@ -12,10 +12,6 @@ #include "DNA_scene_enums.h" -#ifdef __cplusplus -extern "C" { -#endif - struct ID; struct MDeformVert; struct Object; @@ -167,7 +163,3 @@ void BKE_object_defgroup_mirror_selection(struct Object *ob, const bool *selection, bool *dg_flags_sel, int *r_dg_flags_sel_tot); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_ocean.h b/source/blender/blenkernel/BKE_ocean.h index 6f5f0148b79..07243312961 100644 --- a/source/blender/blenkernel/BKE_ocean.h +++ b/source/blender/blenkernel/BKE_ocean.h @@ -10,10 +10,6 @@ * \ingroup bke */ -#ifdef __cplusplus -extern "C" { -#endif - struct OceanModifierData; typedef struct OceanResult { @@ -165,7 +161,3 @@ float BLI_ocean_spectrum_texelmarsenarsloe(const struct Ocean *oc, float kx, flo * called the fetch, or the distance over which the wind blows with constant velocity. */ float BLI_ocean_spectrum_jonswap(const struct Ocean *oc, float kx, float kz); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h index 7915c9704ab..24243ef068b 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -20,10 +20,6 @@ #include "DNA_particle_types.h" -#ifdef __cplusplus -extern "C" { -#endif - struct ParticleKey; struct ParticleSettings; struct ParticleSystem; @@ -712,7 +708,3 @@ void BKE_particle_system_blend_read_after_liblink(struct BlendLibReader *reader, struct Object *ob, struct ID *id, struct ListBase *particles); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_pointcache.h b/source/blender/blenkernel/BKE_pointcache.h index 28b7ced0d13..75dc756b9d1 100644 --- a/source/blender/blenkernel/BKE_pointcache.h +++ b/source/blender/blenkernel/BKE_pointcache.h @@ -15,10 +15,6 @@ #include /* for #FILE */ -#ifdef __cplusplus -extern "C" { -#endif - /* Point cache clearing option, for BKE_ptcache_id_clear, before * and after are non-inclusive (they won't remove the cfra) */ #define PTCACHE_CLEAR_ALL 0 @@ -416,7 +412,3 @@ void BKE_ptcache_blend_read_data(struct BlendDataReader *reader, struct ListBase *ptcaches, struct PointCache **ocache, int force_disk); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_pose_backup.h b/source/blender/blenkernel/BKE_pose_backup.h index b3da49aa952..4c93bd4812d 100644 --- a/source/blender/blenkernel/BKE_pose_backup.h +++ b/source/blender/blenkernel/BKE_pose_backup.h @@ -18,10 +18,6 @@ #include "BLI_listbase.h" #include "BLI_span.hh" -#ifdef __cplusplus -extern "C" { -#endif - struct PoseBackup; struct Object; @@ -66,7 +62,3 @@ bool BKE_pose_backup_restore_on_object(struct Object *ob); * Free the pose backup that was stored on this object's runtime data. */ void BKE_pose_backup_clear(struct Object *ob); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_preferences.h b/source/blender/blenkernel/BKE_preferences.h index 93ca01352d2..ed7e88da9a5 100644 --- a/source/blender/blenkernel/BKE_preferences.h +++ b/source/blender/blenkernel/BKE_preferences.h @@ -8,10 +8,6 @@ * \ingroup bke */ -#ifdef __cplusplus -extern "C" { -#endif - #include "BLI_compiler_attrs.h" #include "BLI_sys_types.h" @@ -181,7 +177,3 @@ bool BKE_preferences_asset_shelf_settings_ensure_catalog_path_enabled(UserDef *u const char *catalog_path); /** \} */ - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_rigidbody.h b/source/blender/blenkernel/BKE_rigidbody.h index e6a60a5a125..80f08b4d797 100644 --- a/source/blender/blenkernel/BKE_rigidbody.h +++ b/source/blender/blenkernel/BKE_rigidbody.h @@ -11,10 +11,6 @@ #include "BKE_lib_query.hh" /* For LibraryForeachIDCallbackFlag enum. */ -#ifdef __cplusplus -extern "C" { -#endif - struct RigidBodyOb; struct RigidBodyWorld; @@ -234,7 +230,3 @@ void BKE_rigidbody_object_sync_transforms(struct Depsgraph *depsgraph, struct Object *ob); /** \} */ - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_sequencer_offscreen.h b/source/blender/blenkernel/BKE_sequencer_offscreen.h index 382798aa3e0..eeba3cdbd63 100644 --- a/source/blender/blenkernel/BKE_sequencer_offscreen.h +++ b/source/blender/blenkernel/BKE_sequencer_offscreen.h @@ -13,10 +13,6 @@ #include "IMB_imbuf_types.hh" -#ifdef __cplusplus -extern "C" { -#endif - struct GPUOffScreen; enum eDrawType; @@ -36,7 +32,3 @@ typedef struct ImBuf *(*SequencerDrawView)(struct Depsgraph *depsgraph, struct GPUViewport *viewport, char err_out[256]); extern SequencerDrawView sequencer_view3d_fn; - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_shader_fx.h b/source/blender/blenkernel/BKE_shader_fx.h index 3b0a3664d5c..050506fb2c5 100644 --- a/source/blender/blenkernel/BKE_shader_fx.h +++ b/source/blender/blenkernel/BKE_shader_fx.h @@ -12,10 +12,6 @@ #include "BKE_lib_query.hh" /* For LibraryForeachIDCallbackFlag enum. */ -#ifdef __cplusplus -extern "C" { -#endif - struct ARegionType; struct BlendDataReader; struct BlendWriter; @@ -185,7 +181,3 @@ void BKE_shaderfx_blend_write(struct BlendWriter *writer, struct ListBase *fxbas void BKE_shaderfx_blend_read_data(struct BlendDataReader *reader, struct ListBase *lb, struct Object *ob); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_softbody.h b/source/blender/blenkernel/BKE_softbody.h index 9cf386a4ecb..9828336675c 100644 --- a/source/blender/blenkernel/BKE_softbody.h +++ b/source/blender/blenkernel/BKE_softbody.h @@ -7,10 +7,6 @@ * \ingroup bke */ -#ifdef __cplusplus -extern "C" { -#endif - struct Depsgraph; struct Object; struct Scene; @@ -81,7 +77,3 @@ extern void sbSetInterruptCallBack(int (*f)(void)); * For velocity & 2nd order stuff see: #vcloud_estimate_transform_v3. */ extern void SB_estimate_transform(Object *ob, float lloc[3], float lrot[3][3], float lscale[3][3]); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_sound.h b/source/blender/blenkernel/BKE_sound.h index 204a4b26ea4..d1e4d129607 100644 --- a/source/blender/blenkernel/BKE_sound.h +++ b/source/blender/blenkernel/BKE_sound.h @@ -7,10 +7,6 @@ * \ingroup bke */ -#ifdef __cplusplus -extern "C" { -#endif - #define SOUND_WAVE_SAMPLES_PER_SECOND 250 #if defined(WITH_AUDASPACE) @@ -28,16 +24,16 @@ typedef struct SoundWaveform { float *data; } SoundWaveform; -void BKE_sound_init_once(void); -void BKE_sound_exit_once(void); +void BKE_sound_init_once(); +void BKE_sound_exit_once(); -void *BKE_sound_get_device(void); +void *BKE_sound_get_device(); void BKE_sound_init(struct Main *bmain); void BKE_sound_init_main(struct Main *bmain); -void BKE_sound_exit(void); +void BKE_sound_exit(); void BKE_sound_force_device(const char *device); @@ -114,8 +110,8 @@ void BKE_sound_ensure_scene(struct Scene *scene); void BKE_sound_destroy_scene(struct Scene *scene); -void BKE_sound_lock(void); -void BKE_sound_unlock(void); +void BKE_sound_lock(); +void BKE_sound_unlock(); void BKE_sound_reset_scene_specs(struct Scene *scene); @@ -190,7 +186,7 @@ void *BKE_sound_get_factory(void *sound); float BKE_sound_get_length(struct Main *bmain, struct bSound *sound); -char **BKE_sound_get_device_names(void); +char **BKE_sound_get_device_names(); typedef void (*SoundJackSyncCallback)(struct Main *bmain, int mode, double time); @@ -202,7 +198,3 @@ void BKE_sound_jack_scene_update(struct Scene *scene, int mode, double time); struct Depsgraph; void BKE_sound_evaluate(struct Depsgraph *depsgraph, struct Main *bmain, struct bSound *sound); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_speaker.h b/source/blender/blenkernel/BKE_speaker.h index 93692c12748..add0b48777d 100644 --- a/source/blender/blenkernel/BKE_speaker.h +++ b/source/blender/blenkernel/BKE_speaker.h @@ -9,15 +9,7 @@ * \brief General operations for speakers. */ -#ifdef __cplusplus -extern "C" { -#endif - struct Main; struct Speaker; struct Speaker *BKE_speaker_add(struct Main *bmain, const char *name); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_studiolight.h b/source/blender/blenkernel/BKE_studiolight.h index 830e45f06b1..e5ccdb68930 100644 --- a/source/blender/blenkernel/BKE_studiolight.h +++ b/source/blender/blenkernel/BKE_studiolight.h @@ -16,10 +16,6 @@ #include "DNA_userdef_types.h" /* for #SolidLight */ -#ifdef __cplusplus -extern "C" { -#endif - struct ImBuf; #define STUDIOLIGHT_ICON_ID_TYPE_RADIANCE (1 << 0) @@ -120,7 +116,3 @@ void BKE_studiolight_set_free_function(StudioLight *sl, StudioLightFreeFunction *free_function, void *data); void BKE_studiolight_unset_icon_id(StudioLight *sl, int icon_id); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_text.h b/source/blender/blenkernel/BKE_text.h index 6a3946c1c8a..78431afba56 100644 --- a/source/blender/blenkernel/BKE_text.h +++ b/source/blender/blenkernel/BKE_text.h @@ -7,10 +7,6 @@ * \ingroup bke */ -#ifdef __cplusplus -extern "C" { -#endif - struct Main; struct Text; struct TextLine; @@ -158,7 +154,3 @@ char *txt_to_buf_for_undo(struct Text *text, size_t *r_buf_len) * Decode a buffer from #txt_to_buf_for_undo. */ void txt_from_buf_for_undo(struct Text *text, const char *buf, size_t buf_len) ATTR_NONNULL(1, 2); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_text_suggestions.h b/source/blender/blenkernel/BKE_text_suggestions.h index 8e728eee6d6..73dd44ccf7f 100644 --- a/source/blender/blenkernel/BKE_text_suggestions.h +++ b/source/blender/blenkernel/BKE_text_suggestions.h @@ -7,10 +7,6 @@ * \ingroup bke */ -#ifdef __cplusplus -extern "C" { -#endif - struct Text; typedef struct SuggItem { @@ -56,7 +52,3 @@ SuggItem *texttool_suggest_last(void); void texttool_suggest_select(SuggItem *sel); SuggItem *texttool_suggest_selected(void); int *texttool_suggest_top(void); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_texture.h b/source/blender/blenkernel/BKE_texture.h index 4a75ca45b54..1f69fab81b0 100644 --- a/source/blender/blenkernel/BKE_texture.h +++ b/source/blender/blenkernel/BKE_texture.h @@ -7,10 +7,6 @@ * \ingroup bke */ -#ifdef __cplusplus -extern "C" { -#endif - struct Brush; struct ColorBand; struct FreestyleLineStyle; @@ -90,7 +86,3 @@ void BKE_texture_get_value(struct Tex *texture, * Make sure all images used by texture are loaded into pool. */ void BKE_texture_fetch_images_for_pool(struct Tex *texture, struct ImagePool *pool); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_tracking.h b/source/blender/blenkernel/BKE_tracking.h index b7a6151b970..fccb010871c 100644 --- a/source/blender/blenkernel/BKE_tracking.h +++ b/source/blender/blenkernel/BKE_tracking.h @@ -10,10 +10,6 @@ #include "BLI_sys_types.h" -#ifdef __cplusplus -extern "C" { -#endif - struct Camera; struct ImBuf; struct ListBase; @@ -828,7 +824,3 @@ void BKE_tracking_get_rna_path_prefix_for_plane_track( #define PLANE_TRACK_VIEW_SELECTED(plane_track) \ ((((plane_track)->flag & PLANE_TRACK_HIDDEN) == 0) && ((plane_track)->flag & SELECT)) - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/BKE_world.h b/source/blender/blenkernel/BKE_world.h index 8aae3df9349..c974dfb924a 100644 --- a/source/blender/blenkernel/BKE_world.h +++ b/source/blender/blenkernel/BKE_world.h @@ -7,17 +7,9 @@ * \ingroup bke */ -#ifdef __cplusplus -extern "C" { -#endif - struct Depsgraph; struct Main; struct World; struct World *BKE_world_add(struct Main *bmain, const char *name); void BKE_world_eval(struct Depsgraph *depsgraph, struct World *world); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/intern/CCGSubSurf.h b/source/blender/blenkernel/intern/CCGSubSurf.h index 0c38d32461a..964e1e639d2 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf.h +++ b/source/blender/blenkernel/intern/CCGSubSurf.h @@ -8,10 +8,6 @@ * \ingroup bke */ -#ifdef __cplusplus -extern "C" { -#endif - using CCGMeshHDL = void *; using CCGVertHDL = void *; using CCGEdgeHDL = void *; @@ -221,7 +217,3 @@ void ccgEdgeIterator_next(CCGEdgeIterator *ei); CCGFace *ccgFaceIterator_getCurrent(CCGFaceIterator *fi); int ccgFaceIterator_isStopped(CCGFaceIterator *fi); void ccgFaceIterator_next(CCGFaceIterator *fi); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/intern/CCGSubSurf_inline.h b/source/blender/blenkernel/intern/CCGSubSurf_inline.h index dc0a495dfe0..a4c5d3d3b8e 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf_inline.h +++ b/source/blender/blenkernel/intern/CCGSubSurf_inline.h @@ -17,10 +17,6 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif - BLI_INLINE int ccg_gridsize(int level) { BLI_assert(level > 0); @@ -266,7 +262,3 @@ BLI_INLINE void VertDataAvg4(float v[], v[i] = (a[i] + b[i] + c[i] + d[i]) * 0.25f; } } - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/intern/CCGSubSurf_intern.h b/source/blender/blenkernel/intern/CCGSubSurf_intern.h index c1eeb9165d7..6bd152f0198 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf_intern.h +++ b/source/blender/blenkernel/intern/CCGSubSurf_intern.h @@ -10,10 +10,6 @@ #include "CCGSubSurf.h" -#ifdef __cplusplus -extern "C" { -#endif - /** * Definitions which defines internal behavior of CCGSubSurf. */ @@ -260,7 +256,3 @@ void ccgSubSurf__sync_legacy(CCGSubSurf *ss); #ifdef DUMP_RESULT_GRIDS void ccgSubSurf__dumpCoords(CCGSubSurf *ss); #endif - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/intern/ocean_intern.h b/source/blender/blenkernel/intern/ocean_intern.h index 66036e8d26d..ba0ef98be77 100644 --- a/source/blender/blenkernel/intern/ocean_intern.h +++ b/source/blender/blenkernel/intern/ocean_intern.h @@ -8,10 +8,6 @@ * \ingroup bke */ -#ifdef __cplusplus -extern "C" { -#endif - #ifdef WITH_OCEANSIM # include "BLI_threads.h" # include "fftw3.h" @@ -117,7 +113,3 @@ typedef struct Ocean { int stub; } Ocean; #endif - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/nla_private.h b/source/blender/blenkernel/nla_private.h index e49239b2d98..1476243f48d 100644 --- a/source/blender/blenkernel/nla_private.h +++ b/source/blender/blenkernel/nla_private.h @@ -16,10 +16,6 @@ #include "RNA_types.hh" -#ifdef __cplusplus -extern "C" { -#endif - struct AnimationEvalContext; /* --------------- NLA Evaluation DataTypes ----------------------- */ @@ -294,7 +290,3 @@ void nlasnapshot_blend_strip_no_blend(PointerRNA *ptr, NlaEvalStrip *nes, NlaEvalSnapshot *snapshot, const struct AnimationEvalContext *anim_eval_context); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/particle_private.h b/source/blender/blenkernel/particle_private.h index f9c2b957ec6..a12abcd0cbe 100644 --- a/source/blender/blenkernel/particle_private.h +++ b/source/blender/blenkernel/particle_private.h @@ -10,10 +10,6 @@ #include "BKE_particle.h" -#ifdef __cplusplus -extern "C" { -#endif - struct CurveMapping; typedef struct ParticleChildModifierContext { @@ -56,7 +52,3 @@ void do_child_modifiers(const ParticleChildModifierContext *modifier_ctx, float mat[4][4], ParticleKey *state, float t); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/tracking_private.h b/source/blender/blenkernel/tracking_private.h index 8c9643a2b7c..ee5bb628d9b 100644 --- a/source/blender/blenkernel/tracking_private.h +++ b/source/blender/blenkernel/tracking_private.h @@ -16,10 +16,6 @@ #include "BLI_threads.h" -#ifdef __cplusplus -extern "C" { -#endif - struct GHash; struct MovieTracking; struct MovieTrackingMarker; @@ -184,7 +180,3 @@ TrackingImageAccessor *tracking_image_accessor_new(MovieClip *clips[MAX_ACCESSOR MovieTrackingTrack **tracks, int num_tracks); void tracking_image_accessor_destroy(TrackingImageAccessor *accessor); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/draw/engines/compositor/compositor_engine.cc b/source/blender/draw/engines/compositor/compositor_engine.cc index 2e5fb280d7e..72c34a6724c 100644 --- a/source/blender/draw/engines/compositor/compositor_engine.cc +++ b/source/blender/draw/engines/compositor/compositor_engine.cc @@ -325,8 +325,6 @@ static void compositor_engine_update(void *data) } } -extern "C" { - DrawEngineType draw_engine_compositor_type = { /*next*/ nullptr, /*prev*/ nullptr, @@ -343,4 +341,3 @@ DrawEngineType draw_engine_compositor_type = { /*render_to_image*/ nullptr, /*store_metadata*/ nullptr, }; -} diff --git a/source/blender/draw/engines/compositor/compositor_engine.h b/source/blender/draw/engines/compositor/compositor_engine.h index 77e2f61035f..b45fa056538 100644 --- a/source/blender/draw/engines/compositor/compositor_engine.h +++ b/source/blender/draw/engines/compositor/compositor_engine.h @@ -4,14 +4,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - struct DrawEngineType; extern DrawEngineType draw_engine_compositor_type; - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/draw/engines/eevee_next/eevee_engine.cc b/source/blender/draw/engines/eevee_next/eevee_engine.cc index 4d74fd4d043..a0053d0678e 100644 --- a/source/blender/draw/engines/eevee_next/eevee_engine.cc +++ b/source/blender/draw/engines/eevee_next/eevee_engine.cc @@ -183,8 +183,6 @@ static void eevee_render_update_passes(RenderEngine *engine, Scene *scene, ViewL eevee::Instance::update_passes(engine, scene, view_layer); } -extern "C" { - DrawEngineType draw_engine_eevee_next_type = { /*next*/ nullptr, /*prev*/ nullptr, @@ -225,4 +223,3 @@ RenderEngineType DRW_engine_viewport_eevee_next_type = { /*call*/ nullptr, }, }; -} diff --git a/source/blender/draw/engines/eevee_next/eevee_engine.h b/source/blender/draw/engines/eevee_next/eevee_engine.h index 3c1e6e5eb34..e9012e280ce 100644 --- a/source/blender/draw/engines/eevee_next/eevee_engine.h +++ b/source/blender/draw/engines/eevee_next/eevee_engine.h @@ -11,13 +11,5 @@ #include "DRW_render.hh" #include "RE_engine.h" -#ifdef __cplusplus -extern "C" { -#endif - extern DrawEngineType draw_engine_eevee_next_type; extern RenderEngineType DRW_engine_viewport_eevee_next_type; - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/draw/engines/external/external_engine.h b/source/blender/draw/engines/external/external_engine.h index 5fb54eecd49..78dd6932e58 100644 --- a/source/blender/draw/engines/external/external_engine.h +++ b/source/blender/draw/engines/external/external_engine.h @@ -8,10 +8,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - struct DrawEngineType; struct RenderEngineType; @@ -24,7 +20,3 @@ extern RenderEngineType DRW_engine_viewport_external_type; * * NOTE: Released by the draw engine when it is done drawing. */ bool DRW_engine_external_acquire_for_image_editor(void); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/draw/engines/gpencil/gpencil_shader_shared.h b/source/blender/draw/engines/gpencil/gpencil_shader_shared.h index 2861b9b3f54..fa858619830 100644 --- a/source/blender/draw/engines/gpencil/gpencil_shader_shared.h +++ b/source/blender/draw/engines/gpencil/gpencil_shader_shared.h @@ -6,15 +6,6 @@ #ifndef GPU_SHADER # include "GPU_shader_shared_utils.hh" - -# ifndef __cplusplus -typedef struct gpMaterial gpMaterial; -typedef struct gpLight gpLight; -typedef enum gpMaterialFlag gpMaterialFlag; -# ifdef GP_LIGHT -typedef enum gpLightType gpLightType; -# endif -# endif #endif enum gpMaterialFlag : uint32_t { diff --git a/source/blender/draw/engines/image/image_engine.cc b/source/blender/draw/engines/image/image_engine.cc index 5638c26062d..9af77062d10 100644 --- a/source/blender/draw/engines/image/image_engine.cc +++ b/source/blender/draw/engines/image/image_engine.cc @@ -83,8 +83,6 @@ static void IMAGE_instance_free(void *instance) } // namespace blender::image_engine -extern "C" { - using namespace blender::image_engine; DrawEngineType draw_engine_image_type = { @@ -103,4 +101,3 @@ DrawEngineType draw_engine_image_type = { /*render_to_image*/ nullptr, /*store_metadata*/ nullptr, }; -} diff --git a/source/blender/draw/engines/image/image_engine.h b/source/blender/draw/engines/image/image_engine.h index 5ff434accbd..a7cb77ba2e5 100644 --- a/source/blender/draw/engines/image/image_engine.h +++ b/source/blender/draw/engines/image/image_engine.h @@ -8,14 +8,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - struct DrawEngineType; extern DrawEngineType draw_engine_image_type; - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/draw/engines/overlay/overlay_engine.h b/source/blender/draw/engines/overlay/overlay_engine.h index c58487db92c..9467e03db56 100644 --- a/source/blender/draw/engines/overlay/overlay_engine.h +++ b/source/blender/draw/engines/overlay/overlay_engine.h @@ -8,14 +8,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - struct DrawEngineType; extern DrawEngineType draw_engine_overlay_next_type; - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/draw/engines/overlay/overlay_shader_shared.h b/source/blender/draw/engines/overlay/overlay_shader_shared.h index 58fd531ebe2..bb5754bc203 100644 --- a/source/blender/draw/engines/overlay/overlay_shader_shared.h +++ b/source/blender/draw/engines/overlay/overlay_shader_shared.h @@ -9,16 +9,6 @@ # include "DNA_action_types.h" # include "DNA_view3d_types.h" - -# ifdef __cplusplus -extern "C" { -# else -typedef enum OVERLAY_GridBits OVERLAY_GridBits; -# endif -typedef struct OVERLAY_GridData OVERLAY_GridData; -typedef struct ThemeColorData ThemeColorData; -typedef struct ExtraInstanceData ExtraInstanceData; -typedef struct VertexData VertexData; #endif /* TODO(fclem): Should eventually become OVERLAY_BackgroundType. @@ -215,7 +205,7 @@ struct ExtraInstanceData { float4 color_; float4x4 object_to_world; -#if !defined(GPU_SHADER) && defined(__cplusplus) +#if !defined(GPU_SHADER) ExtraInstanceData(const float4x4 &object_to_world, const float4 &color, float draw_size) { this->color_ = color; @@ -351,9 +341,3 @@ struct BoneStickData { #endif }; BLI_STATIC_ASSERT_ALIGN(BoneStickData, 16) - -#ifndef GPU_SHADER -# ifdef __cplusplus -} -# endif -#endif diff --git a/source/blender/draw/engines/workbench/workbench_engine.cc b/source/blender/draw/engines/workbench/workbench_engine.cc index e41142e0745..cd0715fd8b3 100644 --- a/source/blender/draw/engines/workbench/workbench_engine.cc +++ b/source/blender/draw/engines/workbench/workbench_engine.cc @@ -792,8 +792,6 @@ static void workbench_render_update_passes(RenderEngine *engine, } } -extern "C" { - DrawEngineType draw_engine_workbench = { /*next*/ nullptr, /*prev*/ nullptr, @@ -834,6 +832,5 @@ RenderEngineType DRW_engine_viewport_workbench_type = { /*call*/ nullptr, }, }; -} /** \} */ diff --git a/source/blender/draw/engines/workbench/workbench_engine.h b/source/blender/draw/engines/workbench/workbench_engine.h index db1c143d901..ea8c0947fa6 100644 --- a/source/blender/draw/engines/workbench/workbench_engine.h +++ b/source/blender/draw/engines/workbench/workbench_engine.h @@ -8,14 +8,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - struct RenderEngineType; extern RenderEngineType DRW_engine_viewport_workbench_type; - -#ifdef __cplusplus -}; -#endif diff --git a/source/blender/editors/armature/meshlaplacian.h b/source/blender/editors/armature/meshlaplacian.h index 65ee82fbe36..eff9ecc042c 100644 --- a/source/blender/editors/armature/meshlaplacian.h +++ b/source/blender/editors/armature/meshlaplacian.h @@ -9,10 +9,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - // #define RIGID_DEFORM struct Mesh; @@ -57,10 +53,6 @@ void rigid_deform_iteration(void); void rigid_deform_end(int cancel); #endif -#ifdef __cplusplus -} -#endif - /* Harmonic Coordinates */ /* ED_mesh_deform_bind_callback(...) defined in ED_armature.hh */ diff --git a/source/blender/editors/gizmo_library/gizmo_geometry.h b/source/blender/editors/gizmo_library/gizmo_geometry.h index 1d7d1fea7d0..6e33735b917 100644 --- a/source/blender/editors/gizmo_library/gizmo_geometry.h +++ b/source/blender/editors/gizmo_library/gizmo_geometry.h @@ -16,10 +16,6 @@ #include "BLI_sys_types.h" -#ifdef __cplusplus -extern "C" { -#endif - typedef struct GizmoGeomInfo { int nverts; int ntris; @@ -36,7 +32,3 @@ extern GizmoGeomInfo wm_gizmo_geom_data_cube; /* dial gizmo */ extern GizmoGeomInfo wm_gizmo_geom_data_dial; - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/space_file/fsmenu.h b/source/blender/editors/space_file/fsmenu.h index 3b91ae3c19b..cc7bff79120 100644 --- a/source/blender/editors/space_file/fsmenu.h +++ b/source/blender/editors/space_file/fsmenu.h @@ -13,10 +13,6 @@ /* XXX could become UserPref */ #define FSMENU_RECENT_MAX 10 -#ifdef __cplusplus -extern "C" { -#endif - /** * Inserts a new fsmenu entry with the given \a path. * Duplicate entries are not added. @@ -63,7 +59,3 @@ void fsmenu_refresh_bookmarks_status(struct wmWindowManager *wm, struct FSMenu * int fsmenu_get_active_indices(struct FSMenu *fsmenu, enum FSMenuCategory category, const char *dir); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/FRS_freestyle.h b/source/blender/freestyle/FRS_freestyle.h index b1b961576e0..2c1a92bb86c 100644 --- a/source/blender/freestyle/FRS_freestyle.h +++ b/source/blender/freestyle/FRS_freestyle.h @@ -8,10 +8,6 @@ * \ingroup freestyle */ -#ifdef __cplusplus -extern "C" { -#endif - struct FreestyleConfig; struct FreestyleLineStyle; struct Material; @@ -56,7 +52,3 @@ bool FRS_move_active_lineset(struct FreestyleConfig *config, int direction); /* Testing */ struct Material *FRS_create_stroke_material(struct Main *bmain, struct FreestyleLineStyle *linestyle); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp index f26475ee373..9790cb85104 100644 --- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp +++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp @@ -50,8 +50,6 @@ using namespace Freestyle; #include "FRS_freestyle.h" -extern "C" { - FreestyleGlobals g_freestyle; // Freestyle configuration @@ -760,5 +758,3 @@ Material *FRS_create_stroke_material(Main *bmain, FreestyleLineStyle *linestyle) ma->id.us = 0; return ma; } - -} // extern "C" diff --git a/source/blender/freestyle/intern/python/BPy_BBox.cpp b/source/blender/freestyle/intern/python/BPy_BBox.cpp index 783bcee51ed..dcd710e223e 100644 --- a/source/blender/freestyle/intern/python/BPy_BBox.cpp +++ b/source/blender/freestyle/intern/python/BPy_BBox.cpp @@ -8,10 +8,6 @@ #include "BPy_BBox.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; using namespace Freestyle::Geometry; @@ -109,7 +105,3 @@ PyTypeObject BBox_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_BBox.h b/source/blender/freestyle/intern/python/BPy_BBox.h index 7e3d34c87ae..0cfb4fdeb6a 100644 --- a/source/blender/freestyle/intern/python/BPy_BBox.h +++ b/source/blender/freestyle/intern/python/BPy_BBox.h @@ -15,10 +15,6 @@ extern "C" { #include "../geometry/BBox.h" #include "../geometry/Geom.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject BBox_Type; @@ -36,7 +32,3 @@ typedef struct { int BBox_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp index 60d83b7fd61..9d9ad3b1e2e 100644 --- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp +++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp @@ -11,10 +11,6 @@ #include "BPy_Convert.h" #include "BPy_Interface0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -178,7 +174,3 @@ PyTypeObject BinaryPredicate0D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h index 40c33d95180..3b03166aeda 100644 --- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h +++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h @@ -14,10 +14,6 @@ extern "C" { #include "../stroke/Predicates0D.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject BinaryPredicate0D_Type; @@ -36,7 +32,3 @@ typedef struct { int BinaryPredicate0D_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp index 2faded49976..10a7243dce6 100644 --- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp +++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp @@ -17,10 +17,6 @@ #include "BinaryPredicate1D/BPy_TrueBP1D.h" #include "BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -209,7 +205,3 @@ PyTypeObject BinaryPredicate1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h index 8731ad87de4..cc067275042 100644 --- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h +++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h @@ -14,10 +14,6 @@ extern "C" { #include "../stroke/Predicates1D.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject BinaryPredicate1D_Type; @@ -36,7 +32,3 @@ typedef struct { int BinaryPredicate1D_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_ContextFunctions.cpp b/source/blender/freestyle/intern/python/BPy_ContextFunctions.cpp index 1e59923714d..96a20899b75 100644 --- a/source/blender/freestyle/intern/python/BPy_ContextFunctions.cpp +++ b/source/blender/freestyle/intern/python/BPy_ContextFunctions.cpp @@ -15,10 +15,6 @@ using namespace Freestyle; -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// //------------------------ MODULE FUNCTIONS ---------------------------------- @@ -336,7 +332,3 @@ int ContextFunctions_Init(PyObject *module) } /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_ContextFunctions.h b/source/blender/freestyle/intern/python/BPy_ContextFunctions.h index eb65b8ed91e..38ab4afa542 100644 --- a/source/blender/freestyle/intern/python/BPy_ContextFunctions.h +++ b/source/blender/freestyle/intern/python/BPy_ContextFunctions.h @@ -12,14 +12,6 @@ extern "C" { #include } -#ifdef __cplusplus -extern "C" { -#endif - /*---------------------------Python BPy_ContextFunctions visible prototypes-----------*/ int ContextFunctions_Init(PyObject *module); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp index 30e5c8d096f..ce503e8f7d5 100644 --- a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp +++ b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp @@ -46,10 +46,6 @@ #include "BKE_colortools.hh" /* BKE_curvemapping_evaluateF() */ #include "BKE_material.hh" /* ramp_blend() */ -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// //------------------------ MODULE FUNCTIONS ---------------------------------- @@ -599,7 +595,3 @@ PyObject *Freestyle_Init() } /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_Freestyle.h b/source/blender/freestyle/intern/python/BPy_Freestyle.h index 74d0ad2503b..9f58627946d 100644 --- a/source/blender/freestyle/intern/python/BPy_Freestyle.h +++ b/source/blender/freestyle/intern/python/BPy_Freestyle.h @@ -8,10 +8,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - #include /////////////////////////////////////////////////////////////////////////////////////////// @@ -21,7 +17,3 @@ extern "C" { PyObject *Freestyle_Init(void); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp index 65004abe986..e4a4d960e1f 100644 --- a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp +++ b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp @@ -13,10 +13,6 @@ #include "BLI_hash_mm2a.hh" #include "BLI_math_vector.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -590,7 +586,3 @@ PyTypeObject FrsMaterial_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_FrsMaterial.h b/source/blender/freestyle/intern/python/BPy_FrsMaterial.h index 695b8d27a68..f3294c97424 100644 --- a/source/blender/freestyle/intern/python/BPy_FrsMaterial.h +++ b/source/blender/freestyle/intern/python/BPy_FrsMaterial.h @@ -14,10 +14,6 @@ extern "C" { #include "../scene_graph/FrsMaterial.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject FrsMaterial_Type; @@ -37,7 +33,3 @@ int FrsMaterial_Init(PyObject *module); void FrsMaterial_mathutils_register_callback(); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp b/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp index 0d9a1d9bc3d..6de4f4d67c5 100644 --- a/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp +++ b/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp @@ -15,10 +15,6 @@ #include -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -372,7 +368,3 @@ PyTypeObject FrsNoise_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_FrsNoise.h b/source/blender/freestyle/intern/python/BPy_FrsNoise.h index ff9fb0cb190..84696a519ae 100644 --- a/source/blender/freestyle/intern/python/BPy_FrsNoise.h +++ b/source/blender/freestyle/intern/python/BPy_FrsNoise.h @@ -15,10 +15,6 @@ extern "C" { #include "../geometry/Noise.h" #include "../system/PseudoNoise.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject FrsNoise_Type; @@ -37,7 +33,3 @@ typedef struct { int FrsNoise_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_Id.cpp b/source/blender/freestyle/intern/python/BPy_Id.cpp index f2dcb7ae325..69845104268 100644 --- a/source/blender/freestyle/intern/python/BPy_Id.cpp +++ b/source/blender/freestyle/intern/python/BPy_Id.cpp @@ -10,10 +10,6 @@ #include "BPy_Convert.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -203,7 +199,3 @@ PyTypeObject Id_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_Id.h b/source/blender/freestyle/intern/python/BPy_Id.h index 5dc93588843..a1362d4d95f 100644 --- a/source/blender/freestyle/intern/python/BPy_Id.h +++ b/source/blender/freestyle/intern/python/BPy_Id.h @@ -16,10 +16,6 @@ extern "C" { #include "../system/Id.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject Id_Type; @@ -37,7 +33,3 @@ typedef struct { int Id_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp b/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp index eafeaf77aab..728a92a74ee 100644 --- a/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp +++ b/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp @@ -16,10 +16,6 @@ #include "BLI_sys_types.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -239,7 +235,3 @@ int IntegrationType_Init(PyObject *module) } /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_IntegrationType.h b/source/blender/freestyle/intern/python/BPy_IntegrationType.h index a6e2af08937..79c28ea5271 100644 --- a/source/blender/freestyle/intern/python/BPy_IntegrationType.h +++ b/source/blender/freestyle/intern/python/BPy_IntegrationType.h @@ -14,10 +14,6 @@ extern "C" { #include "../view_map/Interface1D.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject IntegrationType_Type; @@ -30,7 +26,3 @@ extern PyTypeObject IntegrationType_Type; int IntegrationType_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_Interface0D.cpp b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp index f301ad01468..9dc76755d68 100644 --- a/source/blender/freestyle/intern/python/BPy_Interface0D.cpp +++ b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp @@ -18,10 +18,6 @@ #include "Interface0D/ViewVertex/BPy_TVertex.h" #include "Interface1D/BPy_FEdge.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -353,7 +349,3 @@ PyTypeObject Interface0D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_Interface0D.h b/source/blender/freestyle/intern/python/BPy_Interface0D.h index 866fcbc7a3c..67cb29d7563 100644 --- a/source/blender/freestyle/intern/python/BPy_Interface0D.h +++ b/source/blender/freestyle/intern/python/BPy_Interface0D.h @@ -14,10 +14,6 @@ extern "C" { #include "../view_map/Interface0D.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject Interface0D_Type; @@ -37,7 +33,3 @@ typedef struct { int Interface0D_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp index 3f6d31efb8a..0c02d408655 100644 --- a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp +++ b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp @@ -19,10 +19,6 @@ #include "BPy_MediumType.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -381,7 +377,3 @@ PyTypeObject Interface1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_Interface1D.h b/source/blender/freestyle/intern/python/BPy_Interface1D.h index 28aa292c0b1..da2d9277f64 100644 --- a/source/blender/freestyle/intern/python/BPy_Interface1D.h +++ b/source/blender/freestyle/intern/python/BPy_Interface1D.h @@ -14,10 +14,6 @@ extern "C" { #include "../view_map/Interface1D.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject Interface1D_Type; @@ -37,7 +33,3 @@ typedef struct { int Interface1D_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_Iterator.cpp b/source/blender/freestyle/intern/python/BPy_Iterator.cpp index 430e9451333..8ec3cde62ff 100644 --- a/source/blender/freestyle/intern/python/BPy_Iterator.cpp +++ b/source/blender/freestyle/intern/python/BPy_Iterator.cpp @@ -20,10 +20,6 @@ #include "Iterator/BPy_ViewEdgeIterator.h" #include "Iterator/BPy_orientedViewEdgeIterator.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -258,7 +254,3 @@ PyTypeObject Iterator_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_Iterator.h b/source/blender/freestyle/intern/python/BPy_Iterator.h index 8a9a40dc222..1464aece8cb 100644 --- a/source/blender/freestyle/intern/python/BPy_Iterator.h +++ b/source/blender/freestyle/intern/python/BPy_Iterator.h @@ -14,10 +14,6 @@ extern "C" { #include "../system/Iterator.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject Iterator_Type; @@ -35,7 +31,3 @@ typedef struct { int Iterator_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_MediumType.cpp b/source/blender/freestyle/intern/python/BPy_MediumType.cpp index 672bdfa1893..c26e4d2490e 100644 --- a/source/blender/freestyle/intern/python/BPy_MediumType.cpp +++ b/source/blender/freestyle/intern/python/BPy_MediumType.cpp @@ -10,10 +10,6 @@ #include "BPy_Convert.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -92,7 +88,3 @@ int MediumType_Init(PyObject *module) } /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_MediumType.h b/source/blender/freestyle/intern/python/BPy_MediumType.h index 91d570d4b04..69ef142bbc6 100644 --- a/source/blender/freestyle/intern/python/BPy_MediumType.h +++ b/source/blender/freestyle/intern/python/BPy_MediumType.h @@ -14,10 +14,6 @@ extern "C" { #include "../stroke/Stroke.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject MediumType_Type; @@ -34,7 +30,3 @@ typedef struct { int MediumType_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_Nature.cpp b/source/blender/freestyle/intern/python/BPy_Nature.cpp index d9849f550bd..9a130302817 100644 --- a/source/blender/freestyle/intern/python/BPy_Nature.cpp +++ b/source/blender/freestyle/intern/python/BPy_Nature.cpp @@ -10,10 +10,6 @@ #include "BPy_Convert.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -235,7 +231,3 @@ static PyObject *BPy_Nature_or(PyObject *a, PyObject *b) } /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_Nature.h b/source/blender/freestyle/intern/python/BPy_Nature.h index c70774b8b75..f35f4b09ad8 100644 --- a/source/blender/freestyle/intern/python/BPy_Nature.h +++ b/source/blender/freestyle/intern/python/BPy_Nature.h @@ -14,10 +14,6 @@ extern "C" { #include "../winged_edge/Nature.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject Nature_Type; @@ -34,7 +30,3 @@ typedef struct { int Nature_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_Operators.cpp b/source/blender/freestyle/intern/python/BPy_Operators.cpp index b673ae48493..5cb9ef9d28f 100644 --- a/source/blender/freestyle/intern/python/BPy_Operators.cpp +++ b/source/blender/freestyle/intern/python/BPy_Operators.cpp @@ -22,10 +22,6 @@ #include -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -836,7 +832,3 @@ PyTypeObject Operators_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_Operators.h b/source/blender/freestyle/intern/python/BPy_Operators.h index 2976dafc717..850454630fc 100644 --- a/source/blender/freestyle/intern/python/BPy_Operators.h +++ b/source/blender/freestyle/intern/python/BPy_Operators.h @@ -14,10 +14,6 @@ extern "C" { #include "../stroke/Operators.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject Operators_Type; @@ -34,7 +30,3 @@ typedef struct { int Operators_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_SShape.cpp b/source/blender/freestyle/intern/python/BPy_SShape.cpp index ffb01bf6cb1..77e018b185a 100644 --- a/source/blender/freestyle/intern/python/BPy_SShape.cpp +++ b/source/blender/freestyle/intern/python/BPy_SShape.cpp @@ -16,10 +16,6 @@ #include "BLI_sys_types.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -324,7 +320,3 @@ PyTypeObject SShape_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_SShape.h b/source/blender/freestyle/intern/python/BPy_SShape.h index 6abb43e4e85..b9874a9b065 100644 --- a/source/blender/freestyle/intern/python/BPy_SShape.h +++ b/source/blender/freestyle/intern/python/BPy_SShape.h @@ -14,10 +14,6 @@ extern "C" { #include "../view_map/Silhouette.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject SShape_Type; @@ -36,7 +32,3 @@ typedef struct { int SShape_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp index 8a7ffeb9f09..30580e2824b 100644 --- a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp +++ b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp @@ -10,10 +10,6 @@ #include "BPy_Convert.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -736,7 +732,3 @@ PyTypeObject StrokeAttribute_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h index d847b1c5d3c..93a9f46f6dc 100644 --- a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h +++ b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h @@ -14,10 +14,6 @@ extern "C" { #include "../stroke/Stroke.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject StrokeAttribute_Type; @@ -38,7 +34,3 @@ int StrokeAttribute_Init(PyObject *module); void StrokeAttribute_mathutils_register_callback(); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp b/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp index 41420234591..329efa8ab55 100644 --- a/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp +++ b/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp @@ -30,10 +30,6 @@ #include "StrokeShader/BPy_ThicknessNoiseShader.h" #include "StrokeShader/BPy_TipRemoverShader.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -300,7 +296,3 @@ PyTypeObject StrokeShader_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_StrokeShader.h b/source/blender/freestyle/intern/python/BPy_StrokeShader.h index 69fa4e65471..f986076e18d 100644 --- a/source/blender/freestyle/intern/python/BPy_StrokeShader.h +++ b/source/blender/freestyle/intern/python/BPy_StrokeShader.h @@ -16,10 +16,6 @@ extern "C" { #include "../stroke/StrokeShader.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject StrokeShader_Type; @@ -38,7 +34,3 @@ typedef struct { int StrokeShader_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp index 4d632682de7..4deaba611d8 100644 --- a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp +++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp @@ -19,10 +19,6 @@ #include "UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h" #include "UnaryFunction0D/BPy_UnaryFunction0DViewShape.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -154,7 +150,3 @@ PyTypeObject UnaryFunction0D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h index 69a414bd898..9df7fe22dd9 100644 --- a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h +++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h @@ -14,10 +14,6 @@ extern "C" { #include "../view_map/Functions0D.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject UnaryFunction0D_Type; @@ -36,7 +32,3 @@ typedef struct { int UnaryFunction0D_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp index e4873d114b4..47aa221ccee 100644 --- a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp +++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp @@ -17,10 +17,6 @@ #include "UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h" #include "UnaryFunction1D/BPy_UnaryFunction1DVoid.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -148,7 +144,3 @@ PyTypeObject UnaryFunction1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h index cf6558e146b..38914c3dc7d 100644 --- a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h +++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h @@ -14,10 +14,6 @@ extern "C" { #include "../view_map/Functions1D.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject UnaryFunction1D_Type; @@ -36,7 +32,3 @@ typedef struct { int UnaryFunction1D_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp index 51f20b7fbb1..542485f3dc0 100644 --- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp +++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp @@ -13,10 +13,6 @@ #include "UnaryPredicate0D/BPy_FalseUP0D.h" #include "UnaryPredicate0D/BPy_TrueUP0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -196,7 +192,3 @@ PyTypeObject UnaryPredicate0D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h index 3b43df756d3..09119963437 100644 --- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h +++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h @@ -14,10 +14,6 @@ extern "C" { #include "../stroke/Predicates0D.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject UnaryPredicate0D_Type; @@ -36,7 +32,3 @@ typedef struct { int UnaryPredicate0D_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp index 1cec17f14e9..8945c01cf10 100644 --- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp +++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp @@ -22,10 +22,6 @@ #include "UnaryPredicate1D/BPy_TrueUP1D.h" #include "UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -246,7 +242,3 @@ PyTypeObject UnaryPredicate1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h index 9c220381017..6c1b37f0964 100644 --- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h +++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h @@ -14,10 +14,6 @@ extern "C" { #include "../stroke/Predicates1D.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject UnaryPredicate1D_Type; @@ -36,7 +32,3 @@ typedef struct { int UnaryPredicate1D_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_ViewMap.cpp b/source/blender/freestyle/intern/python/BPy_ViewMap.cpp index 779c1c79b7e..7570730143d 100644 --- a/source/blender/freestyle/intern/python/BPy_ViewMap.cpp +++ b/source/blender/freestyle/intern/python/BPy_ViewMap.cpp @@ -13,10 +13,6 @@ #include "Interface1D/BPy_FEdge.h" #include "Interface1D/BPy_ViewEdge.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -218,7 +214,3 @@ PyTypeObject ViewMap_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_ViewMap.h b/source/blender/freestyle/intern/python/BPy_ViewMap.h index d99ee894781..9cc1c0947c3 100644 --- a/source/blender/freestyle/intern/python/BPy_ViewMap.h +++ b/source/blender/freestyle/intern/python/BPy_ViewMap.h @@ -14,10 +14,6 @@ extern "C" { #include "../view_map/ViewMap.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject ViewMap_Type; @@ -35,7 +31,3 @@ typedef struct { int ViewMap_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_ViewShape.cpp b/source/blender/freestyle/intern/python/BPy_ViewShape.cpp index b0f463e0dd9..27f63afa432 100644 --- a/source/blender/freestyle/intern/python/BPy_ViewShape.cpp +++ b/source/blender/freestyle/intern/python/BPy_ViewShape.cpp @@ -15,10 +15,6 @@ #include "BLI_sys_types.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -399,7 +395,3 @@ PyTypeObject ViewShape_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BPy_ViewShape.h b/source/blender/freestyle/intern/python/BPy_ViewShape.h index 07ddce17a2f..00e32af6a2c 100644 --- a/source/blender/freestyle/intern/python/BPy_ViewShape.h +++ b/source/blender/freestyle/intern/python/BPy_ViewShape.h @@ -16,10 +16,6 @@ extern "C" { #include "BPy_SShape.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject ViewShape_Type; @@ -39,7 +35,3 @@ typedef struct { int ViewShape_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.cpp index 045682e1dbc..a18ee9cd147 100644 --- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.cpp +++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.cpp @@ -8,10 +8,6 @@ #include "BPy_FalseBP1D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -89,7 +85,3 @@ PyTypeObject FalseBP1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.h b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.h index 76c92c605d0..04eadac5d70 100644 --- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.h +++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.h @@ -10,10 +10,6 @@ #include "../BPy_BinaryPredicate1D.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject FalseBP1D_Type; @@ -26,7 +22,3 @@ typedef struct { } BPy_FalseBP1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.cpp index f4e25ebff86..163c6b50bbb 100644 --- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.cpp +++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.cpp @@ -8,10 +8,6 @@ #include "BPy_Length2DBP1D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -90,7 +86,3 @@ PyTypeObject Length2DBP1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.h b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.h index 85ce9ac8b65..43ef46cca95 100644 --- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.h +++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.h @@ -10,10 +10,6 @@ #include "../BPy_BinaryPredicate1D.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject Length2DBP1D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_Length2DBP1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.cpp index 54cef71333e..e675b69d7f2 100644 --- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.cpp +++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.cpp @@ -8,10 +8,6 @@ #include "BPy_SameShapeIdBP1D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -89,7 +85,3 @@ PyTypeObject SameShapeIdBP1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.h b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.h index 539845f57d5..13ad7778936 100644 --- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.h +++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.h @@ -10,10 +10,6 @@ #include "../BPy_BinaryPredicate1D.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject SameShapeIdBP1D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_SameShapeIdBP1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.cpp index a068f16b1f3..cc27bf641b3 100644 --- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.cpp +++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.cpp @@ -8,10 +8,6 @@ #include "BPy_TrueBP1D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -89,7 +85,3 @@ PyTypeObject TrueBP1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.h b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.h index 9f5b98e11df..a900d567805 100644 --- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.h +++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.h @@ -10,10 +10,6 @@ #include "../BPy_BinaryPredicate1D.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject TrueBP1D_Type; @@ -26,7 +22,3 @@ typedef struct { } BPy_TrueBP1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.cpp index 820229a0551..c004d847d69 100644 --- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.cpp +++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.cpp @@ -11,10 +11,6 @@ #include "../BPy_Convert.h" #include "../BPy_IntegrationType.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -120,7 +116,3 @@ PyTypeObject ViewMapGradientNormBP1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.h b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.h index cea92f5cbe6..8a2338fee32 100644 --- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.h +++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.h @@ -10,10 +10,6 @@ #include "../BPy_BinaryPredicate1D.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject ViewMapGradientNormBP1D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_ViewMapGradientNormBP1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp index 0120035bc96..0f3f5c5ff58 100644 --- a/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp @@ -11,10 +11,6 @@ #include "../BPy_Convert.h" #include "../Interface0D/BPy_SVertex.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -278,7 +274,3 @@ PyTypeObject CurvePoint_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.h b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.h index 689626d9aaa..ec58a77f791 100644 --- a/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.h +++ b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.h @@ -12,10 +12,6 @@ #include "../../stroke/Curve.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject CurvePoint_Type; @@ -29,7 +25,3 @@ typedef struct { } BPy_CurvePoint; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp index a0c94f0a155..a1630ebda25 100644 --- a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp @@ -14,10 +14,6 @@ #include "BLI_sys_types.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -510,7 +506,3 @@ PyTypeObject SVertex_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.h b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.h index 7bc00895777..236844d9787 100644 --- a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.h +++ b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.h @@ -12,10 +12,6 @@ #include "../../view_map/Silhouette.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject SVertex_Type; @@ -33,7 +29,3 @@ typedef struct { void SVertex_mathutils_register_callback(); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp index 9c0c380fd94..6ccbae99635 100644 --- a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp @@ -12,10 +12,6 @@ #include "../BPy_Nature.h" #include "../Interface1D/BPy_ViewEdge.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -202,7 +198,3 @@ PyTypeObject ViewVertex_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h index 6844fa27395..b764671d583 100644 --- a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h +++ b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h @@ -12,10 +12,6 @@ #include "../../view_map/ViewMap.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject ViewVertex_Type; @@ -29,7 +25,3 @@ typedef struct { } BPy_ViewVertex; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp index 13925a4ba2d..dffcff1e869 100644 --- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp @@ -13,10 +13,6 @@ #include "../../BPy_StrokeAttribute.h" #include "../../Interface0D/BPy_SVertex.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -400,7 +396,3 @@ PyTypeObject StrokeVertex_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.h b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.h index 0b5f2dfd4aa..29b5854f78d 100644 --- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.h +++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.h @@ -12,10 +12,6 @@ #include "../../../stroke/Stroke.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject StrokeVertex_Type; @@ -34,7 +30,3 @@ typedef struct { void StrokeVertex_mathutils_register_callback(); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp index 2d7ede57cc5..8ba5473966a 100644 --- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp @@ -11,10 +11,6 @@ #include "../../BPy_Convert.h" #include "../BPy_SVertex.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -140,7 +136,3 @@ PyTypeObject NonTVertex_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.h b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.h index 157f4141f9d..a3badaa6f8a 100644 --- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.h +++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.h @@ -12,10 +12,6 @@ #include "../../../view_map/ViewMap.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject NonTVertex_Type; @@ -29,7 +25,3 @@ typedef struct { } BPy_NonTVertex; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp index f15f5a62c32..a4cf50ffa63 100644 --- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp @@ -14,10 +14,6 @@ #include "../../Interface1D/BPy_ViewEdge.h" #include "../BPy_SVertex.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -259,7 +255,3 @@ PyTypeObject TVertex_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.h b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.h index b876568ebe7..7184258a0c4 100644 --- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.h +++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.h @@ -12,10 +12,6 @@ #include "../../../view_map/ViewMap.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject TVertex_Type; @@ -29,7 +25,3 @@ typedef struct { } BPy_TVertex; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp index a75d323958d..d5d24b61614 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp @@ -14,10 +14,6 @@ #include "../Interface0D/BPy_SVertex.h" #include "../Interface1D/BPy_ViewEdge.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -398,7 +394,3 @@ PyTypeObject FEdge_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.h b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.h index c9ca7939f35..bbe9dda1fc3 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.h +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.h @@ -12,10 +12,6 @@ #include "../../view_map/Silhouette.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject FEdge_Type; @@ -29,7 +25,3 @@ typedef struct { } BPy_FEdge; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp index 6cae94e64ed..c0e25df893c 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp @@ -13,10 +13,6 @@ #include "../Interface0D/BPy_CurvePoint.h" #include "../Interface0D/BPy_SVertex.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -228,7 +224,3 @@ PyTypeObject FrsCurve_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.h b/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.h index 7d2b9172084..b099b61c155 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.h +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.h @@ -12,10 +12,6 @@ #include "../../stroke/Curve.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject FrsCurve_Type; @@ -29,7 +25,3 @@ typedef struct { } BPy_FrsCurve; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp index a62da45ab23..33b3b63a4df 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp @@ -17,10 +17,6 @@ #include "BLI_sys_types.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -564,7 +560,3 @@ PyTypeObject Stroke_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.h b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.h index 6ab0ba1729c..ae0e1868a82 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.h +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.h @@ -12,10 +12,6 @@ #include "../../stroke/Stroke.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject Stroke_Type; @@ -29,7 +25,3 @@ typedef struct { } BPy_Stroke; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp index 8bc2f934f1a..69cb4ae3c5e 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp @@ -16,10 +16,6 @@ #include "../Interface1D/BPy_FEdge.h" #include "../Interface1D/BPy_ViewEdge.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -436,7 +432,3 @@ PyTypeObject ViewEdge_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.h b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.h index 5c6be016329..78203beeb64 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.h +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.h @@ -12,10 +12,6 @@ #include "../../view_map/ViewMap.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject ViewEdge_Type; @@ -29,7 +25,3 @@ typedef struct { } BPy_ViewEdge; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp b/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp index 52a107955c1..19f4e38b222 100644 --- a/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp @@ -12,10 +12,6 @@ #include "../../BPy_Id.h" #include "../BPy_ViewEdge.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -186,7 +182,3 @@ PyTypeObject Chain_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.h b/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.h index 23b7530b7ef..db779753680 100644 --- a/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.h +++ b/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.h @@ -12,10 +12,6 @@ #include "../../../stroke/Chain.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject Chain_Type; @@ -29,7 +25,3 @@ typedef struct { } BPy_Chain; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp index 2d4e7da2314..f357e759712 100644 --- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp @@ -13,10 +13,6 @@ #include "BLI_sys_types.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -454,7 +450,3 @@ PyTypeObject FEdgeSharp_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.h b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.h index 12773e06064..38e5cd198ae 100644 --- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.h +++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.h @@ -12,10 +12,6 @@ #include "../../../view_map/Silhouette.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject FEdgeSharp_Type; @@ -33,7 +29,3 @@ typedef struct { void FEdgeSharp_mathutils_register_callback(); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp index 6d39fe27ee1..077878fe48e 100644 --- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp @@ -13,10 +13,6 @@ #include "BLI_sys_types.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -287,7 +283,3 @@ PyTypeObject FEdgeSmooth_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.h b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.h index f7c66612abe..def5e50aba2 100644 --- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.h +++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.h @@ -12,10 +12,6 @@ #include "../../../view_map/Silhouette.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject FEdgeSmooth_Type; @@ -34,7 +30,3 @@ typedef struct { void FEdgeSmooth_mathutils_register_callback(); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp index a6e7e33eef4..cd06db8af9d 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp @@ -11,10 +11,6 @@ #include "../BPy_Convert.h" #include "../Interface0D/BPy_ViewVertex.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -219,7 +215,3 @@ PyTypeObject AdjacencyIterator_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h index 6202507a584..4b09985dd61 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h @@ -12,10 +12,6 @@ #include "../../stroke/ChainingIterators.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject AdjacencyIterator_Type; @@ -31,7 +27,3 @@ typedef struct { } BPy_AdjacencyIterator; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp index 2fcbdd748b2..a89ed365a91 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp @@ -13,10 +13,6 @@ #include "../BPy_UnaryPredicate1D.h" #include "../Interface1D/BPy_ViewEdge.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -197,7 +193,3 @@ PyTypeObject ChainPredicateIterator_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h index 4267b2248ba..0003904de3f 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h @@ -12,10 +12,6 @@ #include "../../stroke/ChainingIterators.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject ChainPredicateIterator_Type; @@ -32,7 +28,3 @@ typedef struct { } BPy_ChainPredicateIterator; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp index c7382046435..6c0a929d0f0 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp @@ -11,10 +11,6 @@ #include "../BPy_Convert.h" #include "../Interface1D/BPy_ViewEdge.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -152,7 +148,3 @@ PyTypeObject ChainSilhouetteIterator_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.h index e8e3d4c04d2..03ea842c2e5 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.h @@ -12,10 +12,6 @@ #include "../../stroke/ChainingIterators.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject ChainSilhouetteIterator_Type; @@ -30,7 +26,3 @@ typedef struct { } BPy_ChainSilhouetteIterator; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp index b34ed534804..b95fa96dd7e 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp @@ -13,10 +13,6 @@ #include "../Interface1D/BPy_ViewEdge.h" #include "BPy_AdjacencyIterator.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -295,7 +291,3 @@ PyTypeObject ChainingIterator_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.h index 955382dcba5..e78add02871 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.h @@ -12,10 +12,6 @@ #include "../../stroke/ChainingIterators.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject ChainingIterator_Type; @@ -30,7 +26,3 @@ typedef struct { } BPy_ChainingIterator; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp index 5929a2f710f..a21f20600dc 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp @@ -11,10 +11,6 @@ #include "../BPy_Convert.h" #include "BPy_Interface0DIterator.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -172,7 +168,3 @@ PyTypeObject CurvePointIterator_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.h index cc49844ffd4..065071cdc5d 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.h @@ -12,10 +12,6 @@ #include "../../stroke/CurveIterators.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject CurvePointIterator_Type; @@ -30,7 +26,3 @@ typedef struct { } BPy_CurvePointIterator; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp index d8c2b2adf47..6b30fd91f63 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp @@ -11,10 +11,6 @@ #include "../BPy_Convert.h" #include "../BPy_Interface1D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -248,7 +244,3 @@ PyTypeObject Interface0DIterator_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.h index 14c07350a0e..4a8e66c10d6 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.h @@ -12,10 +12,6 @@ #include "../../view_map/Interface0D.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject Interface0DIterator_Type; @@ -32,7 +28,3 @@ typedef struct { } BPy_Interface0DIterator; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp index 0b6ad7b5012..b958ba09420 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp @@ -12,10 +12,6 @@ #include "../Interface0D/BPy_SVertex.h" #include "../Interface1D/BPy_FEdge.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -198,7 +194,3 @@ PyTypeObject SVertexIterator_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.h index b5991237870..d6ddc580049 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.h @@ -12,10 +12,6 @@ #include "../../view_map/ViewMapIterators.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject SVertexIterator_Type; @@ -30,7 +26,3 @@ typedef struct { } BPy_SVertexIterator; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp index 5e1c0106b6c..cafe19faaa8 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp @@ -12,10 +12,6 @@ #include "../Interface1D/BPy_Stroke.h" #include "BPy_Interface0DIterator.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -338,7 +334,3 @@ PyTypeObject StrokeVertexIterator_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.h index 72fc82ad9f6..ba16c28e449 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.h @@ -12,10 +12,6 @@ #include "../../stroke/StrokeIterators.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject StrokeVertexIterator_Type; @@ -33,7 +29,3 @@ typedef struct { } BPy_StrokeVertexIterator; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp index ed3c7a8a4ab..dbe4c23c0fe 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp @@ -11,10 +11,6 @@ #include "../BPy_Convert.h" #include "../Interface1D/BPy_ViewEdge.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -279,7 +275,3 @@ PyTypeObject ViewEdgeIterator_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h index 3008d33bf14..96d1b083b3a 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h @@ -12,10 +12,6 @@ #include "../../view_map/ViewMapIterators.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject ViewEdgeIterator_Type; @@ -30,7 +26,3 @@ typedef struct { } BPy_ViewEdgeIterator; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp index e3339eba40e..dd5ad609c0d 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp @@ -10,10 +10,6 @@ #include "../BPy_Convert.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -176,7 +172,3 @@ PyTypeObject orientedViewEdgeIterator_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h index afd5f72e058..45db3443cd8 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h @@ -12,10 +12,6 @@ #include "../../view_map/ViewMapIterators.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject orientedViewEdgeIterator_Type; @@ -32,7 +28,3 @@ typedef struct { } BPy_orientedViewEdgeIterator; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.cpp index 4f8cd0c7566..0de882cb103 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.cpp @@ -10,10 +10,6 @@ #include "../../stroke/BasicStrokeShaders.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -100,7 +96,3 @@ PyTypeObject BackboneStretcherShader_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.h index 9c2ee91d79c..8e15702dcf1 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.h @@ -10,10 +10,6 @@ #include "../BPy_StrokeShader.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject BackboneStretcherShader_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_BackboneStretcherShader; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.cpp index f15fe10bfff..78b4b82aca0 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.cpp @@ -10,10 +10,6 @@ #include "../../stroke/BasicStrokeShaders.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -100,7 +96,3 @@ PyTypeObject BezierCurveShader_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.h index 73cca3dfa06..47a801ceb70 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.h @@ -10,10 +10,6 @@ #include "../BPy_StrokeShader.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject BezierCurveShader_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_BezierCurveShader; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.cpp index 802721ac48f..e6d692aa781 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.cpp @@ -12,10 +12,6 @@ #include "../../../../python/generic/py_capi_utils.hh" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -120,7 +116,3 @@ PyTypeObject BlenderTextureShader_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.h index 8dcff7bad04..a00ff29ceed 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.h @@ -10,10 +10,6 @@ #include "../BPy_StrokeShader.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// #include @@ -29,7 +25,3 @@ typedef struct { } BPy_BlenderTextureShader; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.cpp index c678e1d7ac0..cf6258d9de0 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.cpp @@ -11,10 +11,6 @@ #include "../../stroke/AdvancedStrokeShaders.h" #include "../BPy_Convert.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -119,7 +115,3 @@ PyTypeObject CalligraphicShader_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.h index 635762c08d3..c458a2d1d17 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.h @@ -10,10 +10,6 @@ #include "../BPy_StrokeShader.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject CalligraphicShader_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_CalligraphicShader; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.cpp index 4413ce38db3..07d5aeb488f 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.cpp @@ -10,10 +10,6 @@ #include "../../stroke/BasicStrokeShaders.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -99,7 +95,3 @@ PyTypeObject ColorNoiseShader_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.h index 6853b9f90a0..60bddbb3860 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.h @@ -10,10 +10,6 @@ #include "../BPy_StrokeShader.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject ColorNoiseShader_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_ColorNoiseShader; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.cpp index 55ace15da3e..f2389f756e4 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.cpp @@ -10,10 +10,6 @@ #include "../../stroke/BasicStrokeShaders.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -105,7 +101,3 @@ PyTypeObject ConstantColorShader_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.h index c2e3902ea03..ccfd6cfc255 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.h @@ -10,10 +10,6 @@ #include "../BPy_StrokeShader.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject ConstantColorShader_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_ConstantColorShader; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.cpp index 342ec8982bf..a45639f195c 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.cpp @@ -10,10 +10,6 @@ #include "../../stroke/BasicStrokeShaders.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -99,7 +95,3 @@ PyTypeObject ConstantThicknessShader_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.h index 2e005177077..2d83e668990 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.h @@ -10,10 +10,6 @@ #include "../BPy_StrokeShader.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject ConstantThicknessShader_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_ConstantThicknessShader; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.cpp index 46acaa168b2..d29f996d0e6 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.cpp @@ -10,10 +10,6 @@ #include "../../stroke/BasicStrokeShaders.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -105,7 +101,3 @@ PyTypeObject ConstrainedIncreasingThicknessShader_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h index dc55615eb61..c28142a12df 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h @@ -10,10 +10,6 @@ #include "../BPy_StrokeShader.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject ConstrainedIncreasingThicknessShader_Type; @@ -28,7 +24,3 @@ typedef struct { } BPy_ConstrainedIncreasingThicknessShader; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.cpp index 30d10c75fa9..7101998df12 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.cpp @@ -10,10 +10,6 @@ #include "../../stroke/BasicStrokeShaders.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -107,7 +103,3 @@ PyTypeObject GuidingLinesShader_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.h index 65fdeee04bd..8445b358e77 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.h @@ -10,10 +10,6 @@ #include "../BPy_StrokeShader.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject GuidingLinesShader_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_GuidingLinesShader; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.cpp index 67da93af663..534b62a4093 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.cpp @@ -10,10 +10,6 @@ #include "../../stroke/BasicStrokeShaders.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -128,7 +124,3 @@ PyTypeObject IncreasingColorShader_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.h index 626c84957d9..d8dcee27964 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.h @@ -10,10 +10,6 @@ #include "../BPy_StrokeShader.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject IncreasingColorShader_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_IncreasingColorShader; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.cpp index bcf53d6945e..41a26008dd8 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.cpp @@ -10,10 +10,6 @@ #include "../../stroke/BasicStrokeShaders.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -105,7 +101,3 @@ PyTypeObject IncreasingThicknessShader_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.h index 3824ac7cc49..92c19da8e56 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.h @@ -10,10 +10,6 @@ #include "../BPy_StrokeShader.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject IncreasingThicknessShader_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_IncreasingThicknessShader; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.cpp index 3623782c229..31bfb07529f 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.cpp @@ -10,10 +10,6 @@ #include "../../stroke/BasicStrokeShaders.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -106,7 +102,3 @@ PyTypeObject PolygonalizationShader_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.h index bd6e8a50518..6f3625b93a4 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.h @@ -10,10 +10,6 @@ #include "../BPy_StrokeShader.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject PolygonalizationShader_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_PolygonalizationShader; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.cpp index 83c270e8dd0..096ab7ce3fa 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.cpp @@ -10,10 +10,6 @@ #include "../../stroke/BasicStrokeShaders.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -97,7 +93,3 @@ PyTypeObject SamplingShader_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.h index 6b46e8b024c..6b8c9e54c56 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.h @@ -10,10 +10,6 @@ #include "../BPy_StrokeShader.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject SamplingShader_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_SamplingShader; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.cpp index 969804ba49b..e97c14a66c3 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.cpp @@ -10,10 +10,6 @@ #include "../../stroke/AdvancedStrokeShaders.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -130,7 +126,3 @@ PyTypeObject SmoothingShader_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.h index f1cad8e72c5..4d67bb8b1e4 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.h @@ -10,10 +10,6 @@ #include "../BPy_StrokeShader.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject SmoothingShader_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_SmoothingShader; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.cpp index 1dee5392c19..b33908c92b7 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.cpp @@ -11,10 +11,6 @@ #include "../../stroke/AdvancedStrokeShaders.h" #include "../BPy_Convert.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -124,7 +120,3 @@ PyTypeObject SpatialNoiseShader_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.h index 6d16834b739..53ec96d6722 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.h @@ -10,10 +10,6 @@ #include "../BPy_StrokeShader.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject SpatialNoiseShader_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_SpatialNoiseShader; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.cpp index f6a9ec8b244..9d85de71dad 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.cpp @@ -10,10 +10,6 @@ #include "../../stroke/BasicStrokeShaders.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -99,7 +95,3 @@ PyTypeObject StrokeTextureStepShader_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.h index 772fd2a44c5..727d04daa5f 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.h @@ -10,10 +10,6 @@ #include "../BPy_StrokeShader.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// #include @@ -29,7 +25,3 @@ typedef struct { } BPy_StrokeTextureStepShader; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.cpp index d4f0ea0a6ae..8591e278429 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.cpp @@ -10,10 +10,6 @@ #include "../../stroke/BasicStrokeShaders.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -101,7 +97,3 @@ PyTypeObject ThicknessNoiseShader_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.h index d8cf73fc0de..ad661b5a986 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.h @@ -10,10 +10,6 @@ #include "../BPy_StrokeShader.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject ThicknessNoiseShader_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_ThicknessNoiseShader; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.cpp index db104a6a9fc..78eb9791b7c 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.cpp @@ -10,10 +10,6 @@ #include "../../stroke/BasicStrokeShaders.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -98,7 +94,3 @@ PyTypeObject TipRemoverShader_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.h index 1191efced2a..2e0d3329015 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.h +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.h @@ -10,10 +10,6 @@ #include "../BPy_StrokeShader.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject TipRemoverShader_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_TipRemoverShader; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp index 2bd73784fef..3c36bf10149 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp @@ -22,10 +22,6 @@ #include "UnaryFunction0D_double/BPy_LocalAverageDepthF0D.h" #include "UnaryFunction0D_double/BPy_ZDiscontinuityF0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -206,7 +202,3 @@ PyTypeObject UnaryFunction0DDouble_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.h index c610d985b06..03fd59bde83 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction0D.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject UnaryFunction0DDouble_Type; @@ -31,7 +27,3 @@ typedef struct { int UnaryFunction0DDouble_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp index a8c0ab9b2d0..9b7e75aba6b 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp @@ -13,10 +13,6 @@ #include "UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -154,7 +150,3 @@ PyTypeObject UnaryFunction0DEdgeNature_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.h index 2b4543d21cd..d77448b440b 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.h @@ -12,10 +12,6 @@ #include "../../winged_edge/Nature.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject UnaryFunction0DEdgeNature_Type; @@ -33,7 +29,3 @@ typedef struct { int UnaryFunction0DEdgeNature_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp index 7bc3b339fa9..214c2a3c999 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp @@ -18,10 +18,6 @@ #include "UnaryFunction0D_float/BPy_ReadMapPixelF0D.h" #include "UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -186,7 +182,3 @@ PyTypeObject UnaryFunction0DFloat_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.h index 6cea75cac1b..e80457857d1 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction0D.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject UnaryFunction0DFloat_Type; @@ -31,7 +27,3 @@ typedef struct { int UnaryFunction0DFloat_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp index cfbcb4c57f6..bcbe1b14acd 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp @@ -13,10 +13,6 @@ #include "UnaryFunction0D_Id/BPy_ShapeIdF0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -150,7 +146,3 @@ PyTypeObject UnaryFunction0DId_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.h index 7bbaa953f1d..d6a5f55452d 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.h @@ -12,10 +12,6 @@ #include "../../system/Id.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject UnaryFunction0DId_Type; @@ -33,7 +29,3 @@ typedef struct { int UnaryFunction0DId_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp index 95cee2701b9..372a1ebed93 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp @@ -13,10 +13,6 @@ #include "UnaryFunction0D_Material/BPy_MaterialF0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -154,7 +150,3 @@ PyTypeObject UnaryFunction0DMaterial_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.h index 3891de01e83..364aa957994 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.h @@ -12,10 +12,6 @@ #include "../../scene_graph/FrsMaterial.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject UnaryFunction0DMaterial_Type; @@ -33,7 +29,3 @@ typedef struct { int UnaryFunction0DMaterial_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp index 6948b10b613..2700aae0613 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp @@ -15,10 +15,6 @@ #include "BLI_sys_types.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -157,7 +153,3 @@ PyTypeObject UnaryFunction0DUnsigned_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.h index 033172356a5..483c798cb2a 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction0D.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject UnaryFunction0DUnsigned_Type; @@ -31,7 +27,3 @@ typedef struct { int UnaryFunction0DUnsigned_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp index ab15ac6b443..00068862645 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp @@ -14,10 +14,6 @@ #include "UnaryFunction0D_Vec2f/BPy_Normal2DF0D.h" #include "UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -159,7 +155,3 @@ PyTypeObject UnaryFunction0DVec2f_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.h index b355648e562..19e93ca5199 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.h @@ -12,10 +12,6 @@ #include "../../geometry/Geom.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject UnaryFunction0DVec2f_Type; @@ -33,7 +29,3 @@ typedef struct { int UnaryFunction0DVec2f_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp index c516a5355d5..8d9b7d5fdaf 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp @@ -13,10 +13,6 @@ #include "UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -153,7 +149,3 @@ PyTypeObject UnaryFunction0DVec3f_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.h index 4cf5806b821..bb63aae01d9 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.h @@ -12,10 +12,6 @@ #include "../../geometry/Geom.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject UnaryFunction0DVec3f_Type; @@ -33,7 +29,3 @@ typedef struct { int UnaryFunction0DVec3f_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp index 3c357a05d66..b6977aa528d 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp @@ -15,10 +15,6 @@ #include "BLI_sys_types.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -165,7 +161,3 @@ PyTypeObject UnaryFunction0DVectorViewShape_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h index 01a27cff082..eaf8b277bd9 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h @@ -13,10 +13,6 @@ #include "../../view_map/ViewMap.h" #include -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject UnaryFunction0DVectorViewShape_Type; @@ -36,7 +32,3 @@ typedef struct { int UnaryFunction0DVectorViewShape_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp index 04317013534..47b3c2f3de3 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp @@ -14,10 +14,6 @@ #include "UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.h" #include "UnaryFunction0D_ViewShape/BPy_GetShapeF0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -160,7 +156,3 @@ PyTypeObject UnaryFunction0DViewShape_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.h index 687152b1ffb..41f9a3a0fa2 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.h @@ -12,10 +12,6 @@ #include "../../view_map/ViewMap.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject UnaryFunction0DViewShape_Type; @@ -33,7 +29,3 @@ typedef struct { int UnaryFunction0DViewShape_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.cpp index 5931285d84c..09121d67efd 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.cpp @@ -10,10 +10,6 @@ #include "../../../view_map/Functions0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -103,7 +99,3 @@ PyTypeObject ShapeIdF0D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.h index 7cbc747dcbd..cef56316376 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction0DId.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject ShapeIdF0D_Type; @@ -26,7 +22,3 @@ typedef struct { } BPy_ShapeIdF0D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp index 75a5e14863a..26120fc022a 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp @@ -10,10 +10,6 @@ #include "../../../view_map/Functions0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -106,7 +102,3 @@ PyTypeObject MaterialF0D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.h index 9779c71ed48..fe389c67569 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction0DMaterial.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject MaterialF0D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_MaterialF0D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.cpp index 8383f7d0065..b3a9b57fbf6 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.cpp @@ -10,10 +10,6 @@ #include "../../../view_map/Functions0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -97,7 +93,3 @@ PyTypeObject CurveNatureF0D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.h index c584f242ecd..f3c68ff2b4d 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction0DEdgeNature.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject CurveNatureF0D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_CurveNatureF0D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.cpp index fe536d5428f..e954335e3be 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.cpp @@ -10,10 +10,6 @@ #include "../../../view_map/Functions0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -99,7 +95,3 @@ PyTypeObject Normal2DF0D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.h index a4ca5d29173..7a55199f6c3 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction0DVec2f.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject Normal2DF0D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_Normal2DF0D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.cpp index 7d65ba4d807..e3369a3ede2 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.cpp @@ -10,10 +10,6 @@ #include "../../../view_map/Functions0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -101,7 +97,3 @@ PyTypeObject VertexOrientation2DF0D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.h index 1311983bcc4..66b42670146 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction0DVec2f.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject VertexOrientation2DF0D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_VertexOrientation2DF0D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.cpp index a1680b03974..e8f039f1b6d 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.cpp @@ -10,10 +10,6 @@ #include "../../../view_map/Functions0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -101,7 +97,3 @@ PyTypeObject VertexOrientation3DF0D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.h index 01995e3f989..c4664c45c35 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction0DVec3f.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject VertexOrientation3DF0D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_VertexOrientation3DF0D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.cpp index 41f38d20519..a480aa5853a 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.cpp @@ -10,10 +10,6 @@ #include "../../../view_map/Functions0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -96,7 +92,3 @@ PyTypeObject GetOccludeeF0D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.h index 0c33226b2e3..b9221e31d7d 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction0DViewShape.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject GetOccludeeF0D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_GetOccludeeF0D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.cpp index 819be56d7b1..e907c01c53f 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.cpp @@ -10,10 +10,6 @@ #include "../../../view_map/Functions0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -96,7 +92,3 @@ PyTypeObject GetShapeF0D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.h index 73c4dc83055..2f6cdc87975 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction0DViewShape.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject GetShapeF0D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_GetShapeF0D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.cpp index 765b1a94571..c464eeb9ecd 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.cpp @@ -10,10 +10,6 @@ #include "../../../view_map/Functions0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -101,7 +97,3 @@ PyTypeObject Curvature2DAngleF0D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.h index 40c85ca833a..dc8aa2d1096 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction0DDouble.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject Curvature2DAngleF0D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_Curvature2DAngleF0D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.cpp index c1c378c7b35..438a18c8498 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.cpp @@ -10,10 +10,6 @@ #include "../../../stroke/AdvancedFunctions0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -106,7 +102,3 @@ PyTypeObject DensityF0D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.h index 5570a2b23e7..4bc0ce2024d 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction0DDouble.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject DensityF0D_Type; @@ -26,7 +22,3 @@ typedef struct { } BPy_DensityF0D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.cpp index 7cc60bd62ce..bf6adfdf38d 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.cpp @@ -10,10 +10,6 @@ #include "../../../view_map/Functions0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -96,7 +92,3 @@ PyTypeObject GetProjectedXF0D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.h index 7ed4640581d..de4a6ccdfc3 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction0DDouble.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject GetProjectedXF0D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_GetProjectedXF0D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.cpp index c313b31e017..d9e2e93f416 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.cpp @@ -10,10 +10,6 @@ #include "../../../view_map/Functions0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -96,7 +92,3 @@ PyTypeObject GetProjectedYF0D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.h index 1c1c5a704db..f27afabce73 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction0DDouble.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject GetProjectedYF0D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_GetProjectedYF0D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.cpp index 52941bb3236..bcb64acce8b 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.cpp @@ -10,10 +10,6 @@ #include "../../../view_map/Functions0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -96,7 +92,3 @@ PyTypeObject GetProjectedZF0D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.h index bdcdd9cd1c6..c573c92cf8c 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction0DDouble.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject GetProjectedZF0D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_GetProjectedZF0D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.cpp index 46e1a375929..4b134515608 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.cpp @@ -10,10 +10,6 @@ #include "../../../view_map/Functions0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -96,7 +92,3 @@ PyTypeObject GetXF0D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.h index 7ebe60af518..8688ff0e597 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction0DDouble.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject GetXF0D_Type; @@ -26,7 +22,3 @@ typedef struct { } BPy_GetXF0D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.cpp index 67c88f94aa0..8227fdc363a 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.cpp @@ -10,10 +10,6 @@ #include "../../../view_map/Functions0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -96,7 +92,3 @@ PyTypeObject GetYF0D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.h index 94c60280cc5..c73de3c02e3 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction0DDouble.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject GetYF0D_Type; @@ -26,7 +22,3 @@ typedef struct { } BPy_GetYF0D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.cpp index 10af35eefa4..7d95737319d 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.cpp @@ -10,10 +10,6 @@ #include "../../../view_map/Functions0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -96,7 +92,3 @@ PyTypeObject GetZF0D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.h index 2821b787094..c4bf0e6171e 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction0DDouble.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject GetZF0D_Type; @@ -26,7 +22,3 @@ typedef struct { } BPy_GetZF0D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.cpp index 24f4482a4f1..e9c07bd83c4 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.cpp @@ -10,10 +10,6 @@ #include "../../../stroke/AdvancedFunctions0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -104,7 +100,3 @@ PyTypeObject LocalAverageDepthF0D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.h index fb21923eb3f..9d17387d2f7 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction0DDouble.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject LocalAverageDepthF0D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_LocalAverageDepthF0D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp index 3cfab30345b..4c9d4e63315 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp @@ -10,10 +10,6 @@ #include "../../../view_map/Functions0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -101,7 +97,3 @@ PyTypeObject ZDiscontinuityF0D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.h index 7726e5add43..dd44722eeeb 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction0DDouble.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject ZDiscontinuityF0D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_ZDiscontinuityF0D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.cpp index 482e065ad07..1dd6e1cd42c 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.cpp @@ -10,10 +10,6 @@ #include "../../../view_map/Functions0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -99,7 +95,3 @@ PyTypeObject GetCurvilinearAbscissaF0D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.h index 1b1fac001f7..8fe01bc1f64 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction0DFloat.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject GetCurvilinearAbscissaF0D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_GetCurvilinearAbscissaF0D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.cpp index 84d057c4d62..1351bc6210b 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.cpp @@ -10,10 +10,6 @@ #include "../../../view_map/Functions0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -96,7 +92,3 @@ PyTypeObject GetParameterF0D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.h index 30921ae1d37..c33aa27d322 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction0DFloat.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject GetParameterF0D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_GetParameterF0D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.cpp index 614a6dd430c..7bfba6de2bd 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.cpp @@ -10,10 +10,6 @@ #include "../../../stroke/AdvancedFunctions0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -104,7 +100,3 @@ PyTypeObject GetViewMapGradientNormF0D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.h index 0e983c7145a..e9125827eb8 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction0DFloat.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject GetViewMapGradientNormF0D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_GetViewMapGradientNormF0D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.cpp index 8c46545bb3c..d1dcbcd05cb 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.cpp @@ -10,10 +10,6 @@ #include "../../../stroke/AdvancedFunctions0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -102,7 +98,3 @@ PyTypeObject ReadCompleteViewMapPixelF0D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.h index 2710fe4fa31..8527e91a2cd 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction0DFloat.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject ReadCompleteViewMapPixelF0D_Type; @@ -28,7 +24,3 @@ typedef struct { } BPy_ReadCompleteViewMapPixelF0D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.cpp index 512c04bc877..6cea96a2b21 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.cpp @@ -10,10 +10,6 @@ #include "../../../stroke/AdvancedFunctions0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -103,7 +99,3 @@ PyTypeObject ReadMapPixelF0D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.h index daa4e87e7d4..9a93c545d77 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction0DFloat.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject ReadMapPixelF0D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_ReadMapPixelF0D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.cpp index 200ed9f7ea8..09d72bf2928 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.cpp @@ -12,10 +12,6 @@ #include "BLI_sys_types.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -108,7 +104,3 @@ PyTypeObject ReadSteerableViewMapPixelF0D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.h index 8683b0d8c7f..71d0d238a6b 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction0DFloat.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject ReadSteerableViewMapPixelF0D_Type; @@ -28,7 +24,3 @@ typedef struct { } BPy_ReadSteerableViewMapPixelF0D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.cpp index 787f792a849..08019cbbdac 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.cpp @@ -10,10 +10,6 @@ #include "../../../view_map/Functions0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -104,7 +100,3 @@ PyTypeObject QuantitativeInvisibilityF0D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.h index 7c2c0fb28dc..e13fc41d9d0 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction0DUnsigned.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject QuantitativeInvisibilityF0D_Type; @@ -28,7 +24,3 @@ typedef struct { } BPy_QuantitativeInvisibilityF0D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.cpp index e435760699f..3cc22566777 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.cpp @@ -10,10 +10,6 @@ #include "../../../view_map/Functions0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -97,7 +93,3 @@ PyTypeObject GetOccludersF0D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.h index a71f0713108..308af56369d 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction0DVectorViewShape.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject GetOccludersF0D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_GetOccludersF0D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp index e87b1c79128..34d958cf0aa 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp @@ -27,10 +27,6 @@ #include "UnaryFunction1D_double/BPy_LocalAverageDepthF1D.h" #include "UnaryFunction1D_double/BPy_ZDiscontinuityF1D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -285,7 +281,3 @@ PyTypeObject UnaryFunction1DDouble_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.h index 8915dae39c2..955605af66e 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction1D.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject UnaryFunction1DDouble_Type; @@ -31,7 +27,3 @@ typedef struct { int UnaryFunction1DDouble_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp index e123328edd7..6d97032e77e 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp @@ -14,10 +14,6 @@ #include "UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -205,7 +201,3 @@ PyTypeObject UnaryFunction1DEdgeNature_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.h index 7296d2306e5..3d88f4c3dcc 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.h @@ -12,10 +12,6 @@ #include "../../winged_edge/Nature.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject UnaryFunction1DEdgeNature_Type; @@ -33,7 +29,3 @@ typedef struct { int UnaryFunction1DEdgeNature_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp index da48c5be737..0dea3f08ed8 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp @@ -12,10 +12,6 @@ #include "../BPy_IntegrationType.h" #include "../BPy_Interface1D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -195,7 +191,3 @@ PyTypeObject UnaryFunction1DFloat_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.h index 797d548502c..a7515a39ece 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction1D.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject UnaryFunction1DFloat_Type; @@ -31,7 +27,3 @@ typedef struct { int UnaryFunction1DFloat_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp index e5125cb6e85..6c413268b95 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp @@ -16,10 +16,6 @@ #include "BLI_sys_types.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -207,7 +203,3 @@ PyTypeObject UnaryFunction1DUnsigned_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.h index cdc260fcc0c..dffe8309638 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction1D.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject UnaryFunction1DUnsigned_Type; @@ -31,7 +27,3 @@ typedef struct { int UnaryFunction1DUnsigned_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp index ba67ccf64d6..b816e838710 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp @@ -15,10 +15,6 @@ #include "UnaryFunction1D_Vec2f/BPy_Normal2DF1D.h" #include "UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -208,7 +204,3 @@ PyTypeObject UnaryFunction1DVec2f_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.h index 18ece1bbb1f..9c80c7d485a 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.h @@ -12,10 +12,6 @@ #include "../../geometry/Geom.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject UnaryFunction1DVec2f_Type; @@ -33,7 +29,3 @@ typedef struct { int UnaryFunction1DVec2f_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp index 7926afe0ea0..9befedf5dc4 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp @@ -14,10 +14,6 @@ #include "UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -202,7 +198,3 @@ PyTypeObject UnaryFunction1DVec3f_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.h index 7270f013393..3c277168cef 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.h @@ -12,10 +12,6 @@ #include "../../geometry/Geom.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject UnaryFunction1DVec3f_Type; @@ -33,7 +29,3 @@ typedef struct { int UnaryFunction1DVec3f_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp index 66135e58809..c82d2224597 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp @@ -18,10 +18,6 @@ #include "BLI_sys_types.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -229,7 +225,3 @@ PyTypeObject UnaryFunction1DVectorViewShape_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h index 0965db0c5cf..39a1f835697 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h @@ -13,10 +13,6 @@ #include "../../view_map/ViewMap.h" #include -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject UnaryFunction1DVectorViewShape_Type; @@ -36,7 +32,3 @@ typedef struct { int UnaryFunction1DVectorViewShape_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp index 49efb7aa31b..b386e493c80 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp @@ -16,10 +16,6 @@ #include "UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.h" #include "UnaryFunction1D_void/BPy_TimeStampF1D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -213,7 +209,3 @@ PyTypeObject UnaryFunction1DVoid_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.h index 43d4842d906..593f9634d9e 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction1D.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject UnaryFunction1DVoid_Type; @@ -31,7 +27,3 @@ typedef struct { int UnaryFunction1DVoid_Init(PyObject *module); /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.cpp index c301ebbcfa6..047740bdfa1 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.cpp @@ -12,10 +12,6 @@ #include "../../BPy_Convert.h" #include "../../BPy_IntegrationType.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -110,7 +106,3 @@ PyTypeObject CurveNatureF1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.h index fb5b6a93ab7..b08d07a91a2 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction1DEdgeNature.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject CurveNatureF1D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_CurveNatureF1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.cpp index a027b8924c9..98ded1114a6 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.cpp @@ -12,10 +12,6 @@ #include "../../BPy_Convert.h" #include "../../BPy_IntegrationType.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -104,7 +100,3 @@ PyTypeObject Normal2DF1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.h index d6a91687701..4c31c17657c 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction1DVec2f.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject Normal2DF1D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_Normal2DF1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.cpp index 1a5d64897ef..4e1fc1d9857 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.cpp @@ -12,10 +12,6 @@ #include "../../BPy_Convert.h" #include "../../BPy_IntegrationType.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -104,7 +100,3 @@ PyTypeObject Orientation2DF1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.h index 1c3ff0548f8..b99a4ad221f 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction1DVec2f.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject Orientation2DF1D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_Orientation2DF1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.cpp index 5803358a10a..cb1ee285ec2 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.cpp @@ -12,10 +12,6 @@ #include "../../BPy_Convert.h" #include "../../BPy_IntegrationType.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -104,7 +100,3 @@ PyTypeObject Orientation3DF1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.h index eb1fd842867..30acf006f5a 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction1DVec3f.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject Orientation3DF1D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_Orientation3DF1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.cpp index 879346f28b4..ddf07344404 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.cpp @@ -12,10 +12,6 @@ #include "../../BPy_Convert.h" #include "../../BPy_IntegrationType.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -105,7 +101,3 @@ PyTypeObject Curvature2DAngleF1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.h index e5e96766709..5fce73f1e18 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction1DDouble.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject Curvature2DAngleF1D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_Curvature2DAngleF1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.cpp index e1c2e45d8e0..c4e5cf698e7 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.cpp @@ -12,10 +12,6 @@ #include "../../BPy_Convert.h" #include "../../BPy_IntegrationType.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -118,7 +114,3 @@ PyTypeObject DensityF1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.h index 30d72d5f1be..9836567530d 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction1DDouble.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject DensityF1D_Type; @@ -26,7 +22,3 @@ typedef struct { } BPy_DensityF1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.cpp index ecd9e7a1597..107366deb32 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.cpp @@ -12,10 +12,6 @@ #include "../../BPy_Convert.h" #include "../../BPy_IntegrationType.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -122,7 +118,3 @@ PyTypeObject GetCompleteViewMapDensityF1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.h index 41846587cf9..d7a15a96836 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction1DDouble.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject GetCompleteViewMapDensityF1D_Type; @@ -28,7 +24,3 @@ typedef struct { } BPy_GetCompleteViewMapDensityF1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.cpp index 7b7ea6a5eba..d4f2faf9163 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.cpp @@ -14,10 +14,6 @@ #include "BLI_sys_types.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -131,7 +127,3 @@ PyTypeObject GetDirectionalViewMapDensityF1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.h index a63ed695b31..2927aa16ab5 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction1DDouble.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject GetDirectionalViewMapDensityF1D_Type; @@ -28,7 +24,3 @@ typedef struct { } BPy_GetDirectionalViewMapDensityF1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.cpp index 1d9d90b5f22..848a902d7fe 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.cpp @@ -12,10 +12,6 @@ #include "../../BPy_Convert.h" #include "../../BPy_IntegrationType.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -104,7 +100,3 @@ PyTypeObject GetProjectedXF1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.h index 3dd0d41da31..2be3ce9822e 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction1DDouble.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject GetProjectedXF1D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_GetProjectedXF1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.cpp index 1e62d833739..6ead3c986c4 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.cpp @@ -12,10 +12,6 @@ #include "../../BPy_Convert.h" #include "../../BPy_IntegrationType.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -104,7 +100,3 @@ PyTypeObject GetProjectedYF1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.h index 2987f69e87a..33266e33372 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction1DDouble.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject GetProjectedYF1D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_GetProjectedYF1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.cpp index 7c64f20a7ae..fdf66524b70 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.cpp @@ -12,10 +12,6 @@ #include "../../BPy_Convert.h" #include "../../BPy_IntegrationType.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -104,7 +100,3 @@ PyTypeObject GetProjectedZF1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.h index 91086c91272..cdeaa8b15b5 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction1DDouble.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject GetProjectedZF1D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_GetProjectedZF1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.cpp index 2a7b43b345e..c1debd41fdf 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.cpp @@ -12,10 +12,6 @@ #include "../../BPy_Convert.h" #include "../../BPy_IntegrationType.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -119,7 +115,3 @@ PyTypeObject GetSteerableViewMapDensityF1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.h index c1b56a3bfad..9c7235fc725 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction1DDouble.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject GetSteerableViewMapDensityF1D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_GetSteerableViewMapDensityF1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.cpp index 83e192d2809..73a012dd224 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.cpp @@ -12,10 +12,6 @@ #include "../../BPy_Convert.h" #include "../../BPy_IntegrationType.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -119,7 +115,3 @@ PyTypeObject GetViewMapGradientNormF1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.h index df73b27a1f1..769e2b64f0b 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction1DDouble.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject GetViewMapGradientNormF1D_Type; @@ -28,7 +24,3 @@ typedef struct { } BPy_GetViewMapGradientNormF1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.cpp index 375e0bb143b..ed603b813aa 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.cpp @@ -12,10 +12,6 @@ #include "../../BPy_Convert.h" #include "../../BPy_IntegrationType.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -104,7 +100,3 @@ PyTypeObject GetXF1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.h index 18e297b196f..286cc4a2a06 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction1DDouble.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject GetXF1D_Type; @@ -26,7 +22,3 @@ typedef struct { } BPy_GetXF1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.cpp index 6b14a51f78b..33c9c2bb330 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.cpp @@ -12,10 +12,6 @@ #include "../../BPy_Convert.h" #include "../../BPy_IntegrationType.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -103,7 +99,3 @@ PyTypeObject GetYF1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.h index b9dc1e269ab..c55fc4ff4ef 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction1DDouble.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject GetYF1D_Type; @@ -26,7 +22,3 @@ typedef struct { } BPy_GetYF1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.cpp index b427facf11b..fea134d04c6 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.cpp @@ -12,10 +12,6 @@ #include "../../BPy_Convert.h" #include "../../BPy_IntegrationType.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -104,7 +100,3 @@ PyTypeObject GetZF1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.h index 47e85193282..11699cd0222 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction1DDouble.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject GetZF1D_Type; @@ -26,7 +22,3 @@ typedef struct { } BPy_GetZF1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.cpp index 6ee56a71ba0..dff3cfcd54a 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.cpp @@ -12,10 +12,6 @@ #include "../../BPy_Convert.h" #include "../../BPy_IntegrationType.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -114,7 +110,3 @@ PyTypeObject LocalAverageDepthF1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.h index 157c0a5ff4e..3dfe66aa958 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction1DDouble.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject LocalAverageDepthF1D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_LocalAverageDepthF1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.cpp index e86718c0413..cd36a856c15 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.cpp @@ -12,10 +12,6 @@ #include "../../BPy_Convert.h" #include "../../BPy_IntegrationType.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -108,7 +104,3 @@ PyTypeObject ZDiscontinuityF1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.h index 3bbd1687108..560397b18fd 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction1DDouble.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject ZDiscontinuityF1D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_ZDiscontinuityF1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.cpp index 12238378e26..f9601e11060 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.cpp @@ -12,10 +12,6 @@ #include "../../BPy_Convert.h" #include "../../BPy_IntegrationType.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -110,7 +106,3 @@ PyTypeObject QuantitativeInvisibilityF1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.h index a69ed15c69d..8dc074cd99e 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction1DUnsigned.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject QuantitativeInvisibilityF1D_Type; @@ -28,7 +24,3 @@ typedef struct { } BPy_QuantitativeInvisibilityF1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.cpp index 0af7b96fda3..986ab16be1f 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.cpp @@ -12,10 +12,6 @@ #include "../../BPy_Convert.h" #include "../../BPy_IntegrationType.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -96,7 +92,3 @@ PyTypeObject GetOccludeeF1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.h index 5ae5791595c..1fbcf9dae09 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction1DVectorViewShape.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject GetOccludeeF1D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_GetOccludeeF1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.cpp index 50aeca0d6a9..bc643c29918 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.cpp @@ -12,10 +12,6 @@ #include "../../BPy_Convert.h" #include "../../BPy_IntegrationType.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -96,7 +92,3 @@ PyTypeObject GetOccludersF1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.h index f08c8ebbb0f..684b4f1a1a8 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction1DVectorViewShape.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject GetOccludersF1D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_GetOccludersF1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.cpp index 69b73c56b7e..1fa117e2a02 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.cpp @@ -12,10 +12,6 @@ #include "../../BPy_Convert.h" #include "../../BPy_IntegrationType.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -96,7 +92,3 @@ PyTypeObject GetShapeF1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.h index 55f167a3ed2..452d9d54068 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction1DVectorViewShape.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject GetShapeF1D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_GetShapeF1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.cpp index 315f1511513..8b3f6b5cbba 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.cpp @@ -12,10 +12,6 @@ #include "../../BPy_Convert.h" #include "../../BPy_IntegrationType.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -96,7 +92,3 @@ PyTypeObject ChainingTimeStampF1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.h index fbd90520252..84477d49798 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction1DVoid.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject ChainingTimeStampF1D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_ChainingTimeStampF1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.cpp index 2854afc831e..c9af98cf3b9 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.cpp @@ -12,10 +12,6 @@ #include "../../BPy_Convert.h" #include "../../BPy_IntegrationType.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -96,7 +92,3 @@ PyTypeObject IncrementChainingTimeStampF1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.h index bab304b559c..a1c52872f71 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction1DVoid.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject IncrementChainingTimeStampF1D_Type; @@ -28,7 +24,3 @@ typedef struct { } BPy_IncrementChainingTimeStampF1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.cpp index 407d0147c8d..57747fd9459 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.cpp @@ -12,10 +12,6 @@ #include "../../BPy_Convert.h" #include "../../BPy_IntegrationType.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -94,7 +90,3 @@ PyTypeObject TimeStampF1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.h index 9b57aba7a94..7a0364b12d0 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryFunction1DVoid.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject TimeStampF1D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_TimeStampF1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.cpp index bdf0af073a8..0674bef54cd 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.cpp +++ b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.cpp @@ -8,10 +8,6 @@ #include "BPy_FalseUP0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -87,7 +83,3 @@ PyTypeObject FalseUP0D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.h b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.h index 06dfebd68cc..ab61727da48 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.h +++ b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryPredicate0D.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject FalseUP0D_Type; @@ -26,7 +22,3 @@ typedef struct { } BPy_FalseUP0D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.cpp index 1c4b38b4810..eb02c22a754 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.cpp +++ b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.cpp @@ -8,10 +8,6 @@ #include "BPy_TrueUP0D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -87,7 +83,3 @@ PyTypeObject TrueUP0D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.h b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.h index 2b7ed2c6d89..ccbe892499a 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.h +++ b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryPredicate0D.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject TrueUP0D_Type; @@ -26,7 +22,3 @@ typedef struct { } BPy_TrueUP0D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.cpp index d7756dbdfb0..04ef1fd98ab 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.cpp @@ -8,10 +8,6 @@ #include "BPy_ContourUP1D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -88,7 +84,3 @@ PyTypeObject ContourUP1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.h index c573ad115ff..4404b109fad 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.h +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryPredicate1D.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject ContourUP1D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_ContourUP1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.cpp index 40a0601f29a..6e3532957a2 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.cpp @@ -10,10 +10,6 @@ #include "../../stroke/AdvancedPredicates1D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -104,7 +100,3 @@ PyTypeObject DensityLowerThanUP1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.h index 86f763b81fb..38788ba7df8 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.h +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryPredicate1D.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject DensityLowerThanUP1D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_DensityLowerThanUP1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.cpp index 5f7181fe5cd..872996bf214 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.cpp @@ -10,10 +10,6 @@ #include "BLI_sys_types.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -101,7 +97,3 @@ PyTypeObject EqualToChainingTimeStampUP1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.h index d2c82f3d00a..83838515fac 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.h +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryPredicate1D.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject EqualToChainingTimeStampUP1D_Type; @@ -28,7 +24,3 @@ typedef struct { } BPy_EqualToChainingTimeStampUP1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.cpp index d57d916dbc6..bc7c3ee766b 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.cpp @@ -10,10 +10,6 @@ #include "BLI_sys_types.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -100,7 +96,3 @@ PyTypeObject EqualToTimeStampUP1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.h index 774d4eb35f7..adf5bbf5005 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.h +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryPredicate1D.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject EqualToTimeStampUP1D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_EqualToTimeStampUP1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.cpp index 5813d4b9cae..f05143f10aa 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.cpp @@ -8,10 +8,6 @@ #include "BPy_ExternalContourUP1D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -92,7 +88,3 @@ PyTypeObject ExternalContourUP1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.h index fd82d981adf..3bbd09e725e 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.h +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryPredicate1D.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject ExternalContourUP1D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_ExternalContourUP1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.cpp index 3b7ec2bbdad..f994373d772 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.cpp @@ -8,10 +8,6 @@ #include "BPy_FalseUP1D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -87,7 +83,3 @@ PyTypeObject FalseUP1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.h index f3229553155..c796e859900 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.h +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryPredicate1D.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject FalseUP1D_Type; @@ -26,7 +22,3 @@ typedef struct { } BPy_FalseUP1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.cpp index 3b0c0e57d98..fd961dd6268 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.cpp @@ -8,10 +8,6 @@ #include "BPy_QuantitativeInvisibilityUP1D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -103,7 +99,3 @@ PyTypeObject QuantitativeInvisibilityUP1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.h index eae4b2032c5..77487e96ea6 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.h +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryPredicate1D.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject QuantitativeInvisibilityUP1D_Type; @@ -28,7 +24,3 @@ typedef struct { } BPy_QuantitativeInvisibilityUP1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.cpp index c48b5e798da..dd5e0e4ae7e 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.cpp @@ -10,10 +10,6 @@ #include "BLI_sys_types.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -101,7 +97,3 @@ PyTypeObject ShapeUP1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.h index 549d16b97cf..a206746dfee 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.h +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryPredicate1D.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject ShapeUP1D_Type; @@ -26,7 +22,3 @@ typedef struct { } BPy_ShapeUP1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.cpp index d9e3923052b..ee2678f8572 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.cpp @@ -8,10 +8,6 @@ #include "BPy_TrueUP1D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -87,7 +83,3 @@ PyTypeObject TrueUP1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.h index 8bd250ce682..8a45a813f87 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.h +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryPredicate1D.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject TrueUP1D_Type; @@ -26,7 +22,3 @@ typedef struct { } BPy_TrueUP1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.cpp index b0d5dda815c..2d1385e1abe 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.cpp @@ -8,10 +8,6 @@ #include "BPy_WithinImageBoundaryUP1D.h" -#ifdef __cplusplus -extern "C" { -#endif - using namespace Freestyle; /////////////////////////////////////////////////////////////////////////////////////////// @@ -101,7 +97,3 @@ PyTypeObject WithinImageBoundaryUP1D_Type = { }; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.h index d465e391550..3a8be8f8244 100644 --- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.h +++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.h @@ -10,10 +10,6 @@ #include "../BPy_UnaryPredicate1D.h" -#ifdef __cplusplus -extern "C" { -#endif - /////////////////////////////////////////////////////////////////////////////////////////// extern PyTypeObject WithinImageBoundaryUP1D_Type; @@ -27,7 +23,3 @@ typedef struct { } BPy_WithinImageBoundaryUP1D; /////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/ikplugin/BIK_api.h b/source/blender/ikplugin/BIK_api.h index 05e26831029..8e3e096bdd4 100644 --- a/source/blender/ikplugin/BIK_api.h +++ b/source/blender/ikplugin/BIK_api.h @@ -8,10 +8,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - struct Depsgraph; struct Object; struct Scene; @@ -33,7 +29,3 @@ void BIK_clear_data(struct bPose *pose); void BIK_clear_cache(struct bPose *pose); void BIK_update_param(struct bPose *pose); void BIK_test_constraint(struct Object *ob, struct bConstraint *cons); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/ikplugin/intern/ikplugin_api.h b/source/blender/ikplugin/intern/ikplugin_api.h index a9007e7f5f3..2da62b3e9e1 100644 --- a/source/blender/ikplugin/intern/ikplugin_api.h +++ b/source/blender/ikplugin/intern/ikplugin_api.h @@ -8,10 +8,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - struct Depsgraph; struct Object; struct Scene; @@ -35,7 +31,3 @@ struct IKPlugin { }; using IKPlugin = struct IKPlugin; - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/ikplugin/intern/iksolver_plugin.h b/source/blender/ikplugin/intern/iksolver_plugin.h index d1056642332..a73414ebbe0 100644 --- a/source/blender/ikplugin/intern/iksolver_plugin.h +++ b/source/blender/ikplugin/intern/iksolver_plugin.h @@ -10,10 +10,6 @@ #include "ikplugin_api.h" -#ifdef __cplusplus -extern "C" { -#endif - void iksolver_initialize_tree(struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob, @@ -25,7 +21,3 @@ void iksolver_execute_tree(struct Depsgraph *depsgraph, float ctime); void iksolver_release_tree(struct Scene *scene, struct Object *ob, float ctime); void iksolver_clear_data(struct bPose *pose); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/ikplugin/intern/itasc_plugin.h b/source/blender/ikplugin/intern/itasc_plugin.h index 7b092f2ef1c..cb7082849ab 100644 --- a/source/blender/ikplugin/intern/itasc_plugin.h +++ b/source/blender/ikplugin/intern/itasc_plugin.h @@ -10,10 +10,6 @@ #include "ikplugin_api.h" -#ifdef __cplusplus -extern "C" { -#endif - void itasc_initialize_tree(struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob, @@ -28,7 +24,3 @@ void itasc_clear_data(struct bPose *pose); void itasc_clear_cache(struct bPose *pose); void itasc_update_param(struct bPose *pose); void itasc_test_constraint(struct Object *ob, struct bConstraint *cons); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/imbuf/IMB_imbuf_enums.h b/source/blender/imbuf/IMB_imbuf_enums.h index 51971643fac..66ad5b6a99d 100644 --- a/source/blender/imbuf/IMB_imbuf_enums.h +++ b/source/blender/imbuf/IMB_imbuf_enums.h @@ -6,10 +6,6 @@ #include "BLI_utildefines.h" -#ifdef __cplusplus -extern "C" { -#endif - /** \file * \ingroup imbuf */ @@ -56,7 +52,3 @@ enum IMB_Proxy_Size { IMB_PROXY_MAX_SLOT = 4, }; ENUM_OPERATORS(IMB_Proxy_Size, IMB_PROXY_100); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/imbuf/intern/cineon/cineonlib.h b/source/blender/imbuf/intern/cineon/cineonlib.h index 2dd56fe761d..e85e5161206 100644 --- a/source/blender/imbuf/intern/cineon/cineonlib.h +++ b/source/blender/imbuf/intern/cineon/cineonlib.h @@ -13,10 +13,6 @@ #include "logImageCore.h" -#ifdef __cplusplus -extern "C" { -#endif - #define CINEON_FILE_MAGIC 0x802A5FD7 #define CINEON_UNDEFINED_U8 0xFF #define CINEON_UNDEFINED_U16 0xFFFF @@ -116,7 +112,3 @@ void cineonSetVerbose(int); LogImageFile *cineonOpen(const uchar *byteStuff, int fromMemory, size_t bufferSize); LogImageFile *cineonCreate( const char *filepath, int width, int height, int bitsPerSample, const char *creator); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/imbuf/intern/cineon/dpxlib.h b/source/blender/imbuf/intern/cineon/dpxlib.h index a54979f24b7..3c7608950a1 100644 --- a/source/blender/imbuf/intern/cineon/dpxlib.h +++ b/source/blender/imbuf/intern/cineon/dpxlib.h @@ -14,10 +14,6 @@ #include "logImageCore.h" -#ifdef __cplusplus -extern "C" { -#endif - #define DPX_FILE_MAGIC 0x53445058 #define DPX_UNDEFINED_U8 0xFF #define DPX_UNDEFINED_U16 0xFFFF @@ -144,7 +140,3 @@ LogImageFile *dpxCreate(const char *filepath, int referenceBlack, float gamma, const char *creator); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/imbuf/intern/cineon/logImageCore.h b/source/blender/imbuf/intern/cineon/logImageCore.h index 3daec6a77cb..53aab755d00 100644 --- a/source/blender/imbuf/intern/cineon/logImageCore.h +++ b/source/blender/imbuf/intern/cineon/logImageCore.h @@ -26,10 +26,6 @@ # define PATHSEP_CHAR '/' #endif -#ifdef __cplusplus -extern "C" { -#endif - /* * Image structure */ @@ -270,7 +266,3 @@ BLI_INLINE unsigned int float_uint(float value, unsigned int max) } return (unsigned int)(((float)max * value) + 0.5f); } - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/imbuf/intern/oiio/openimageio_api.cpp b/source/blender/imbuf/intern/oiio/openimageio_api.cpp index c9646649a17..f7a566472c9 100644 --- a/source/blender/imbuf/intern/oiio/openimageio_api.cpp +++ b/source/blender/imbuf/intern/oiio/openimageio_api.cpp @@ -14,8 +14,6 @@ OIIO_NAMESPACE_USING -extern "C" { - void OIIO_init() { /* Make OIIO thread pool follow Blender number of threads override. */ @@ -32,5 +30,3 @@ int OIIO_getVersionHex() { return openimageio_version(); } - -} /* extern "C" */ diff --git a/source/blender/imbuf/intern/oiio/openimageio_api.h b/source/blender/imbuf/intern/oiio/openimageio_api.h index 025911045d5..e0e84a048f6 100644 --- a/source/blender/imbuf/intern/oiio/openimageio_api.h +++ b/source/blender/imbuf/intern/oiio/openimageio_api.h @@ -8,21 +8,12 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - /* * Initialize OpenImageIO on startup. */ -void OIIO_init(void); +void OIIO_init(); /* * Get OpenImageIO version. */ -int OIIO_getVersionHex(void); - -#ifdef __cplusplus -} - -#endif +int OIIO_getVersionHex(); diff --git a/source/blender/imbuf/intern/openexr/openexr_api.h b/source/blender/imbuf/intern/openexr/openexr_api.h index 630c28bf179..2fb3bbf280e 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.h +++ b/source/blender/imbuf/intern/openexr/openexr_api.h @@ -10,10 +10,6 @@ #include -#ifdef __cplusplus -extern "C" { -#endif - void imb_initopenexr(void); void imb_exitopenexr(void); @@ -33,7 +29,3 @@ struct ImBuf *imb_load_filepath_thumbnail_openexr(const char *filepath, char colorspace[], size_t *r_width, size_t *r_height); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/io/collada/BlenderContext.h b/source/blender/io/collada/BlenderContext.h index 51f7565050b..e82f2564b98 100644 --- a/source/blender/io/collada/BlenderContext.h +++ b/source/blender/io/collada/BlenderContext.h @@ -17,10 +17,6 @@ #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; @@ -43,9 +39,6 @@ int bc_is_marked(Object *ob); void bc_remove_mark(Object *ob); void bc_set_mark(Object *ob); -#ifdef __cplusplus -} - class BlenderContext { private: bContext *context; @@ -64,4 +57,3 @@ class BlenderContext { ViewLayer *get_view_layer(); Main *get_main(); }; -#endif diff --git a/source/blender/io/collada/collada.cpp b/source/blender/io/collada/collada.cpp index cf8637ac211..cc53bd5c4ff 100644 --- a/source/blender/io/collada/collada.cpp +++ b/source/blender/io/collada/collada.cpp @@ -16,8 +16,6 @@ #include "BLI_linklist.h" -extern "C" { - static void print_import_header(ImportSettings &import_settings) { fprintf(stderr, "+-- Collada Import parameters------\n"); @@ -95,6 +93,3 @@ int collada_export(bContext *C, ExportSettings *export_settings) return (status) ? -1 : export_count; } - -/* end extern C */ -} diff --git a/source/blender/io/collada/collada.h b/source/blender/io/collada/collada.h index 7c13935a1b8..fb49efca1b1 100644 --- a/source/blender/io/collada/collada.h +++ b/source/blender/io/collada/collada.h @@ -15,10 +15,6 @@ #include "RNA_types.hh" -#ifdef __cplusplus -extern "C" { -#endif - struct bContext; /* @@ -27,7 +23,3 @@ struct bContext; int collada_import(struct bContext *C, ImportSettings *import_settings); int collada_export(struct bContext *C, ExportSettings *export_settings); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/modifiers/intern/lineart/lineart_intern.hh b/source/blender/modifiers/intern/lineart/lineart_intern.hh index 762fabd5f15..5dee58b6646 100644 --- a/source/blender/modifiers/intern/lineart/lineart_intern.hh +++ b/source/blender/modifiers/intern/lineart/lineart_intern.hh @@ -18,10 +18,6 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif - struct LineartBoundingArea; struct LineartEdge; struct LineartData; @@ -242,7 +238,3 @@ void lineart_edge_cut(struct LineartData *ld, void lineart_add_edge_to_array(struct LineartPendingEdges *pe, struct LineartEdge *e); void lineart_finalize_object_edge_array_reserve(struct LineartPendingEdges *pe, int count); void lineart_destroy_render_data_keep_init(struct LineartData *ld); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/nodes/NOD_shader.h b/source/blender/nodes/NOD_shader.h index 1713efed709..b9eb594ee61 100644 --- a/source/blender/nodes/NOD_shader.h +++ b/source/blender/nodes/NOD_shader.h @@ -10,10 +10,6 @@ #include "BKE_node.hh" -#ifdef __cplusplus -extern "C" { -#endif - extern struct blender::bke::bNodeTreeType *ntreeType_Shader; void register_node_type_sh_custom_group(blender::bke::bNodeType *ntype); @@ -35,7 +31,3 @@ struct bNode *ntreeShaderOutputNode(struct bNodeTree *ntree, int target); * This one needs to work on a local tree. */ void ntreeGPUMaterialNodes(struct bNodeTree *localtree, struct GPUMaterial *mat); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/nodes/NOD_texture.h b/source/blender/nodes/NOD_texture.h index 1cde0a13dd2..ee9628696d6 100644 --- a/source/blender/nodes/NOD_texture.h +++ b/source/blender/nodes/NOD_texture.h @@ -10,10 +10,6 @@ #include "BKE_node.hh" -#ifdef __cplusplus -extern "C" { -#endif - extern struct blender::bke::bNodeTreeType *ntreeType_Texture; void ntreeTexCheckCyclics(struct bNodeTree *ntree); @@ -31,7 +27,3 @@ int ntreeTexExecTree(struct bNodeTree *ntree, int cfra, int preview, struct MTex *mtex); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/nodes/intern/node_common.h b/source/blender/nodes/intern/node_common.h index 6c42a9cd61d..9d2e8601bc6 100644 --- a/source/blender/nodes/intern/node_common.h +++ b/source/blender/nodes/intern/node_common.h @@ -8,9 +8,7 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif +#include struct bNodeTree; @@ -30,10 +28,4 @@ int node_group_ui_class(const struct bNode *node); */ void ntree_update_reroute_nodes(struct bNodeTree *ntree); -#ifdef __cplusplus -} - -# include - std::string node_group_ui_description(const bNode &node); -#endif diff --git a/source/blender/python/intern/bpy_capi_utils.hh b/source/blender/python/intern/bpy_capi_utils.hh index 26aa9146206..379b75b91f5 100644 --- a/source/blender/python/intern/bpy_capi_utils.hh +++ b/source/blender/python/intern/bpy_capi_utils.hh @@ -14,10 +14,6 @@ # error "Python 3.11 or greater is required, you'll need to update your Python." #endif -#ifdef __cplusplus -extern "C" { -#endif - struct bContext; struct ReportList; @@ -54,7 +50,3 @@ extern void bpy_context_set(struct bContext *C, PyGILState_STATE *gilstate); * Context should be used but not now because it causes some bugs. */ extern void bpy_context_clear(struct bContext *C, const PyGILState_STATE *gilstate); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/render/RE_bake.h b/source/blender/render/RE_bake.h index efde1a94bc5..9c9977b00cd 100644 --- a/source/blender/render/RE_bake.h +++ b/source/blender/render/RE_bake.h @@ -17,10 +17,6 @@ struct ImBuf; struct Mesh; struct Render; -#ifdef __cplusplus -extern "C" { -#endif - struct BakeImage { struct Image *image; int tile_number; @@ -140,7 +136,3 @@ void RE_bake_normal_world_to_world(const BakePixel pixel_array[], const eBakeNormalSwizzle normal_swizzle[3]); void RE_bake_ibuf_clear(struct Image *image, bool is_tangent); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/render/RE_engine.h b/source/blender/render/RE_engine.h index 021cf7573e6..7af6de17847 100644 --- a/source/blender/render/RE_engine.h +++ b/source/blender/render/RE_engine.h @@ -36,10 +36,6 @@ struct ViewRender; struct bNode; struct bNodeTree; -#ifdef __cplusplus -extern "C" { -#endif - /* External Engine */ /** #RenderEngineType.flag */ @@ -297,7 +293,3 @@ void RE_engine_free_blender_memory(struct RenderEngine *engine); void RE_engine_tile_highlight_set( struct RenderEngine *engine, int x, int y, int width, int height, bool highlight); void RE_engine_tile_highlight_clear_all(struct RenderEngine *engine); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/render/RE_multires_bake.h b/source/blender/render/RE_multires_bake.h index 954f0090145..cf03bd28d84 100644 --- a/source/blender/render/RE_multires_bake.h +++ b/source/blender/render/RE_multires_bake.h @@ -15,10 +15,6 @@ struct DerivedMesh; struct MultiresBakeRender; struct Scene; -#ifdef __cplusplus -extern "C" { -#endif - struct MultiresBakeRender { Scene *scene; DerivedMesh *lores_dm, *hires_dm; @@ -54,7 +50,3 @@ struct MultiresBakeRender { }; void RE_multires_bake_images(struct MultiresBakeRender *bkr); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/render/RE_pipeline.h b/source/blender/render/RE_pipeline.h index bbe14b4e225..bc6adc22680 100644 --- a/source/blender/render/RE_pipeline.h +++ b/source/blender/render/RE_pipeline.h @@ -26,10 +26,6 @@ struct Scene; struct StampData; struct ViewLayer; -#ifdef __cplusplus -extern "C" { -#endif - /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ /* this include is what is exposed of render to outside world */ /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ @@ -515,7 +511,3 @@ struct ImBuf *RE_RenderViewEnsureImBuf(const RenderResult *render_result, Render /* Returns true if the pass is a color (as opposite of data) and needs to be color managed. */ bool RE_RenderPassIsColor(const RenderPass *render_pass); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/render/RE_texture.h b/source/blender/render/RE_texture.h index ee1d5fa56e6..f4c165e81d8 100644 --- a/source/blender/render/RE_texture.h +++ b/source/blender/render/RE_texture.h @@ -17,10 +17,6 @@ struct ImagePool; struct MTex; struct Tex; -#ifdef __cplusplus -extern "C" { -#endif - /* `texture_procedural.cc` */ /** @@ -139,7 +135,3 @@ int multitex_nodes(struct Tex *tex, short which_output, const struct MTex *mtex, struct ImagePool *pool); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/render/RE_texture_margin.h b/source/blender/render/RE_texture_margin.h index 0930f0c09e2..7155605c622 100644 --- a/source/blender/render/RE_texture_margin.h +++ b/source/blender/render/RE_texture_margin.h @@ -7,10 +7,6 @@ * \ingroup bke */ -#ifdef __cplusplus -extern "C" { -#endif - struct DerivedMesh; struct ImBuf; struct Mesh; @@ -33,7 +29,3 @@ void RE_generate_texturemargin_adjacentfaces(struct ImBuf *ibuf, void RE_generate_texturemargin_adjacentfaces_dm( struct ImBuf *ibuf, char *mask, int margin, struct DerivedMesh *dm, const float uv_offset[2]); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/render/intern/render_result.h b/source/blender/render/intern/render_result.h index e84c1e1f676..7ffe6ddf283 100644 --- a/source/blender/render/intern/render_result.h +++ b/source/blender/render/intern/render_result.h @@ -26,10 +26,6 @@ struct RenderResult; struct ReportList; struct rcti; -#ifdef __cplusplus -extern "C" { -#endif - /* New */ /** @@ -163,7 +159,3 @@ void render_result_free_gpu_texture_caches(struct RenderResult *rr); } \ } \ ((void)0) - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/render/intern/texture_common.h b/source/blender/render/intern/texture_common.h index 864978abec5..272b5f00bf9 100644 --- a/source/blender/render/intern/texture_common.h +++ b/source/blender/render/intern/texture_common.h @@ -10,10 +10,6 @@ #include "BLI_math_color.h" /* IWYU pragma: keep. Used in macros. */ -#ifdef __cplusplus -extern "C" { -#endif - #define BRICONT \ texres->tin = (texres->tin - 0.5f) * tex->contrast + tex->bright - 0.5f; \ if (!(tex->flag & TEX_NO_CLAMP)) { \ @@ -94,7 +90,3 @@ void image_sample(struct Image *ima, float dy, float result[4], struct ImagePool *pool); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/render/intern/zbuf.h b/source/blender/render/intern/zbuf.h index e9ecef6a4b7..888476ae280 100644 --- a/source/blender/render/intern/zbuf.h +++ b/source/blender/render/intern/zbuf.h @@ -8,10 +8,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - /** Span fill in method, is also used to localize data for Z-buffering. */ struct ZSpan { int rectx, recty; /* range for clipping */ @@ -37,7 +33,3 @@ void zspan_scanconvert(struct ZSpan *zspan, float *v2, float *v3, void (*func)(void *, int, int, float, float)); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/shader_fx/FX_shader_types.h b/source/blender/shader_fx/FX_shader_types.h index 79bc3f0e9d7..fe83be11428 100644 --- a/source/blender/shader_fx/FX_shader_types.h +++ b/source/blender/shader_fx/FX_shader_types.h @@ -10,10 +10,6 @@ #include "BKE_shader_fx.h" -#ifdef __cplusplus -extern "C" { -#endif - /* ****************** Type structures for all effects ****************** */ extern ShaderFxTypeInfo shaderfx_Type_None; @@ -30,7 +26,3 @@ extern ShaderFxTypeInfo shaderfx_Type_Wave; /* FX_shaderfx_util.c */ void shaderfx_type_init(ShaderFxTypeInfo *types[]); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/shader_fx/intern/FX_ui_common.h b/source/blender/shader_fx/intern/FX_ui_common.h index c441e32094a..8caaf92768a 100644 --- a/source/blender/shader_fx/intern/FX_ui_common.h +++ b/source/blender/shader_fx/intern/FX_ui_common.h @@ -10,10 +10,6 @@ #include "FX_shader_types.h" // IWYU pragma: export -#ifdef __cplusplus -extern "C" { -#endif - struct PointerRNA; struct Panel; struct ARegionType; @@ -50,7 +46,3 @@ struct PanelType *shaderfx_subpanel_register(struct ARegionType *region_type, PanelDrawFn draw_header, PanelDrawFn draw, struct PanelType *parent); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/simulation/SIM_mass_spring.h b/source/blender/simulation/SIM_mass_spring.h index 8e681332e46..a670b702688 100644 --- a/source/blender/simulation/SIM_mass_spring.h +++ b/source/blender/simulation/SIM_mass_spring.h @@ -8,10 +8,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - struct ClothModifierData; struct Depsgraph; struct Implicit_Data; @@ -40,7 +36,3 @@ int SIM_cloth_solve(struct Depsgraph *depsgraph, struct ListBase *effectors); void SIM_cloth_solver_set_positions(struct ClothModifierData *clmd); void SIM_cloth_solver_set_volume(struct ClothModifierData *clmd); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/simulation/intern/implicit.h b/source/blender/simulation/intern/implicit.h index 4e8e62e13f5..e702f8c6c44 100644 --- a/source/blender/simulation/intern/implicit.h +++ b/source/blender/simulation/intern/implicit.h @@ -12,10 +12,6 @@ #include -#ifdef __cplusplus -extern "C" { -#endif - // #define IMPLICIT_SOLVER_EIGEN #define IMPLICIT_SOLVER_BLENDER @@ -277,7 +273,3 @@ void SIM_hair_volume_vertex_grid_forces(struct HairGrid *grid, float f[3], float dfdx[3][3], float dfdv[3][3]); - -#ifdef __cplusplus -} -#endif