Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-05-31 16:32:31 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-05-31 16:32:31 +0300
commitd5220d23f976d14350d5d76f7cb97d4fef8e977d (patch)
treef8c678ac9c051e1377203333256135ada66cb0de /intern/cycles/app
parent230cf2e46de2dea9303159a93ac00596c2918470 (diff)
Cycles: Fixes for recent refactor
- add_vertex() can be called from split_vertex() which does not guarantee to have properly pre-allocate arrays. - Need to check whether Cycles is compiled with OSL in XML reader.
Diffstat (limited to 'intern/cycles/app')
-rw-r--r--intern/cycles/app/cycles_xml.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp
index 6f9cbe37a58..9f967a4bde9 100644
--- a/intern/cycles/app/cycles_xml.cpp
+++ b/intern/cycles/app/cycles_xml.cpp
@@ -306,6 +306,7 @@ static void xml_read_shader_graph(XMLReadState& state, Shader *shader, pugi::xml
snode = env;
}
+#ifdef WITH_OSL
else if(string_iequals(node.name(), "osl_shader")) {
if(manager->use_osl()) {
std::string filepath;
@@ -329,6 +330,7 @@ static void xml_read_shader_graph(XMLReadState& state, Shader *shader, pugi::xml
fprintf(stderr, "OSL node without using --shadingsys osl.\n");
}
}
+#endif
else if(string_iequals(node.name(), "sky_texture")) {
SkyTextureNode *sky = new SkyTextureNode();