diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-01-30 12:53:55 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-01-30 12:53:55 +0300 |
| commit | 91882d3ba171870b0d11a87db87f9a1b7e2e5aca (patch) | |
| tree | 69b618a0c17ea208fe9e123c2edb92b1c04c574c /source | |
| parent | 5e98d8c523bba0146d18a404c810ba9ebbf3a535 (diff) | |
Fix #19980: crash with opengl render active viewport.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/screen/screen_ops.c | 2 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_extensions.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 5c66c9a32e0..209535b1350 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -3397,7 +3397,7 @@ static int screen_opengl_render_init(bContext *C, wmOperator *op) 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; diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c index 48ef5fdb0aa..a5a8c626cbd 100644 --- a/source/blender/gpu/intern/gpu_extensions.c +++ b/source/blender/gpu/intern/gpu_extensions.c @@ -103,7 +103,7 @@ int GPU_non_power_of_two_support() /* 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 |