Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Erwin <significant.bit@gmail.com>2017-02-12 09:56:08 +0300
committerMike Erwin <significant.bit@gmail.com>2017-02-12 09:56:08 +0300
commitb104057d001d2472cc55c7fa51cff3275e331523 (patch)
tree02b78998050a5807d471663f63e877b747ba1507 /source/blender/editors/interface/interface_icons.c
parent09bfc378895f320bcc12ac5c77252f58780e73fc (diff)
OpenGL: enable program point size for keyframes
Allows vertex shader to determine how large to rasterize each point sprite. Forgot to do this before.
Diffstat (limited to 'source/blender/editors/interface/interface_icons.c')
-rw-r--r--source/blender/editors/interface/interface_icons.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index b7eab9f2a57..a9cdb34f634 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -35,6 +35,7 @@
#include "GPU_extensions.h"
#include "GPU_basic_shader.h"
+#include "GPU_draw.h"
#include "GPU_immediate.h"
#include "BLI_blenlib.h"
@@ -60,7 +61,6 @@
#include "IMB_imbuf_types.h"
#include "IMB_thumbs.h"
-#include "BIF_gl.h"
#include "BIF_glutil.h"
#include "ED_datafiles.h"
@@ -262,6 +262,7 @@ static void vicon_keytype_draw_wrapper(int x, int y, int w, int h, float alpha,
unsigned int outline_color_id = add_attrib(format, "outlineColor", COMP_U8, 4, NORMALIZE_INT_TO_FLOAT);
immBindBuiltinProgram(GPU_SHADER_KEYFRAME_DIAMOND);
+ GPU_enable_program_point_size();
immBegin(PRIM_POINTS, 1);
/* draw keyframe
@@ -272,6 +273,7 @@ static void vicon_keytype_draw_wrapper(int x, int y, int w, int h, float alpha,
pos_id, size_id, color_id, outline_color_id);
immEnd();
+ GPU_disable_program_point_size();
immUnbindProgram();
UI_Theme_Restore(&theme_state);