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

Merge pull request #1522 from MoritzBrueckner/prop

Browse source 
Allow @prop for `final` keyword too
This commit is contained in:
Lubos Lenco 2019-12-22 12:29:29 +01:00 committed by GitHub
parent db4f0cc107 71287e442f
commit c6cd194f59
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
blender/arm/utils.py
View file

@ -230,20 +230,27 @@ def fetch_script_props(file):
with open(file) as f:
name = file.rsplit('.')[0]
if 'Sources' in name:
name = name[name.index('Sources')+8:]
name = name[name.index('Sources') + 8:]
if '/' in name:
name = name.replace('/','.')
name = name.replace('/', '.')
if '\\' in file:
name = name.replace('\\','.')
name = name.replace('\\', '.')
script_props[name] = []
script_props_defaults[name] = []
lines = f.read().splitlines()
read_prop = False
for l in lines:
for line in lines:
if not read_prop:
read_prop = l.lstrip().startswith('@prop')
if read_prop and 'var ' in l:
p = l.split('var ')[1]
read_prop = line.lstrip().startswith('@prop')
continue
if read_prop:
if 'var ' in line:
p = line.split('var ')[1]
elif 'final ' in line:
p = line.split('final ')[1]
else:
break
valid_prop = False
# Has type