diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2016-04-28 18:33:19 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2016-04-28 18:33:19 +0300 |
| commit | 1f723603c882e6d79ab69bea6e5c034ae21a6ce7 (patch) | |
| tree | 098b0133beea06c460c3e9e92010bc669d151e5d /intern/cycles/render/scene.h | |
| parent | 3632c4997f5019d2a519996d9e216d474aa05d3b (diff) | |
| parent | a48d7407986d04492107a2ef16d0ff6f0d012c45 (diff) | |
Merge branch 'master' into temp_remove_particlestemp_remove_particles
Diffstat (limited to 'intern/cycles/render/scene.h')
| -rw-r--r-- | intern/cycles/render/scene.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/intern/cycles/render/scene.h b/intern/cycles/render/scene.h index d30a0cb45fe..b29aff88c01 100644 --- a/intern/cycles/render/scene.h +++ b/intern/cycles/render/scene.h @@ -213,6 +213,11 @@ public: void device_free(); protected: + /* Check if some heavy data worth logging was updated. + * Mainly used to suppress extra annoying logging. + */ + bool need_data_update(); + void free_memory(bool final); }; |