Bastien Montagne
bb7202495a
Merge branch 'master' into blender2.8
Conflicts:
source/blender/collada/ArmatureExporter.cpp
source/blender/collada/ArmatureExporter.h
source/blender/collada/DocumentExporter.cpp
source/blender/collada/DocumentExporter.h
source/blender/collada/SceneExporter.cpp
source/blender/collada/SceneExporter.h
source/blender/collada/collada.cpp
source/blender/collada/collada.h
source/blender/editors/armature/armature_edit.c
source/blender/editors/armature/editarmature_retarget.c
source/blender/editors/armature/pose_transform.c
source/blender/editors/include/ED_armature.h
source/blender/editors/include/ED_object.h
source/blender/editors/include/ED_screen.h
source/blender/editors/io/io_collada.c
source/blender/editors/object/object_transform.c
source/blender/editors/screen/screen_edit.c
source/blender/editors/screen/screen_ops.c
source/blender/windowmanager/intern/wm.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_window.c
source/blenderplayer/bad_level_call_stubs/stubs.c
2018-06-06 16:25:28 +02:00
..
2018-06-06 15:58:18 +02:00
2018-01-17 19:59:47 +01:00
2018-06-01 18:26:42 +02:00
2018-06-06 16:00:25 +02:00
2018-06-01 18:26:42 +02:00
2018-06-06 14:51:18 +02:00
2018-06-01 18:26:42 +02:00
2018-06-05 16:59:18 +02:00
2018-06-06 16:25:28 +02:00
2018-06-05 17:02:50 +02:00
2018-05-31 11:50:30 -06:00
2018-06-06 12:36:52 +02:00
2018-06-06 15:26:09 +02:00
2018-06-06 16:25:28 +02:00
2018-06-01 18:26:42 +02:00
2018-06-04 15:15:00 +02:00
2018-06-01 18:26:42 +02:00
2018-06-01 18:26:42 +02:00
2018-06-06 16:00:25 +02:00
2018-06-06 16:25:28 +02:00
2018-06-05 16:59:18 +02:00
2018-06-01 18:26:42 +02:00
2018-06-01 18:26:42 +02:00
2018-06-05 17:02:50 +02:00
2018-06-05 17:02:50 +02:00
2018-06-06 16:25:28 +02:00
2018-04-17 17:51:28 +02:00