forked from bartvdbraak/blender
Fix T49489: Pose marker in camera action + marker bound to camera -> crash.
'camera' Object pointer of TimeMarkers is a 'temp' hack since Durian project... Would need to be either made definitive now, or removed/reworked/whatever. But since we intend to use that object pointer for other needs, and current code could lead to crashing .blend files, for now let's fix that mess (was missing some bits in read code, and also totally ignored in libquery code). Should be safe for 2.78a.
This commit is contained in:
parent
396a6d8a86
commit
85d543b4ac
@ -378,6 +378,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);
|
||||
|
||||
@ -842,6 +846,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:
|
||||
@ -849,7 +862,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:
|
||||
|
@ -2511,6 +2511,12 @@ static void lib_link_action(FileData *fd, Main *main)
|
||||
// >>> XXX deprecated - old animation system
|
||||
|
||||
lib_link_fcurves(fd, &act->id, &act->curves);
|
||||
|
||||
for (TimeMarker *marker = act->markers.first; marker; marker = marker->next) {
|
||||
if (marker->camera) {
|
||||
marker->camera = newlibadr(fd, act->id.lib, marker->camera);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -5608,7 +5614,6 @@ static void lib_link_scene(FileData *fd, Main *main)
|
||||
Base *base, *next;
|
||||
Sequence *seq;
|
||||
SceneRenderLayer *srl;
|
||||
TimeMarker *marker;
|
||||
FreestyleModuleConfig *fmc;
|
||||
FreestyleLineSet *fls;
|
||||
|
||||
@ -5709,15 +5714,11 @@ static void lib_link_scene(FileData *fd, Main *main)
|
||||
}
|
||||
SEQ_END
|
||||
|
||||
#ifdef DURIAN_CAMERA_SWITCH
|
||||
for (marker = sce->markers.first; marker; marker = marker->next) {
|
||||
for (TimeMarker *marker = sce->markers.first; marker; marker = marker->next) {
|
||||
if (marker->camera) {
|
||||
marker->camera = newlibadr(fd, sce->id.lib, marker->camera);
|
||||
}
|
||||
}
|
||||
#else
|
||||
(void)marker;
|
||||
#endif
|
||||
|
||||
BKE_sequencer_update_muting(sce->ed);
|
||||
BKE_sequencer_update_sound_bounds_all(sce);
|
||||
@ -8860,6 +8861,12 @@ static void expand_action(FileData *fd, Main *mainvar, bAction *act)
|
||||
|
||||
/* F-Curves in Action */
|
||||
expand_fcurves(fd, mainvar, &act->curves);
|
||||
|
||||
for (TimeMarker *marker = act->markers.first; marker; marker = marker->next) {
|
||||
if (marker->camera) {
|
||||
expand_doit(fd, mainvar, marker->camera);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void expand_keyingsets(FileData *fd, Main *mainvar, ListBase *list)
|
||||
@ -9490,17 +9497,11 @@ static void expand_scene(FileData *fd, Main *mainvar, Scene *sce)
|
||||
expand_doit(fd, mainvar, sce->rigidbody_world->constraints);
|
||||
}
|
||||
|
||||
#ifdef DURIAN_CAMERA_SWITCH
|
||||
{
|
||||
TimeMarker *marker;
|
||||
|
||||
for (marker = sce->markers.first; marker; marker = marker->next) {
|
||||
if (marker->camera) {
|
||||
expand_doit(fd, mainvar, marker->camera);
|
||||
}
|
||||
for (TimeMarker *marker = sce->markers.first; marker; marker = marker->next) {
|
||||
if (marker->camera) {
|
||||
expand_doit(fd, mainvar, marker->camera);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
expand_doit(fd, mainvar, sce->clip);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user