[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24127] trunk/blender/source/blender: Fixes for AutoKeying + File Loading Prints:
Joshua Leung
aligorith at gmail.com
Wed Oct 28 00:21:26 CET 2009
Revision: 24127
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24127
Author: aligorith
Date: 2009-10-28 00:21:26 +0100 (Wed, 28 Oct 2009)
Log Message:
-----------
Fixes for AutoKeying + File Loading Prints:
* 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.
Modified Paths:
--------------
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2009-10-27 21:58:03 UTC (rev 24126)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2009-10-27 23:21:26 UTC (rev 24127)
@@ -3497,7 +3497,7 @@
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);
Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c 2009-10-27 21:58:03 UTC (rev 24126)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c 2009-10-27 23:21:26 UTC (rev 24127)
@@ -4400,7 +4400,7 @@
{
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 @@
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 @@
// 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 @@
}
}
}
- 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 @@
if (!cancelled)
autokeyframe_ob_cb_func(t->scene, (View3D *)t->view, ob, t->mode);
}
+
}
}
More information about the Bf-blender-cvs
mailing list