Kévin Dietrich 94eb189752 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/BKE_blender_version.h

2018-02-24 14:02:50 +01:00

..

bl_operators

Merge branch 'master' into blender2.8

2018-02-23 19:02:49 +01:00

bl_ui

Merge branch 'master' into blender2.8

2018-02-24 14:02:50 +01:00

keyingsets_builtins.py

Object Mode: move to workspace struct

2018-02-08 21:14:26 +11:00

nodeitems_builtins.py

Merge branch 'master' into blender2.8

2018-02-23 19:02:49 +01:00