[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26425] trunk/blender/source/blender: Fix #19980: crash with opengl render active viewport.

[Brecht Van Lommel]

Revision: 26425
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26425
Author:   blendix
Date:     2010-01-30 10:53:55 +0100 (Sat, 30 Jan 2010)

Log Message:
-----------
Fix #19980: crash with opengl render active viewport.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/screen/screen_ops.c
    trunk/blender/source/blender/gpu/intern/gpu_extensions.c

Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c	2010-01-30 09:34:54 UTC (rev 26424)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c	2010-01-30 09:53:55 UTC (rev 26425)
@@ -3397,7 +3397,7 @@
 	
 	rr= RE_AcquireResultWrite(oglrender->re);
 	if(rr->rectf==NULL)
-		rr->rectf= MEM_mallocN(sizeof(float)*4*sizex*sizex, "32 bits rects");
+		rr->rectf= MEM_mallocN(sizeof(float)*4*sizex*sizey, "32 bits rects");
 	RE_ReleaseResult(oglrender->re);
 	
 	return 1;

Modified: trunk/blender/source/blender/gpu/intern/gpu_extensions.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_extensions.c	2010-01-30 09:34:54 UTC (rev 26424)
+++ trunk/blender/source/blender/gpu/intern/gpu_extensions.c	2010-01-30 09:53:55 UTC (rev 26425)
@@ -103,7 +103,7 @@
 	/* Exception for buggy ATI/Apple driver in Mac OS X 10.5/10.6,
 	 * they claim to support this but can cause system freeze */
 #ifdef __APPLE__
-	if(strcmp(glGetString(GL_VENDOR), "ATI Technologies Inc.") == 0)
+	if(strcmp((char*)glGetString(GL_VENDOR), "ATI Technologies Inc.") == 0)
 		return 0;
 #endif