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:
authorJoshua Leung <aligorith@gmail.com>2018-03-08 05:17:53 +0300
committerJoshua Leung <aligorith@gmail.com>2018-03-08 07:15:33 +0300
commitfb70f9bf997114a55cdfebe47fa42005c2112927 (patch)
tree6bc83a8d0036b6bb1cc2bce2973337b1f74b9529 /source/blender/editors
parenta5d63624dee121b96cc6611bdd3242548aec4668 (diff)
Fix crash if NLA strip with "Use Animated Influence" setting is enabled without the Influence Strip F-Curve existing
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/space_nla/nla_draw.c22
1 files changed, 13 insertions, 9 deletions
diff --git a/source/blender/editors/space_nla/nla_draw.c b/source/blender/editors/space_nla/nla_draw.c
index 255fc0d6f8f..d33b84f76c0 100644
--- a/source/blender/editors/space_nla/nla_draw.c
+++ b/source/blender/editors/space_nla/nla_draw.c
@@ -285,16 +285,20 @@ static void nla_draw_strip_curves(NlaStrip *strip, float yminc, float ymaxc)
float cfra;
/* plot the curve (over the strip's main region) */
- glBegin(GL_LINE_STRIP);
- /* sample at 1 frame intervals, and draw
- * - min y-val is yminc, max is y-maxc, so clamp in those regions
- */
- for (cfra = strip->start; cfra <= strip->end; cfra += 1.0f) {
- float y = evaluate_fcurve(fcu, cfra);
- CLAMP(y, 0.0f, 1.0f);
- glVertex2f(cfra, ((y * yheight) + yminc));
+ if (fcu) {
+ glBegin(GL_LINE_STRIP);
+
+ /* sample at 1 frame intervals, and draw
+ * - min y-val is yminc, max is y-maxc, so clamp in those regions
+ */
+ for (cfra = strip->start; cfra <= strip->end; cfra += 1.0f) {
+ float y = evaluate_fcurve(fcu, cfra);
+ CLAMP(y, 0.0f, 1.0f);
+ glVertex2f(cfra, ((y * yheight) + yminc));
+ }
+
+ glEnd(); // GL_LINE_STRIP
}
- glEnd(); // GL_LINE_STRIP
}
else {
/* use blend in/out values only if both aren't zero */