Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 9 Nov 2018 13:34:33 +0000 (14:34 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 9 Nov 2018 13:34:33 +0000 (14:34 +0100)
17 files changed:
1  2 
intern/cycles/blender/blender_python.cpp
intern/cycles/blender/blender_session.h
intern/cycles/blender/blender_shader.cpp
intern/cycles/blender/blender_sync.h
intern/cycles/blender/blender_util.h
intern/cycles/device/device.h
intern/cycles/device/device_cuda.cpp
intern/cycles/kernel/kernel_id_passes.h
intern/cycles/kernel/kernel_passes.h
intern/cycles/render/image.h
intern/cycles/render/light.h
intern/cycles/render/nodes.h
intern/cycles/render/shader.cpp
intern/cycles/render/shader.h
intern/cycles/util/util_math_intersect.h
intern/cycles/util/util_opengl.h
intern/cycles/util/util_view.cpp

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -199,11 -199,11 +199,11 @@@ ccl_device_inline size_t kernel_write_i
                (*map)[id] += matte_weight;
                return 0;
        }
- #else /* __KERNEL_CPU__ */
+ #else  /* __KERNEL_CPU__ */
 -#define WRITE_ID_SLOT(buffer, depth, id, matte_weight, name) kernel_write_id_slots_gpu(buffer, depth * 2, id, matte_weight) 
 +#define WRITE_ID_SLOT(buffer, depth, id, matte_weight, name) kernel_write_id_slots_gpu(buffer, depth * 2, id, matte_weight)
  ccl_device_inline size_t kernel_write_id_slots_gpu(ccl_global float *buffer, size_t depth, float id, float matte_weight)
  {
- #endif /* __KERNEL_CPU__ */
+ #endif  /* __KERNEL_CPU__ */
        kernel_write_id_slots(buffer, depth, id, matte_weight);
        return depth * 2;
  }
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
  /* OpenGL header includes, used everywhere we use OpenGL, to deal with
   * platform differences in one central place. */
  
 -#ifdef WITH_GLEW_MX
 -#  include "glew-mx.h"
 -#else
 -#  include <GL/glew.h>
 -#  define mxCreateContext() glewInit()
 -#  define mxMakeCurrentContext(x) (x)
 -#endif
 +#include <GL/glew.h>
  
- #endif /* __UTIL_OPENGL_H__ */
+ #endif  /* __UTIL_OPENGL_H__ */
Simple merge