diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-06-06 16:40:09 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-06-06 17:39:04 +0400 |
| commit | e4e58d46128dc7fe4fb9b881d73b38173f00f5c3 (patch) | |
| tree | cc38ac39838bec84d28de396374ba022139a8aa2 /intern/cycles/render/bake.h | |
| parent | 553264ff8e20484d0b91bb468f56aa1b7144f7aa (diff) | |
Fix T40370: cycles CUDA baking timeout with high number of AA samples.
Now baking does one AA sample at a time, just like final render. There is
also some code for shader antialiasing that solves T40369 but it is disabled
for now because there may be unpredictable side effects.
Diffstat (limited to 'intern/cycles/render/bake.h')
| -rw-r--r-- | intern/cycles/render/bake.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/intern/cycles/render/bake.h b/intern/cycles/render/bake.h index ea403f7d39a..f91ba589b8b 100644 --- a/intern/cycles/render/bake.h +++ b/intern/cycles/render/bake.h @@ -17,10 +17,11 @@ #ifndef __BAKE_H__ #define __BAKE_H__ -#include "util_vector.h" #include "device.h" #include "scene.h" -#include "session.h" + +#include "util_progress.h" +#include "util_vector.h" CCL_NAMESPACE_BEGIN @@ -64,6 +65,9 @@ public: void device_update(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress); void device_free(Device *device, DeviceScene *dscene); + static bool is_light_pass(ShaderEvalType type); + static bool is_aa_pass(ShaderEvalType type); + bool need_update; private: |