Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / space_nla / nla_channels.c
index 4f30c04..957d5a9 100644 (file)
@@ -175,7 +175,6 @@ static int mouse_nla_channels(bContext *C, bAnimContext *ac, float x, int channe
                case ANIMTYPE_DSSKEY:
                case ANIMTYPE_DSWOR:
                case ANIMTYPE_DSNTREE:
-               case ANIMTYPE_DSPART:
                case ANIMTYPE_DSMBALL:
                case ANIMTYPE_DSARM:
                case ANIMTYPE_DSMESH:
@@ -215,7 +214,7 @@ static int mouse_nla_channels(bContext *C, bAnimContext *ac, float x, int channe
                        /* offset for start of channel (on LHS of channel-list) */
                        if (ale->id) {
                                /* special exception for materials and particles */
-                               if (ELEM(GS(ale->id->name), ID_MA, ID_PA))
+                               if (GS(ale->id->name) == ID_MA)
                                        offset = 21 + NLACHANNEL_BUTTON_WIDTH;
                                else
                                        offset = 14;