diff options
| -rw-r--r-- | source/blender/blenlib/intern/graph.c | 1 | ||||
| -rw-r--r-- | source/blender/src/autoarmature.c | 23 | ||||
| -rw-r--r-- | source/blender/src/reeb.c | 9 |
3 files changed, 21 insertions, 12 deletions
diff --git a/source/blender/blenlib/intern/graph.c b/source/blender/blenlib/intern/graph.c index 29c51e05bd7..8f35b38379e 100644 --- a/source/blender/blenlib/intern/graph.c +++ b/source/blender/blenlib/intern/graph.c @@ -732,6 +732,7 @@ static void handleRadialSymmetry(BGraph *graph, BNode *root_node, int depth, flo if (sub_total == 1) { + group -= 1; /* not really a group so decrement */ /* NOTHING TO DO */ } else if (sub_total == 2) diff --git a/source/blender/src/autoarmature.c b/source/blender/src/autoarmature.c index 0f5a55da0d0..4beff877cab 100644 --- a/source/blender/src/autoarmature.c +++ b/source/blender/src/autoarmature.c @@ -2827,11 +2827,15 @@ void BIF_retargetArmature() Base *base; ReebGraph *reebg; double start_time, end_time; + double gstart_time, gend_time; + double reeb_time, rig_time, retarget_time; - start_time = PIL_check_seconds_timer(); + gstart_time = start_time = PIL_check_seconds_timer(); reebg = BIF_ReebGraphMultiFromEditMesh(); + end_time = PIL_check_seconds_timer(); + reeb_time = end_time - start_time; printf("Reeb Graph created\n"); @@ -2853,8 +2857,13 @@ void BIF_retargetArmature() list.first= list.last = NULL; make_boneList(&list, &arm->bonebase, NULL); + start_time = PIL_check_seconds_timer(); + rigg = armatureToGraph(ob, &list); + end_time = PIL_check_seconds_timer(); + rig_time = end_time - start_time; + printf("Armature graph created\n"); //RIG_printGraph(rigg); @@ -2863,8 +2872,13 @@ void BIF_retargetArmature() printf("retargetting %s\n", ob->id.name); + start_time = PIL_check_seconds_timer(); + retargetGraphs(rigg); + end_time = PIL_check_seconds_timer(); + retarget_time = end_time - start_time; + /* Turn the list into an armature */ editbones_to_armature(&list, ob); @@ -2877,10 +2891,13 @@ void BIF_retargetArmature() REEB_freeGraph(reebg); - end_time = PIL_check_seconds_timer(); + gend_time = PIL_check_seconds_timer(); printf("-----------\n"); - printf("runtime: %.3f\n", end_time - start_time); + printf("runtime: \t%.3f\n", gend_time - gstart_time); + printf("reeb: \t%.3f\n", reeb_time); + printf("rig: \t%.3f\n", rig_time); + printf("retarget: \t%.3f\n", retarget_time); printf("-----------\n"); BIF_undo_push("Retarget Skeleton"); diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c index 3899d8438ae..54befb85a9b 100644 --- a/source/blender/src/reeb.c +++ b/source/blender/src/reeb.c @@ -3413,9 +3413,6 @@ ReebGraph *BIF_ReebGraphMultiFromEditMesh(void) ReebGraph *rg = NULL; ReebGraph *rgi, *previous; int i, nb_levels = REEB_MAX_MULTI_LEVEL; - double start_time, end_time; - - start_time = PIL_check_seconds_timer(); if (em == NULL) return NULL; @@ -3438,12 +3435,6 @@ ReebGraph *BIF_ReebGraphMultiFromEditMesh(void) freeEdgeIndex(&indexed_edges); - end_time = PIL_check_seconds_timer(); - - printf("-----------\n"); - printf("runtime: %.3f\n", end_time - start_time); - printf("-----------\n"); - #ifdef DEBUG_REEB weightToVCol(em, 0); #endif |