test2

Files

Bastien Montagne 508e34d0bf Merge branch 'master' into blender2.8

Conflicts:
	source/blender/editors/animation/anim_deps.c
	source/blender/editors/animation/keyframing.c
	source/blender/editors/animation/keyingsets.c
	source/blender/editors/armature/pose_edit.c
	source/blender/editors/armature/pose_transform.c
	source/blender/editors/gpencil/gpencil_convert.c
	source/blender/editors/include/ED_anim_api.h
	source/blender/editors/include/ED_keyframing.h
	source/blender/editors/interface/interface_anim.c
	source/blender/editors/space_action/action_edit.c
	source/blender/editors/space_graph/graph_edit.c
	source/blender/editors/space_outliner/outliner_draw.c
	source/blender/editors/transform/transform_conversions.c
	source/blender/makesrna/intern/rna_armature.c
	source/blender/makesrna/intern/rna_pose.c
	source/blender/python/intern/bpy_rna_anim.c
	source/blenderplayer/bad_level_call_stubs/stubs.c
	source/gameengine/Converter/KX_BlenderSceneConverter.cpp

2018-06-07 13:04:16 +02:00

bmesh

Merge branch 'master' into blender2.8

2018-06-04 09:06:14 +02:00

gawain

Cleanup: trailing spaces

2018-04-22 08:45:52 +02:00

generic

Merge branch 'master' into blender2.8

2018-06-07 08:15:11 +02:00

intern

Merge branch 'master' into blender2.8