projects
/
blender.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5d6e9f2
a7f16c1
)
Merge branch 'master' into blender2.8
author
Campbell Barton <ideasman42@gmail.com>
Sat, 25 Mar 2017 02:39:47 +0000
(13:39 +1100)
committer
Campbell 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
patch
|
diff1
|
diff2
|
blob
|
history
release/scripts/startup/bl_ui/space_view3d.py
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/blenkernel/BKE_node.h
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/blenkernel/intern/cloth.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/editors/interface/interface_handlers.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/editors/interface/interface_regions.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/editors/screen/screen_ops.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/editors/space_node/drawnode.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/editors/space_outliner/outliner_draw.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/editors/space_outliner/outliner_edit.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/editors/space_view3d/view3d_buttons.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/gpu/intern/gpu_codegen.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/modifiers/intern/MOD_surface.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/windowmanager/intern/wm_files.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/windowmanager/intern/wm_operators.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blenderplayer/bad_level_call_stubs/stubs.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
build_files/build_environment/install_deps.sh
Simple merge
diff --cc
release/scripts/startup/bl_ui/space_view3d.py
Simple merge
diff --cc
source/blender/blenkernel/BKE_node.h
Simple merge
diff --cc
source/blender/blenkernel/intern/cloth.c
Simple merge
diff --cc
source/blender/editors/interface/interface_handlers.c
Simple merge
diff --cc
source/blender/editors/interface/interface_regions.c
Simple merge
diff --cc
source/blender/editors/screen/screen_ops.c
Simple merge
diff --cc
source/blender/editors/space_node/drawnode.c
Simple merge
diff --cc
source/blender/editors/space_outliner/outliner_draw.c
index ee943db95334d85c3c8643bef8a218202c5e02dc,121fe8120168306203c0dd3ba261755a3f404e9c..5d1323bbdd836b137b07ff04484bd11f95a255c6
---
1
/
source/blender/editors/space_outliner/outliner_draw.c
---
2
/
source/blender/editors/space_outliner/outliner_draw.c
+++ b/
source/blender/editors/space_outliner/outliner_draw.c
@@@
-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:
diff --cc
source/blender/editors/space_outliner/outliner_edit.c
Simple merge
diff --cc
source/blender/editors/space_view3d/view3d_buttons.c
Simple merge
diff --cc
source/blender/gpu/intern/gpu_codegen.c
Simple merge
diff --cc
source/blender/modifiers/intern/MOD_surface.c
Simple merge
diff --cc
source/blender/windowmanager/intern/wm_files.c
Simple merge
diff --cc
source/blender/windowmanager/intern/wm_operators.c
Simple merge
diff --cc
source/blenderplayer/bad_level_call_stubs/stubs.c
Simple merge