[Bf-blender-cvs] [eca2f918a7] blender2.8: OpenGL immediate mode: transform_generics.c
Luca Rood
noreply at git.blender.org
Wed Feb 1 20:10:30 CET 2017
Commit: eca2f918a7934c09bde7f499e3a521f60250ce4c
Author: Luca Rood
Date: Thu Jan 26 12:13:50 2017 -0200
Branches: blender2.8
https://developer.blender.org/rBeca2f918a7934c09bde7f499e3a521f60250ce4c
OpenGL immediate mode: transform_generics.c
Differential Revision: https://developer.blender.org/D2482
Part of T49043
===================================================================
M source/blender/editors/transform/transform_generics.c
===================================================================
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index f78a23be7b..a9eb4c705b 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -62,8 +62,7 @@
#include "RNA_access.h"
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
+#include "GPU_immediate.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_make_axis_color(col, col2, axis);
- glColor3ubv(col2);
-
- setlinestyle(0);
- glBegin(GL_LINES);
- glVertex3fv(v1);
- glVertex3fv(v2);
- glEnd();
-
+
+ unsigned pos = add_attrib(immVertexFormat(), "pos", GL_FLOAT, 3, KEEP_FLOAT);
+
+ immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
+ immUniformColor3ubv(col2);
+
+ immBegin(GL_LINES, 2);
+ immVertex3fv(pos, v1);
+ immVertex3fv(pos, v2);
+ immEnd();
+
+ immUnbindProgram();
+
glPopMatrix();
}
}
More information about the Bf-blender-cvs
mailing list