forked from bartvdbraak/blender
c1ceab1281
Resolved conflicts: release/datafiles/startup.blend source/blender/editors/space_nla/nla_buttons.c Also updated source/blender/blenkernel/intern/linestyle.c as a follow-up of recent changes for the use of bool. |
||
---|---|---|
.. | ||
freestyle | ||
modules | ||
presets | ||
startup | ||
templates_osl | ||
templates_py |