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

« back to all changes in this revision

Viewing changes to source/blender/editors/animation/anim_channels_defines.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:
574
574
                case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */
575
575
                        if (scene->adt)
576
576
                                return GET_ACF_FLAG_PTR(scene->adt->flag, type);
577
 
                        else
578
 
                                return NULL;
 
577
                        return NULL;
579
578
                        
580
579
                default: /* unsupported */
581
580
                        return NULL;
719
718
                case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */
720
719
                        if (ob->adt)
721
720
                                return GET_ACF_FLAG_PTR(ob->adt->flag, type);
722
 
                        else
723
 
                                return NULL;
724
 
                        
 
721
                        return NULL;
 
722
 
725
723
                default: /* unsupported */
726
724
                        return NULL;
727
725
        }
1053
1051
                        if (adt) {
1054
1052
                                return GET_ACF_FLAG_PTR(adt->flag, type);
1055
1053
                        }
1056
 
                        else
1057
 
                                return NULL;
1058
 
                        
 
1054
                        return NULL;
 
1055
 
1059
1056
                case ACHANNEL_SETTING_EXPAND: /* expanded */
1060
1057
                        return GET_ACF_FLAG_PTR(act->flag, type);
1061
1058
                
1213
1210
                case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */
1214
1211
                        if (ma->adt)
1215
1212
                                return GET_ACF_FLAG_PTR(ma->adt->flag, type);
1216
 
                        else
1217
 
                                return NULL;
1218
 
                
 
1213
                        return NULL;
 
1214
 
1219
1215
                default: /* unsupported */
1220
1216
                        return NULL;
1221
1217
        }
1290
1286
                case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */
1291
1287
                        if (la->adt)
1292
1288
                                return GET_ACF_FLAG_PTR(la->adt->flag, type);
1293
 
                        else
1294
 
                                return NULL;
 
1289
                        return NULL;
1295
1290
                
1296
1291
                default: /* unsupported */
1297
1292
                        return NULL;
1374
1369
                case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */
1375
1370
                        if (tex->adt)
1376
1371
                                return GET_ACF_FLAG_PTR(tex->adt->flag, type);
1377
 
                        else
1378
 
                                return NULL;
 
1372
                        return NULL;
1379
1373
                
1380
1374
                default: /* unsupported */
1381
1375
                        return NULL;
1451
1445
                case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */
1452
1446
                        if (ca->adt)
1453
1447
                                return GET_ACF_FLAG_PTR(ca->adt->flag, type);
1454
 
                        else
1455
 
                                return NULL;
 
1448
                        return NULL;
1456
1449
                
1457
1450
                default: /* unsupported */
1458
1451
                        return NULL;
1538
1531
                case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */
1539
1532
                        if (cu->adt)
1540
1533
                                return GET_ACF_FLAG_PTR(cu->adt->flag, type);
1541
 
                        else
1542
 
                                return NULL;
 
1534
                        return NULL;
1543
1535
                
1544
1536
                default: /* unsupported */
1545
1537
                        return NULL;
1615
1607
                case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */
1616
1608
                        if (key->adt)
1617
1609
                                return GET_ACF_FLAG_PTR(key->adt->flag, type);
1618
 
                        else
1619
 
                                return NULL;
 
1610
                        return NULL;
1620
1611
                
1621
1612
                default: /* unsupported */
1622
1613
                        return NULL;
1692
1683
                case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */
1693
1684
                        if (wo->adt)
1694
1685
                                return GET_ACF_FLAG_PTR(wo->adt->flag, type);
1695
 
                        else
1696
 
                                return NULL;
 
1686
                        return NULL;
1697
1687
                
1698
1688
                default: /* unsupported */
1699
1689
                        return NULL;
1769
1759
                case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */
1770
1760
                        if (part->adt)
1771
1761
                                return GET_ACF_FLAG_PTR(part->adt->flag, type);
1772
 
                        else
1773
 
                                return NULL;
 
1762
                        return NULL;
1774
1763
                
1775
1764
                default: /* unsupported */
1776
1765
                        return NULL;
1839
1828
        
1840
1829
        switch (setting) {
1841
1830
                case ACHANNEL_SETTING_EXPAND: /* expanded */
1842
 
                        return GET_ACF_FLAG_PTR(mb->flag, type);
 
1831
                        return GET_ACF_FLAG_PTR(mb->flag2, type);
1843
1832
                        
1844
1833
                case ACHANNEL_SETTING_SELECT: /* selected */
1845
1834
                case ACHANNEL_SETTING_MUTE: /* muted (for NLA only) */
1846
1835
                case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */
1847
1836
                        if (mb->adt)
1848
1837
                                return GET_ACF_FLAG_PTR(mb->adt->flag, type);
1849
 
                        else
1850
 
                                return NULL;
 
1838
                        return NULL;
1851
1839
                
1852
1840
                default: /* unsupported */
1853
1841
                        return NULL;
1923
1911
                case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */
1924
1912
                        if (arm->adt)
1925
1913
                                return GET_ACF_FLAG_PTR(arm->adt->flag, type);
1926
 
                        else
1927
 
                                return NULL;
 
1914
                        return NULL;
1928
1915
                
1929
1916
                default: /* unsupported */
1930
1917
                        return NULL;
2011
1998
                case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */
2012
1999
                        if (ntree->adt)
2013
2000
                                return GET_ACF_FLAG_PTR(ntree->adt->flag, type);
2014
 
                        else
2015
 
                                return NULL;
 
2001
                        return NULL;
2016
2002
                        
2017
2003
                default: /* unsupported */
2018
2004
                        return NULL;
2088
2074
                case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */
2089
2075
                        if (linestyle->adt)
2090
2076
                                return GET_ACF_FLAG_PTR(linestyle->adt->flag, type);
2091
 
                        else
2092
 
                                return NULL;
 
2077
                        return NULL;
2093
2078
                        
2094
2079
                default: /* unsupported */
2095
2080
                        return NULL;
2165
2150
                case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */
2166
2151
                        if (me->adt)
2167
2152
                                return GET_ACF_FLAG_PTR(me->adt->flag, type);
2168
 
                        else
2169
 
                                return NULL;
 
2153
                        return NULL;
2170
2154
                        
2171
2155
                default: /* unsupported */
2172
2156
                        return NULL;
2242
2226
                case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */
2243
2227
                        if (lt->adt)
2244
2228
                                return GET_ACF_FLAG_PTR(lt->adt->flag, type);
2245
 
                        else
2246
 
                                return NULL;
 
2229
                        return NULL;
2247
2230
                        
2248
2231
                default: /* unsupported */
2249
2232
                        return NULL;
2319
2302
                case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */
2320
2303
                        if (spk->adt)
2321
2304
                                return GET_ACF_FLAG_PTR(spk->adt->flag, type);
2322
 
                        else
2323
 
                                return NULL;
 
2305
                        return NULL;
2324
2306
                
2325
2307
                default: /* unsupported */
2326
2308
                        return NULL;
2799
2781
        if (ACF_INIT) {
2800
2782
                ACF_INIT = 0;
2801
2783
                
 
2784
                /* NOTE: need to keep the order of these synchronized with the definition of
 
2785
                 * channel types (eAnim_ChannelType) in ED_anim_api.h
 
2786
                 */
2802
2787
                animchannelTypeInfo[type++] = NULL;              /* None */
2803
2788
                animchannelTypeInfo[type++] = NULL;              /* AnimData */
2804
2789
                animchannelTypeInfo[type++] = NULL;              /* Special */
2826
2811
                animchannelTypeInfo[type++] = &ACF_DSMESH;       /* Mesh Channel */
2827
2812
                animchannelTypeInfo[type++] = &ACF_DSTEX;        /* Texture Channel */
2828
2813
                animchannelTypeInfo[type++] = &ACF_DSLAT;        /* Lattice Channel */
 
2814
                animchannelTypeInfo[type++] = &ACF_DSLINESTYLE;  /* LineStyle Channel */
2829
2815
                animchannelTypeInfo[type++] = &ACF_DSSPK;        /* Speaker Channel */
2830
 
                animchannelTypeInfo[type++] = &ACF_DSLINESTYLE;  /* LineStyle Channel */
2831
2816
                
2832
2817
                animchannelTypeInfo[type++] = &ACF_SHAPEKEY;     /* ShapeKey */
2833
2818
                
2921
2906
                                                return ((*val) & flag) == 0;
2922
2907
                                        else
2923
2908
                                                return ((*val) & flag) != 0;
 
2909
                                        break;
2924
2910
                                }
2925
 
                                break;
2926
 
                                        
2927
2911
                                case sizeof(short): /* short pointer for setting */
2928
2912
                                {
2929
2913
                                        short *val = (short *)ptr;
2932
2916
                                                return ((*val) & flag) == 0;
2933
2917
                                        else
2934
2918
                                                return ((*val) & flag) != 0;
 
2919
                                        break;
2935
2920
                                }
2936
 
                                break;
2937
 
                                        
2938
2921
                                case sizeof(char):  /* char pointer for setting */
2939
2922
                                {
2940
2923
                                        char *val = (char *)ptr;
2943
2926
                                                return ((*val) & flag) == 0;
2944
2927
                                        else
2945
2928
                                                return ((*val) & flag) != 0;
 
2929
                                        break;
2946
2930
                                }
2947
 
                                break;
2948
2931
                        }
2949
2932
                }
2950
2933
        }
2994
2977
                                {
2995
2978
                                        int *val = (int *)ptr;
2996
2979
                                        ACF_SETTING_SET(*val, flag, mode);
 
2980
                                        break;
2997
2981
                                }
2998
 
                                break;
2999
 
                                        
3000
2982
                                case sizeof(short): /* short pointer for setting */
3001
2983
                                {
3002
2984
                                        short *val = (short *)ptr;
3003
2985
                                        ACF_SETTING_SET(*val, flag, mode);
 
2986
                                        break;
3004
2987
                                }
3005
 
                                break;
3006
 
                                        
3007
2988
                                case sizeof(char):  /* char pointer for setting */
3008
2989
                                {
3009
2990
                                        char *val = (char *)ptr;
3010
2991
                                        ACF_SETTING_SET(*val, flag, mode);
 
2992
                                        break;
3011
2993
                                }
3012
 
                                break;
3013
2994
                        }
3014
2995
                }
3015
2996
        }
3156
3137
                                {
3157
3138
                                        SpaceAction *saction = (SpaceAction *)ac->sl;
3158
3139
                                        draw_sliders = (saction->flag & SACTION_SLIDERS);
 
3140
                                        break;
3159
3141
                                }
3160
 
                                break;
3161
3142
                                case SPACE_IPO:
3162
3143
                                {
3163
3144
                                        SpaceIpo *sipo = (SpaceIpo *)ac->sl;
3164
3145
                                        draw_sliders = (sipo->flag & SIPO_SLIDERS);
 
3146
                                        break;
3165
3147
                                }
3166
 
                                break;
3167
3148
                        }
3168
3149
                }
3169
3150
 
3443
3424
                                case ACHANNEL_SETTING_EXPAND: /* expanding - cannot flush, otherwise all would open/close at once */
3444
3425
                                default:
3445
3426
                                        uiButSetFunc(but, achannel_setting_widget_cb, NULL, NULL);
 
3427
                                        break;
3446
3428
                        }
3447
3429
                }
3448
3430
        }
3546
3528
                                {
3547
3529
                                        SpaceAction *saction = (SpaceAction *)ac->sl;
3548
3530
                                        draw_sliders = (saction->flag & SACTION_SLIDERS);
 
3531
                                        break;
3549
3532
                                }
3550
 
                                break;
3551
3533
                                case SPACE_IPO:
3552
3534
                                {
3553
3535
                                        SpaceIpo *sipo = (SpaceIpo *)ac->sl;
3554
3536
                                        draw_sliders = (sipo->flag & SIPO_SLIDERS);
 
3537
                                        break;
3555
3538
                                }
3556
 
                                break;
3557
3539
                        }
3558
3540
                }
3559
3541