archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fixes for AutoKeying + File Loading Prints:

Browse Source 
* AutoKeying was broken after the fix to get automerge working again in 3D view. The 3D-View check was swallowing the processing before autokeying could be done. Separated these out again.

* The error print when some external data couldn't be found for objects was missing a newline.
This commit is contained in:
Joshua Leung
2009-10-27 23:21:26 +00:00
parent be42f422da
commit 49d7a2c51a
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenloader/intern/readfile.c
View File

@@ -3497,7 +3497,7 @@ static void lib_link_object(FileData *fd, Main *main)
ob->type= OB_EMPTY;
warn= 1;
if(ob->id.lib) printf("Can't find obdata of %s lib %s\n", ob->id.name+2, ob->id.lib->name);
else printf("Object %s lost data.", ob->id.name+2);
else printf("Object %s lost data.\n", ob->id.name+2);
if(ob->pose) {
free_pose(ob->pose);

10
source/blender/editors/transform/transform_conversions.c
View File

@@ -4400,7 +4400,7 @@ void autokeyframe_ob_cb_func(Scene *scene, View3D *v3d, Object *ob, int tmode)
{
ID *id= &ob->id;
FCurve *fcu;
// TODO: this should probably be done per channel instead...
if (autokeyframe_cfra_can_key(scene, id)) {
KeyingSet *active_ks = ANIM_scene_get_active_keyingset(scene);
@@ -4501,7 +4501,7 @@ void autokeyframe_pose_cb_func(Scene *scene, View3D *v3d, Object *ob, int tmode,
bPose *pose= ob->pose;
bPoseChannel *pchan;
FCurve *fcu;
// TODO: this should probably be done per channel instead...
if (autokeyframe_cfra_can_key(scene, id)) {
KeyingSet *active_ks = ANIM_scene_get_active_keyingset(scene);
@@ -4635,7 +4635,7 @@ void special_aftertrans_update(TransInfo *t)
// short redrawipo=0, resetslowpar=1;
int cancelled= (t->state == TRANS_CANCEL);
short duplicate= (t->undostr && strstr(t->undostr, "Duplicate")) ? 1 : 0;
if (t->spacetype==SPACE_VIEW3D) {
if (t->obedit) {
if (cancelled==0) {
@@ -4643,7 +4643,8 @@ void special_aftertrans_update(TransInfo *t)
}
}
}
else if (t->spacetype == SPACE_SEQ) {
if (t->spacetype == SPACE_SEQ) {
/* freeSeqData in transform_conversions.c does this
* keep here so the else at the end wont run... */
}
@@ -4945,6 +4946,7 @@ void special_aftertrans_update(TransInfo *t)
if (!cancelled)
autokeyframe_ob_cb_func(t->scene, (View3D *)t->view, ob, t->mode);
}
}
}