git.blender.org - blender.git/commit

projects / blender.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: dc9a7f8 b498db0)

author	Julian Eisel <eiseljulian@gmail.com>
	Mon, 6 Mar 2017 12:00:46 +0000 (13:00 +0100)
committer	Julian Eisel <eiseljulian@gmail.com>
	Mon, 6 Mar 2017 12:00:46 +0000 (13:00 +0100)
commit	a5cba9aab9a2ade00caefc1a7697f8fbd3f7304f
tree	b34138ac968663a47cdd2b09a26ea68aeeba2377	tree
parent	dc9a7f861fa43fecae7450ee254a711b061c0c26	commit \| diff
parent	b498db06eb43f1e036f16cb346bf4cbb6d20e6d5	commit \| diff

Merge branch 'master' into blender2.8

Conflicts:
source/blender/editors/space_nla/nla_draw.c
source/blender/editors/space_view3d/view3d_draw.c

19 files changed:

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/blender/blenloader/intern/versioning_270.c	diff1 \|	diff2 \|	blob \| history
source/blender/bmesh/tools/bmesh_intersect.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/armature/armature_select.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/armature/editarmature_sketch.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/include/ED_view3d.h	diff1 \|	diff2 \|	blob \| history
source/blender/editors/interface/interface_handlers.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/render/render_opengl.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/space_nla/nla_draw.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/space_view3d/view3d_draw.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/space_view3d/view3d_draw_legacy.c	diff1 \|	\|	blob \| history
source/blender/editors/space_view3d/view3d_edit.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/space_view3d/view3d_view.c	diff1 \|	diff2 \|	blob \| history
source/blender/modifiers/intern/MOD_boolean.c	diff1 \|	diff2 \|	blob \| history
source/blender/modifiers/intern/MOD_surfacedeform.c	diff1 \|	diff2 \|	blob \| history
source/blender/python/intern/gpu_offscreen.c	diff1 \|	diff2 \|	blob \| history
source/blender/windowmanager/intern/wm_event_system.c	diff1 \|	diff2 \|	blob \| history
source/blender/windowmanager/intern/wm_stereo.c	diff1 \|	diff2 \|	blob \| history
source/blender/windowmanager/wm.h	diff1 \|	diff2 \|	blob \| history

The official Blender Foundation tree