1berry/blender
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup: Move interface_intern.hh

Browse Source 
The entire interface directory is now compiled as C++ files.
This commit is contained in:
Hans Goudey 2022-11-26 00:21:17 -06:00
parent e47c75aa6e
commit 4ecc7cf14a
51 changed files with 346 additions and 430 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/interface/CMakeLists.txt
View File

@ -82,7 +82,7 @@ set(SRC
views/tree_view.cc views/tree_view.cc
eyedroppers/eyedropper_intern.hh eyedroppers/eyedropper_intern.hh
interface_intern.h interface_intern.hh
interface_regions_intern.hh interface_regions_intern.hh
) )

2
source/blender/editors/interface/eyedroppers/eyedropper_color.cc
View File

@ -41,7 +41,7 @@
#include "RNA_define.h" #include "RNA_define.h"
#include "interface_intern.h" #include "interface_intern.hh"
#include "ED_clip.h" #include "ED_clip.h"
#include "ED_image.h" #include "ED_image.h"

2
source/blender/editors/interface/eyedroppers/eyedropper_colorband.cc
View File

@ -33,7 +33,7 @@
#include "WM_api.h" #include "WM_api.h"
#include "WM_types.h" #include "WM_types.h"
#include "interface_intern.h" #include "interface_intern.hh"
#include "eyedropper_intern.hh" #include "eyedropper_intern.hh"

2
source/blender/editors/interface/eyedroppers/eyedropper_datablock.cc
View File

@ -39,7 +39,7 @@
#include "ED_view3d.h" #include "ED_view3d.h"
#include "eyedropper_intern.hh" #include "eyedropper_intern.hh"
#include "interface_intern.h" #include "interface_intern.hh"
/** /**
* \note #DataDropper is only internal name to avoid confusion with other kinds of eye-droppers. * \note #DataDropper is only internal name to avoid confusion with other kinds of eye-droppers.

2
source/blender/editors/interface/eyedroppers/eyedropper_depth.cc
View File

@ -39,7 +39,7 @@
#include "ED_view3d.h" #include "ED_view3d.h"
#include "eyedropper_intern.hh" #include "eyedropper_intern.hh"
#include "interface_intern.h" #include "interface_intern.hh"
/** /**
* \note #DepthDropper is only internal name to avoid confusion with other kinds of eye-droppers. * \note #DepthDropper is only internal name to avoid confusion with other kinds of eye-droppers.

4
source/blender/editors/interface/eyedroppers/eyedropper_driver.cc
View File

@ -34,7 +34,7 @@
#include "ED_keyframing.h" #include "ED_keyframing.h"
#include "eyedropper_intern.hh" #include "eyedropper_intern.hh"
#include "interface_intern.h" #include "interface_intern.hh"
struct DriverDropper { struct DriverDropper {
/* Destination property (i.e. where we'll add a driver) */ /* Destination property (i.e. where we'll add a driver) */
@ -156,7 +156,7 @@ static int driverdropper_modal(bContext *C, wmOperator *op, const wmEvent *event
} }
/* Modal Operator init */ /* Modal Operator init */
static int driverdropper_invoke(bContext *C, wmOperator *op, const wmEvent */*event*/) static int driverdropper_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/)
{ {
/* init */ /* init */
if (driverdropper_init(C, op)) { if (driverdropper_init(C, op)) {

2
source/blender/editors/interface/eyedroppers/eyedropper_gpencil_color.cc
View File

@ -47,7 +47,7 @@
#include "DEG_depsgraph_build.h" #include "DEG_depsgraph_build.h"
#include "eyedropper_intern.hh" #include "eyedropper_intern.hh"
#include "interface_intern.h" #include "interface_intern.hh"
struct EyedropperGPencil { struct EyedropperGPencil {
struct ColorManagedDisplay *display; struct ColorManagedDisplay *display;

2
source/blender/editors/interface/eyedroppers/interface_eyedropper.cc
View File

@ -19,7 +19,7 @@
#include "WM_api.h" #include "WM_api.h"
#include "WM_types.h" #include "WM_types.h"
#include "interface_intern.h" #include "interface_intern.hh"
#include "eyedropper_intern.hh" /* own include */ #include "eyedropper_intern.hh" /* own include */

2
source/blender/editors/interface/interface.cc
View File

@ -73,7 +73,7 @@
#include "DEG_depsgraph_query.h" #include "DEG_depsgraph_query.h"
#include "interface_intern.h" #include "interface_intern.hh"
using blender::Vector; using blender::Vector;

2
source/blender/editors/interface/interface_align.cc
View File

@ -14,7 +14,7 @@
#include "UI_interface.h" #include "UI_interface.h"
#include "interface_intern.h" #include "interface_intern.hh"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"

2
source/blender/editors/interface/interface_anim.cc
View File

@ -40,7 +40,7 @@
#include "WM_api.h" #include "WM_api.h"
#include "WM_types.h" #include "WM_types.h"
#include "interface_intern.h" #include "interface_intern.hh"
static FCurve *ui_but_get_fcurve( static FCurve *ui_but_get_fcurve(
uiBut *but, AnimData **adt, bAction **action, bool *r_driven, bool *r_special) uiBut *but, AnimData **adt, bAction **action, bool *r_driven, bool *r_special)

2
source/blender/editors/interface/interface_button_group.cc
View File

@ -8,7 +8,7 @@
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "interface_intern.h" #include "interface_intern.hh"
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/** \name Button Groups /** \name Button Groups

2
source/blender/editors/interface/interface_context_menu.cc
View File

@ -30,7 +30,7 @@
#include "UI_interface.h" #include "UI_interface.h"
#include "interface_intern.h" #include "interface_intern.hh"
#include "RNA_access.h" #include "RNA_access.h"
#include "RNA_prototypes.h" #include "RNA_prototypes.h"

2
source/blender/editors/interface/interface_drag.cc
View File

@ -8,7 +8,7 @@
#include "WM_api.h" #include "WM_api.h"
#include "interface_intern.h" #include "interface_intern.hh"
void UI_but_drag_set_id(uiBut *but, ID *id) void UI_but_drag_set_id(uiBut *but, ID *id)
{ {

2
source/blender/editors/interface/interface_draw.cc
View File

@ -48,7 +48,7 @@
#include "UI_interface.h" #include "UI_interface.h"
/* own include */ /* own include */
#include "interface_intern.h" #include "interface_intern.hh"
static int roundboxtype = UI_CNR_ALL; static int roundboxtype = UI_CNR_ALL;

2
source/blender/editors/interface/interface_handlers.cc
View File

@ -57,7 +57,7 @@
#include "BLF_api.h" #include "BLF_api.h"
#include "interface_intern.h" #include "interface_intern.hh"
#include "RNA_access.h" #include "RNA_access.h"
#include "RNA_prototypes.h" #include "RNA_prototypes.h"

2
source/blender/editors/interface/interface_icons.cc
View File

@ -62,7 +62,7 @@
#include "WM_api.h" #include "WM_api.h"
#include "WM_types.h" #include "WM_types.h"
#include "interface_intern.h" #include "interface_intern.hh"
#ifndef WITH_HEADLESS #ifndef WITH_HEADLESS
# define ICON_GRID_COLS 26 # define ICON_GRID_COLS 26

2
source/blender/editors/interface/interface_icons_event.cc
View File

@ -18,7 +18,7 @@
#include "UI_interface.h" #include "UI_interface.h"
#include "interface_intern.h" #include "interface_intern.hh"
static void icon_draw_rect_input_text( static void icon_draw_rect_input_text(
const rctf *rect, const float color[4], const char *str, float font_size, float v_offset) const rctf *rect, const float color[4], const char *str, float font_size, float v_offset)

628
source/blender/editors/interface/interface_intern.h → source/blender/editors/interface/interface_intern.hh
View File

File diff suppressed because it is too large Load Diff

2
source/blender/editors/interface/interface_layout.cc
View File

@ -40,7 +40,7 @@
#include "WM_api.h" #include "WM_api.h"
#include "WM_types.h" #include "WM_types.h"
#include "interface_intern.h" #include "interface_intern.hh"
/* Show an icon button after each RNA button to use to quickly set keyframes, /* Show an icon button after each RNA button to use to quickly set keyframes,
* this is a way to display animation/driven/override status, see T54951. */ * this is a way to display animation/driven/override status, see T54951. */

2
source/blender/editors/interface/interface_ops.cc
View File

@ -48,7 +48,7 @@
#include "UI_interface.h" #include "UI_interface.h"
#include "interface_intern.h" #include "interface_intern.hh"
#include "WM_api.h" #include "WM_api.h"
#include "WM_types.h" #include "WM_types.h"

2
source/blender/editors/interface/interface_panel.cc
View File

@ -48,7 +48,7 @@
#include "GPU_matrix.h" #include "GPU_matrix.h"
#include "GPU_state.h" #include "GPU_state.h"
#include "interface_intern.h" #include "interface_intern.hh"
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/** \name Defines & Structs /** \name Defines & Structs

2
source/blender/editors/interface/interface_query.cc
View File

@ -19,7 +19,7 @@
#include "RNA_access.h" #include "RNA_access.h"
#include "interface_intern.h" #include "interface_intern.hh"
#include "WM_api.h" #include "WM_api.h"
#include "WM_types.h" #include "WM_types.h"

2
source/blender/editors/interface/interface_region_color_picker.cc
View File

@ -34,7 +34,7 @@
#include "IMB_colormanagement.h" #include "IMB_colormanagement.h"
#include "interface_intern.h" #include "interface_intern.hh"
enum ePickerType { enum ePickerType {
PICKER_TYPE_RGB = 0, PICKER_TYPE_RGB = 0,

2
source/blender/editors/interface/interface_region_hud.cc
View File

@ -36,7 +36,7 @@
#include "ED_undo.h" #include "ED_undo.h"
#include "GPU_framebuffer.h" #include "GPU_framebuffer.h"
#include "interface_intern.h" #include "interface_intern.hh"
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/** \name Utilities /** \name Utilities

2
source/blender/editors/interface/interface_region_menu_pie.cc
View File

@ -36,7 +36,7 @@
#include "ED_screen.h" #include "ED_screen.h"
#include "interface_intern.h" #include "interface_intern.hh"
#include "interface_regions_intern.hh" #include "interface_regions_intern.hh"
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */

2
source/blender/editors/interface/interface_region_menu_popup.cc
View File

@ -39,7 +39,7 @@
#include "ED_screen.h" #include "ED_screen.h"
#include "interface_intern.h" #include "interface_intern.hh"
#include "interface_regions_intern.hh" #include "interface_regions_intern.hh"
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */

2
source/blender/editors/interface/interface_region_popover.cc
View File

@ -45,7 +45,7 @@
#include "UI_interface.h" #include "UI_interface.h"
#include "interface_intern.h" #include "interface_intern.hh"
#include "interface_regions_intern.hh" #include "interface_regions_intern.hh"
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */

2
source/blender/editors/interface/interface_region_popup.cc
View File

@ -30,7 +30,7 @@
#include "ED_screen.h" #include "ED_screen.h"
#include "interface_intern.h" #include "interface_intern.hh"
#include "interface_regions_intern.hh" #include "interface_regions_intern.hh"
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */

2
source/blender/editors/interface/interface_region_search.cc
View File

@ -41,7 +41,7 @@
#include "ED_screen.h" #include "ED_screen.h"
#include "GPU_state.h" #include "GPU_state.h"
#include "interface_intern.h" #include "interface_intern.hh"
#include "interface_regions_intern.hh" #include "interface_regions_intern.hh"
#define MENU_BORDER int(0.3f * U.widget_unit) #define MENU_BORDER int(0.3f * U.widget_unit)

2
source/blender/editors/interface/interface_region_tooltip.cc
View File

@ -52,7 +52,7 @@
#include "ED_screen.h" #include "ED_screen.h"
#include "interface_intern.h" #include "interface_intern.hh"
#include "interface_regions_intern.hh" #include "interface_regions_intern.hh"
#define UI_TIP_PAD_FAC 1.3f #define UI_TIP_PAD_FAC 1.3f

2
source/blender/editors/interface/interface_style.cc
View File

@ -30,7 +30,7 @@
#include "ED_datafiles.h" #include "ED_datafiles.h"
#include "interface_intern.h" #include "interface_intern.hh"
#ifdef WIN32 #ifdef WIN32
# include "BLI_math_base.h" /* M_PI */ # include "BLI_math_base.h" /* M_PI */

2
source/blender/editors/interface/interface_template_asset_view.cc
View File

@ -28,7 +28,7 @@
#include "WM_api.h" #include "WM_api.h"
#include "WM_types.h" #include "WM_types.h"
#include "interface_intern.h" #include "interface_intern.hh"
struct AssetViewListData { struct AssetViewListData {
AssetLibraryReference asset_library_ref; AssetLibraryReference asset_library_ref;

2
source/blender/editors/interface/interface_template_list.cc
View File

@ -30,7 +30,7 @@
#include "WM_api.h" #include "WM_api.h"
#include "interface_intern.h" #include "interface_intern.hh"
/** /**
* The validated data that was passed to #uiTemplateList (typically through Python). * The validated data that was passed to #uiTemplateList (typically through Python).

2
source/blender/editors/interface/interface_template_search_menu.cc
View File

@ -47,7 +47,7 @@
#include "WM_types.h" #include "WM_types.h"
#include "UI_interface.h" #include "UI_interface.h"
#include "interface_intern.h" #include "interface_intern.hh"
/* For key-map item access. */ /* For key-map item access. */
#include "wm_event_system.h" #include "wm_event_system.h"

2
source/blender/editors/interface/interface_template_search_operator.cc
View File

@ -28,7 +28,7 @@
#include "WM_types.h" #include "WM_types.h"
#include "UI_interface.h" #include "UI_interface.h"
#include "interface_intern.h" #include "interface_intern.hh"
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/** \name Operator Search Template Implementation /** \name Operator Search Template Implementation

2
source/blender/editors/interface/interface_templates.cc
View File

@ -84,7 +84,7 @@
#include "UI_interface.h" #include "UI_interface.h"
#include "UI_interface_icons.h" #include "UI_interface_icons.h"
#include "UI_view2d.h" #include "UI_view2d.h"
#include "interface_intern.h" #include "interface_intern.hh"
#include "PIL_time.h" #include "PIL_time.h"

2
source/blender/editors/interface/interface_undo.cc
View File

@ -15,7 +15,7 @@
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "interface_intern.h" #include "interface_intern.hh"
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/** \name Text Field Undo Stack /** \name Text Field Undo Stack

2
source/blender/editors/interface/interface_utils.cc
View File

@ -40,7 +40,7 @@
#include "WM_api.h" #include "WM_api.h"
#include "WM_types.h" #include "WM_types.h"
#include "interface_intern.h" #include "interface_intern.hh"
/*************************** RNA Utilities ******************************/ /*************************** RNA Utilities ******************************/

2
source/blender/editors/interface/interface_widgets.cc
View File

@ -32,7 +32,7 @@
#include "UI_interface_icons.h" #include "UI_interface_icons.h"
#include "UI_view2d.h" #include "UI_view2d.h"
#include "interface_intern.h" #include "interface_intern.hh"
#include "GPU_batch.h" #include "GPU_batch.h"
#include "GPU_batch_presets.h" #include "GPU_batch_presets.h"

2
source/blender/editors/interface/resources.cc
View File

@ -34,7 +34,7 @@
#include "UI_interface_icons.h" #include "UI_interface_icons.h"
#include "GPU_framebuffer.h" #include "GPU_framebuffer.h"
#include "interface_intern.h" #include "interface_intern.hh"
/* be sure to keep 'bThemeState' in sync */ /* be sure to keep 'bThemeState' in sync */
static bThemeState g_theme_state = { static bThemeState g_theme_state = {

2
source/blender/editors/interface/view2d.cc
View File

@ -43,7 +43,7 @@
#include "UI_interface.h" #include "UI_interface.h"
#include "UI_view2d.h" #include "UI_view2d.h"
#include "interface_intern.h" #include "interface_intern.hh"
static void ui_view2d_curRect_validate_resize(View2D *v2d, bool resize); static void ui_view2d_curRect_validate_resize(View2D *v2d, bool resize);

2
source/blender/editors/interface/view2d_draw.cc
View File

@ -33,7 +33,7 @@
#include "UI_interface.h" #include "UI_interface.h"
#include "UI_view2d.h" #include "UI_view2d.h"
#include "interface_intern.h" #include "interface_intern.hh"
/* Compute display grid resolution /* Compute display grid resolution
********************************************************/ ********************************************************/

2
source/blender/editors/interface/views/abstract_view.cc
View File

@ -4,7 +4,7 @@
* \ingroup edinterface * \ingroup edinterface
*/ */
#include "interface_intern.h" #include "interface_intern.hh"
#include "UI_abstract_view.hh" #include "UI_abstract_view.hh"

2
source/blender/editors/interface/views/abstract_view_item.cc
View File

@ -12,7 +12,7 @@
#include "WM_api.h" #include "WM_api.h"
#include "UI_interface.h" #include "UI_interface.h"
#include "interface_intern.h" #include "interface_intern.hh"
#include "UI_abstract_view.hh" #include "UI_abstract_view.hh"

2
source/blender/editors/interface/views/grid_view.cc
View File

@ -12,7 +12,7 @@
#include "WM_types.h" #include "WM_types.h"
#include "UI_interface.h" #include "UI_interface.h"
#include "interface_intern.h" #include "interface_intern.hh"
#include "UI_grid_view.hh" #include "UI_grid_view.hh"

2
source/blender/editors/interface/views/interface_view.cc
View File

@ -27,7 +27,7 @@
#include "ED_screen.h" #include "ED_screen.h"
#include "interface_intern.h" #include "interface_intern.hh"
#include "UI_interface.hh" #include "UI_interface.hh"

2
source/blender/editors/interface/views/tree_view.cc
View File

@ -11,7 +11,7 @@
#include "BLT_translation.h" #include "BLT_translation.h"
#include "interface_intern.h" #include "interface_intern.hh"
#include "UI_interface.h" #include "UI_interface.h"

2
source/blender/editors/space_buttons/buttons_texture.cc
View File

@ -51,7 +51,7 @@
#include "WM_api.h" #include "WM_api.h"
#include "WM_types.h" #include "WM_types.h"
#include "../interface/interface_intern.h" #include "../interface/interface_intern.hh"
#include "buttons_intern.h" /* own include */ #include "buttons_intern.h" /* own include */

8
source/blender/editors/space_node/node_draw.cc
View File

@ -77,6 +77,8 @@
#include "FN_field.hh" #include "FN_field.hh"
#include "FN_field_cpp_type.hh" #include "FN_field_cpp_type.hh"
#include "../interface/interface_intern.hh" /* TODO: Remove */
#include "node_intern.hh" /* own include */ #include "node_intern.hh" /* own include */
namespace geo_log = blender::nodes::geo_eval_log; namespace geo_log = blender::nodes::geo_eval_log;
@ -84,12 +86,6 @@ namespace geo_log = blender::nodes::geo_eval_log;
using blender::GPointer; using blender::GPointer;
using blender::Vector; using blender::Vector;
extern "C" {
/* XXX interface.h */
extern void ui_draw_dropshadow(
const rctf *rct, float radius, float aspect, float alpha, int select);
}
/** /**
* This is passed to many functions which draw the node editor. * This is passed to many functions which draw the node editor.
*/ */

2
source/blender/editors/space_node/node_templates.cc
View File

@ -32,7 +32,7 @@
#include "NOD_socket.h" #include "NOD_socket.h"
#include "NOD_socket_declarations.hh" #include "NOD_socket_declarations.hh"
#include "../interface/interface_intern.h" /* XXX bad level */ #include "../interface/interface_intern.hh" /* XXX bad level */
#include "UI_interface.h" #include "UI_interface.h"
#include "ED_node.h" /* own include */ #include "ED_node.h" /* own include */