[Bf-blender-cvs] [78a6689aea1] blender2.8: Merge branch 'master' into blender2.8

Sergey Sharybin noreply at git.blender.org
Fri Nov 9 14:34:39 CET 2018


Commit: 78a6689aea1976d42ba0fca927f3e7572768e1fb
Author: Sergey Sharybin
Date:   Fri Nov 9 14:34:33 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB78a6689aea1976d42ba0fca927f3e7572768e1fb

Merge branch 'master' into blender2.8

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



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

diff --cc intern/cycles/kernel/kernel_passes.h
index 49a1b2c848e,80477f921ea..1f5929e4938
--- a/intern/cycles/kernel/kernel_passes.h
+++ b/intern/cycles/kernel/kernel_passes.h
@@@ -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;
  }
diff --cc intern/cycles/util/util_opengl.h
index 7a8d5eec1f9,2ca7b7e4c87..04f0fbaf288
--- a/intern/cycles/util/util_opengl.h
+++ b/intern/cycles/util/util_opengl.h
@@@ -20,6 -20,12 +20,6 @@@
  /* 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__ */



More information about the Bf-blender-cvs mailing list