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

Conflicts:
	source/blender/editors/gpencil/drawgpencil.c

2017-01-05 00:31:15 +01:00

..

bl_operators

Fix T50350: Quick Explode time frame problem

2017-01-04 10:13:28 +01:00

bl_ui

Merge branch 'master' into blender2.8

2017-01-05 00:31:15 +01:00

keyingsets_builtins.py

Fixes for pose library change 601ce6a89c

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

nodeitems_builtins.py

Fresnel node support for Blender Internal Render

2016-12-14 18:02:38 +03:00