Bastien Montagne 6e5b573dc8 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/editors/transform/transform_conversions.c

2018-12-18 20:33:04 +01:00

..

blender

Merge branch 'master' into blender2.8

2018-12-18 20:33:04 +01:00

creator

Merge remote-tracking branch 'origin/master' into blender2.8

2018-12-11 15:14:00 -07:00

tools @ 30d4611eac

Fix T58022: Changing workspace may change layout of User Pref window

2018-11-24 19:20:31 +01:00

CMakeLists.txt

Merge branch 'master' into blender2.8

2018-06-29 09:25:40 +02:00