Merge branch 'fix-gltf-loader' into 'master'

fix loading material without texture See merge request avvy/blocks-admin!56

Merge branch 'fix-gltf-loader' into 'master'
fix loading material without texture See merge request avvy/blocks-admin!56
f473ecf1 · Vlad Gaydukov · 2dbcc572 · 0e436ee8 · f473ecf1 · f473ecf1
Commit f473ecf1 authored 3 years ago by Vlad Gaydukov
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 1085 additions and 721 deletions
+1085 -721
--- a/local.ini
+++ b/local.ini
 # When deployed, generated with ansible/roles/server_tornado/templates/config.ini.tpl

 [ucs]
-#ucs_http_address = http://165.227.139.116:8710
-ucs_http_address = http://localhost:8888
+ucs_http_address = http://165.227.139.116:8710
+# ucs_http_address = http://localhost:8888

 [deploy]
 # Run migrations

--- a/static/js/avvy_viewer.js
+++ b/static/js/avvy_viewer.js