← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to source/blender/editors/space_time/space_time.c

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/editors/space_time/space_time.c
201
201
                                col[3] = 0.1;
202
202
                                break;
203
203
                        default:
 
204
                                col[0] = 1.0;   col[1] = 0.0;   col[2] = 1.0;
 
205
                                col[3] = 0.1;
204
206
                                BLI_assert(0);
205
 
                                col[0] = 1.0;   col[1] = 0.0;   col[2] = 1.0;
206
 
                                col[3] = 0.1;
 
207
                                break;
207
208
                }
208
209
                glColor4fv(col);
209
210
                
419
420
                case NC_SCENE:
420
421
                {
421
422
                        switch (wmn->data) {
 
423
                                case ND_RENDER_RESULT:
 
424
                                        ED_area_tag_redraw(sa);
 
425
                                        break;
422
426
                                case ND_OB_ACTIVE:
423
427
                                case ND_FRAME:
424
428
                                        ED_area_tag_refresh(sa);
435
439
                                                        break;
436
440
                                                }
437
441
                                        }
 
442
                                        break;
438
443
                                }
439
 
                                break;
440
444
                        }
441
445
                        break;
442
446
                }
558
562
                                        ED_region_tag_redraw(ar);
559
563
                                        break;
560
564
                        }
 
565
                        break;
561
566
        }
562
567
}
563
568
 
587
592
                case NC_SCENE:
588
593
                {
589
594
                        switch (wmn->data) {
 
595
                                case ND_RENDER_RESULT:
590
596
                                case ND_OB_SELECT:
591
597
                                case ND_FRAME:
592
598
                                case ND_FRAME_RANGE: