Orange: some better support for new bone layers: action window now draws

nicer... it was still counting all bones for defining visible area, so
many times channels got displayed out of view.

1 files changed, 14 insertions, 12 deletions

diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c
index cee36e06fae..1aaf4c6f2c1 100644
--- a/source/blender/blenkernel/intern/action.c
+++ b/source/blender/blenkernel/intern/action.c
@@ -437,18 +437,9 @@ void calc_action_range(const bAction *act, float *start, float *end)
 
 	if(act) {
 		for (chan=act->chanbase.first; chan; chan=chan->next) {
-			if(chan->ipo) {
-				for (icu=chan->ipo->curve.first; icu; icu=icu->next) {
-					if(icu->totvert) {
-						min= MIN2 (min, icu->bezt[0].vec[1][0]);
-						max= MAX2 (max, icu->bezt[icu->totvert-1].vec[1][0]);
-						foundvert=1;
-					}
-				}
-			}
-			for (conchan=chan->constraintChannels.first; conchan; conchan=conchan->next) {
-				if(conchan->ipo) {
-					for (icu=conchan->ipo->curve.first; icu; icu=icu->next) {
+			if((chan->flag & ACHAN_HIDDEN)==0) {
+				if(chan->ipo) {
+					for (icu=chan->ipo->curve.first; icu; icu=icu->next) {
 						if(icu->totvert) {
 							min= MIN2 (min, icu->bezt[0].vec[1][0]);
 							max= MAX2 (max, icu->bezt[icu->totvert-1].vec[1][0]);
@@ -456,6 +447,17 @@ void calc_action_range(const bAction *act, float *start, float *end)
 						}
 					}
 				}
+				for (conchan=chan->constraintChannels.first; conchan; conchan=conchan->next) {
+					if(conchan->ipo) {
+						for (icu=conchan->ipo->curve.first; icu; icu=icu->next) {
+							if(icu->totvert) {
+								min= MIN2 (min, icu->bezt[0].vec[1][0]);
+								max= MAX2 (max, icu->bezt[icu->totvert-1].vec[1][0]);
+								foundvert=1;
+							}
+						}
+					}
+				}
 			}
 		}
 	}