maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #2320 from QuantumCoderQC/AddTraitFix

Browse source 
Add trait fix
This commit is contained in:
Lubos Lenco 2021-09-06 09:02:22 +02:00 committed by GitHub
parent 974181e75e ccbc946bf1
commit fe6d1fa372
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Sources/armory/logicnode/AddTraitNode.hx
View file

@ -10,10 +10,17 @@ class AddTraitNode extends LogicNode {
override function run(from: Int) {
var object: Object = inputs[1].get();
var trait: Dynamic = inputs[2].get();
var traitName: String = inputs[2].get();
if (object == null || trait == null) return;
assert(Error, object != null, "Object should not be null");
assert(Error, traitName != null, "Trait name should not be null");
var cname = Type.resolveClass(Main.projectPackage + "." + traitName);
if (cname == null) cname = Type.resolveClass(Main.projectPackage + ".node." + traitName);
assert(Error, cname != null, 'No trait with the name "$traitName" found, make sure that the trait is exported!');
assert(Warning, object.getTrait(cname) == null, 'Object already has the trait "$traitName" applied');
var trait = Type.createInstance(cname, []);
object.addTrait(trait);
runOutput(0);

4
blender/arm/logicnode/trait/LN_add_trait_to_object.py
View file

@ -4,11 +4,11 @@ class AddTraitNode(ArmLogicTreeNode):
"""Adds trait to the given object."""
bl_idname = 'LNAddTraitNode'
bl_label = 'Add Trait to Object'
arm_version = 1
arm_version = 2
def arm_init(self, context):
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('ArmNodeSocketObject', 'Object')
self.add_input('ArmDynamicSocket', 'Trait')
self.add_input('ArmStringSocket', 'Trait')
self.add_output('ArmNodeSocketAction', 'Out')