blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Fix incompatible type passed to XR haptic 

Likely caused by recent fixed-size types changes.
Seems to be no-functional-changes since the function is unused.
This commit is contained in:
Sergey Sharybin 2021-07-06 12:36:42 +02:00
parent 3382b07ad6
commit ae8fa7062c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/windowmanager/WM_api.h
View File

@ -31,6 +31,7 @@
/* dna-savable wmStructs here */
#include "BLI_compiler_attrs.h"
#include "BLI_sys_types.h"
#include "DNA_windowmanager_types.h"
#include "WM_keymap.h"
@ -1015,7 +1016,7 @@ bool WM_xr_action_state_get(const wmXrData *xr,
bool WM_xr_haptic_action_apply(wmXrData *xr,
const char *action_set_name,
const char *action_name,
const long long *duration,
const int64_t *duration,
const float *frequency,
const float *amplitude);
void WM_xr_haptic_action_stop(wmXrData *xr, const char *action_set_name, const char *action_name);

2
source/blender/windowmanager/xr/intern/wm_xr_actions.c
View File

@ -462,7 +462,7 @@ bool WM_xr_action_state_get(const wmXrData *xr,
bool WM_xr_haptic_action_apply(wmXrData *xr,
const char *action_set_name,
const char *action_name,
const long long *duration,
const int64_t *duration,
const float *frequency,
const float *amplitude)
{