Hopefully this will finally fix the merging issues I had.

This commit is contained in:
Jorge Vássquez Pérez
2016-12-02 17:20:13 -08:00
parent 4ca84b5fee
commit b1efb4928b
4 changed files with 11 additions and 7 deletions
+2 -2
View File
@@ -93,7 +93,7 @@ function YBindBetween2()
}
this.activate = function activate()
{
this.yTool.yMainFunction();
yBindBetween2.yMainFunction();
}
this.run = function run()
{
@@ -212,5 +212,5 @@ if (typeof(YTB)=='undefined')
}
else
{
YTB.addTool(new YBindBetween2());
yBindBetween2 = YTB.addTool(new YBindBetween2());
}
+2 -2
View File
@@ -63,7 +63,7 @@ function YColorProbe()
}
this.yMainFunction = function yMainFunction()
{
app.beginUndoGroup(this.yTool.info.name); // yTool is a refernece to the Tool object, because THIS in this context returns the ButtonObject....
app.beginUndoGroup( yColorProbe.info.name ); // yTool is a refernece to the Tool object, because THIS in this context returns the ButtonObject....
//It works with Sampled layers at a 100% scale only.
try
@@ -124,5 +124,5 @@ if (typeof(YTB)=='undefined')
}
else
{
YTB.addTool(new YColorProbe());
yColorProbe = YTB.addTool(new YColorProbe());
}
+3 -3
View File
@@ -4,9 +4,9 @@ function YPuppetRigTool()
this.info =
{
name : "yPuppetRig",
version : 0.33,
version : 0.0,
stage : "development",
description : "Tools for streamlining puppet-based animation rigs.",
description : "Tool to create nulls at puppet pin locations, and link the latter to the former.",
url : "yorchnet.com"
};
this.appearence =
@@ -98,7 +98,7 @@ function YPuppetRigTool()
}
this.activate = function activate()
{
this.yTool.yMainFunction();
yPuppetRigTool.yMainFunction();
}
/**/