9dc1ec1a2b
Conflicts: source/blender/editors/include/ED_view3d.hh source/blender/editors/object/object_add.cc source/blender/draw/intern/draw_shader_shared.h renamed to .hh |
||
---|---|---|
.. | ||
freestyle | ||
modules | ||
presets | ||
site | ||
startup | ||
templates_osl | ||
templates_py |