Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh. |
||
|---|---|---|
| .. | ||
| CMakeLists.txt | ||
| slplugin-objc.h | ||
| slplugin-objc.mm | ||
| slplugin.cpp | ||
| slplugin_info.plist | ||
Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh. |
||
|---|---|---|
| .. | ||
| CMakeLists.txt | ||
| slplugin-objc.h | ||
| slplugin-objc.mm | ||
| slplugin.cpp | ||
| slplugin_info.plist | ||