archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

OpenGL immediate mode: transform_generics.c

Browse Source 
Differential Revision: https://developer.blender.org/D2482

Part of T49043
This commit is contained in:
Luna Rood
2017-01-26 12:13:50 -02:00
parent be72d7a9f5
commit eca2f918a7
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/editors/transform/transform_generics.c
View File

@@ -62,8 +62,7 @@
#include "RNA_access.h" #include "RNA_access.h"
#include "BIF_gl.h" #include "GPU_immediate.h"
#include "BIF_glutil.h"
#include "BIK_api.h" #include "BIK_api.h"
@@ -1050,14 +1049,19 @@ void drawLine(TransInfo *t, const float center[3], const float dir[3], char axis
UI_GetThemeColor3ubv(TH_GRID, col); UI_GetThemeColor3ubv(TH_GRID, col);
} }
UI_make_axis_color(col, col2, axis); UI_make_axis_color(col, col2, axis);
glColor3ubv(col2);
unsigned pos = add_attrib(immVertexFormat(), "pos", GL_FLOAT, 3, KEEP_FLOAT);
setlinestyle(0);
glBegin(GL_LINES); immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
glVertex3fv(v1); immUniformColor3ubv(col2);
glVertex3fv(v2);
glEnd(); immBegin(GL_LINES, 2);
immVertex3fv(pos, v1);
immVertex3fv(pos, v2);
immEnd();
immUnbindProgram();
glPopMatrix(); glPopMatrix();
} }
} }