forked from bartvdbraak/blender
Cocoa / Mac:
- tablet : fix pressure retrieval => value sliding now works with tablet, UV-painting is pressure sensitive, and no more crash when clicking on window minimize button with the tablet - update CMake file to remove unneeded folders in the app bundle (the __MACOSX stuff). From Jens' patch
This commit is contained in:
parent
5133f75779
commit
068ab484ac
@ -1046,11 +1046,14 @@ GHOST_TSuccess GHOST_SystemCocoa::handleTabletEvent(void *eventPtr, short eventT
|
|||||||
{
|
{
|
||||||
NSEvent *event = (NSEvent *)eventPtr;
|
NSEvent *event = (NSEvent *)eventPtr;
|
||||||
GHOST_IWindow* window = m_windowManager->getActiveWindow();
|
GHOST_IWindow* window = m_windowManager->getActiveWindow();
|
||||||
|
|
||||||
|
if (!window) return GHOST_kFailure;
|
||||||
|
|
||||||
GHOST_TabletData& ct=((GHOST_WindowCocoa*)window)->GetCocoaTabletData();
|
GHOST_TabletData& ct=((GHOST_WindowCocoa*)window)->GetCocoaTabletData();
|
||||||
|
|
||||||
switch (eventType) {
|
switch (eventType) {
|
||||||
case NSTabletPoint:
|
case NSTabletPoint:
|
||||||
ct.Pressure = [event tangentialPressure];
|
ct.Pressure = [event pressure];
|
||||||
ct.Xtilt = [event tilt].x;
|
ct.Xtilt = [event tilt].x;
|
||||||
ct.Ytilt = [event tilt].y;
|
ct.Ytilt = [event tilt].y;
|
||||||
break;
|
break;
|
||||||
|
@ -173,6 +173,7 @@ IF(WITH_INSTALL)
|
|||||||
ADD_CUSTOM_COMMAND(
|
ADD_CUSTOM_COMMAND(
|
||||||
TARGET blender POST_BUILD MAIN_DEPENDENCY blender
|
TARGET blender POST_BUILD MAIN_DEPENDENCY blender
|
||||||
COMMAND find ${TARGETDIR} -name .svn -prune -exec rm -rf {} "\;"
|
COMMAND find ${TARGETDIR} -name .svn -prune -exec rm -rf {} "\;"
|
||||||
|
COMMAND find ${TARGETDIR} -name __MACOSX -prune -exec rm -rf {} "\;"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user