[Bf-blender-cvs] [465fb31ed27] cycles_texture_cache: Merge branch 'master' into cycles_texture_cache

[Stefan Werner]

Commit: 465fb31ed275618ec71e4925ab94bd4a9b077a12
Author: Stefan Werner
Date:   Thu Jul 15 12:26:05 2021 +0200
Branches: cycles_texture_cache
https://developer.blender.org/rB465fb31ed275618ec71e4925ab94bd4a9b077a12

Merge branch 'master' into cycles_texture_cache

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



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

diff --cc intern/cycles/kernel/kernel_globals.h
index bb64d03ec7a,70aed6d54ed..383464dbfd9
--- a/intern/cycles/kernel/kernel_globals.h
+++ b/intern/cycles/kernel/kernel_globals.h
@@@ -67,12 -64,7 +67,12 @@@ typedef struct KernelGlobals 
    OSLThreadData *osl_tdata;
  #  endif
  
 +#  ifdef __OIIO__
 +  OIIOGlobals *oiio;
 +  void *oiio_tdata;
 +#  endif
 +
-   /* **** Run-time data ****  */
+   /* **** Run-time data **** */
  
    /* Heap-allocated storage for transparent shadows intersections. */
    Intersection *transparent_shadow_intersections;