diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-12-03 15:30:59 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-12-03 15:30:59 +0300 |
commit | cd972535027a73ba70069051fe9038b6a8b5696a (patch) | |
tree | b50696bddbc710192b89e34fcdd1e82e6c8073b7 /source/blender/editors/space_nla | |
parent | aca76ddb502cbf0ee7888c3356f9f35240919410 (diff) |
- added GCC warning -Wstrict-prototypes
- fixed bug in paste material, exposed by stricter warnings.
- removed/renamed various shadowed vars.
- removed BGE lamp.colour, only allow lamp.color attribute.
Diffstat (limited to 'source/blender/editors/space_nla')
-rw-r--r-- | source/blender/editors/space_nla/nla_draw.c | 6 |
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 98550b7e452..d5a007fd506 100644 --- a/source/blender/editors/space_nla/nla_draw.c +++ b/source/blender/editors/space_nla/nla_draw.c @@ -171,7 +171,7 @@ static void nla_strip_get_color_inside (AnimData *adt, NlaStrip *strip, float co } else if (strip->type == NLASTRIP_TYPE_META) { /* Meta Clip */ - // TODO: should temporary metas get different colours too? + // TODO: should temporary metas get different colors too? if (strip->flag & NLASTRIP_FLAG_SELECT) { /* selected - use a bold purple color */ // FIXME: hardcoded temp-hack colors @@ -272,7 +272,7 @@ static void nla_draw_strip_curves (NlaStrip *strip, float yminc, float ymaxc) } /* time -------------------------- */ - // XXX do we want to draw this curve? in a different colour too? + // XXX do we want to draw this curve? in a different color too? /* turn off AA'd lines */ glDisable(GL_LINE_SMOOTH); @@ -431,7 +431,7 @@ static void nla_draw_strip_text (NlaTrack *UNUSED(nlt), NlaStrip *strip, int UNU else sprintf(str, "%s | %.2f %s %.2f", strip->name, strip->start, dir, strip->end); - /* set text colour - if colours (see above) are light, draw black text, otherwise draw white */ + /* set text color - if colors (see above) are light, draw black text, otherwise draw white */ if (strip->flag & (NLASTRIP_FLAG_ACTIVE|NLASTRIP_FLAG_SELECT|NLASTRIP_FLAG_TWEAKUSER)) glColor3f(0.0f, 0.0f, 0.0f); else |