Skip to content

Commit e751963

Browse files
committed
build: 17.1.19
1 parent 7798edb commit e751963

17 files changed

+535
-272
lines changed

dist/Duik_api.jsxinc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
//@include "libs/DuAEF.jsxinc"
2+
//@include "libs/DuGR_API.jsxinc"
3+
//@include "libs/DuIO_api.jsxinc"
4+
//@include "libs/DuSan_api.jsxinc"
5+
//@include "libs/api1.jsxinc"
6+
//@include "libs/api2.jsxinc"
7+
//@include "libs/api3.jsxinc"

dist/libs/DuAEF.jsxinc

Lines changed: 37 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30052,9 +30052,15 @@ DuAEComp.setUniqueCompName = function(comp) {
3005230052
*/
3005330053
DuAEComp.setUniqueLayerNames = function(layers, comp) {
3005430054
comp = def(comp, DuAEProject.getActiveComp());
30055-
if (!comp) return;
30055+
if (!comp)
30056+
return;
3005630057
layers = def(layers, comp.layers);
3005730058
var it = new DuList(layers);
30059+
30060+
// Only if needed, check first
30061+
if (!DuAEComp.hasUniqueLayerNames(comp))
30062+
return;
30063+
3005830064
it.do(function(layer) {
3005930065
var locked = layer.locked;
3006030066
layer.locked = false;
@@ -30067,6 +30073,30 @@ DuAEComp.setUniqueLayerNames = function(layers, comp) {
3006730073
});
3006830074
}
3006930075

30076+
/**
30077+
* Checks if a comp has duplicate layer names
30078+
* @param {CompItem} [comp=DuAEProject.getActiveComp] - The composition
30079+
* @return {Boolean}
30080+
*/
30081+
DuAEComp.hasUniqueLayerNames = function(comp) {
30082+
comp = def(comp, DuAEProject.getActiveComp());
30083+
if (!comp)
30084+
return false;
30085+
30086+
for (var l = 1, n = comp.numLayers; l <= n; l++) {
30087+
var name = comp.layer(l).name;
30088+
for(var i = 1; i <= n; i++) {
30089+
if (i == l)
30090+
break;
30091+
if (name == comp.layer(i).name)
30092+
return true;
30093+
}
30094+
}
30095+
return false;
30096+
}
30097+
30098+
30099+
3007030100
/**
3007130101
* Gets the After Effects selected properties in the current comp
3007230102
* @param {PropertyType|PropertyValueType|string|function} [filter] - A filter to get only a certain type, or value type, or property name or matchName.<br />
@@ -30255,17 +30285,15 @@ DuAEComp.newUniqueLayerName = function(newName, comp, increment) {
3025530285
newName = nName.join(' | ');
3025630286
}//*/
3025730287

30258-
// Let's try to remove any trailing number first, that's better
30259-
newName = DuString.trimNumbers(newName);
30260-
3026130288
increment = def(increment, true);
3026230289
comp = def(comp, DuAEProject.getActiveComp());
3026330290
var layerNames = [];
3026430291
// Check if we really need to change the name
3026530292
var isAlreadyUnique = true;
3026630293
for (var i = 1; i <= comp.layers.length; i++) {
3026730294
var n = comp.layer(i).name;
30268-
if (n == newName) isAlreadyUnique = false;
30295+
if (n == newName)
30296+
isAlreadyUnique = false;
3026930297
// Ignore the last block
3027030298
/*var tName = n.split(' | ');
3027130299
if (tName.length == 4) {
@@ -30275,8 +30303,11 @@ DuAEComp.newUniqueLayerName = function(newName, comp, increment) {
3027530303
layerNames.push(n);
3027630304
}
3027730305
// Let's stop here if there's no need to change it
30278-
if (isAlreadyUnique) return newName;
30306+
if (isAlreadyUnique)
30307+
return newName;
3027930308

30309+
// Let's try to remove any trailing number first, that's better
30310+
newName = DuString.trimNumbers(newName);
3028030311
newName = DuString.generateUnique(newName, layerNames, increment);
3028130312
// Ignore the last block
3028230313
//if (lastBlock != '') newName += ' | ' + lastBlock;

dist/libs/api3.jsxinc

Lines changed: 4 additions & 4 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)