diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2019-03-15 18:28:33 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2019-03-15 18:28:33 +0300 |
| commit | 5051e580e4028e0a741e6519e469321a7e1f2a71 (patch) | |
| tree | 83d1195eb21106155c0c949ae1453a9ce8665333 /intern/cycles/blender/blender_session.h | |
| parent | 86ea76254d3f625bf3d9e15dade5d5b3544c06a3 (diff) | |
| parent | 2f6257fd7fe305e3b226a8b505eb614bbeaf762a (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/blender/blender_session.h')
| -rw-r--r-- | intern/cycles/blender/blender_session.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_session.h b/intern/cycles/blender/blender_session.h index 1915cdb36f1..2bfb9e56c37 100644 --- a/intern/cycles/blender/blender_session.h +++ b/intern/cycles/blender/blender_session.h @@ -90,6 +90,7 @@ public: void tag_redraw(); void tag_update(); void get_status(string& status, string& substatus); + void get_kernel_status(string& kernel_status); void get_progress(float& progress, double& total_time, double& render_time); void test_cancel(); void update_status_progress(); |