diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-11-09 18:04:53 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-11-09 19:53:02 +0300 |
commit | cbbf991f62b7f1546771a71b3b9f14a46d1b6b61 (patch) | |
tree | c528c8c46adfc9172ff37a07990225b7dc15a31e /intern/cycles/render | |
parent | 1ed31bef1a4e4512b2adfe282ccebf4c607bac3f (diff) |
Cycles: Add name field to scene
Doesn't mean much for Cycles itself, but allows to have nice logs
and progress reports without access of original scene.
Diffstat (limited to 'intern/cycles/render')
-rw-r--r-- | intern/cycles/render/scene.cpp | 5 | ||||
-rw-r--r-- | intern/cycles/render/scene.h | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp index ccaca8707c8..2241d8d9c69 100644 --- a/intern/cycles/render/scene.cpp +++ b/intern/cycles/render/scene.cpp @@ -83,7 +83,10 @@ DeviceScene::DeviceScene(Device *device) } Scene::Scene(const SceneParams& params_, Device *device) -: device(device), dscene(device), params(params_) + : name("Scene"), + device(device), + dscene(device), + params(params_) { memset((void *)&dscene.data, 0, sizeof(dscene.data)); diff --git a/intern/cycles/render/scene.h b/intern/cycles/render/scene.h index 57ea1d471e8..69cbfe9a324 100644 --- a/intern/cycles/render/scene.h +++ b/intern/cycles/render/scene.h @@ -196,6 +196,9 @@ public: class Scene { public: + /* Optional name. Is used for logging and reporting. */ + string name; + /* data */ Camera *camera; Camera *dicing_camera; |