[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38832] branches/soc-2011-tomato: Merging r38819 through r38831 from trunk into soc-2011-tomato

[Sergey Sharybin]

Revision: 38832
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38832
Author:   nazgul
Date:     2011-07-29 21:14:20 +0000 (Fri, 29 Jul 2011)
Log Message:
-----------
Merging r38819 through r38831 from trunk into soc-2011-tomato

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38819
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38831

Modified Paths:
--------------
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/soc-2011-tomato/source/blender/blenkernel/intern/ipo.c

Property Changed:
----------------
    branches/soc-2011-tomato/
    branches/soc-2011-tomato/intern/audaspace/OpenAL/


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:36831-38818
   + /trunk/blender:36831-38831


Property changes on: branches/soc-2011-tomato/intern/audaspace/OpenAL
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-pepper/intern/audaspace/OpenAL:38630
/trunk/blender/intern/audaspace/OpenAL:36831-38818
   + /branches/soc-2011-pepper/intern/audaspace/OpenAL:38630
/trunk/blender/intern/audaspace/OpenAL:36831-38831

Modified: branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemWin32.cpp	2011-07-29 21:07:51 UTC (rev 38831)
+++ branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemWin32.cpp	2011-07-29 21:14:20 UTC (rev 38832)
@@ -989,11 +989,16 @@
 					 * procedure of the top-level window being activated. If the windows use different input queues,
 					 * the message is sent asynchronously, so the window is activated immediately. 
 					 */
+					{
+					GHOST_ModifierKeys modifiers;
+					modifiers.clear();
+					system->storeModifierKeys(modifiers);
 					event = processWindowEvent(LOWORD(wParam) ? GHOST_kEventWindowActivate : GHOST_kEventWindowDeactivate, window);
 					/* WARNING: Let DefWindowProc handle WM_ACTIVATE, otherwise WM_MOUSEWHEEL
 					will not be dispatched to OUR active window if we minimize one of OUR windows. */
 					lResult = ::DefWindowProc(hwnd, msg, wParam, lParam);
 					break;
+					}
 				case WM_PAINT:
 					/* An application sends the WM_PAINT message when the system or another application 
 					 * makes a request to paint a portion of an application's window. The message is sent

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/ipo.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/ipo.c	2011-07-29 21:07:51 UTC (rev 38831)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/ipo.c	2011-07-29 21:14:20 UTC (rev 38832)
@@ -518,7 +518,7 @@
 			return "alpha";
 			
 		case MA_REF:
-			return "diffuse_reflection";
+			return "diffuse_intensity";
 		
 		case MA_EMIT:
 			return "emit";
@@ -527,7 +527,7 @@
 			return "ambient";
 		
 		case MA_SPEC:
-			return "specular_reflection";
+			return "specular_intensity";
 		
 		case MA_HARD:
 			return "specular_hardness";
@@ -551,13 +551,13 @@
 			return "raytrace_mirror.fresnel";
 			
 		case MA_FRESMIRI:
-			return "raytrace_mirror.fresnel_fac";
+			return "raytrace_mirror.fresnel_factor";
 			
 		case MA_FRESTRA:
 			return "raytrace_transparency.fresnel";
 			
 		case MA_FRESTRAI:
-			return "raytrace_transparency.fresnel_fac";
+			return "raytrace_transparency.fresnel_factor";
 			
 		case MA_ADD:
 			return "halo.add";