Skip to content

Commit

Permalink
Merge branch 'master' into v9
Browse files Browse the repository at this point in the history
  • Loading branch information
CodyJasonBennett committed Sep 28, 2023
2 parents 642c0ca + ef0992e commit c5694ee
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
3 changes: 2 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
"rules": {
"import/no-unresolved": "off",
"import/named": "off",
"import/namespace": "off"
"import/namespace": "off",
"import/no-named-as-default-member": "off"
}
}
2 changes: 1 addition & 1 deletion docs/API/hooks.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ useLoader(loader, url, extensions, (xhr) => {
If a `result.scene` prop is found the hook will automatically create a object & material collection: `{ nodes, materials }`. This lets you build immutable scene graphs selectively. You can also specifically alter the data without having to traverse it. [GLTFJSX](https://github.com/pmndrs/gltfjsx) specifically relies on this data.
```jsx
const { nodes, material } = useLoader(GLTFLoader, url)
const { nodes, materials } = useLoader(GLTFLoader, url)
```
### Pre-loading assets
Expand Down
6 changes: 6 additions & 0 deletions packages/fiber/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @react-three/fiber

## 8.14.3

### Patch Changes

- d77b0990: fix(native): drop fsstat for react-native-web

## 8.14.2

### Patch Changes
Expand Down
3 changes: 1 addition & 2 deletions packages/fiber/src/native/polyfills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,7 @@ export function polyfills() {
// Unpack assets in Android Release Mode
if (!uri.includes(':')) {
const file = `${fs.cacheDirectory}ExponentAsset-${asset.hash}.${asset.type}`
const stats = await fs.getInfoAsync(file, { size: false })
if (!stats.exists) await fs.copyAsync({ from: uri, to: file })
await fs.copyAsync({ from: uri, to: file })
uri = file
}

Expand Down

0 comments on commit c5694ee

Please sign in to comment.