[Bf-blender-cvs] [15a5333] depsgraph_refactor: Merge branch 'master' into depsgraph_refactor

Sergey Sharybin noreply at git.blender.org
Mon Feb 9 16:55:02 CET 2015


Commit: 15a53331562e53a83b3ba3cecc41b730d0414e17
Author: Sergey Sharybin
Date:   Mon Feb 9 20:54:53 2015 +0500
Branches: depsgraph_refactor
https://developer.blender.org/rB15a53331562e53a83b3ba3cecc41b730d0414e17

Merge branch 'master' into depsgraph_refactor

===================================================================



===================================================================

diff --cc intern/ghost/intern/GHOST_WindowWin32.h
index fbb3d1e,fd8c0c2..0850be5
--- a/intern/ghost/intern/GHOST_WindowWin32.h
+++ b/intern/ghost/intern/GHOST_WindowWin32.h
@@@ -193,12 -193,14 +193,12 @@@ public
  	 * \param order The order of the window.
  	 * \return Indication of success.
  	 */
- 	virtual GHOST_TSuccess setOrder(GHOST_TWindowOrder order);
+ 	GHOST_TSuccess setOrder(GHOST_TWindowOrder order);
  
  	/**
 -
 -	/**
  	 * Invalidates the contents of this window.
  	 */
- 	virtual GHOST_TSuccess invalidate();
+ 	GHOST_TSuccess invalidate();
  
  	/**
  	 * Sets the progress bar value displayed in the window/application icon




More information about the Bf-blender-cvs mailing list