text animator fixes
diff --git a/extension/jsx/utils/textAnimatorHelper.jsx b/extension/jsx/utils/textAnimatorHelper.jsx
index b651576..86a1b81 100644
--- a/extension/jsx/utils/textAnimatorHelper.jsx
+++ b/extension/jsx/utils/textAnimatorHelper.jsx
@@ -25,7 +25,11 @@
}
}
- len = selectorProperty.numProperties;
+ if(!selectorProperty) {
+ selectorType = -1;
+ } else {
+ len = selectorProperty.numProperties;
+ }
/*for (i = 0; i < len; i += 1) {
//bm_eventDispatcher.log(selectorProperty.property(i + 1).matchName);
}*/
@@ -72,6 +76,18 @@
var amount = selectorProperty.property('ADBE Text Expressible Amount');
bm_expressionHelper.checkExpression(amount, ob);
//bm_eventDispatcher.log(ob.x);
+ } else if (selectorType === -1) {
+ ob.t = 0;
+ ob.xe = {k:0}
+ ob.ne = {k:0}
+ ob.a = {k:100}
+ ob.b = 1
+ ob.b = 0
+ ob.sh = 0
+ ob.s = {k:0}
+ ob.e = {k:100}
+ ob.o = {k:0}
+ //bm_eventDispatcher.log(ob.x);
}
return ob;
}
diff --git a/player/js/utils/PropertyFactory.js b/player/js/utils/PropertyFactory.js
index ecf8fdd..ad87841 100644
--- a/player/js/utils/PropertyFactory.js
+++ b/player/js/utils/PropertyFactory.js
@@ -761,7 +761,7 @@
mult = easer(mult);
}else if(type == 4){
if(e === s){
- mult = ind >= e ? 0 : 1;
+ mult = 0;
}else{
mult = max(0,min(0.5/(e-s) + (ind-s)/(e-s),1));
if(mult<.5){
@@ -773,7 +773,7 @@
mult = easer(mult);
}else if(type == 5){
if(e === s){
- mult = ind >= e ? 0 : 1;
+ mult = 0;
}else{
var tot = e - s;
/*ind += 0.5;
@@ -786,7 +786,7 @@
mult = easer(mult);
}else if(type == 6){
if(e === s){
- mult = ind >= e ? 0 : 1;
+ mult = 0;
}else{
ind = min(max(0,ind+0.5-s),e-s);
mult = (1+(Math.cos((Math.PI+Math.PI*2*(ind)/(e-s)))))/2;
