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:
authorKent Mein <mein@cs.umn.edu>2008-10-10 21:52:25 +0400
committerKent Mein <mein@cs.umn.edu>2008-10-10 21:52:25 +0400
commit2f9e0ec15453261c7edde8b2fa487c4c17af65de (patch)
tree2239bad53cf2b67b4fede15b1796f98158b11d3f /source/blender/yafray
parentd99fd92ffa04b4f6fc7a830b62cb764d9de3f05d (diff)
This commit fixes bug: [#17770] Texture Plugins do not work. (on windows)
Thanks to Lguillaume for helping with this one. Had to go back to bug: [#17631] PIL_dynlib_get_error_as_string() returns NULL, causes crash and revert the fix and make some new updates. function needs to return NULL so fix the functions that were assuming it always returns a string. Kent
Diffstat (limited to 'source/blender/yafray')
-rw-r--r--source/blender/yafray/intern/export_Plugin.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/yafray/intern/export_Plugin.cpp b/source/blender/yafray/intern/export_Plugin.cpp
index 92ec7ba8d82..db9fb7ccc72 100644
--- a/source/blender/yafray/intern/export_Plugin.cpp
+++ b/source/blender/yafray/intern/export_Plugin.cpp
@@ -171,7 +171,9 @@ bool yafrayPluginRender_t::initExport()
corehandle = PIL_dynlib_open((char *)(location + "\\yafraycore.dll").c_str());
if (corehandle==NULL)
{
- cerr << "Error loading yafray plugin: " << PIL_dynlib_get_error_as_string(corehandle) << endl;
+ char *err = PIL_dynlib_get_error_as_string(corehandle);
+ if (err) cerr << "Error loading yafray plugin: " << err << endl;
+ else cerr << "Error loading yafray plugin: Unknown." << endl;
return false;
}
location += "\\yafrayplugin.dll";