Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-07-03 07:58:34 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-07-03 07:58:34 +0300
commit00fc1d70a70694973c53d4974ed21ef888532d0a (patch)
tree5c40fa7d2a915c764b244fbed591fae5b4072a74 /source/blender/python
parente856eb7e8b65a7391c89b0938de49bb7d781f5dc (diff)
parent8c15d612a5cdfe39233c7f2b7556742091c82558 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/python')
-rw-r--r--source/blender/python/rna_dump.py5
-rw-r--r--source/blender/python/simple_enum_gen.py6
2 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/python/rna_dump.py b/source/blender/python/rna_dump.py
index 7259ceb67a0..3c09175910e 100644
--- a/source/blender/python/rna_dump.py
+++ b/source/blender/python/rna_dump.py
@@ -129,6 +129,7 @@ def seek(r, txt, recurs):
newtxt = txt + '[' + str(i) + ']'
seek(r[i], newtxt, recurs + 1)
+
seek(bpy.data, 'bpy.data', 0)
# seek(bpy.types, 'bpy.types', 0)
'''
@@ -140,8 +141,8 @@ for d in dir(bpy.types):
seek(r, 'bpy.types.' + d + '.bl_rna', 0)
'''
-#print dir(bpy)
+# print dir(bpy)
#import sys
-#sys.exit()
+# sys.exit()
print("iter over ", seek_count, "rna items")
diff --git a/source/blender/python/simple_enum_gen.py b/source/blender/python/simple_enum_gen.py
index 95052ccae0c..6094154050b 100644
--- a/source/blender/python/simple_enum_gen.py
+++ b/source/blender/python/simple_enum_gen.py
@@ -50,8 +50,10 @@ for d in defs.split('\n'):
if not w:
continue
- try: w.remove("#define")
- except: pass
+ try:
+ w.remove("#define")
+ except:
+ pass
# print w