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-28 09:21:27 +0300
committerMike Erwin <significant.bit@gmail.com>2017-02-28 09:21:27 +0300
commite7d57628c955c1843c70c8fc5023f5d8954847bd (patch)
treeebd1a94dba38fd2d958850f60a48263aae7ead63 /source/blender/editors/space_nla
parent5138fe3c0a24d5890438eed90a70401d90423356 (diff)
OpenGL: keyframe shape fixes
- Size parameter is total size of the shape, not its radius (half size). Updated hard-coded sizes to match this. - Shader expands size to include outline. - Fixed fringe between outline color and transparent background.
Diffstat (limited to 'source/blender/editors/space_nla')
-rw-r--r--source/blender/editors/space_nla/nla_draw.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_nla/nla_draw.c b/source/blender/editors/space_nla/nla_draw.c
index e744a39fde9..65582b994e8 100644
--- a/source/blender/editors/space_nla/nla_draw.c
+++ b/source/blender/editors/space_nla/nla_draw.c
@@ -150,11 +150,11 @@ static void nla_action_draw_keyframes(AnimData *adt, bAction *act, float y, floa
immBegin(PRIM_POINTS, key_ct);
/* - disregard the selection status of keyframes so they draw a certain way
- * - size is 3.0f which is smaller than the editable keyframes, so that there is a distinction
+ * - size is 6.0f which is smaller than the editable keyframes, so that there is a distinction
*/
for (ActKeyColumn *ak = keys.first; ak; ak = ak->next) {
- draw_keyframe_shape(ak->cfra, y, 3.0f, false, ak->key_type, KEYFRAME_SHAPE_FRAME, 1.0f,
- pos_id, size_id, color_id, outline_color_id);
+ draw_keyframe_shape(ak->cfra, y, 6.0f, false, ak->key_type, KEYFRAME_SHAPE_FRAME, 1.0f,
+ pos_id, size_id, color_id, outline_color_id);
}
immEnd();