← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty-proposed

« back to all changes in this revision

Viewing changes to source/blender/editors/space_nla/nla_draw.c

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2013-08-14 10:43:49 UTC
  • mfrom: (14.2.19 sid)
  • Revision ID: package-import@ubuntu.com-20130814104349-t1d5mtwkphp12dyj
Tags: 2.68a-3
* Upload to unstable
* debian/: python3.3 Depends simplified
  - debian/control: python3.3 Depends dropped
    for blender-data package
  - 0001-blender_thumbnailer.patch refreshed
* debian/control: libavcodec b-dep versioning dropped

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/editors/space_nla/nla_draw.c
43
43
 
44
44
#include "BLI_blenlib.h"
45
45
#include "BLI_math.h"
46
 
#include "BLI_rand.h"
47
46
#include "BLI_dlrbTree.h"
48
47
#include "BLI_utildefines.h"
49
48
 
695
694
                                        
696
695
                                        special = ICON_ACTION;
697
696
                                        
698
 
                                        if (act)
699
 
                                                BLI_snprintf(name, sizeof(name), "%s", act->id.name + 2);
700
 
                                        else
701
 
                                                BLI_strncpy(name, "<No Action>", sizeof(name));
702
 
                                                
 
697
                                        BLI_strncpy(name, act ? act->id.name + 2 : "<No Action>", sizeof(name));
 
698
 
703
699
                                        /* draw manually still */
704
700
                                        do_draw = TRUE;
705
701
                                }
759
755
                                glEnable(GL_BLEND);
760
756
                                
761
757
                                /* draw backing strip behind channel name */
762
 
                                // FIXME: hardcoded colors!!!
763
758
                                if (group == 5) {
764
759
                                        float color[4];
765
760