Merge branch 'master' into blender2.8
authorJulian Eisel <eiseljulian@gmail.com>
Sun, 7 May 2017 22:19:22 +0000 (00:19 +0200)
committerJulian Eisel <eiseljulian@gmail.com>
Sun, 7 May 2017 22:19:22 +0000 (00:19 +0200)
17 files changed:
1  2 
intern/cycles/blender/addon/engine.py
intern/cycles/blender/addon/properties.py
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_session.cpp
intern/cycles/blender/blender_session.h
intern/cycles/blender/blender_sync.cpp
intern/cycles/blender/blender_sync.h
intern/cycles/device/device.cpp
intern/cycles/device/device.h
intern/cycles/device/device_cuda.cpp
intern/cycles/device/device_multi.cpp
intern/cycles/render/buffers.cpp
source/blender/editors/space_node/drawnode.c
source/blender/makesrna/intern/rna_render.c
source/blender/render/extern/include/RE_engine.h
source/blender/render/intern/source/external_engine.c
source/blenderplayer/bad_level_call_stubs/stubs.c

Simple merge
Simple merge
Simple merge
Simple merge
index 21d29a801ae16d38e2fc31e5a178b17cc8a5233e,527940e8f50b185a03d38709f11d6f8a4259f95f..c22969d7dc644ced2b87b51957012a6d983e9cbf
@@@ -228,28 -228,24 +228,37 @@@ struct DeviceDrawParams 
  };
  
  class Device {
+       friend class device_sub_ptr;
  protected:
 -      Device(DeviceInfo& info_, Stats &stats_, bool background) : background(background), vertex_buffer(0), info(info_), stats(stats_) {}
 +      enum {
 +              FALLBACK_SHADER_STATUS_NONE = 0,
 +              FALLBACK_SHADER_STATUS_ERROR,
 +              FALLBACK_SHADER_STATUS_SUCCESS,
 +      };
 +
 +      Device(DeviceInfo& info_, Stats &stats_, bool background) : background(background),
 +          vertex_buffer(0),
 +          fallback_status(FALLBACK_SHADER_STATUS_NONE), fallback_shader_program(0),
 +          info(info_), stats(stats_) {}
  
        bool background;
        string error_msg;
  
        /* used for real time display */
        unsigned int vertex_buffer;
 +      int fallback_status, fallback_shader_program;
 +      int image_texture_location, fullscreen_location;
 +
 +      bool bind_fallback_display_space_shader(const float width, const float height);
  
+       virtual device_ptr mem_alloc_sub_ptr(device_memory& /*mem*/, int /*offset*/, int /*size*/, MemoryType /*type*/)
+       {
+               /* Only required for devices that implement denoising. */
+               assert(false);
+               return (device_ptr) 0;
+       }
+       virtual void mem_free_sub_ptr(device_ptr /*ptr*/) {};
  public:
        virtual ~Device();
  
Simple merge
Simple merge
Simple merge