Merge remote-tracking branch 'origin/master' into svetoslavtsenov/merge-release-in-master

This commit is contained in:
SvetoslavTsenov
2019-07-16 13:26:15 +03:00
22 changed files with 104 additions and 78 deletions

View File

@@ -35,7 +35,7 @@ import * as kam from "../animation/keyframe-animation";
let keyframeAnimationModule: typeof kam;
function ensureKeyframeAnimationModule() {
if (!keyframeAnimationModule) {
keyframeAnimationModule = require("ui/animation/keyframe-animation");
keyframeAnimationModule = require("../animation/keyframe-animation");
}
}