[Bf-blender-cvs] [290e080db4] blender2.8: Fix T50530: Crash on Info Editor "console"

Dalai Felinto noreply at git.blender.org
Thu Jan 26 09:41:44 CET 2017


Commit: 290e080db40e746416d2f70d28cb906ceb4c4723
Author: Dalai Felinto
Date:   Thu Jan 26 09:41:40 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB290e080db40e746416d2f70d28cb906ceb4c4723

Fix T50530: Crash on Info Editor "console"

Introduced on rB2de882e8 - the original size of the array was neglected

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

M	source/blender/editors/space_info/textview.c

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

diff --git a/source/blender/editors/space_info/textview.c b/source/blender/editors/space_info/textview.c
index b82972853e..d3c8fed5fc 100644
--- a/source/blender/editors/space_info/textview.c
+++ b/source/blender/editors/space_info/textview.c
@@ -194,7 +194,7 @@ static int console_draw_string(ConsoleDrawContext *cdc, const char *str, int str
 			unsigned pos = add_attrib(format, "pos", GL_INT, 2, CONVERT_INT_TO_FLOAT);
 			immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
-			immUniformColor4ubv(bg);
+			immUniformColor3ubv(bg);
 			immRecti(pos, 0, cdc->xy[1], cdc->winx, (cdc->xy[1] + (cdc->lheight * tot_lines)));
 
 			immUnbindProgram();
@@ -248,7 +248,7 @@ static int console_draw_string(ConsoleDrawContext *cdc, const char *str, int str
 			unsigned pos = add_attrib(format, "pos", GL_INT, 2, CONVERT_INT_TO_FLOAT);
 			immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
-			immUniformColor4ubv(bg);
+			immUniformColor3ubv(bg);
 			immRecti(pos, 0, cdc->xy[1], cdc->winx, cdc->xy[1] + cdc->lheight);
 
 			immUnbindProgram();




More information about the Bf-blender-cvs mailing list