diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-29 19:01:35 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-29 19:01:35 +0300 |
| commit | b25c224d901c420acf36e2aff9100e6041746a64 (patch) | |
| tree | f71a05a472fcd1ff287898ba3cb38407ac148e7b /source/blender/windowmanager | |
| parent | 732cd96737007b1411a161369f842209a4c26419 (diff) | |
| parent | 94a80a1fb117a93c0143f990332cec1233e14b94 (diff) | |
Merge branch 'master' into asset-engine
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files_link.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_files_link.c b/source/blender/windowmanager/intern/wm_files_link.c index 3a5700424aa..f3792e0bac6 100644 --- a/source/blender/windowmanager/intern/wm_files_link.c +++ b/source/blender/windowmanager/intern/wm_files_link.c @@ -356,7 +356,7 @@ static void wm_link_do( use_placeholders, force_indirect); if (new_id) { - /* If the link is sucessful, clear item's libs 'todo' flags. + /* If the link is successful, clear item's libs 'todo' flags. * This avoids trying to link same item with other libraries to come. */ BLI_BITMAP_SET_ALL(item->libraries, false, lapp_data->num_libraries); item->new_id = new_id; |