Merge branch 'master' into blender2.8
[blender.git] / source / blender / blenkernel / intern / library_query.c
index 772ba2d9c807d0f3ba3a6019896308db40629b70..66aa8e3f498a9020f28f03427c4ad289cd79a1b3 100644 (file)
@@ -368,6 +368,10 @@ void BKE_library_foreach_ID_link(ID *id, LibraryIDLinkCallback callback, void *u
                                        CALLBACK_INVOKE(base->object, IDWALK_USER);
                                }
 
+                               for (TimeMarker *marker = scene->markers.first; marker; marker = marker->next) {
+                                       CALLBACK_INVOKE(marker->camera, IDWALK_NOP);
+                               }
+
                                if (toolsett) {
                                        CALLBACK_INVOKE(toolsett->skgen_template, IDWALK_NOP);
 
@@ -776,6 +780,15 @@ void BKE_library_foreach_ID_link(ID *id, LibraryIDLinkCallback callback, void *u
                                }
                                break;
                        }
+                       case ID_AC:
+                       {
+                               bAction *act = (bAction *) id;
+
+                               for (TimeMarker *marker = act->markers.first; marker; marker = marker->next) {
+                                       CALLBACK_INVOKE(marker->camera, IDWALK_NOP);
+                               }
+                               break;
+                       }
 
                        /* Nothing needed for those... */
                        case ID_IM:
@@ -783,7 +796,6 @@ void BKE_library_foreach_ID_link(ID *id, LibraryIDLinkCallback callback, void *u
                        case ID_TXT:
                        case ID_SO:
                        case ID_AR:
-                       case ID_AC:
                        case ID_GD:
                        case ID_WM:
                        case ID_PAL: