Skip to content

Commit 1c9fc3d

Browse files
committed
Merge branch 'master' into 73_new_json_format
2 parents 2bb5bdf + b589ee7 commit 1c9fc3d

7 files changed

Lines changed: 432 additions & 245 deletions

File tree

‎bundle/jsx/renderManager.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ $.__bodymovin.bm_renderManager = (function () {
378378
}
379379

380380
function shouldIgnoreExpressionProperties() {
381-
return currentCompSettings && currentCompSettings.ignore_expression_properties;
381+
return currentCompSettings.ignore_expression_properties;
382382
}
383383

384384
ob.renderData = {

‎bundle/jsx/utils/keyframeHelper.jsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,8 @@ $.__bodymovin.bm_keyframeHelper = (function () {
242242
switch (property.propertyValueType) {
243243
case PropertyValueType.ThreeD_SPATIAL:
244244
case PropertyValueType.TwoD_SPATIAL:
245-
lastKey.to = property.keyOutSpatialTangent(indexTime);
246-
key.ti = property.keyInSpatialTangent(indexTime + 1);
245+
lastKey.to = bm_generalUtils.roundNumber(property.keyOutSpatialTangent(indexTime), 3);
246+
key.ti = bm_generalUtils.roundNumber(property.keyInSpatialTangent(indexTime + 1), 3);
247247
break;
248248
}
249249
}
@@ -474,7 +474,7 @@ $.__bodymovin.bm_keyframeHelper = (function () {
474474
}
475475
searchRovingKeyframes(prop);
476476
returnOb.k = exportKeys(prop, frRate, stretch, keyframeValues);
477-
if(prop.propertyIndex && !bm_renderManager.shouldIgnoreExpressionProperties()) {
477+
if(prop.propertyIndex && !$.__bodymovin.bm_renderManager.shouldIgnoreExpressionProperties()) {
478478
returnOb.ix = prop.propertyIndex;
479479
}
480480
bm_expressionHelper.checkExpression(prop, returnOb);

‎gulpfile.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ var replace = require('gulp-replace');
88
var gzip = require('gulp-gzip');
99
var insert = require('gulp-insert');
1010

11-
var version = '5.4.3'
11+
var version = '5.4.4'
1212

1313
var extensionSource = './bundle';
1414
var extensionDestination = '../../../tropi/AppData/Roaming/Adobe/CEP/extensions/bodymovin';

0 commit comments

Comments
 (0)