Bastien Montagne c1ba58c44d Merge branch 'master' into blender2.8 ...

Conflicts:
	intern/cycles/blender/addon/properties.py

2016-11-07 15:46:27 +01:00

..

bl_operators

Merge branch 'master' into blender2.8

2016-11-07 15:46:27 +01:00

bl_ui

Merge branch 'master' into blender2.8

2016-11-07 15:46:27 +01:00

keyingsets_builtins.py

Fixes for pose library change 601ce6a89c

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

nodeitems_builtins.py

Cleanup: unused vars, imports, pep8

2016-08-01 11:55:06 +10:00