[Bf-blender-cvs] [8600c7f9ef3] cycles_texture_cache: Merge branch 'master' of git.blender.org:blender into cycles_texture_cache

Stefan Werner noreply at git.blender.org
Tue Nov 6 20:41:28 CET 2018


Commit: 8600c7f9ef3e8c67b0b46a185dc6b1e2050e5942
Author: Stefan Werner
Date:   Mon Oct 29 14:23:46 2018 -0400
Branches: cycles_texture_cache
https://developer.blender.org/rB8600c7f9ef3e8c67b0b46a185dc6b1e2050e5942

Merge branch 'master' of git.blender.org:blender into cycles_texture_cache

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



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

diff --cc intern/cycles/kernel/kernel_globals.h
index 5bd74a3ba3c,37402f42863..87a4a45b81e
--- a/intern/cycles/kernel/kernel_globals.h
+++ b/intern/cycles/kernel/kernel_globals.h
@@@ -41,10 -42,9 +42,12 @@@ struct OSLGlobals
  struct OSLThreadData;
  struct OSLShadingSystem;
  #  endif
 +#  ifdef __OIIO__
 +struct OIIOGlobals;
 +#  endif
  
+ typedef unordered_map<float, float> CoverageMap;
+ 
  struct Intersection;
  struct VolumeStep;
  
diff --cc intern/cycles/render/shader.cpp
index b20af57daa2,8d0cec7b14e..831ab9e87a0
--- a/intern/cycles/render/shader.cpp
+++ b/intern/cycles/render/shader.cpp
@@@ -30,9 -30,8 +30,10 @@@
  #include "render/tables.h"
  
  #include "util/util_foreach.h"
+ #include "util/util_murmurhash.h"
  
 +#include "kernel/kernel_oiio_globals.h"
 +#include <OpenImageIO/texture.h>
  #ifdef WITH_OCIO
  #  include <OpenColorIO/OpenColorIO.h>
  namespace OCIO = OCIO_NAMESPACE;



More information about the Bf-blender-cvs mailing list