git.blender.org - blender.git/commit

projects / blender.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5d6e9f2 a7f16c1)

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)
commit	0c93bc2b637a6a3fe01b174dad2fb61895d004d2
tree	b877a434d2a7af2dfdf727b9794fa46359ba670a	tree \| snapshot
parent	5d6e9f237be3379b63169f86b8f4117752d095b3	commit \| diff
parent	a7f16c17c260f311e136758497e5490b226ebc03	commit \| diff

Merge branch 'master' into blender2.8

16 files changed:

build_files/build_environment/install_deps.sh	diff1 \|	diff2 \|	blob \| history
release/scripts/startup/bl_ui/space_view3d.py	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/BKE_node.h	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/cloth.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/interface/interface_handlers.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/interface/interface_regions.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/screen/screen_ops.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/space_node/drawnode.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/space_outliner/outliner_draw.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/space_outliner/outliner_edit.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/space_view3d/view3d_buttons.c	diff1 \|	diff2 \|	blob \| history
source/blender/gpu/intern/gpu_codegen.c	diff1 \|	diff2 \|	blob \| history
source/blender/modifiers/intern/MOD_surface.c	diff1 \|	diff2 \|	blob \| history
source/blender/windowmanager/intern/wm_files.c	diff1 \|	diff2 \|	blob \| history
source/blender/windowmanager/intern/wm_operators.c	diff1 \|	diff2 \|	blob \| history
source/blenderplayer/bad_level_call_stubs/stubs.c	diff1 \|	diff2 \|	blob \| history

The official Blender Foundation tree