[Bf-blender-cvs] [6db39d36cb1] cycles_texture_cache: Merge branch 'master' into cycles_texture_cache

[Stefan Werner]

Commit: 6db39d36cb1ef05ac9b52dd975772274484b960e
Author: Stefan Werner
Date:   Tue Apr 6 14:44:43 2021 +0200
Branches: cycles_texture_cache
https://developer.blender.org/rB6db39d36cb1ef05ac9b52dd975772274484b960e

Merge branch 'master' into cycles_texture_cache

===================================================================



===================================================================

diff --cc intern/cycles/blender/addon/properties.py
index 408fb26aa81,cda1355eb2d..8e0d6d124aa
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@@ -801,85 -801,15 +801,91 @@@ class CyclesRenderSettings(bpy.types.Pr
          items=enum_texture_limit
      )
  
 +    use_texture_cache: BoolProperty(
 +        name="Use Texture Cache",
 +        default=False,
 +        description="Enables out-of-core texturing to conserve RAM"
 +    )
 +
 +    texture_cache_size: IntProperty(
 +        name="Texture Cache Size (MB)",
 +        default=1024,
 +        description="The size of the OpenImageIO texture cache in MB",
 +        min=0
 +    )
 +
 +    texture_auto_convert: BoolProperty(
 +        name="Auto Convert Textures",
 +        default=True,
 +        description="Automatically convert textures to .tx files for optimal texture cache performance"
 +    )
 +
 +    texture_accept_unmipped: BoolProperty(
 +        name="Accept Unmipped",
 +        default=True,
 +        description="Texture cached rendering without mip mapping is very expensive. Uncheck to prevent Cycles from using textures that are not mip mapped"
 +    )
 +
 +    texture_accept_untiled: BoolProperty(
 +        name="Accept Untiled",
 +        default=True,
 +        description="Texture cached rendering without tiled textures is very expensive. Uncheck to prevent Cycles from using textures that are not tiled"
 +    )
 +
 +    texture_auto_tile: BoolProperty(
 +        name="Auto Tile",
 +        default=True,
 +        description="On the fly creation of tiled versions of textures that are not tiled. This can increase render time but helps reduce memory usage"
 +    )
 +
 +    texture_auto_mip: BoolProperty(
 +        name="Auto Mip",
 +        default=True,
 +        description="On the fly creation of mip maps of textures that are not mip mapped. This can increase render time but helps reduce memory usage"
 +    )
 +
 +    texture_tile_size: IntProperty(
 +        name="Tile Size",
 +        default=64,
 +        description="The size of tiles that Cycles uses for auto tiling"
 +    )
 +
 +    texture_blur_diffuse: FloatProperty(
 +        name="Diffuse Blur",
 +        default=0.0156,
 +        description="The amount of texture blur applied to diffuse bounces",
 +        min = 0.0, max = 1.0
 +    )
 +
 +    texture_blur_glossy: FloatProperty(
 +        name="Glossy Blur",
 +        default=0.0,
 +        description="The amount of texture blur applied to glossy bounces",
 +        min = 0.0, max = 1.0
 +    )
 +
 +    use_custom_cache_path: BoolProperty(
 +        name="Use Custom Cache Path",
 +        default=False,
 +        description="Use a custom path for the texture cache, as oppoosed to placing cache files next to the original file"
 +    )
 +
 +    custom_cache_path: StringProperty(
 +        name="Custom Cache Path",
 +        default="",
 +        subtype="DIR_PATH",
 +        description="Custom path for the texture cache"
 +    )
++
+     use_fast_gi: BoolProperty(
+         name="Fast GI Approximation",
+         description="Approximate diffuse indirect light with background tinted ambient occlusion. This provides fast alternative to full global illumination, for interactive viewport rendering or final renders with reduced quality",
+         default=False,
+     )
      ao_bounces: IntProperty(
          name="AO Bounces",
-         default=0,
-         description="Approximate indirect light with background tinted ambient occlusion at the specified bounce, 0 disables this feature",
+         default=1,
+         description="After this number of light bounces, use approximate global illumination. 0 disables this feature",
          min=0, max=1024,
      )
  
diff --cc intern/cycles/blender/addon/ui.py
index 3013c251d40,73bc114893a..3d068b55acf
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@@ -746,42 -775,8 +775,42 @@@ class CYCLES_RENDER_PT_performance_fina
          col = layout.column()
  
          col.prop(rd, "use_save_buffers")
-         col.prop(rd, "use_persistent_data", text="Persistent Images")
+         col.prop(rd, "use_persistent_data", text="Persistent Data")
  
 +class CYCLES_RENDER_PT_texture_cache(CyclesButtonsPanel, Panel):
 +    bl_label = "Texture Cache"
 +    bl_options = {'DEFAULT_CLOSED'}
 +
 +    def draw_header(self, context):
 +        cscene = context.scene.cycles
 +
 +        self.layout.prop(cscene, "use_texture_cache", text="")
 +
 +    def draw(self, context):
 +        layout = self.layout
 +
 +        scene = context.scene
 +        cscene = scene.cycles
 +        rd = scene.render
 +        layout.active = cscene.use_texture_cache
 +
 +        split = layout.split()
 +        col = split.column()
 +        col.prop(cscene, "texture_auto_convert")
 +        col.prop(cscene, "texture_accept_unmipped")
 +        col.prop(cscene, "texture_accept_untiled")
 +        col.prop(cscene, "texture_auto_mip")
 +        col.prop(cscene, "texture_auto_tile")
 +        col = split.column()
 +        col.prop(cscene, "texture_cache_size")
 +        col.prop(cscene, "texture_tile_size")
 +        col.prop(cscene, "texture_blur_diffuse")
 +        col.prop(cscene, "texture_blur_glossy")
 +        row = layout.row()
 +        row.prop(cscene, "use_custom_cache_path")
 +        row = layout.row()
 +        row.active = cscene.use_custom_cache_path
 +        row.prop(cscene, "custom_cache_path")
  
  class CYCLES_RENDER_PT_performance_viewport(CyclesButtonsPanel, Panel):
      bl_label = "Viewport"
diff --cc intern/cycles/device/device_cpu.cpp
index 9b37d0b6dac,0e3c771dbc3..c0c0aeb4aa8
--- a/intern/cycles/device/device_cpu.cpp
+++ b/intern/cycles/device/device_cpu.cpp
@@@ -561,11 -548,6 +561,11 @@@ class CPUDevice : public Device 
  #endif
    }
  
-   void *oiio_memory()
++  void *oiio_memory() override
 +  {
 +    return &oiio_globals;
 +  }
 +
    void build_bvh(BVH *bvh, Progress &progress, bool refit) override
    {
  #ifdef WITH_EMBREE
diff --cc intern/cycles/render/scene.h
index eaa93b84042,3e7de203c54..fa9e754d2c4
--- a/intern/cycles/render/scene.h
+++ b/intern/cycles/render/scene.h
@@@ -222,9 -178,7 +222,8 @@@ class SceneParams 
    int num_bvh_time_steps;
    int hair_subdivisions;
    CurveShapeType hair_shape;
-   bool persistent_data;
    int texture_limit;
 +  TextureCacheParams texture;
  
    bool background;