Keep shared skin controls owned by the skin module when deleting basic adjustment (build 51)
这个提交包含在:
1 父节点
85ec27d49f
当前提交
72a0269fe7
5 个文件已更改
+9
-5
没有与搜索条件相匹配的文件
@@ -11,7 +11,7 @@ NSArray<NSDictionary *> *DYBaseToolDescriptors(NSString *type){
|
||||
if(![DYToolTypes()containsObject:type])return @[];NSMutableSet *pids=[NSMutableSet set];
|
||||
for(NSString *part in DYBaseToolParts(type)){NSDictionary *section=DYToolSection(part);if(section[@"enabled"])[pids addObject:section[@"enabled"]];for(NSDictionary *row in section[@"rows"]){if(row[@"pid"])[pids addObject:row[@"pid"]];if(row[@"enabled"])[pids addObject:row[@"enabled"]];}}
|
||||
NSMutableArray *result=[NSMutableArray array];for(NSDictionary *d in DYDescriptors()){
|
||||
NSString *key=d[@"key"];BOOL extra=([type isEqual:@"primary"]&&([key hasPrefix:@"cm"]||[@[@"primaryMasterEnabled",@"inputProfile",@"preLUTStrength"]containsObject:key]))||([type isEqual:@"base"]&&[@[@"skinEnabled",@"copyAutoGrade"]containsObject:key])||([type isEqual:@"look"]&&([key hasPrefix:@"look"]||[key isEqual:@"postLUTStrength"]))||([type isEqual:@"film"]&&[key hasPrefix:@"film"]);
|
||||
NSString *key=d[@"key"];BOOL extra=([type isEqual:@"primary"]&&([key hasPrefix:@"cm"]||[@[@"primaryMasterEnabled",@"inputProfile",@"preLUTStrength"]containsObject:key]))||([type isEqual:@"base"]&&[key isEqual:@"copyAutoGrade"])||([type isEqual:@"look"]&&([key hasPrefix:@"look"]||[key isEqual:@"postLUTStrength"]))||([type isEqual:@"film"]&&[key hasPrefix:@"film"]);
|
||||
if(extra||[pids containsObject:d[@"pid"]])[result addObject:d];
|
||||
}return result;
|
||||
}
|
||||
@@ -26,7 +26,6 @@ void DYApplyRemovedBaseTools(DYUniforms *u,NSDictionary *doc){
|
||||
for(NSDictionary *d in DYBaseToolDescriptors(type))if([d[@"offset"]integerValue]>=0)*(float*)((uint8_t*)u+[d[@"offset"]unsignedIntegerValue])=[d[@"default"]floatValue];
|
||||
for(NSString *part in DYBaseToolParts(type))for(NSDictionary *d in DYDescriptors())if([d[@"pid"]isEqual:DYToolSection(part)[@"enabled"]])*(float*)((uint8_t*)u+[d[@"offset"]unsignedIntegerValue])=0;
|
||||
if([type isEqual:@"primary"]){u->primarySectionEnabled=0;u->inputProfile=0;u->preLUTStrength=0;}
|
||||
if([type isEqual:@"base"])u->skinProtection.x=0;
|
||||
}
|
||||
}
|
||||
NSDictionary *DYVisibleBaseToolPaths(NSDictionary *paths,NSDictionary *doc){
|
||||
|
||||
在新工单中引用
屏蔽一个用户