2.5

Preview renders:

- Added proper button type (BUT_EXTRA) for preview buttons, to
  handle drawing better. It now first draws an alpha mask, to 
  ensure the preview is correctly fitting inside the widget style.
  It then draws the outline.
- Added protection for executing preview renders while regular
  rendering, that's not going to work...

1 files changed, 10 insertions, 0 deletions

diff --git a/source/blender/windowmanager/intern/wm_subwindow.c b/source/blender/windowmanager/intern/wm_subwindow.c
index 67ba31b84c0..9bd55e1c5a7 100644
--- a/source/blender/windowmanager/intern/wm_subwindow.c
+++ b/source/blender/windowmanager/intern/wm_subwindow.c
@@ -307,10 +307,16 @@ void wmMultMatrix(float mat[][4])
 		glGetFloatv(GL_MODELVIEW_MATRIX, (float *)_curswin->winmat);
 }
 
+static int debugpush= 0;
+
 void wmPushMatrix(void)
 {
 	if(_curswin==NULL) return;
 	
+	if(debugpush)
+		printf("wmPushMatrix error already pushed\n");
+	debugpush= 1;
+	
 	Mat4CpyMat4(_curswin->viewmat1, _curswin->viewmat);
 	Mat4CpyMat4(_curswin->winmat1, _curswin->winmat);
 }
@@ -319,6 +325,10 @@ void wmPopMatrix(void)
 {
 	if(_curswin==NULL) return;
 	
+	if(debugpush==0)
+		printf("wmPopMatrix error nothing popped\n");
+	debugpush= 0;
+	
 	Mat4CpyMat4(_curswin->viewmat, _curswin->viewmat1);
 	Mat4CpyMat4(_curswin->winmat, _curswin->winmat1);