3332bee2ad
Conflicts: source/blender/editors/transform/transform_orientations.cc |
||
---|---|---|
.. | ||
freestyle | ||
modules | ||
presets | ||
site | ||
startup | ||
templates_osl | ||
templates_py |
3332bee2ad
Conflicts: source/blender/editors/transform/transform_orientations.cc |
||
---|---|---|
.. | ||
freestyle | ||
modules | ||
presets | ||
site | ||
startup | ||
templates_osl | ||
templates_py |