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
path: root/intern
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-12-05 20:00:39 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2014-12-05 20:15:09 +0300
commit049387940111ffec0a30cc614e32c75defeacb64 (patch)
tree32172afa4d0b77e8f44600db5561e57918beae3b /intern
parentecc03c8ed0ca196f4c249ec25f331938a1a0405a (diff)
Cycles: Report error via the new engine API
This way CUDA errors are visible in the image info line, which makes things to behave the same across viewport and final rendering. That's right, we've got error reported via reports and info line now. This is based on the feedback from our gooseberry team.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/blender/blender_session.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index 39085ff2a1c..79ab25483e2 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -875,6 +875,7 @@ void BlenderSession::update_status_progress()
* For until then, 1 << 5 means RPT_ERROR.
*/
b_engine.report(1 << 5, error.c_str());
+ b_engine.error_set(error.c_str());
last_error = error;
}
}