mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-21 08:02:39 +08:00
6c96b973b5
# Conflicts: # cocos/renderer/renderer/Model.cpp # cocos/scripting/js-bindings/auto/api/jsb_renderer_auto_api.js # cocos/scripting/js-bindings/auto/jsb_renderer_auto.cpp # cocos/scripting/js-bindings/auto/jsb_renderer_auto.hpp # tools/tojs/renderer.ini