Conflicts: source/blender/editors/interface/interface_layout.cc source/blender/makesrna/intern/rna_ui_api.cc |
||
---|---|---|
.. | ||
addons_core | ||
freestyle | ||
modules | ||
presets | ||
site | ||
startup | ||
templates_osl | ||
templates_py |
Conflicts: source/blender/editors/interface/interface_layout.cc source/blender/makesrna/intern/rna_ui_api.cc |
||
---|---|---|
.. | ||
addons_core | ||
freestyle | ||
modules | ||
presets | ||
site | ||
startup | ||
templates_osl | ||
templates_py |