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

git.blender.org/blender-addons.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-10-19 19:13:31 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-10-19 19:13:31 +0300
commit1c75533d9cc0693733bacbadecfaac5c504313fb (patch)
tree865ca6cfc8f2ea136d7ff2462e435151e612d06d /system_demo_mode
parent4179941c58871bf85cf275130af0696affa5040f (diff)
parentd7d3233715503ecc15b8dd1973f7e73257e2cbda (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'system_demo_mode')
-rw-r--r--system_demo_mode/__init__.py2
-rw-r--r--system_demo_mode/demo_mode.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/system_demo_mode/__init__.py b/system_demo_mode/__init__.py
index 552708af..75eb38ba 100644
--- a/system_demo_mode/__init__.py
+++ b/system_demo_mode/__init__.py
@@ -233,7 +233,7 @@ def extern_demo_mode_unregister():
from . import demo_mode
demo_mode.unregister()
-# --- intergration
+# --- integration
def menu_func(self, context):
diff --git a/system_demo_mode/demo_mode.py b/system_demo_mode/demo_mode.py
index f0906434..1a717a5e 100644
--- a/system_demo_mode/demo_mode.py
+++ b/system_demo_mode/demo_mode.py
@@ -526,7 +526,7 @@ def load_config(cfg_name=DEMO_CFG):
blend_lookup.update(dict(blend_dict_items(demo_search_path)))
- # fallback to orginal file
+ # fallback to original file
return blend_lookup.get(filename, filepath)
# done with search lookup