diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-05-28 00:46:02 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-05-28 01:04:14 +0300 |
| commit | dc0eed178a0f71634399a61b929a544e554ef6aa (patch) | |
| tree | 18433e48fda07fd8eae5e182e6eea6596b624414 /intern/cycles/render/light.cpp | |
| parent | fd2c48726fd27ff1335c4adbe251fb1e076d8266 (diff) | |
Fix Cycles + OSL build error, pass main to node editing functions.
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 5a77094c0c1..cbcd2564e6e 100644 --- a/intern/cycles/render/light.cpp +++ b/intern/cycles/render/light.cpp @@ -891,9 +891,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)); |