[Bf-blender-cvs] [189c2e9] soc-2014-viewport_context: Merge branch 'master' into soc-2014-viewport_context

Jason Wilkins noreply at git.blender.org
Tue Oct 7 17:44:39 CEST 2014


Commit: 189c2e9277d4abd3b750a5a60ef42549dcfe359d
Author: Jason Wilkins
Date:   Tue Oct 7 10:39:17 2014 -0500
Branches: soc-2014-viewport_context
https://developer.blender.org/rB189c2e9277d4abd3b750a5a60ef42549dcfe359d

Merge branch 'master' into soc-2014-viewport_context

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



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

diff --cc source/blender/windowmanager/intern/wm_window.c
index 20e5b1d,ec806fb..46a20d3
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@@ -339,8 -339,21 +339,21 @@@ void wm_window_title(wmWindowManager *w
  	}
  }
  
+ float wm_window_pixelsize(wmWindow *win)
+ {
+ 	float pixelsize = GHOST_GetNativePixelSize(win->ghostwin);
+ 	
+ 	switch (U.virtual_pixel) {
+ 		default:
+ 		case VIRTUAL_PIXEL_NATIVE:
+ 			return pixelsize;
+ 		case VIRTUAL_PIXEL_DOUBLE:
+ 			return 2.0f * pixelsize;
+ 	}
+ }
+ 
  /* belongs to below */
 -static void wm_window_add_ghostwindow(const char *title, wmWindow *win)
 +static void wm_window_add_ghostwindow(wmWindowManager *wm, const char *title, wmWindow *win)
  {
  	GHOST_WindowHandle ghostwin;
  	static int multisamples = -1;
diff --cc source/blender/windowmanager/wm_window.h
index a71e0fd,bf96e02..9c9c79d
--- a/source/blender/windowmanager/wm_window.h
+++ b/source/blender/windowmanager/wm_window.h
@@@ -58,9 -58,11 +58,11 @@@ void		wm_window_lower			(wmWindow *win)
  void		wm_window_set_size		(wmWindow *win, int width, int height);
  void		wm_window_get_position	(wmWindow *win, int *posx_r, int *posy_r);
  void		wm_window_swap_buffers	(wmWindow *win);
 -void		wm_window_set_swap_interval	(wmWindow *win, int interval);
 -int			wm_window_get_swap_interval	(wmWindow *win);
 +void		wm_window_set_swap_interval(wmWindow *win, int interval);
 +bool		wm_window_get_swap_interval(wmWindow *win, int *intervalOut);
  
+ float		wm_window_pixelsize(wmWindow *win);
+ 
  void		wm_get_cursor_position	(wmWindow *win, int *x, int *y);
  
  wmWindow	*wm_window_copy			(bContext *C, wmWindow *winorig);




More information about the Bf-blender-cvs mailing list