Merge branch 'master' into blender2.8
authorJulian Eisel <eiseljulian@gmail.com>
Sun, 22 Oct 2017 22:04:20 +0000 (00:04 +0200)
committerJulian Eisel <eiseljulian@gmail.com>
Sun, 22 Oct 2017 22:04:20 +0000 (00:04 +0200)
1  2 
intern/cycles/blender/addon/properties.py
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_session.cpp
intern/cycles/blender/blender_sync.cpp
intern/cycles/device/device.cpp
intern/cycles/device/device.h
intern/cycles/device/device_cuda.cpp
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface_layout.c
source/blender/editors/interface/interface_templates.c
source/blender/windowmanager/intern/wm_operators.c

Simple merge
Simple merge
Simple merge
Simple merge
index a5fe840716e81e2cd518cd6200af9cf3bf9e0fed,c392464ec3e1a14e15ba3face50b3f8905bbc22c..d7fac303d4e4ba7c0e259b4ae59443c05f7d4fbe
  
  #include "PIL_time.h"
  
+ // #define USE_OP_RESET_BUT  // we may want to make this optional, disable for now.
 +/* defines for templateID/TemplateSearch */
 +#define TEMPLATE_SEARCH_TEXTBUT_WIDTH  (UI_UNIT_X * 6)
 +#define TEMPLATE_SEARCH_TEXTBUT_HEIGHT  UI_UNIT_Y
 +
  
  void UI_template_fix_linking(void)
  {