Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 25 Mar 2017 02:39:47 +0000 (13:39 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 25 Mar 2017 02:39:47 +0000 (13:39 +1100)
16 files changed:
1  2 
build_files/build_environment/install_deps.sh
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/cloth.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_regions.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_outliner/outliner_edit.c
source/blender/editors/space_view3d/view3d_buttons.c
source/blender/gpu/intern/gpu_codegen.c
source/blender/modifiers/intern/MOD_surface.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_operators.c
source/blenderplayer/bad_level_call_stubs/stubs.c

Simple merge
index ee943db95334d85c3c8643bef8a218202c5e02dc,121fe8120168306203c0dd3ba261755a3f404e9c..5d1323bbdd836b137b07ff04484bd11f95a255c6
@@@ -846,11 -1052,9 +846,11 @@@ static void tselem_draw_icon(uiBlock *b
        aspect = (0.8f * UI_UNIT_Y) / ICON_DEFAULT_HEIGHT;
        x += 2.0f * aspect;
        y += 2.0f * aspect;
-       arg.x = x = x;
-       arg.y = y = y;
+       arg.x = x;
+       arg.y = y;
  
 +#define ICON_DRAW(_icon) UI_icon_draw_alpha(x, y, _icon, alpha)
 +
        if (tselem->type) {
                switch (tselem->type) {
                        case TSE_ANIM_DATA: