diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-06-27 05:10:19 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-06-27 05:10:19 +0400 |
commit | bb42703ea34e539e441dd90f5cbba16599e91506 (patch) | |
tree | 1af46e3f9ff573dcf049e9a371b19b938f6ff613 /source/blender/blenlib/intern | |
parent | 46808dd22c046d8ce1def1a52175c8be15e217b3 (diff) |
- remove edge collapse loop operator (now replaced by dissolve).
- fix missing null pointer check from own recent changes.
- add asserts if BLI path functions are given wrong id's
Diffstat (limited to 'source/blender/blenlib/intern')
-rw-r--r-- | source/blender/blenlib/intern/path_util.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index 1f96c10e712..fe50c2abcc1 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -1222,6 +1222,9 @@ const char *BLI_get_folder(int folder_id, const char *subfolder) if (get_path_local(path, "python", subfolder, ver)) break; if (get_path_system(path, "python", subfolder, "BLENDER_SYSTEM_PYTHON", ver)) break; return NULL; + + default: + BLI_assert(0); } return path; @@ -1248,6 +1251,8 @@ const char *BLI_get_user_folder_notest(int folder_id, const char *subfolder) case BLENDER_USER_SCRIPTS: get_path_user(path, "scripts", subfolder, "BLENDER_USER_SCRIPTS", ver); break; + default: + BLI_assert(0); } if ('\0' == path[0]) { return NULL; |