archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

resolved conflict state with HEAD r14096

Browse Source 
blenderbuttons still bad

not let this compile
This commit is contained in:
JLuc Peuriere
2008-03-13 23:54:02 +00:00
parent 526d0bec47 15215493bf
commit a68a7f42b0
1174 changed files with 179989 additions and 80340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/src/ghostwinlay.c
View File

@@ -68,6 +68,8 @@
#ifdef __APPLE__
#include <OpenGL/OpenGL.h>
#define __CARBONSOUND__
/* XXX BIG WARNING: carbon.h should not be included in blender/src code, it conflicts with struct ID */
#define ID ID_
#include <Carbon/Carbon.h>
/*declarations*/
@@ -509,7 +511,7 @@ static int change_bit(int val, int bit, int to_on) {
return to_on?(val|bit):(val&~bit);
}
static void update_tablet_data(Window *win, Window *ghostwin) {
static void update_tablet_data(Window *win, GHOST_WindowHandle ghostwin) {
const GHOST_TabletData *td= GHOST_GetTabletData(ghostwin);
/* if there's tablet data from an active tablet device then use it,
@@ -521,7 +523,7 @@ static void update_tablet_data(Window *win, Window *ghostwin) {
win->ytilt = td->Ytilt;
} else {
win->activedevice = DEV_MOUSE;
win->pressure = 0.0;
win->pressure = 1.0;
win->xtilt = win->ytilt = 0.0;
}
}
@@ -946,3 +948,11 @@ void window_open_ndof(Window* win)
G.ndofdevice = -1;
}
}
char *getClipboard(int flag) {
return (char*)GHOST_getClipboard(flag);
}
void putClipboard(char *buffer, int flag) {
GHOST_putClipboard((GHOST_TInt8*)buffer, flag);
}