← Back to branch summary

~ubuntu-branches/ubuntu/utopic/blender/utopic-proposed

« back to all changes in this revision

Viewing changes to source/blender/editors/space_action/action_draw.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_action/action_draw.c
226
226
                                                {
227
227
                                                        /* reddish color from NLA */
228
228
                                                        UI_ThemeColor4(TH_ANIM_ACTIVE);
 
229
                                                        break;
229
230
                                                }
230
 
                                                break;
231
 
                                                
232
231
                                                case ANIMTYPE_SCENE:
233
232
                                                case ANIMTYPE_OBJECT:
234
233
                                                {
235
234
                                                        if (sel) glColor4ub(col1b[0], col1b[1], col1b[2], 0x45); 
236
235
                                                        else glColor4ub(col1b[0], col1b[1], col1b[2], 0x22); 
 
236
                                                        break;
237
237
                                                }
238
 
                                                break;
239
 
                                                
240
238
                                                case ANIMTYPE_FILLACTD:
241
239
                                                case ANIMTYPE_DSSKEY:
242
240
                                                case ANIMTYPE_DSWOR:
243
241
                                                {
244
242
                                                        if (sel) glColor4ub(col2b[0], col2b[1], col2b[2], 0x45); 
245
243
                                                        else glColor4ub(col2b[0], col2b[1], col2b[2], 0x22); 
 
244
                                                        break;
246
245
                                                }
247
 
                                                break;
248
 
                                                
249
246
                                                case ANIMTYPE_GROUP:
250
247
                                                {
251
248
                                                        if (sel) glColor4ub(col1a[0], col1a[1], col1a[2], 0x22);
252
249
                                                        else glColor4ub(col2a[0], col2a[1], col2a[2], 0x22);
 
250
                                                        break;
253
251
                                                }
254
 
                                                break;
255
 
                                                
256
252
                                                default:
257
253
                                                {
258
254
                                                        if (sel) glColor4ub(col1[0], col1[1], col1[2], 0x22);
259
255
                                                        else glColor4ub(col2[0], col2[1], col2[2], 0x22);
 
256
                                                        break;
260
257
                                                }
261
 
                                                break;
262
258
                                        }
263
259
                                        
264
260
                                        /* draw region twice: firstly backdrop, then the current range */