diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2018-05-27 18:14:01 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2018-05-27 18:16:15 +0300 |
| commit | edce44d6931586fad3cee019db762d54e73a886a (patch) | |
| tree | 181b0ef4048592930010a221f60d6af03d4281af /intern/cycles/blender | |
| parent | 56254a42e0aa42a39e1f3f7b3d13905168c3f39c (diff) | |
Cycles: Fix problems in the IES loader when rendering with no file selected
Diffstat (limited to 'intern/cycles/blender')
| -rw-r--r-- | intern/cycles/blender/blender_shader.cpp | 3 | ||||
| -rw-r--r-- | intern/cycles/blender/blender_util.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index c6144cef1bf..9896dd1d94f 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -827,6 +827,9 @@ static ShaderNode *add_node(Scene *scene, break; case BL::ShaderNodeTexIES::mode_INTERNAL: ies->ies = get_text_datablock_content(b_ies_node.ies().ptr); + if(ies->ies.empty()) { + ies->ies = "\n"; + } break; } node = ies; diff --git a/intern/cycles/blender/blender_util.h b/intern/cycles/blender/blender_util.h index 87d6c7eba8a..85bff8f8323 100644 --- a/intern/cycles/blender/blender_util.h +++ b/intern/cycles/blender/blender_util.h @@ -468,7 +468,7 @@ static inline string blender_absolute_path(BL::BlendData& b_data, return path; } -static inline string get_text_datablock_content(const PointerRNA&& ptr) +static inline string get_text_datablock_content(const PointerRNA& ptr) { if(ptr.data == NULL) { return ""; |