Julian Eisel a99495d291 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/intern/scene.c

2017-03-02 19:15:32 +01:00

..

bl_operators

Merge branch 'master' into blender2.8

2017-02-23 10:56:28 +01:00

bl_ui

Merge branch 'master' into blender2.8

2017-03-02 19:15:32 +01:00

keyingsets_builtins.py

Fixes for pose library change 601ce6a89c

2016-09-28 15:40:22 +02:00

nodeitems_builtins.py

Add 'Layer Weight' node to Blender internal node items

2017-01-17 12:02:05 +03:00