[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60505] trunk/blender/source/blender/ editors/interface/interface_handlers.c: re-shuffle ifdef for osx to make it more clear

Campbell Barton ideasman42 at gmail.com
Wed Oct 2 18:13:25 CEST 2013


Revision: 60505
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60505
Author:   campbellbarton
Date:     2013-10-02 16:13:24 +0000 (Wed, 02 Oct 2013)
Log Message:
-----------
re-shuffle ifdef for osx to make it more clear

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_handlers.c

Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c	2013-10-02 16:09:09 UTC (rev 60504)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2013-10-02 16:13:24 UTC (rev 60505)
@@ -2227,12 +2227,16 @@
 				break;
 				
 			case AKEY:
+
 				/* Ctrl + A: Select all */
-#if !defined(__APPLE__)
-				if (event->ctrl && !(event->alt || event->shift || event->oskey)) {
-#else			/* OSX uses cmd-a systemwide, so add it */
-				if ((event->oskey && !(event->alt || event->shift || event->ctrl)) || (event->ctrl && !(event->alt || event->shift || event->oskey))) {
+#if defined(__APPLE__)
+				/* OSX uses cmd-a systemwide, so add it */
+				if ((event->oskey && !(event->alt || event->shift || event->ctrl)) ||
+				    (event->ctrl  && !(event->alt || event->shift || event->oskey)))
+#else
+				if (event->ctrl && !(event->alt || event->shift || event->oskey))
 #endif
+				{
 					ui_textedit_move(but, data, STRCUR_DIR_PREV,
 					                 false, STRCUR_JUMP_ALL);
 					ui_textedit_move(but, data, STRCUR_DIR_NEXT,




More information about the Bf-blender-cvs mailing list