mod_moder/blender
mod_moder/blender
0
1
Fork 0
forked from blender/blender
Code Pull Requests Activity

index-of-nearest-104619 #2

Merged
Iliya Katushenock merged 62 commits from HooglyBoogly/blender:index-of-nearest-104619 into index_of_nearest 2023-04-20 21:19:53 +02:00
Conversation 0 Commits 62 Files Changed 226 +19 -17
8 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 62cc09f267 - Show all commits

2
intern/ghost/GHOST_Path-api.hh
View File

@ -61,7 +61,7 @@ extern const char *GHOST_getBinaryDir(void);
/** /**
* Add the file to the operating system most recently used files * Add the file to the operating system most recently used files
*/ */
extern void GHOST_addToSystemRecentFiles(const char *filename); extern void GHOST_addToSystemRecentFiles(const char *filepath);
#ifdef __cplusplus #ifdef __cplusplus
} }

2
intern/ghost/intern/GHOST_IXrGraphicsBinding.hh
View File

@ -57,4 +57,4 @@ class GHOST_IXrGraphicsBinding {
}; };
std::unique_ptr<GHOST_IXrGraphicsBinding> GHOST_XrGraphicsBindingCreateFromType( std::unique_ptr<GHOST_IXrGraphicsBinding> GHOST_XrGraphicsBindingCreateFromType(
GHOST_TXrGraphicsBinding type, GHOST_Context &ghost_ctx); GHOST_TXrGraphicsBinding type, GHOST_Context &context);

14
intern/ghost/intern/GHOST_SystemWayland.hh
View File

@ -37,15 +37,15 @@ bool ghost_wl_output_own(const struct wl_output *wl_output);
void ghost_wl_output_tag(struct wl_output *wl_output); void ghost_wl_output_tag(struct wl_output *wl_output);
struct GWL_Output *ghost_wl_output_user_data(struct wl_output *wl_output); struct GWL_Output *ghost_wl_output_user_data(struct wl_output *wl_output);
bool ghost_wl_surface_own(const struct wl_surface *surface); bool ghost_wl_surface_own(const struct wl_surface *wl_surface);
void ghost_wl_surface_tag(struct wl_surface *surface); void ghost_wl_surface_tag(struct wl_surface *wl_surface);
GHOST_WindowWayland *ghost_wl_surface_user_data(struct wl_surface *surface); GHOST_WindowWayland *ghost_wl_surface_user_data(struct wl_surface *wl_surface);
bool ghost_wl_surface_own_cursor_pointer(const struct wl_surface *surface); bool ghost_wl_surface_own_cursor_pointer(const struct wl_surface *wl_surface);
void ghost_wl_surface_tag_cursor_pointer(struct wl_surface *surface); void ghost_wl_surface_tag_cursor_pointer(struct wl_surface *wl_surface);
bool ghost_wl_surface_own_cursor_tablet(const struct wl_surface *surface); bool ghost_wl_surface_own_cursor_tablet(const struct wl_surface *wl_surface);
void ghost_wl_surface_tag_cursor_tablet(struct wl_surface *surface); void ghost_wl_surface_tag_cursor_tablet(struct wl_surface *wl_surface);
/* Scaling to: translates from WAYLAND into GHOST (viewport local) coordinates. /* Scaling to: translates from WAYLAND into GHOST (viewport local) coordinates.
* Scaling from: performs the reverse translation. * Scaling from: performs the reverse translation.

6
intern/ghost/intern/GHOST_SystemX11.cc
View File

@ -85,7 +85,7 @@ static uchar bit_is_on(const uchar *ptr, int bit)
static GHOST_TKey ghost_key_from_keysym(const KeySym key); static GHOST_TKey ghost_key_from_keysym(const KeySym key);
static GHOST_TKey ghost_key_from_keycode(const XkbDescPtr xkb_descr, const KeyCode keycode); static GHOST_TKey ghost_key_from_keycode(const XkbDescPtr xkb_descr, const KeyCode keycode);
static GHOST_TKey ghost_key_from_keysym_or_keycode(const KeySym key, static GHOST_TKey ghost_key_from_keysym_or_keycode(const KeySym key_sym,
const XkbDescPtr xkb_descr, const XkbDescPtr xkb_descr,
const KeyCode keycode); const KeyCode keycode);
@ -1776,11 +1776,11 @@ bool GHOST_SystemX11::generateWindowExposeEvents()
return anyProcessed; return anyProcessed;
} }
static GHOST_TKey ghost_key_from_keysym_or_keycode(const KeySym keysym, static GHOST_TKey ghost_key_from_keysym_or_keycode(const KeySym key_sym,
XkbDescPtr xkb_descr, XkbDescPtr xkb_descr,
const KeyCode keycode) const KeyCode keycode)
{ {
GHOST_TKey type = ghost_key_from_keysym(keysym); GHOST_TKey type = ghost_key_from_keysym(key_sym);
if (type == GHOST_kKeyUnknown) { if (type == GHOST_kKeyUnknown) {
if (xkb_descr) { if (xkb_descr) {
type = ghost_key_from_keycode(xkb_descr, keycode); type = ghost_key_from_keycode(xkb_descr, keycode);

2
intern/ghost/intern/GHOST_SystemX11.hh
View File

@ -31,7 +31,7 @@
#endif #endif
/* generic error handlers */ /* generic error handlers */
int GHOST_X11_ApplicationErrorHandler(Display *display, XErrorEvent *theEvent); int GHOST_X11_ApplicationErrorHandler(Display *display, XErrorEvent *event);
int GHOST_X11_ApplicationIOErrorHandler(Display *display); int GHOST_X11_ApplicationIOErrorHandler(Display *display);
#define GHOST_X11_ERROR_HANDLERS_OVERRIDE(var) \ #define GHOST_X11_ERROR_HANDLERS_OVERRIDE(var) \

2
intern/ghost/intern/GHOST_Window.hh
View File

@ -155,7 +155,7 @@ class GHOST_Window : public GHOST_IWindow {
GHOST_TSuccess getCursorGrabBounds(GHOST_Rect &bounds) const override; GHOST_TSuccess getCursorGrabBounds(GHOST_Rect &bounds) const override;
void getCursorGrabState(GHOST_TGrabCursorMode &mode, void getCursorGrabState(GHOST_TGrabCursorMode &mode,
GHOST_TAxisFlag &axis_flag, GHOST_TAxisFlag &wrap_axis,
GHOST_Rect &bounds, GHOST_Rect &bounds,
bool &use_software_cursor) override; bool &use_software_cursor) override;
/** /**

6
intern/ghost/intern/GHOST_XrAction.hh
View File

@ -89,11 +89,13 @@ class GHOST_XrAction {
const XrTime &predicted_display_time); const XrTime &predicted_display_time);
void applyHapticFeedback(XrSession session, void applyHapticFeedback(XrSession session,
const char *action_name, const char *action_name,
const char *subaction_path, const char *subaction_path_str,
const int64_t &duration, const int64_t &duration,
const float &frequency, const float &frequency,
const float &amplitude); const float &amplitude);
void stopHapticFeedback(XrSession session, const char *action_name, const char *subaction_path); void stopHapticFeedback(XrSession session,
const char *action_name,
const char *subaction_path_str);
void *getCustomdata(); void *getCustomdata();
void getBindings(std::map<XrPath, std::vector<XrActionSuggestedBinding>> &r_bindings) const; void getBindings(std::map<XrPath, std::vector<XrActionSuggestedBinding>> &r_bindings) const;

2
source/blender/imbuf/intern/IMB_filetype.h
View File

@ -184,7 +184,7 @@ struct ImBuf *imb_load_cineon(const unsigned char *mem,
* \{ */ * \{ */
bool imb_is_a_dpx(const unsigned char *buf, size_t size); bool imb_is_a_dpx(const unsigned char *buf, size_t size);
bool imb_save_dpx(struct ImBuf *buf, const char *filepath, int flags); bool imb_save_dpx(struct ImBuf *ibuf, const char *filepath, int flags);
struct ImBuf *imb_load_dpx(const unsigned char *mem, struct ImBuf *imb_load_dpx(const unsigned char *mem,
size_t size, size_t size,
int flags, int flags,