Cycles: merge of changes from tomato branch.
Regular rendering now works tiled, and supports save buffers to save memory during render and cache render results. Brick texture node by Thomas. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Brick_Texture Image texture Blended Box Mapping. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Image_Texture http://mango.blender.org/production/blended_box/ Various bug fixes by Sergey and Campbell. * Fix for reading freed memory in some node setups. * Fix incorrect memory read when synchronizing mesh motion. * Fix crash appearing when direct light usage is different on different layers. * Fix for vector pass gives wrong result in some circumstances. * Fix for wrong resolution used for rendering Render Layer node. * Option to cancel rendering when doing initial synchronization. * No more texture limit when using CPU render. * Many fixes for new tiled rendering.
This commit is contained in:
@@ -38,7 +38,7 @@
|
||||
|
||||
CCL_NAMESPACE_BEGIN
|
||||
|
||||
Scene::Scene(const SceneParams& params_)
|
||||
Scene::Scene(const SceneParams& params_, const DeviceInfo& device_info_)
|
||||
: params(params_)
|
||||
{
|
||||
device = NULL;
|
||||
@@ -55,6 +55,9 @@ Scene::Scene(const SceneParams& params_)
|
||||
image_manager = new ImageManager();
|
||||
shader_manager = ShaderManager::create(this);
|
||||
particle_system_manager = new ParticleSystemManager();
|
||||
|
||||
if (device_info_.type == DEVICE_CPU)
|
||||
image_manager->set_extended_image_limits();
|
||||
}
|
||||
|
||||
Scene::~Scene()
|
||||
|
Reference in New Issue
Block a user