diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2018-05-28 16:25:41 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2018-05-28 16:25:41 +0300 |
| commit | e673be1ebc83b1c156eb608935dace95437eccba (patch) | |
| tree | 1737cc02db725997b34ca7c4601f5c89002849c8 /intern/cycles/render/light.cpp | |
| parent | 95c5d1193f12375cd7423be9bde1606cd0a05809 (diff) | |
| parent | dc0eed178a0f71634399a61b929a544e554ef6aa (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/render/light.cpp')
| -rw-r--r-- | intern/cycles/render/light.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/render/light.cpp b/intern/cycles/render/light.cpp index 806f1cad03e..d45d4543e16 100644 --- a/intern/cycles/render/light.cpp +++ b/intern/cycles/render/light.cpp @@ -898,9 +898,10 @@ void LightManager::tag_update(Scene * /*scene*/) int LightManager::add_ies_from_file(ustring filename) { string content; + /* If the file can't be opened, call with an empty line */ if(filename.empty() || !path_read_text(filename.c_str(), content)) { - content == "\n"; + content = "\n"; } return add_ies(ustring(content)); |