Cleanup: Move interface_intern.hh
The entire interface directory is now compiled as C++ files.
This commit is contained in:
parent
e47c75aa6e
commit
4ecc7cf14a
|
@ -82,7 +82,7 @@ set(SRC
|
|||
views/tree_view.cc
|
||||
|
||||
eyedroppers/eyedropper_intern.hh
|
||||
interface_intern.h
|
||||
interface_intern.hh
|
||||
interface_regions_intern.hh
|
||||
)
|
||||
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
|
||||
#include "RNA_define.h"
|
||||
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
#include "ED_clip.h"
|
||||
#include "ED_image.h"
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
#include "WM_api.h"
|
||||
#include "WM_types.h"
|
||||
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
#include "eyedropper_intern.hh"
|
||||
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
#include "ED_view3d.h"
|
||||
|
||||
#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.
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
#include "ED_view3d.h"
|
||||
|
||||
#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.
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
#include "ED_keyframing.h"
|
||||
|
||||
#include "eyedropper_intern.hh"
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
struct DriverDropper {
|
||||
/* 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 */
|
||||
static int driverdropper_invoke(bContext *C, wmOperator *op, const wmEvent */*event*/)
|
||||
static int driverdropper_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/)
|
||||
{
|
||||
/* init */
|
||||
if (driverdropper_init(C, op)) {
|
||||
|
|
|
@ -47,7 +47,7 @@
|
|||
#include "DEG_depsgraph_build.h"
|
||||
|
||||
#include "eyedropper_intern.hh"
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
struct EyedropperGPencil {
|
||||
struct ColorManagedDisplay *display;
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#include "WM_api.h"
|
||||
#include "WM_types.h"
|
||||
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
#include "eyedropper_intern.hh" /* own include */
|
||||
|
||||
|
|
|
@ -73,7 +73,7 @@
|
|||
|
||||
#include "DEG_depsgraph_query.h"
|
||||
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
using blender::Vector;
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
#include "UI_interface.h"
|
||||
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
#include "MEM_guardedalloc.h"
|
||||
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
#include "WM_api.h"
|
||||
#include "WM_types.h"
|
||||
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
static FCurve *ui_but_get_fcurve(
|
||||
uiBut *but, AnimData **adt, bAction **action, bool *r_driven, bool *r_special)
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
#include "MEM_guardedalloc.h"
|
||||
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Button Groups
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
#include "UI_interface.h"
|
||||
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
#include "RNA_access.h"
|
||||
#include "RNA_prototypes.h"
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
#include "WM_api.h"
|
||||
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
void UI_but_drag_set_id(uiBut *but, ID *id)
|
||||
{
|
||||
|
|
|
@ -48,7 +48,7 @@
|
|||
#include "UI_interface.h"
|
||||
|
||||
/* own include */
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
static int roundboxtype = UI_CNR_ALL;
|
||||
|
||||
|
|
|
@ -57,7 +57,7 @@
|
|||
|
||||
#include "BLF_api.h"
|
||||
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
#include "RNA_access.h"
|
||||
#include "RNA_prototypes.h"
|
||||
|
|
|
@ -62,7 +62,7 @@
|
|||
#include "WM_api.h"
|
||||
#include "WM_types.h"
|
||||
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
#ifndef WITH_HEADLESS
|
||||
# define ICON_GRID_COLS 26
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
#include "UI_interface.h"
|
||||
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
static void icon_draw_rect_input_text(
|
||||
const rctf *rect, const float color[4], const char *str, float font_size, float v_offset)
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -40,7 +40,7 @@
|
|||
#include "WM_api.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,
|
||||
* this is a way to display animation/driven/override status, see T54951. */
|
||||
|
|
|
@ -48,7 +48,7 @@
|
|||
|
||||
#include "UI_interface.h"
|
||||
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
#include "WM_api.h"
|
||||
#include "WM_types.h"
|
||||
|
|
|
@ -48,7 +48,7 @@
|
|||
#include "GPU_matrix.h"
|
||||
#include "GPU_state.h"
|
||||
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Defines & Structs
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
#include "RNA_access.h"
|
||||
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
#include "WM_api.h"
|
||||
#include "WM_types.h"
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
#include "IMB_colormanagement.h"
|
||||
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
enum ePickerType {
|
||||
PICKER_TYPE_RGB = 0,
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
#include "ED_undo.h"
|
||||
|
||||
#include "GPU_framebuffer.h"
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Utilities
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
|
||||
#include "ED_screen.h"
|
||||
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
#include "interface_regions_intern.hh"
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
|
||||
#include "ED_screen.h"
|
||||
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
#include "interface_regions_intern.hh"
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
|
|
|
@ -45,7 +45,7 @@
|
|||
|
||||
#include "UI_interface.h"
|
||||
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
#include "interface_regions_intern.hh"
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
#include "ED_screen.h"
|
||||
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
#include "interface_regions_intern.hh"
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
#include "ED_screen.h"
|
||||
|
||||
#include "GPU_state.h"
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
#include "interface_regions_intern.hh"
|
||||
|
||||
#define MENU_BORDER int(0.3f * U.widget_unit)
|
||||
|
|
|
@ -52,7 +52,7 @@
|
|||
|
||||
#include "ED_screen.h"
|
||||
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
#include "interface_regions_intern.hh"
|
||||
|
||||
#define UI_TIP_PAD_FAC 1.3f
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
#include "ED_datafiles.h"
|
||||
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
#ifdef WIN32
|
||||
# include "BLI_math_base.h" /* M_PI */
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
#include "WM_api.h"
|
||||
#include "WM_types.h"
|
||||
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
struct AssetViewListData {
|
||||
AssetLibraryReference asset_library_ref;
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
#include "WM_api.h"
|
||||
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
/**
|
||||
* The validated data that was passed to #uiTemplateList (typically through Python).
|
||||
|
|
|
@ -47,7 +47,7 @@
|
|||
#include "WM_types.h"
|
||||
|
||||
#include "UI_interface.h"
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
/* For key-map item access. */
|
||||
#include "wm_event_system.h"
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
#include "WM_types.h"
|
||||
|
||||
#include "UI_interface.h"
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Operator Search Template Implementation
|
||||
|
|
|
@ -84,7 +84,7 @@
|
|||
#include "UI_interface.h"
|
||||
#include "UI_interface_icons.h"
|
||||
#include "UI_view2d.h"
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
#include "PIL_time.h"
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
#include "MEM_guardedalloc.h"
|
||||
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Text Field Undo Stack
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
#include "WM_api.h"
|
||||
#include "WM_types.h"
|
||||
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
/*************************** RNA Utilities ******************************/
|
||||
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
#include "UI_interface_icons.h"
|
||||
#include "UI_view2d.h"
|
||||
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
#include "GPU_batch.h"
|
||||
#include "GPU_batch_presets.h"
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
#include "UI_interface_icons.h"
|
||||
|
||||
#include "GPU_framebuffer.h"
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
/* be sure to keep 'bThemeState' in sync */
|
||||
static bThemeState g_theme_state = {
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
#include "UI_interface.h"
|
||||
#include "UI_view2d.h"
|
||||
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
static void ui_view2d_curRect_validate_resize(View2D *v2d, bool resize);
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
#include "UI_interface.h"
|
||||
#include "UI_view2d.h"
|
||||
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
/* Compute display grid resolution
|
||||
********************************************************/
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
* \ingroup edinterface
|
||||
*/
|
||||
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
#include "UI_abstract_view.hh"
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
#include "WM_api.h"
|
||||
|
||||
#include "UI_interface.h"
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
#include "UI_abstract_view.hh"
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
#include "WM_types.h"
|
||||
|
||||
#include "UI_interface.h"
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
#include "UI_grid_view.hh"
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
#include "ED_screen.h"
|
||||
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
#include "UI_interface.hh"
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
#include "BLT_translation.h"
|
||||
|
||||
#include "interface_intern.h"
|
||||
#include "interface_intern.hh"
|
||||
|
||||
#include "UI_interface.h"
|
||||
|
||||
|
|
|
@ -51,7 +51,7 @@
|
|||
#include "WM_api.h"
|
||||
#include "WM_types.h"
|
||||
|
||||
#include "../interface/interface_intern.h"
|
||||
#include "../interface/interface_intern.hh"
|
||||
|
||||
#include "buttons_intern.h" /* own include */
|
||||
|
||||
|
|
|
@ -77,6 +77,8 @@
|
|||
#include "FN_field.hh"
|
||||
#include "FN_field_cpp_type.hh"
|
||||
|
||||
#include "../interface/interface_intern.hh" /* TODO: Remove */
|
||||
|
||||
#include "node_intern.hh" /* own include */
|
||||
|
||||
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::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.
|
||||
*/
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
#include "NOD_socket.h"
|
||||
#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 "ED_node.h" /* own include */
|
||||
|
|
Loading…
Reference in New Issue