Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / space_outliner / outliner_draw.c
index e3baf44bf9cd8239d306a427f9f31a904ef53f48..de82011415963db4e113c42823e4e7a919c9a6b1 100644 (file)
@@ -1120,7 +1120,10 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto
                        }
                }
                else {
-                       switch (GS(tselem->id->name)) {
+                       /* TODO(sergey): Casting to short here just to handle ID_NLA which is
+                        * NOT inside of IDType enum.
+                        */
+                       switch ((short)GS(tselem->id->name)) {
                                case ID_SCE:
                                        tselem_draw_icon_uibut(&arg, ICON_SCENE_DATA); break;
                                case ID_ME:
@@ -1190,6 +1193,8 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto
                                        tselem_draw_icon_uibut(&arg, ICON_LINE_DATA); break;
                                case ID_GD:
                                        tselem_draw_icon_uibut(&arg, ICON_GREASEPENCIL); break;
+                               default:
+                                       break;
                        }
                }
        }