diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
| commit | 9bd0c63382bf226c271c40d5a5967c22c75718ea (patch) | |
| tree | 97ad1061c10f39498459d54da34caddd59d39fbd /source/blender/editors/space_script | |
| parent | be983295ea14af226b3c824a035ccee9d416c67f (diff) | |
| parent | af36dd4664ddf35c7ad99f05f9878ce1acf787bd (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_script')
| -rw-r--r-- | source/blender/editors/space_script/script_intern.h | 1 | ||||
| -rw-r--r-- | source/blender/editors/space_script/space_script.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/editors/space_script/script_intern.h b/source/blender/editors/space_script/script_intern.h index a3fcbb34e7e..0e0936cf082 100644 --- a/source/blender/editors/space_script/script_intern.h +++ b/source/blender/editors/space_script/script_intern.h @@ -43,4 +43,3 @@ void SCRIPT_OT_python_file_run(struct wmOperatorType *ot); void SCRIPT_OT_autoexec_warn_clear(struct wmOperatorType *ot); #endif /* __SCRIPT_INTERN_H__ */ - diff --git a/source/blender/editors/space_script/space_script.c b/source/blender/editors/space_script/space_script.c index fcda16b846b..8b6100cd9e0 100644 --- a/source/blender/editors/space_script/space_script.c +++ b/source/blender/editors/space_script/space_script.c @@ -226,4 +226,3 @@ void ED_spacetype_script(void) BKE_spacetype_register(st); } - |