From 69637b564433cccd5dca64598bde5e0fa29b2bda Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Dec 2025 06:56:48 +0000
Subject: [PATCH 001/133] Bump super-linter/super-linter from 8.2.1 to 8.3.0
 (#21992)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps
[super-linter/super-linter](https://github.com/super-linter/super-linter)
from 8.2.1 to 8.3.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/super-linter/super-linter/releases">super-linter/super-linter's
releases</a>.</em></p>
<blockquote>
<h2>v8.3.0</h2>
<h2><a
href="https://github.com/super-linter/super-linter/compare/v8.2.1...v8.3.0">8.3.0</a>
(2025-11-28)</h2>
<h3>🚀 Features</h3>
<ul>
<li>add ability to specify config files for nbqa tools (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7184">#7184</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/b37c1c33a78f7cbf9bfa04609b83180319421bfc">b37c1c3</a>)</li>
<li>lint dependabot, github actions with zizmor (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7241">#7241</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/09306cdabe5c1afaedcab156e7a75b88575c829b">09306cd</a>),
closes <a
href="https://redirect.github.com/super-linter/super-linter/issues/7137">#7137</a></li>
<li>support rust 2024 (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7211">#7211</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/c15ee6dd7d559940b734579617c3637b9c007f6f">c15ee6d</a>),
closes <a
href="https://redirect.github.com/super-linter/super-linter/issues/7139">#7139</a></li>
</ul>
<h3>🐛 Bugfixes</h3>
<ul>
<li>parse json to extract terraform version (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7239">#7239</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/29f17277db2147d8af291ae20e5c792b499052c7">29f1727</a>)</li>
</ul>
<h3>⬆️ Dependency updates</h3>
<ul>
<li><strong>bundler:</strong> bump rubocop in /dependencies in the
rubocop group (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7188">#7188</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/74b24446f8c7575d1b83edc5c975726d9e47416a">74b2444</a>)</li>
<li><strong>bundler:</strong> bump rubocop-rails in /dependencies in the
rubocop group (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7231">#7231</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/dd55c528c7a818fc25840f934f8a8d8c8264bab7">dd55c52</a>)</li>
<li><strong>bundler:</strong> bump the rubocop group in /dependencies
with 2 updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7178">#7178</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/3bdc91928162635ba67a148016a0ee29846087c6">3bdc919</a>)</li>
<li><strong>bundler:</strong> bump the rubocop group in /dependencies
with 4 updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7202">#7202</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/0e09528bdf1e450d83fab9ce2400225a11c7657d">0e09528</a>)</li>
<li><strong>docker:</strong> bump python in the docker-base-images group
(<a
href="https://redirect.github.com/super-linter/super-linter/issues/7123">#7123</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/41c3da1d09d0e5ec067ad65c9b855c6aeff225bc">41c3da1</a>)</li>
<li><strong>docker:</strong> bump the docker group across 1 directory
with 12 updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7235">#7235</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/b1cf27d548d8e772a89094d18b52c6d097b5ba08">b1cf27d</a>)</li>
<li><strong>docker:</strong> bump the docker group across 1 directory
with 6 updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7148">#7148</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/76149cff49dabb7f045e86f46e93f6767e2da34d">76149cf</a>)</li>
<li><strong>docker:</strong> bump the docker group across 1 directory
with 9 updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7194">#7194</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/45f731ea75a53496824bd31bb77c6ceab71a18ec">45f731e</a>)</li>
<li><strong>npm:</strong> bump <code>@​babel/eslint-parser</code> in
/dependencies (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7183">#7183</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/197eb8863a766dcfcf4c4ca670dc8560a9db85c6">197eb88</a>)</li>
<li><strong>npm:</strong> bump
<code>@​typescript-eslint/eslint-plugin</code> (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7127">#7127</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/2d57f06c64c521f2cfbbea3b8cc9c8f080fb473a">2d57f06</a>)</li>
<li><strong>npm:</strong> bump
<code>@​typescript-eslint/eslint-plugin</code> (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7196">#7196</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/033ea992a1aa5a0d4f868c2a3d401008ef218d9a">033ea99</a>)</li>
<li><strong>npm:</strong> bump body-parser from 2.2.0 to 2.2.1 in
/dependencies (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7238">#7238</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/30403f6aa43e234b7196dfd2eaa425b05294aa4c">30403f6</a>)</li>
<li><strong>npm:</strong> bump eslint from 9.37.0 to 9.38.0 in
/dependencies (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7170">#7170</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/b42af6f21b7bc5b827acd2c977b6047baad41ce9">b42af6f</a>)</li>
<li><strong>npm:</strong> bump eslint from 9.38.0 to 9.39.0 in
/dependencies (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7191">#7191</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/0cf22c89f925988556f38fcce929adde347f527b">0cf22c8</a>)</li>
<li><strong>npm:</strong> bump eslint from 9.39.0 to 9.39.1 in
/dependencies (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7197">#7197</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/513ae8ba519bb2c67e124d0fa1f03aff521babaa">513ae8b</a>)</li>
<li><strong>npm:</strong> bump eslint-plugin-react-hooks (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7180">#7180</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/61e42084aa3bc2771777fc56ca15f2b480117106">61e4208</a>)</li>
<li><strong>npm:</strong> bump js-yaml from 3.14.1 to 3.14.2 in
/dependencies (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7210">#7210</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/29faa987594b8d482545899275cd14bfc3cfe6bd">29faa98</a>)</li>
<li><strong>npm:</strong> bump npm-groovy-lint from 15.2.1 to 15.2.2 in
/dependencies (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7130">#7130</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/49138252344a9c051b5d4c4f12cc660d670415d8">4913825</a>)</li>
<li><strong>npm:</strong> bump renovate from 41.142.0 to 41.146.5 in
/dependencies (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7134">#7134</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/900b973697b89c3d89462a12bdd556c8dec5b4d0">900b973</a>)</li>
<li><strong>npm:</strong> bump renovate from 41.151.1 to 41.161.0 in
/dependencies (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7182">#7182</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/1d8c2a20d753278a958cf2a5f8c5b264bd1807c4">1d8c2a2</a>)</li>
<li><strong>npm:</strong> bump renovate from 41.161.0 to 42.4.0 in
/dependencies (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7198">#7198</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/0a4ed306a12b6a923c8c5ae80b798fd64314e193">0a4ed30</a>)</li>
<li><strong>npm:</strong> bump the eslint-plugins-configs group across 1
directory with 2 updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7145">#7145</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/c137ca99f70bb902052d71b0191dd000fb2390a1">c137ca9</a>)</li>
<li><strong>npm:</strong> bump the npm group across 1 directory with 2
updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7175">#7175</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/f0b0ff5c9a26aac384cd4b016a099932ec2f96a9">f0b0ff5</a>)</li>
<li><strong>npm:</strong> bump the npm group across 1 directory with 3
updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7146">#7146</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/d4d3f168263fb5ae8b10cec7280d34954230f0a0">d4d3f16</a>)</li>
<li><strong>npm:</strong> bump the npm group across 1 directory with 3
updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7195">#7195</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/ad4f63c1683738277ceb276609c1acedf4f72ca9">ad4f63c</a>)</li>
<li><strong>npm:</strong> bump the npm group across 1 directory with 5
updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7233">#7233</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/5cadbf190ab223e8deab07f2415670e0aef342d9">5cadbf1</a>)</li>
<li><strong>npm:</strong> bump the npm group across 1 directory with 8
updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7221">#7221</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/3802c521f77bf81bda1453e9ba189a6e442a0dbb">3802c52</a>)</li>
<li><strong>npm:</strong> bump the react group across 1 directory with 2
updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7190">#7190</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/d6c8078d417d100057ba28b372755aa78d9cbf0b">d6c8078</a>)</li>
<li><strong>npm:</strong> bump the react group across 1 directory with 4
updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7128">#7128</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/40347029803087080f7cc79e7ca129c1e6b7cbd1">4034702</a>)</li>
<li><strong>npm:</strong> bump the typescript group across 1 directory
with 2 updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7176">#7176</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/39aba7679238de915382df7ecbe0194bc6677af9">39aba76</a>)</li>
<li><strong>python:</strong> bump the pip group across 1 directory with
11 updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7199">#7199</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/07fbf76c2cf08a5c12b51f73329ae4ddc0c93d22">07fbf76</a>)</li>
<li><strong>python:</strong> bump the pip group across 1 directory with
3 updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7234">#7234</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/c8bd6d308cdb7dc47ef439de8edff221afca95d2">c8bd6d3</a>)</li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/super-linter/super-linter/blob/main/CHANGELOG.md">super-linter/super-linter's
changelog</a>.</em></p>
<blockquote>
<h2><a
href="https://github.com/super-linter/super-linter/compare/v8.2.1...v8.3.0">8.3.0</a>
(2025-11-28)</h2>
<h3>🚀 Features</h3>
<ul>
<li>add ability to specify config files for nbqa tools (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7184">#7184</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/b37c1c33a78f7cbf9bfa04609b83180319421bfc">b37c1c3</a>)</li>
<li>lint dependabot, github actions with zizmor (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7241">#7241</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/09306cdabe5c1afaedcab156e7a75b88575c829b">09306cd</a>),
closes <a
href="https://redirect.github.com/super-linter/super-linter/issues/7137">#7137</a></li>
<li>support rust 2024 (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7211">#7211</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/c15ee6dd7d559940b734579617c3637b9c007f6f">c15ee6d</a>),
closes <a
href="https://redirect.github.com/super-linter/super-linter/issues/7139">#7139</a></li>
</ul>
<h3>🐛 Bugfixes</h3>
<ul>
<li>parse json to extract terraform version (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7239">#7239</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/29f17277db2147d8af291ae20e5c792b499052c7">29f1727</a>)</li>
</ul>
<h3>⬆️ Dependency updates</h3>
<ul>
<li><strong>bundler:</strong> bump rubocop in /dependencies in the
rubocop group (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7188">#7188</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/74b24446f8c7575d1b83edc5c975726d9e47416a">74b2444</a>)</li>
<li><strong>bundler:</strong> bump rubocop-rails in /dependencies in the
rubocop group (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7231">#7231</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/dd55c528c7a818fc25840f934f8a8d8c8264bab7">dd55c52</a>)</li>
<li><strong>bundler:</strong> bump the rubocop group in /dependencies
with 2 updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7178">#7178</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/3bdc91928162635ba67a148016a0ee29846087c6">3bdc919</a>)</li>
<li><strong>bundler:</strong> bump the rubocop group in /dependencies
with 4 updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7202">#7202</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/0e09528bdf1e450d83fab9ce2400225a11c7657d">0e09528</a>)</li>
<li><strong>docker:</strong> bump python in the docker-base-images group
(<a
href="https://redirect.github.com/super-linter/super-linter/issues/7123">#7123</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/41c3da1d09d0e5ec067ad65c9b855c6aeff225bc">41c3da1</a>)</li>
<li><strong>docker:</strong> bump the docker group across 1 directory
with 12 updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7235">#7235</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/b1cf27d548d8e772a89094d18b52c6d097b5ba08">b1cf27d</a>)</li>
<li><strong>docker:</strong> bump the docker group across 1 directory
with 6 updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7148">#7148</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/76149cff49dabb7f045e86f46e93f6767e2da34d">76149cf</a>)</li>
<li><strong>docker:</strong> bump the docker group across 1 directory
with 9 updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7194">#7194</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/45f731ea75a53496824bd31bb77c6ceab71a18ec">45f731e</a>)</li>
<li><strong>npm:</strong> bump <code>@​babel/eslint-parser</code> in
/dependencies (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7183">#7183</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/197eb8863a766dcfcf4c4ca670dc8560a9db85c6">197eb88</a>)</li>
<li><strong>npm:</strong> bump
<code>@​typescript-eslint/eslint-plugin</code> (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7127">#7127</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/2d57f06c64c521f2cfbbea3b8cc9c8f080fb473a">2d57f06</a>)</li>
<li><strong>npm:</strong> bump
<code>@​typescript-eslint/eslint-plugin</code> (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7196">#7196</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/033ea992a1aa5a0d4f868c2a3d401008ef218d9a">033ea99</a>)</li>
<li><strong>npm:</strong> bump body-parser from 2.2.0 to 2.2.1 in
/dependencies (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7238">#7238</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/30403f6aa43e234b7196dfd2eaa425b05294aa4c">30403f6</a>)</li>
<li><strong>npm:</strong> bump eslint from 9.37.0 to 9.38.0 in
/dependencies (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7170">#7170</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/b42af6f21b7bc5b827acd2c977b6047baad41ce9">b42af6f</a>)</li>
<li><strong>npm:</strong> bump eslint from 9.38.0 to 9.39.0 in
/dependencies (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7191">#7191</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/0cf22c89f925988556f38fcce929adde347f527b">0cf22c8</a>)</li>
<li><strong>npm:</strong> bump eslint from 9.39.0 to 9.39.1 in
/dependencies (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7197">#7197</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/513ae8ba519bb2c67e124d0fa1f03aff521babaa">513ae8b</a>)</li>
<li><strong>npm:</strong> bump eslint-plugin-react-hooks (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7180">#7180</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/61e42084aa3bc2771777fc56ca15f2b480117106">61e4208</a>)</li>
<li><strong>npm:</strong> bump js-yaml from 3.14.1 to 3.14.2 in
/dependencies (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7210">#7210</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/29faa987594b8d482545899275cd14bfc3cfe6bd">29faa98</a>)</li>
<li><strong>npm:</strong> bump npm-groovy-lint from 15.2.1 to 15.2.2 in
/dependencies (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7130">#7130</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/49138252344a9c051b5d4c4f12cc660d670415d8">4913825</a>)</li>
<li><strong>npm:</strong> bump renovate from 41.142.0 to 41.146.5 in
/dependencies (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7134">#7134</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/900b973697b89c3d89462a12bdd556c8dec5b4d0">900b973</a>)</li>
<li><strong>npm:</strong> bump renovate from 41.151.1 to 41.161.0 in
/dependencies (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7182">#7182</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/1d8c2a20d753278a958cf2a5f8c5b264bd1807c4">1d8c2a2</a>)</li>
<li><strong>npm:</strong> bump renovate from 41.161.0 to 42.4.0 in
/dependencies (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7198">#7198</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/0a4ed306a12b6a923c8c5ae80b798fd64314e193">0a4ed30</a>)</li>
<li><strong>npm:</strong> bump the eslint-plugins-configs group across 1
directory with 2 updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7145">#7145</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/c137ca99f70bb902052d71b0191dd000fb2390a1">c137ca9</a>)</li>
<li><strong>npm:</strong> bump the npm group across 1 directory with 2
updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7175">#7175</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/f0b0ff5c9a26aac384cd4b016a099932ec2f96a9">f0b0ff5</a>)</li>
<li><strong>npm:</strong> bump the npm group across 1 directory with 3
updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7146">#7146</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/d4d3f168263fb5ae8b10cec7280d34954230f0a0">d4d3f16</a>)</li>
<li><strong>npm:</strong> bump the npm group across 1 directory with 3
updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7195">#7195</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/ad4f63c1683738277ceb276609c1acedf4f72ca9">ad4f63c</a>)</li>
<li><strong>npm:</strong> bump the npm group across 1 directory with 5
updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7233">#7233</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/5cadbf190ab223e8deab07f2415670e0aef342d9">5cadbf1</a>)</li>
<li><strong>npm:</strong> bump the npm group across 1 directory with 8
updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7221">#7221</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/3802c521f77bf81bda1453e9ba189a6e442a0dbb">3802c52</a>)</li>
<li><strong>npm:</strong> bump the react group across 1 directory with 2
updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7190">#7190</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/d6c8078d417d100057ba28b372755aa78d9cbf0b">d6c8078</a>)</li>
<li><strong>npm:</strong> bump the react group across 1 directory with 4
updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7128">#7128</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/40347029803087080f7cc79e7ca129c1e6b7cbd1">4034702</a>)</li>
<li><strong>npm:</strong> bump the typescript group across 1 directory
with 2 updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7176">#7176</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/39aba7679238de915382df7ecbe0194bc6677af9">39aba76</a>)</li>
<li><strong>python:</strong> bump the pip group across 1 directory with
11 updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7199">#7199</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/07fbf76c2cf08a5c12b51f73329ae4ddc0c93d22">07fbf76</a>)</li>
<li><strong>python:</strong> bump the pip group across 1 directory with
3 updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7234">#7234</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/c8bd6d308cdb7dc47ef439de8edff221afca95d2">c8bd6d3</a>)</li>
<li><strong>python:</strong> bump the pip group across 1 directory with
4 updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7219">#7219</a>)
(<a
href="https://github.com/super-linter/super-linter/commit/91361a34fd58bc5dc83b52e0bd25114a06223fab">91361a3</a>)</li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/super-linter/super-linter/commit/502f4fe48a81a392756e173e39a861f8c8efe056"><code>502f4fe</code></a>
chore(main): release 8.3.0 (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7149">#7149</a>)</li>
<li><a
href="https://github.com/super-linter/super-linter/commit/13997378fdbc9d06dd8791ab2ff8985d27810d58"><code>1399737</code></a>
chore: update google-java-format to 1.29.0 (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7104">#7104</a>)</li>
<li><a
href="https://github.com/super-linter/super-linter/commit/b1cf27d548d8e772a89094d18b52c6d097b5ba08"><code>b1cf27d</code></a>
deps(docker): bump the docker group across 1 directory with 12 updates
(<a
href="https://redirect.github.com/super-linter/super-linter/issues/7235">#7235</a>)</li>
<li><a
href="https://github.com/super-linter/super-linter/commit/09306cdabe5c1afaedcab156e7a75b88575c829b"><code>09306cd</code></a>
feat: lint dependabot, github actions with zizmor (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7241">#7241</a>)</li>
<li><a
href="https://github.com/super-linter/super-linter/commit/5aa81e2b92d9cec28bdd7183b8197383aace3203"><code>5aa81e2</code></a>
chore: set devcontainer name (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7240">#7240</a>)</li>
<li><a
href="https://github.com/super-linter/super-linter/commit/29f17277db2147d8af291ae20e5c792b499052c7"><code>29f1727</code></a>
fix: parse json to extract terraform version (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7239">#7239</a>)</li>
<li><a
href="https://github.com/super-linter/super-linter/commit/30403f6aa43e234b7196dfd2eaa425b05294aa4c"><code>30403f6</code></a>
deps(npm): bump body-parser from 2.2.0 to 2.2.1 in /dependencies (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7238">#7238</a>)</li>
<li><a
href="https://github.com/super-linter/super-linter/commit/c8bd6d308cdb7dc47ef439de8edff221afca95d2"><code>c8bd6d3</code></a>
deps(python): bump the pip group across 1 directory with 3 updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7234">#7234</a>)</li>
<li><a
href="https://github.com/super-linter/super-linter/commit/5cadbf190ab223e8deab07f2415670e0aef342d9"><code>5cadbf1</code></a>
deps(npm): bump the npm group across 1 directory with 5 updates (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7233">#7233</a>)</li>
<li><a
href="https://github.com/super-linter/super-linter/commit/f40c1749ad03cda5cbb70dd78fd74c9f2a8209a6"><code>f40c174</code></a>
ci(github-actions): bump actions/checkout in the dev-ci-tools group (<a
href="https://redirect.github.com/super-linter/super-linter/issues/7232">#7232</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/super-linter/super-linter/compare/v8.2.1...v8.3.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=super-linter/super-linter&package-manager=github_actions&previous-version=8.2.1&new-version=8.3.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4c6e26bc8ef45..6c334489b064a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -304,7 +304,7 @@ jobs:
           # Full git history is needed to get a proper list of changed files within `super-linter`
           fetch-depth: 0
       - name: Run Markdown Lint
-        uses: super-linter/super-linter/slim@v8.2.1
+        uses: super-linter/super-linter/slim@v8.3.0
         env:
           MULTI_STATUS: false
           VALIDATE_ALL_CODEBASE: false

From 1285ccf7c0548c2605bafabe3ce1dc04d564194f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Dec 2025 06:57:49 +0000
Subject: [PATCH 002/133] Bump crate-ci/typos from 1.39.2 to 1.40.0 (#21993)

Bumps [crate-ci/typos](https://github.com/crate-ci/typos) from 1.39.2 to
1.40.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/crate-ci/typos/releases">crate-ci/typos's
releases</a>.</em></p>
<blockquote>
<h2>v1.40.0</h2>
<h2>[1.40.0] - 2025-11-26</h2>
<h3>Features</h3>
<ul>
<li>Updated the dictionary with the <a
href="https://redirect.github.com/crate-ci/typos/issues/1405">November
2025</a> changes</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/crate-ci/typos/blob/master/CHANGELOG.md">crate-ci/typos's
changelog</a>.</em></p>
<blockquote>
<h2>[1.40.0] - 2025-11-26</h2>
<h3>Features</h3>
<ul>
<li>Updated the dictionary with the <a
href="https://redirect.github.com/crate-ci/typos/issues/1405">November
2025</a> changes</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/crate-ci/typos/commit/2d0ce569feab1f8752f1dde43cc2f2aa53236e06"><code>2d0ce56</code></a>
chore: Release</li>
<li><a
href="https://github.com/crate-ci/typos/commit/efbd900f8db9952781b6bd1ad83baa38ebd153e3"><code>efbd900</code></a>
chore: Release</li>
<li><a
href="https://github.com/crate-ci/typos/commit/863fd15db8bf16bfe9117ec1a83ea7b6e802e9f3"><code>863fd15</code></a>
docs: Update changelog</li>
<li><a
href="https://github.com/crate-ci/typos/commit/9a27b16791dd73549457a07f247bc4920f787919"><code>9a27b16</code></a>
Merge pull request <a
href="https://redirect.github.com/crate-ci/typos/issues/1432">#1432</a>
from epage/nov</li>
<li><a
href="https://github.com/crate-ci/typos/commit/3dbd9d4eacab7f22586ea581e4d403c3ca9dbbb7"><code>3dbd9d4</code></a>
feat(dict): November additions</li>
<li><a
href="https://github.com/crate-ci/typos/commit/a1a16c7b7c25d1c27cc750525aada8b9ae68b716"><code>a1a16c7</code></a>
Merge pull request <a
href="https://redirect.github.com/crate-ci/typos/issues/1427">#1427</a>
from deining/bump-github-action</li>
<li><a
href="https://github.com/crate-ci/typos/commit/cb8d2e78ff23c82fca05340ed256b04513d022b9"><code>cb8d2e7</code></a>
docs: Bump GitHub checkout action in 'github-action.md'</li>
<li><a
href="https://github.com/crate-ci/typos/commit/9f99fb8dfe87b8a3441863fb2e5d5da88a2aa9a2"><code>9f99fb8</code></a>
docs(ref): Clarify extend-words / extend-identifiers</li>
<li>See full diff in <a
href="https://github.com/crate-ci/typos/compare/v1.39.2...v1.40.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=crate-ci/typos&package-manager=github_actions&previous-version=1.39.2&new-version=1.40.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6c334489b064a..b687b032e3d13 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -336,7 +336,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6
       - name: Check for typos
-        uses: crate-ci/typos@v1.39.2
+        uses: crate-ci/typos@v1.40.0
       - name: Typos info
         if: failure()
         run: |

From c378b7aa7e36a3629fa739ff823d006cb1ebd9cb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Dec 2025 07:01:32 +0000
Subject: [PATCH 003/133] Update criterion requirement from 0.7.0 to 0.8.0
 (#21994)

Updates the requirements on
[criterion](https://github.com/criterion-rs/criterion.rs) to permit the
latest version.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/criterion-rs/criterion.rs/blob/master/CHANGELOG.md">criterion's
changelog</a>.</em></p>
<blockquote>
<h2><a
href="https://github.com/criterion-rs/criterion.rs/compare/criterion-v0.7.0...criterion-v0.8.0">0.8.0</a>
- 2025-11-29</h2>
<h3>BREAKING</h3>
<ul>
<li>Drop async-std support</li>
</ul>
<h3>Changed</h3>
<ul>
<li>Bump MSRV to 1.86, stable to 1.91.1</li>
</ul>
<h3>Added</h3>
<ul>
<li>Add ability to plot throughput on summary page.</li>
<li>Add support for reporting throughput in elements and bytes -
<code>Throughput::ElementsAndBytes</code> allows the text summary to
report throughput in both units simultaneously.</li>
<li>Add alloca-based memory layout randomisation to mitigate memory
effects on measurements.</li>
<li>Add doc comment to benchmark runner in criterion_group macro
(removes linter warnings)</li>
</ul>
<h3>Fixed</h3>
<ul>
<li>Fix plotting NaN bug</li>
</ul>
<h3>Other</h3>
<ul>
<li>Remove Master API Docs links temporarily while we restore the docs
publishing.</li>
</ul>
<h2>[0.7.0] - 2025-07-25</h2>
<ul>
<li>Bump version of criterion-plot to align dependencies.</li>
</ul>
<h2>[0.6.0] - 2025-05-17</h2>
<h3>Changed</h3>
<ul>
<li>MSRV bumped to 1.80</li>
<li>The <code>real_blackbox</code> feature no longer has any impact.
Criterion always uses <code>std::hint::black_box()</code> now.
Users of <code>criterion::black_box()</code> should switch to
<code>std::hint::black_box()</code>.</li>
<li><code>clap</code> dependency unpinned.</li>
</ul>
<h3>Fixed</h3>
<ul>
<li>gnuplot version is now correctly detected when using certain Windows
binaries/configurations that used to fail</li>
</ul>
<h3>Added</h3>
<ul>
<li>Async benchmarking with Tokio may be done via a
<code>tokio::runtime::Handle</code>, not only a
<code>tokio::runtime::Runtime</code></li>
</ul>
<h2>[0.5.1] - 2023-05-26</h2>
<h3>Fixed</h3>
<ul>
<li>Quick mode (--quick) no longer crashes with measured times over 5
seconds when --noplot is not active</li>
</ul>
<h2>[0.5.0] - 2023-05-23</h2>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/criterion-rs/criterion.rs/commit/b49ade728c064f49cb2a70b0368658a15cf21833"><code>b49ade7</code></a>
chore: release v0.8.0</li>
<li>See full diff in <a
href="https://github.com/criterion-rs/criterion.rs/compare/criterion-plot-v0.7.0...criterion-v0.8.0">compare
view</a></li>
</ul>
</details>
<br />


Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 benches/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/benches/Cargo.toml b/benches/Cargo.toml
index f569def4edbfd..8940f1eed7105 100644
--- a/benches/Cargo.toml
+++ b/benches/Cargo.toml
@@ -10,7 +10,7 @@ autobenches = false
 [dependencies]
 # The primary crate that runs and analyzes our benchmarks. This is a regular dependency because the
 # `bench!` macro refers to it in its documentation.
-criterion = { version = "0.7.0", features = ["html_reports"] }
+criterion = { version = "0.8.0", features = ["html_reports"] }
 
 [dev-dependencies]
 # Bevy crates

From 5fbc9f1d3efb6da8bb557c2e8ae97344c97e36ef Mon Sep 17 00:00:00 2001
From: ickshonpe <david.curthoys@googlemail.com>
Date: Mon, 1 Dec 2025 23:14:21 +0000
Subject: [PATCH 004/133] `PointerbuttonState::clear` (#21997)

# Objective

To clear the `PointerButtonState`, `clear` is called on each of its
individual fields holding the button state data. Instead add a `clear`
method to `PointerButtonState`.

## Solution

Add a `clear` method to `PointerButtonState` to clear its data.

---------

Co-authored-by: Kevin Chen <chen.kevin.f@gmail.com>
---
 crates/bevy_picking/src/events.rs | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/crates/bevy_picking/src/events.rs b/crates/bevy_picking/src/events.rs
index 4528001f0e429..4fb10121efde8 100644
--- a/crates/bevy_picking/src/events.rs
+++ b/crates/bevy_picking/src/events.rs
@@ -351,6 +351,15 @@ pub struct PointerButtonState {
     pub dragging_over: HashMap<Entity, HitData>,
 }
 
+impl PointerButtonState {
+    /// Clears all press and drag data tracked for this button on its pointer.
+    pub fn clear(&mut self) {
+        self.pressing.clear();
+        self.dragging.clear();
+        self.dragging_over.clear();
+    }
+}
+
 /// State for all pointers.
 #[derive(Debug, Clone, Default, Resource)]
 pub struct PointerState {
@@ -379,9 +388,7 @@ impl PointerState {
     pub fn clear(&mut self, pointer_id: PointerId) {
         for button in PointerButton::iter() {
             if let Some(state) = self.pointer_buttons.get_mut(&(pointer_id, button)) {
-                state.pressing.clear();
-                state.dragging.clear();
-                state.dragging_over.clear();
+                state.clear();
             }
         }
     }
@@ -699,9 +706,7 @@ pub fn pointer_events(
                 }
 
                 // Finally, we can clear the state of everything relating to presses or drags.
-                state.pressing.clear();
-                state.dragging.clear();
-                state.dragging_over.clear();
+                state.clear();
             }
             // Moved
             PointerAction::Move { delta } => {

From 1f97c83bf8d70736c051dbf566da5b901ae90d52 Mon Sep 17 00:00:00 2001
From: Sarthak Singh <35749450+SarthakSingh31@users.noreply.github.com>
Date: Tue, 2 Dec 2025 13:35:12 +0530
Subject: [PATCH 005/133] Fix crash on exit due to destroyed surface texture
 (#21976)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Fix crash when a window is closed on current main

<details>
  <summary>Crash log</summary>

```
❯ RUST_BACKTRACE=full cargo run --example 3d_scene -F dev
    Finished `dev` profile [unoptimized + debuginfo] target(s) in 0.17s
     Running `target/debug/examples/3d_scene`
2025-11-29T21:39:06.551816Z  INFO bevy_diagnostic::system_information_diagnostics_plugin::internal: SystemInfo { os: "Linux (Arch Linux rolling)", kernel: "6.17.9-arch1-1", cpu: "AMD Ryzen 9 9950X 16-Core Processor", core_count: "16", memory: "186.4 GiB" }
2025-11-29T21:39:06.589438Z  INFO bevy_render::renderer: AdapterInfo { name: "NVIDIA GeForce RTX 5080", vendor: 4318, device: 11266, device_type: DiscreteGpu, driver: "NVIDIA", driver_info: "580.105.08", backend: Vulkan }
2025-11-29T21:39:06.953148Z  INFO bevy_render::batching::gpu_preprocessing: GPU preprocessing is fully supported on this device.
2025-11-29T21:39:06.959263Z  INFO bevy_winit::system: Creating new window 3d_scene (0v0)
2025-11-29T21:39:09.503214Z  INFO bevy_window::system: No windows are open, exiting
2025-11-29T21:39:09.504687Z  INFO bevy_winit::system: Closing window 0v0
2025-11-29T21:39:09.510808Z ERROR wgpu::backend::wgpu_core: Handling wgpu errors as fatal by default

thread '<unnamed>' (664835) panicked at /home/ssingh/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/wgpu-26.0.1/src/backend/wgpu_core.rs:1852:22:
wgpu error: Validation Error

Caused by:
  In Queue::submit
    In a pass parameter
      Texture with '<Surface Texture>' label has been destroyed


stack backtrace:
   0:     0x557069cd5e42 - std[cbf56a46dac989f5]::backtrace_rs::backtrace::libunwind::trace
                               at /rustc/cc3eee7fbe17ea4b7238531cb97e1b7b8bd6afce/library/std/src/../../backtrace/src/backtrace/libunwind.rs:117:9
   1:     0x557069cd5e42 - std[cbf56a46dac989f5]::backtrace_rs::backtrace::trace_unsynchronized::<std[cbf56a46dac989f5]::sys::backtrace::_print_fmt::{closure#1}>
                               at /rustc/cc3eee7fbe17ea4b7238531cb97e1b7b8bd6afce/library/std/src/../../backtrace/src/backtrace/mod.rs:66:14
   2:     0x557069cd5e42 - std[cbf56a46dac989f5]::sys::backtrace::_print_fmt
                               at /rustc/cc3eee7fbe17ea4b7238531cb97e1b7b8bd6afce/library/std/src/sys/backtrace.rs:68:9
   3:     0x557069cd5e42 - <<std[cbf56a46dac989f5]::sys::backtrace::BacktraceLock>::print::DisplayBacktrace as core[a3424aac13c77cf6]::fmt::Display>::fmt
                               at /rustc/cc3eee7fbe17ea4b7238531cb97e1b7b8bd6afce/library/std/src/sys/backtrace.rs:38:26
   4:     0x557069cf05e7 - <core[a3424aac13c77cf6]::fmt::rt::Argument>::fmt
                               at /rustc/cc3eee7fbe17ea4b7238531cb97e1b7b8bd6afce/library/core/src/fmt/rt.rs:152:76
   5:     0x557069cf05e7 - core[a3424aac13c77cf6]::fmt::write
   6:     0x557069cdc5d6 - std[cbf56a46dac989f5]::io::default_write_fmt::<std[cbf56a46dac989f5]::sys::stdio::unix::Stderr>
                               at /rustc/cc3eee7fbe17ea4b7238531cb97e1b7b8bd6afce/library/std/src/io/mod.rs:639:11
   7:     0x557069cdc5d6 - <std[cbf56a46dac989f5]::sys::stdio::unix::Stderr as std[cbf56a46dac989f5]::io::Write>::write_fmt
                               at /rustc/cc3eee7fbe17ea4b7238531cb97e1b7b8bd6afce/library/std/src/io/mod.rs:1994:13
   8:     0x557069cb255a - <std[cbf56a46dac989f5]::sys::backtrace::BacktraceLock>::print
                               at /rustc/cc3eee7fbe17ea4b7238531cb97e1b7b8bd6afce/library/std/src/sys/backtrace.rs:41:9
   9:     0x557069cb255a - std[cbf56a46dac989f5]::panicking::default_hook::{closure#0}
                               at /rustc/cc3eee7fbe17ea4b7238531cb97e1b7b8bd6afce/library/std/src/panicking.rs:292:27
  10:     0x557069cce7e1 - std[cbf56a46dac989f5]::panicking::default_hook
                               at /rustc/cc3eee7fbe17ea4b7238531cb97e1b7b8bd6afce/library/std/src/panicking.rs:319:9
  11:     0x5570696cd6b3 - <alloc[9fa3fef380221c31]::boxed::Box<dyn for<'a, 'b> core[a3424aac13c77cf6]::ops::function::Fn<(&'a std[cbf56a46dac989f5]::panic::PanicHookInfo<'b>,), Output = ()> + core[a3424aac13c77cf6]::marker::Send + core[a3424aac13c77cf6]::marker::Sync> as core[a3424aac13c77cf6]::ops::function::Fn<(&std[cbf56a46dac989f5]::panic::PanicHookInfo,)>>::call
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/alloc/src/boxed.rs:2220:9
  12:     0x5570696b9081 - bevy_ecs[ae55bfe1c74e77a3]::error::bevy_error::bevy_error_panic_hook::<alloc[9fa3fef380221c31]::boxed::Box<dyn for<'a, 'b> core[a3424aac13c77cf6]::ops::function::Fn<(&'a std[cbf56a46dac989f5]::panic::PanicHookInfo<'b>,), Output = ()> + core[a3424aac13c77cf6]::marker::Send + core[a3424aac13c77cf6]::marker::Sync>>::{closure#0}
                               at /home/ssingh/Projects/bevy/crates/bevy_ecs/src/error/bevy_error.rs:162:9
  13:     0x557069ccea82 - <alloc[9fa3fef380221c31]::boxed::Box<dyn for<'a, 'b> core[a3424aac13c77cf6]::ops::function::Fn<(&'a std[cbf56a46dac989f5]::panic::PanicHookInfo<'b>,), Output = ()> + core[a3424aac13c77cf6]::marker::Send + core[a3424aac13c77cf6]::marker::Sync> as core[a3424aac13c77cf6]::ops::function::Fn<(&std[cbf56a46dac989f5]::panic::PanicHookInfo,)>>::call
                               at /rustc/cc3eee7fbe17ea4b7238531cb97e1b7b8bd6afce/library/alloc/src/boxed.rs:2220:9
  14:     0x557069ccea82 - std[cbf56a46dac989f5]::panicking::panic_with_hook
                               at /rustc/cc3eee7fbe17ea4b7238531cb97e1b7b8bd6afce/library/std/src/panicking.rs:833:13
  15:     0x557069cb2618 - std[cbf56a46dac989f5]::panicking::panic_handler::{closure#0}
                               at /rustc/cc3eee7fbe17ea4b7238531cb97e1b7b8bd6afce/library/std/src/panicking.rs:698:13
  16:     0x557069ca9779 - std[cbf56a46dac989f5]::sys::backtrace::__rust_end_short_backtrace::<std[cbf56a46dac989f5]::panicking::panic_handler::{closure#0}, !>
                               at /rustc/cc3eee7fbe17ea4b7238531cb97e1b7b8bd6afce/library/std/src/sys/backtrace.rs:176:18
  17:     0x557069cb37cd - __rustc[f3f8441e4970532f]::rust_begin_unwind
                               at /rustc/cc3eee7fbe17ea4b7238531cb97e1b7b8bd6afce/library/std/src/panicking.rs:689:5
  18:     0x557069cf0d5c - core[a3424aac13c77cf6]::panicking::panic_fmt
                               at /rustc/cc3eee7fbe17ea4b7238531cb97e1b7b8bd6afce/library/core/src/panicking.rs:80:14
  19:     0x5570675ffab5 - wgpu[932fed8fce9d4b4b]::backend::wgpu_core::default_error_handler
                               at /home/ssingh/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/wgpu-26.0.1/src/backend/wgpu_core.rs:659:5
  20:     0x5570675ff6e5 - <wgpu[932fed8fce9d4b4b]::backend::wgpu_core::ErrorSinkRaw>::handle_error
                               at /home/ssingh/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/wgpu-26.0.1/src/backend/wgpu_core.rs:643:21
  21:     0x5570675ff3f4 - <wgpu[932fed8fce9d4b4b]::backend::wgpu_core::ContextWgpuCore>::handle_error_inner
                               at /home/ssingh/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/wgpu-26.0.1/src/backend/wgpu_core.rs:298:14
  22:     0x5570675fcda3 - <wgpu[932fed8fce9d4b4b]::backend::wgpu_core::ContextWgpuCore>::handle_error_nolabel::<wgpu_core[2f77c8d0c0f83b61]::device::queue::QueueSubmitError>
                               at /home/ssingh/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/wgpu-26.0.1/src/backend/wgpu_core.rs:323:14
  23:     0x55706760ed17 - <wgpu[932fed8fce9d4b4b]::backend::wgpu_core::CoreQueue as wgpu[932fed8fce9d4b4b]::dispatch::QueueInterface>::submit
                               at /home/ssingh/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/wgpu-26.0.1/src/backend/wgpu_core.rs:1852:22
  24:     0x5570672eef2a - <wgpu[932fed8fce9d4b4b]::api::queue::Queue>::submit::<alloc[9fa3fef380221c31]::vec::Vec<wgpu[932fed8fce9d4b4b]::api::command_buffer::CommandBuffer>>
                               at /home/ssingh/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/wgpu-26.0.1/src/api/queue.rs:253:32
  25:     0x557066f4965c - <bevy_render[cbe98d17828001b5]::renderer::graph_runner::RenderGraphRunner>::run::<bevy_render[cbe98d17828001b5]::renderer::render_system::{closure#1}>
                               at /home/ssingh/Projects/bevy/crates/bevy_render/src/renderer/graph_runner.rs:87:19
  26:     0x5570670a05ad - bevy_render[cbe98d17828001b5]::renderer::render_system
                               at /home/ssingh/Projects/bevy/crates/bevy_render/src/renderer/mod.rs:48:15
  27:     0x55706744d021 - <bevy_render[cbe98d17828001b5]::renderer::render_system as core[a3424aac13c77cf6]::ops::function::FnMut<(&mut bevy_ecs[ae55bfe1c74e77a3]::world::World, &mut bevy_ecs[ae55bfe1c74e77a3]::system::function_system::SystemState<bevy_ecs[ae55bfe1c74e77a3]::system::query::Query<(&bevy_render[cbe98d17828001b5]::view::ViewTarget, &bevy_render[cbe98d17828001b5]::camera::ExtractedCamera)>>)>>::call_mut
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/ops/function.rs:166:5
  28:     0x5570670ad864 - <&mut bevy_render[cbe98d17828001b5]::renderer::render_system as core[a3424aac13c77cf6]::ops::function::FnMut<(&mut bevy_ecs[ae55bfe1c74e77a3]::world::World, &mut bevy_ecs[ae55bfe1c74e77a3]::system::function_system::SystemState<bevy_ecs[ae55bfe1c74e77a3]::system::query::Query<(&bevy_render[cbe98d17828001b5]::view::ViewTarget, &bevy_render[cbe98d17828001b5]::camera::ExtractedCamera)>>)>>::call_mut
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/ops/function.rs:298:21
  29:     0x55706735dc8e - <_ as bevy_ecs[ae55bfe1c74e77a3]::system::exclusive_function_system::ExclusiveSystemParamFunction<fn(_) -> _>>::run::call_inner::<(), &mut bevy_ecs[ae55bfe1c74e77a3]::system::function_system::SystemState<bevy_ecs[ae55bfe1c74e77a3]::system::query::Query<(&bevy_render[cbe98d17828001b5]::view::ViewTarget, &bevy_render[cbe98d17828001b5]::camera::ExtractedCamera)>>, &mut bevy_render[cbe98d17828001b5]::renderer::render_system>
                               at /home/ssingh/Projects/bevy/crates/bevy_ecs/src/system/exclusive_function_system.rs:270:21
  30:     0x5570670ad95e - <bevy_render[cbe98d17828001b5]::renderer::render_system as bevy_ecs[ae55bfe1c74e77a3]::system::exclusive_function_system::ExclusiveSystemParamFunction<fn(&mut bevy_ecs[ae55bfe1c74e77a3]::system::function_system::SystemState<bevy_ecs[ae55bfe1c74e77a3]::system::query::Query<(&bevy_render[cbe98d17828001b5]::view::ViewTarget, &bevy_render[cbe98d17828001b5]::camera::ExtractedCamera)>>)>>::run
                               at /home/ssingh/Projects/bevy/crates/bevy_ecs/src/system/exclusive_function_system.rs:273:17
  31:     0x55706735e0ab - <bevy_ecs[ae55bfe1c74e77a3]::system::exclusive_function_system::ExclusiveFunctionSystem<fn(&mut bevy_ecs[ae55bfe1c74e77a3]::system::function_system::SystemState<bevy_ecs[ae55bfe1c74e77a3]::system::query::Query<(&bevy_render[cbe98d17828001b5]::view::ViewTarget, &bevy_render[cbe98d17828001b5]::camera::ExtractedCamera)>>), (), bevy_render[cbe98d17828001b5]::renderer::render_system> as bevy_ecs[ae55bfe1c74e77a3]::system::system::System>::run_unsafe::{closure#0}
                               at /home/ssingh/Projects/bevy/crates/bevy_ecs/src/system/exclusive_function_system.rs:135:33
  32:     0x55706702ac65 - <bevy_ecs[ae55bfe1c74e77a3]::world::World>::last_change_tick_scope::<core[a3424aac13c77cf6]::result::Result<(), bevy_ecs[ae55bfe1c74e77a3]::system::system::RunSystemError>, <bevy_ecs[ae55bfe1c74e77a3]::system::exclusive_function_system::ExclusiveFunctionSystem<fn(&mut bevy_ecs[ae55bfe1c74e77a3]::system::function_system::SystemState<bevy_ecs[ae55bfe1c74e77a3]::system::query::Query<(&bevy_render[cbe98d17828001b5]::view::ViewTarget, &bevy_render[cbe98d17828001b5]::camera::ExtractedCamera)>>), (), bevy_render[cbe98d17828001b5]::renderer::render_system> as bevy_ecs[ae55bfe1c74e77a3]::system::system::System>::run_unsafe::{closure#0}>
                               at /home/ssingh/Projects/bevy/crates/bevy_ecs/src/world/mod.rs:3070:9
  33:     0x55706735eb0a - <bevy_ecs[ae55bfe1c74e77a3]::system::exclusive_function_system::ExclusiveFunctionSystem<fn(&mut bevy_ecs[ae55bfe1c74e77a3]::system::function_system::SystemState<bevy_ecs[ae55bfe1c74e77a3]::system::query::Query<(&bevy_render[cbe98d17828001b5]::view::ViewTarget, &bevy_render[cbe98d17828001b5]::camera::ExtractedCamera)>>), (), bevy_render[cbe98d17828001b5]::renderer::render_system> as bevy_ecs[ae55bfe1c74e77a3]::system::system::System>::run_unsafe
                               at /home/ssingh/Projects/bevy/crates/bevy_ecs/src/system/exclusive_function_system.rs:113:15
  34:     0x55706735f7ab - <bevy_ecs[ae55bfe1c74e77a3]::system::exclusive_function_system::ExclusiveFunctionSystem<fn(&mut bevy_ecs[ae55bfe1c74e77a3]::system::function_system::SystemState<bevy_ecs[ae55bfe1c74e77a3]::system::query::Query<(&bevy_render[cbe98d17828001b5]::view::ViewTarget, &bevy_render[cbe98d17828001b5]::camera::ExtractedCamera)>>), (), bevy_render[cbe98d17828001b5]::renderer::render_system> as bevy_ecs[ae55bfe1c74e77a3]::system::system::System>::run_without_applying_deferred
                               at /home/ssingh/Projects/bevy/crates/bevy_ecs/src/system/system.rs:138:23
  35:     0x55706735f806 - <bevy_ecs[ae55bfe1c74e77a3]::system::exclusive_function_system::ExclusiveFunctionSystem<fn(&mut bevy_ecs[ae55bfe1c74e77a3]::system::function_system::SystemState<bevy_ecs[ae55bfe1c74e77a3]::system::query::Query<(&bevy_render[cbe98d17828001b5]::view::ViewTarget, &bevy_render[cbe98d17828001b5]::camera::ExtractedCamera)>>), (), bevy_render[cbe98d17828001b5]::renderer::render_system> as bevy_ecs[ae55bfe1c74e77a3]::system::system::System>::run
                               at /home/ssingh/Projects/bevy/crates/bevy_ecs/src/system/system.rs:119:24
  36:     0x55706988d090 - bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::__rust_begin_short_backtrace::run
                               at /home/ssingh/Projects/bevy/crates/bevy_ecs/src/schedule/executor/mod.rs:288:29
  37:     0x5570697be94d - <bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::ExecutorState>::spawn_exclusive_system_task::{closure#1}::{closure#0}
                               at /home/ssingh/Projects/bevy/crates/bevy_ecs/src/schedule/executor/multi_threaded.rs:742:25
  38:     0x5570697254f9 - <<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::ExecutorState>::spawn_exclusive_system_task::{closure#1}::{closure#0} as core[a3424aac13c77cf6]::ops::function::FnOnce<()>>::call_once
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/ops/function.rs:250:5
  39:     0x55706977f259 - <core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::ExecutorState>::spawn_exclusive_system_task::{closure#1}::{closure#0}> as core[a3424aac13c77cf6]::ops::function::FnOnce<()>>::call_once
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/panic/unwind_safe.rs:274:9
  40:     0x5570697c3253 - std[cbf56a46dac989f5]::panicking::catch_unwind::do_call::<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::ExecutorState>::spawn_exclusive_system_task::{closure#1}::{closure#0}>, ()>
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/std/src/panicking.rs:581:40
  41:     0x557069887a9b - __rust_try
  42:     0x557069886fae - std[cbf56a46dac989f5]::panicking::catch_unwind::<(), core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::ExecutorState>::spawn_exclusive_system_task::{closure#1}::{closure#0}>>
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/std/src/panicking.rs:544:19
  43:     0x557069886fae - std[cbf56a46dac989f5]::panic::catch_unwind::<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::ExecutorState>::spawn_exclusive_system_task::{closure#1}::{closure#0}>, ()>
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/std/src/panic.rs:359:14
  44:     0x5570697bf233 - <bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::ExecutorState>::spawn_exclusive_system_task::{closure#1}
                               at /home/ssingh/Projects/bevy/crates/bevy_ecs/src/schedule/executor/multi_threaded.rs:740:27
  45:     0x55706977f642 - <core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::ExecutorState>::spawn_exclusive_system_task::{closure#1}> as core[a3424aac13c77cf6]::future::future::Future>::poll
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/panic/unwind_safe.rs:299:9
  46:     0x557069765c04 - <futures_lite[d9f7489fbab33684]::future::CatchUnwind<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::ExecutorState>::spawn_exclusive_system_task::{closure#1}>> as core[a3424aac13c77cf6]::future::future::Future>::poll::{closure#0}
                               at /home/ssingh/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/futures-lite-2.6.1/src/future.rs:653:53
  47:     0x55706977f4f4 - <core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<futures_lite[d9f7489fbab33684]::future::CatchUnwind<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::ExecutorState>::spawn_exclusive_system_task::{closure#1}>> as core[a3424aac13c77cf6]::future::future::Future>::poll::{closure#0}> as core[a3424aac13c77cf6]::ops::function::FnOnce<()>>::call_once
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/panic/unwind_safe.rs:274:9
  48:     0x5570697c374d - std[cbf56a46dac989f5]::panicking::catch_unwind::do_call::<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<futures_lite[d9f7489fbab33684]::future::CatchUnwind<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::ExecutorState>::spawn_exclusive_system_task::{closure#1}>> as core[a3424aac13c77cf6]::future::future::Future>::poll::{closure#0}>, core[a3424aac13c77cf6]::task::poll::Poll<()>>
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/std/src/panicking.rs:581:40
  49:     0x557069887a9b - __rust_try
  50:     0x557069887a24 - std[cbf56a46dac989f5]::panicking::catch_unwind::<core[a3424aac13c77cf6]::task::poll::Poll<()>, core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<futures_lite[d9f7489fbab33684]::future::CatchUnwind<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::ExecutorState>::spawn_exclusive_system_task::{closure#1}>> as core[a3424aac13c77cf6]::future::future::Future>::poll::{closure#0}>>
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/std/src/panicking.rs:544:19
  51:     0x557069887a24 - std[cbf56a46dac989f5]::panic::catch_unwind::<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<futures_lite[d9f7489fbab33684]::future::CatchUnwind<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::ExecutorState>::spawn_exclusive_system_task::{closure#1}>> as core[a3424aac13c77cf6]::future::future::Future>::poll::{closure#0}>, core[a3424aac13c77cf6]::task::poll::Poll<()>>
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/std/src/panic.rs:359:14
  52:     0x557069766ae8 - <futures_lite[d9f7489fbab33684]::future::CatchUnwind<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::ExecutorState>::spawn_exclusive_system_task::{closure#1}>> as core[a3424aac13c77cf6]::future::future::Future>::poll
                               at /home/ssingh/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/futures-lite-2.6.1/src/future.rs:653:9
  53:     0x557069892db3 - <async_executor[9f76b1279a3f5047]::AsyncCallOnDrop<futures_lite[d9f7489fbab33684]::future::CatchUnwind<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::ExecutorState>::spawn_exclusive_system_task::{closure#1}>>, <async_executor[9f76b1279a3f5047]::Executor>::spawn_inner<core[a3424aac13c77cf6]::result::Result<(), alloc[9fa3fef380221c31]::boxed::Box<dyn core[a3424aac13c77cf6]::any::Any + core[a3424aac13c77cf6]::marker::Send>>, futures_lite[d9f7489fbab33684]::future::CatchUnwind<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::ExecutorState>::spawn_exclusive_system_task::{closure#1}>>>::{closure#0}> as core[a3424aac13c77cf6]::future::future::Future>::poll
                               at /home/ssingh/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/async-executor-1.13.2/src/lib.rs:1179:31
  54:     0x557069896c98 - <async_task[6d75e66224110732]::raw::RawTask<async_executor[9f76b1279a3f5047]::AsyncCallOnDrop<futures_lite[d9f7489fbab33684]::future::CatchUnwind<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::ExecutorState>::spawn_exclusive_system_task::{closure#1}>>, <async_executor[9f76b1279a3f5047]::Executor>::spawn_inner<core[a3424aac13c77cf6]::result::Result<(), alloc[9fa3fef380221c31]::boxed::Box<dyn core[a3424aac13c77cf6]::any::Any + core[a3424aac13c77cf6]::marker::Send>>, futures_lite[d9f7489fbab33684]::future::CatchUnwind<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::ExecutorState>::spawn_exclusive_system_task::{closure#1}>>>::{closure#0}>, core[a3424aac13c77cf6]::result::Result<(), alloc[9fa3fef380221c31]::boxed::Box<dyn core[a3424aac13c77cf6]::any::Any + core[a3424aac13c77cf6]::marker::Send>>, <async_executor[9f76b1279a3f5047]::Executor>::schedule::{closure#0}, ()>>::run::{closure#1}
                               at /home/ssingh/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/async-task-4.7.1/src/raw.rs:550:21
  55:     0x557069725734 - <<async_task[6d75e66224110732]::raw::RawTask<async_executor[9f76b1279a3f5047]::AsyncCallOnDrop<futures_lite[d9f7489fbab33684]::future::CatchUnwind<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::ExecutorState>::spawn_exclusive_system_task::{closure#1}>>, <async_executor[9f76b1279a3f5047]::Executor>::spawn_inner<core[a3424aac13c77cf6]::result::Result<(), alloc[9fa3fef380221c31]::boxed::Box<dyn core[a3424aac13c77cf6]::any::Any + core[a3424aac13c77cf6]::marker::Send>>, futures_lite[d9f7489fbab33684]::future::CatchUnwind<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::ExecutorState>::spawn_exclusive_system_task::{closure#1}>>>::{closure#0}>, core[a3424aac13c77cf6]::result::Result<(), alloc[9fa3fef380221c31]::boxed::Box<dyn core[a3424aac13c77cf6]::any::Any + core[a3424aac13c77cf6]::marker::Send>>, <async_executor[9f76b1279a3f5047]::Executor>::schedule::{closure#0}, ()>>::run::{closure#1} as core[a3424aac13c77cf6]::ops::function::FnOnce<()>>::call_once
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/ops/function.rs:250:5
  56:     0x55706977f2db - <core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<async_task[6d75e66224110732]::raw::RawTask<async_executor[9f76b1279a3f5047]::AsyncCallOnDrop<futures_lite[d9f7489fbab33684]::future::CatchUnwind<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::ExecutorState>::spawn_exclusive_system_task::{closure#1}>>, <async_executor[9f76b1279a3f5047]::Executor>::spawn_inner<core[a3424aac13c77cf6]::result::Result<(), alloc[9fa3fef380221c31]::boxed::Box<dyn core[a3424aac13c77cf6]::any::Any + core[a3424aac13c77cf6]::marker::Send>>, futures_lite[d9f7489fbab33684]::future::CatchUnwind<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::ExecutorState>::spawn_exclusive_system_task::{closure#1}>>>::{closure#0}>, core[a3424aac13c77cf6]::result::Result<(), alloc[9fa3fef380221c31]::boxed::Box<dyn core[a3424aac13c77cf6]::any::Any + core[a3424aac13c77cf6]::marker::Send>>, <async_executor[9f76b1279a3f5047]::Executor>::schedule::{closure#0}, ()>>::run::{closure#1}> as core[a3424aac13c77cf6]::ops::function::FnOnce<()>>::call_once
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/panic/unwind_safe.rs:274:9
  57:     0x5570697c336e - std[cbf56a46dac989f5]::panicking::catch_unwind::do_call::<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<async_task[6d75e66224110732]::raw::RawTask<async_executor[9f76b1279a3f5047]::AsyncCallOnDrop<futures_lite[d9f7489fbab33684]::future::CatchUnwind<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::ExecutorState>::spawn_exclusive_system_task::{closure#1}>>, <async_executor[9f76b1279a3f5047]::Executor>::spawn_inner<core[a3424aac13c77cf6]::result::Result<(), alloc[9fa3fef380221c31]::boxed::Box<dyn core[a3424aac13c77cf6]::any::Any + core[a3424aac13c77cf6]::marker::Send>>, futures_lite[d9f7489fbab33684]::future::CatchUnwind<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::ExecutorState>::spawn_exclusive_system_task::{closure#1}>>>::{closure#0}>, core[a3424aac13c77cf6]::result::Result<(), alloc[9fa3fef380221c31]::boxed::Box<dyn core[a3424aac13c77cf6]::any::Any + core[a3424aac13c77cf6]::marker::Send>>, <async_executor[9f76b1279a3f5047]::Executor>::schedule::{closure#0}, ()>>::run::{closure#1}>, core[a3424aac13c77cf6]::task::poll::Poll<core[a3424aac13c77cf6]::result::Result<(), alloc[9fa3fef380221c31]::boxed::Box<dyn core[a3424aac13c77cf6]::any::Any + core[a3424aac13c77cf6]::marker::Send>>>>
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/std/src/panicking.rs:581:40
  58:     0x557069887a9b - __rust_try
  59:     0x5570698871c4 - std[cbf56a46dac989f5]::panicking::catch_unwind::<core[a3424aac13c77cf6]::task::poll::Poll<core[a3424aac13c77cf6]::result::Result<(), alloc[9fa3fef380221c31]::boxed::Box<dyn core[a3424aac13c77cf6]::any::Any + core[a3424aac13c77cf6]::marker::Send>>>, core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<async_task[6d75e66224110732]::raw::RawTask<async_executor[9f76b1279a3f5047]::AsyncCallOnDrop<futures_lite[d9f7489fbab33684]::future::CatchUnwind<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::ExecutorState>::spawn_exclusive_system_task::{closure#1}>>, <async_executor[9f76b1279a3f5047]::Executor>::spawn_inner<core[a3424aac13c77cf6]::result::Result<(), alloc[9fa3fef380221c31]::boxed::Box<dyn core[a3424aac13c77cf6]::any::Any + core[a3424aac13c77cf6]::marker::Send>>, futures_lite[d9f7489fbab33684]::future::CatchUnwind<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::ExecutorState>::spawn_exclusive_system_task::{closure#1}>>>::{closure#0}>, core[a3424aac13c77cf6]::result::Result<(), alloc[9fa3fef380221c31]::boxed::Box<dyn core[a3424aac13c77cf6]::any::Any + core[a3424aac13c77cf6]::marker::Send>>, <async_executor[9f76b1279a3f5047]::Executor>::schedule::{closure#0}, ()>>::run::{closure#1}>>
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/std/src/panicking.rs:544:19
  60:     0x5570698871c4 - std[cbf56a46dac989f5]::panic::catch_unwind::<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<async_task[6d75e66224110732]::raw::RawTask<async_executor[9f76b1279a3f5047]::AsyncCallOnDrop<futures_lite[d9f7489fbab33684]::future::CatchUnwind<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::ExecutorState>::spawn_exclusive_system_task::{closure#1}>>, <async_executor[9f76b1279a3f5047]::Executor>::spawn_inner<core[a3424aac13c77cf6]::result::Result<(), alloc[9fa3fef380221c31]::boxed::Box<dyn core[a3424aac13c77cf6]::any::Any + core[a3424aac13c77cf6]::marker::Send>>, futures_lite[d9f7489fbab33684]::future::CatchUnwind<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::ExecutorState>::spawn_exclusive_system_task::{closure#1}>>>::{closure#0}>, core[a3424aac13c77cf6]::result::Result<(), alloc[9fa3fef380221c31]::boxed::Box<dyn core[a3424aac13c77cf6]::any::Any + core[a3424aac13c77cf6]::marker::Send>>, <async_executor[9f76b1279a3f5047]::Executor>::schedule::{closure#0}, ()>>::run::{closure#1}>, core[a3424aac13c77cf6]::task::poll::Poll<core[a3424aac13c77cf6]::result::Result<(), alloc[9fa3fef380221c31]::boxed::Box<dyn core[a3424aac13c77cf6]::any::Any + core[a3424aac13c77cf6]::marker::Send>>>>
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/std/src/panic.rs:359:14
  61:     0x55706989b7cd - <async_task[6d75e66224110732]::raw::RawTask<async_executor[9f76b1279a3f5047]::AsyncCallOnDrop<futures_lite[d9f7489fbab33684]::future::CatchUnwind<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::ExecutorState>::spawn_exclusive_system_task::{closure#1}>>, <async_executor[9f76b1279a3f5047]::Executor>::spawn_inner<core[a3424aac13c77cf6]::result::Result<(), alloc[9fa3fef380221c31]::boxed::Box<dyn core[a3424aac13c77cf6]::any::Any + core[a3424aac13c77cf6]::marker::Send>>, futures_lite[d9f7489fbab33684]::future::CatchUnwind<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::ExecutorState>::spawn_exclusive_system_task::{closure#1}>>>::{closure#0}>, core[a3424aac13c77cf6]::result::Result<(), alloc[9fa3fef380221c31]::boxed::Box<dyn core[a3424aac13c77cf6]::any::Any + core[a3424aac13c77cf6]::marker::Send>>, <async_executor[9f76b1279a3f5047]::Executor>::schedule::{closure#0}, ()>>::run
                               at /home/ssingh/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/async-task-4.7.1/src/raw.rs:549:23
  62:     0x557069924fd2 - <async_task[6d75e66224110732]::runnable::Runnable>::run
                               at /home/ssingh/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/async-task-4.7.1/src/runnable.rs:781:18
  63:     0x55706990a9bb - <async_executor[9f76b1279a3f5047]::State>::tick::{closure#0}
                               at /home/ssingh/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/async-executor-1.13.2/src/lib.rs:733:18
  64:     0x55706990a4b5 - <async_executor[9f76b1279a3f5047]::Executor>::tick::{closure#0}
                               at /home/ssingh/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/async-executor-1.13.2/src/lib.rs:324:29
  65:     0x5570697c9dec - <bevy_tasks[be92084dce5eafd]::thread_executor::ThreadExecutorTicker>::tick::{closure#0}
                               at /home/ssingh/Projects/bevy/crates/bevy_tasks/src/thread_executor.rs:105:39
  66:     0x55706975e735 - <bevy_tasks[be92084dce5eafd]::task_pool::TaskPool>::execute_scope::<(), <bevy_tasks[be92084dce5eafd]::task_pool::TaskPool>::scope_with_executor_inner<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::MultiThreadedExecutor as bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::SystemExecutor>::run::{closure#1}, ()>::{closure#0}::{closure#0}>::{closure#0}::{closure#0}::{closure#0}
                               at /home/ssingh/Projects/bevy/crates/bevy_tasks/src/task_pool.rs:542:45
  67:     0x55706977f583 - <core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<bevy_tasks[be92084dce5eafd]::task_pool::TaskPool>::execute_scope<(), <bevy_tasks[be92084dce5eafd]::task_pool::TaskPool>::scope_with_executor_inner<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::MultiThreadedExecutor as bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::SystemExecutor>::run::{closure#1}, ()>::{closure#0}::{closure#0}>::{closure#0}::{closure#0}::{closure#0}> as core[a3424aac13c77cf6]::future::future::Future>::poll
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/panic/unwind_safe.rs:299:9
  68:     0x557069765b84 - <futures_lite[d9f7489fbab33684]::future::CatchUnwind<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<bevy_tasks[be92084dce5eafd]::task_pool::TaskPool>::execute_scope<(), <bevy_tasks[be92084dce5eafd]::task_pool::TaskPool>::scope_with_executor_inner<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::MultiThreadedExecutor as bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::SystemExecutor>::run::{closure#1}, ()>::{closure#0}::{closure#0}>::{closure#0}::{closure#0}::{closure#0}>> as core[a3424aac13c77cf6]::future::future::Future>::poll::{closure#0}
                               at /home/ssingh/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/futures-lite-2.6.1/src/future.rs:653:53
  69:     0x55706977f474 - <core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<futures_lite[d9f7489fbab33684]::future::CatchUnwind<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<bevy_tasks[be92084dce5eafd]::task_pool::TaskPool>::execute_scope<(), <bevy_tasks[be92084dce5eafd]::task_pool::TaskPool>::scope_with_executor_inner<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::MultiThreadedExecutor as bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::SystemExecutor>::run::{closure#1}, ()>::{closure#0}::{closure#0}>::{closure#0}::{closure#0}::{closure#0}>> as core[a3424aac13c77cf6]::future::future::Future>::poll::{closure#0}> as core[a3424aac13c77cf6]::ops::function::FnOnce<()>>::call_once
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/panic/unwind_safe.rs:274:9
  70:     0x5570697c3647 - std[cbf56a46dac989f5]::panicking::catch_unwind::do_call::<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<futures_lite[d9f7489fbab33684]::future::CatchUnwind<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<bevy_tasks[be92084dce5eafd]::task_pool::TaskPool>::execute_scope<(), <bevy_tasks[be92084dce5eafd]::task_pool::TaskPool>::scope_with_executor_inner<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::MultiThreadedExecutor as bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::SystemExecutor>::run::{closure#1}, ()>::{closure#0}::{closure#0}>::{closure#0}::{closure#0}::{closure#0}>> as core[a3424aac13c77cf6]::future::future::Future>::poll::{closure#0}>, core[a3424aac13c77cf6]::task::poll::Poll<!>>
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/std/src/panicking.rs:581:40
  71:     0x557069887a9b - __rust_try
  72:     0x5570698877da - std[cbf56a46dac989f5]::panicking::catch_unwind::<core[a3424aac13c77cf6]::task::poll::Poll<!>, core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<futures_lite[d9f7489fbab33684]::future::CatchUnwind<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<bevy_tasks[be92084dce5eafd]::task_pool::TaskPool>::execute_scope<(), <bevy_tasks[be92084dce5eafd]::task_pool::TaskPool>::scope_with_executor_inner<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::MultiThreadedExecutor as bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::SystemExecutor>::run::{closure#1}, ()>::{closure#0}::{closure#0}>::{closure#0}::{closure#0}::{closure#0}>> as core[a3424aac13c77cf6]::future::future::Future>::poll::{closure#0}>>
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/std/src/panicking.rs:544:19
  73:     0x5570698877da - std[cbf56a46dac989f5]::panic::catch_unwind::<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<futures_lite[d9f7489fbab33684]::future::CatchUnwind<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<bevy_tasks[be92084dce5eafd]::task_pool::TaskPool>::execute_scope<(), <bevy_tasks[be92084dce5eafd]::task_pool::TaskPool>::scope_with_executor_inner<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::MultiThreadedExecutor as bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::SystemExecutor>::run::{closure#1}, ()>::{closure#0}::{closure#0}>::{closure#0}::{closure#0}::{closure#0}>> as core[a3424aac13c77cf6]::future::future::Future>::poll::{closure#0}>, core[a3424aac13c77cf6]::task::poll::Poll<!>>
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/std/src/panic.rs:359:14
  74:     0x5570697667ea - <futures_lite[d9f7489fbab33684]::future::CatchUnwind<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<bevy_tasks[be92084dce5eafd]::task_pool::TaskPool>::execute_scope<(), <bevy_tasks[be92084dce5eafd]::task_pool::TaskPool>::scope_with_executor_inner<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::MultiThreadedExecutor as bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::SystemExecutor>::run::{closure#1}, ()>::{closure#0}::{closure#0}>::{closure#0}::{closure#0}::{closure#0}>> as core[a3424aac13c77cf6]::future::future::Future>::poll
                               at /home/ssingh/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/futures-lite-2.6.1/src/future.rs:653:9
  75:     0x55706975d6e3 - <bevy_tasks[be92084dce5eafd]::task_pool::TaskPool>::execute_scope::<(), <bevy_tasks[be92084dce5eafd]::task_pool::TaskPool>::scope_with_executor_inner<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::MultiThreadedExecutor as bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::SystemExecutor>::run::{closure#1}, ()>::{closure#0}::{closure#0}>::{closure#0}::{closure#0}
                               at /home/ssingh/Projects/bevy/crates/bevy_tasks/src/task_pool.rs:545:77
  76:     0x557069766039 - <futures_lite[d9f7489fbab33684]::future::Or<<bevy_tasks[be92084dce5eafd]::task_pool::TaskPool>::scope_with_executor_inner<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::MultiThreadedExecutor as bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::SystemExecutor>::run::{closure#1}, ()>::{closure#0}::{closure#0}, <bevy_tasks[be92084dce5eafd]::task_pool::TaskPool>::execute_scope<(), <bevy_tasks[be92084dce5eafd]::task_pool::TaskPool>::scope_with_executor_inner<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::MultiThreadedExecutor as bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::SystemExecutor>::run::{closure#1}, ()>::{closure#0}::{closure#0}>::{closure#0}::{closure#0}> as core[a3424aac13c77cf6]::future::future::Future>::poll
                               at /home/ssingh/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/futures-lite-2.6.1/src/future.rs:454:46
  77:     0x55706975c15d - <bevy_tasks[be92084dce5eafd]::task_pool::TaskPool>::execute_scope::<(), <bevy_tasks[be92084dce5eafd]::task_pool::TaskPool>::scope_with_executor_inner<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::MultiThreadedExecutor as bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::SystemExecutor>::run::{closure#1}, ()>::{closure#0}::{closure#0}>::{closure#0}
                               at /home/ssingh/Projects/bevy/crates/bevy_tasks/src/task_pool.rs:548:41
  78:     0x55706975d1e7 - <bevy_tasks[be92084dce5eafd]::task_pool::TaskPool>::scope_with_executor_inner::<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::MultiThreadedExecutor as bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::SystemExecutor>::run::{closure#1}, ()>::{closure#0}
                               at /home/ssingh/Projects/bevy/crates/bevy_tasks/src/task_pool.rs:459:85
  79:     0x55706976577a - futures_lite[d9f7489fbab33684]::future::block_on::<alloc[9fa3fef380221c31]::vec::Vec<()>, <bevy_tasks[be92084dce5eafd]::task_pool::TaskPool>::scope_with_executor_inner<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::MultiThreadedExecutor as bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::SystemExecutor>::run::{closure#1}, ()>::{closure#0}>::{closure#0}
                               at /home/ssingh/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/futures-lite-2.6.1/src/future.rs:96:35
  80:     0x5570698fe6e4 - <std[cbf56a46dac989f5]::thread::local::LocalKey<core[a3424aac13c77cf6]::cell::RefCell<(parking[9edd71b36109867e]::Parker, core[a3424aac13c77cf6]::task::wake::Waker)>>>::try_with::<futures_lite[d9f7489fbab33684]::future::block_on<alloc[9fa3fef380221c31]::vec::Vec<()>, <bevy_tasks[be92084dce5eafd]::task_pool::TaskPool>::scope_with_executor_inner<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::MultiThreadedExecutor as bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::SystemExecutor>::run::{closure#1}, ()>::{closure#0}>::{closure#0}, alloc[9fa3fef380221c31]::vec::Vec<()>>
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/std/src/thread/local.rs:508:12
  81:     0x5570698fe563 - <std[cbf56a46dac989f5]::thread::local::LocalKey<core[a3424aac13c77cf6]::cell::RefCell<(parking[9edd71b36109867e]::Parker, core[a3424aac13c77cf6]::task::wake::Waker)>>>::with::<futures_lite[d9f7489fbab33684]::future::block_on<alloc[9fa3fef380221c31]::vec::Vec<()>, <bevy_tasks[be92084dce5eafd]::task_pool::TaskPool>::scope_with_executor_inner<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::MultiThreadedExecutor as bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::SystemExecutor>::run::{closure#1}, ()>::{closure#0}>::{closure#0}, alloc[9fa3fef380221c31]::vec::Vec<()>>
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/std/src/thread/local.rs:472:20
  82:     0x5570697654dd - futures_lite[d9f7489fbab33684]::future::block_on::<alloc[9fa3fef380221c31]::vec::Vec<()>, <bevy_tasks[be92084dce5eafd]::task_pool::TaskPool>::scope_with_executor_inner<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::MultiThreadedExecutor as bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::SystemExecutor>::run::{closure#1}, ()>::{closure#0}>
                               at /home/ssingh/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/futures-lite-2.6.1/src/future.rs:75:11
  83:     0x55706975b709 - <bevy_tasks[be92084dce5eafd]::task_pool::TaskPool>::scope_with_executor_inner::<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::MultiThreadedExecutor as bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::SystemExecutor>::run::{closure#1}, ()>
                               at /home/ssingh/Projects/bevy/crates/bevy_tasks/src/task_pool.rs:413:13
  84:     0x55706975c349 - <bevy_tasks[be92084dce5eafd]::task_pool::TaskPool>::scope_with_executor::<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::MultiThreadedExecutor as bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::SystemExecutor>::run::{closure#1}, ()>::{closure#0}
                               at /home/ssingh/Projects/bevy/crates/bevy_tasks/src/task_pool.rs:343:22
  85:     0x5570698fe407 - <std[cbf56a46dac989f5]::thread::local::LocalKey<alloc[9fa3fef380221c31]::sync::Arc<bevy_tasks[be92084dce5eafd]::thread_executor::ThreadExecutor>>>::try_with::<<bevy_tasks[be92084dce5eafd]::task_pool::TaskPool>::scope_with_executor<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::MultiThreadedExecutor as bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::SystemExecutor>::run::{closure#1}, ()>::{closure#0}, alloc[9fa3fef380221c31]::vec::Vec<()>>
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/std/src/thread/local.rs:508:12
  86:     0x5570698fe29d - <std[cbf56a46dac989f5]::thread::local::LocalKey<alloc[9fa3fef380221c31]::sync::Arc<bevy_tasks[be92084dce5eafd]::thread_executor::ThreadExecutor>>>::with::<<bevy_tasks[be92084dce5eafd]::task_pool::TaskPool>::scope_with_executor<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::MultiThreadedExecutor as bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::SystemExecutor>::run::{closure#1}, ()>::{closure#0}, alloc[9fa3fef380221c31]::vec::Vec<()>>
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/std/src/thread/local.rs:472:20
  87:     0x55706975b42c - <bevy_tasks[be92084dce5eafd]::task_pool::TaskPool>::scope_with_executor::<<bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::MultiThreadedExecutor as bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::SystemExecutor>::run::{closure#1}, ()>
                               at /home/ssingh/Projects/bevy/crates/bevy_tasks/src/task_pool.rs:339:31
  88:     0x5570698d5d34 - <bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::multi_threaded::MultiThreadedExecutor as bevy_ecs[ae55bfe1c74e77a3]::schedule::executor::SystemExecutor>::run
                               at /home/ssingh/Projects/bevy/crates/bevy_ecs/src/schedule/executor/multi_threaded.rs:279:57
  89:     0x55706980e792 - <bevy_ecs[ae55bfe1c74e77a3]::schedule::schedule::Schedule>::run
                               at /home/ssingh/Projects/bevy/crates/bevy_ecs/src/schedule/schedule.rs:540:14
  90:     0x5570696aca61 - <bevy_ecs[ae55bfe1c74e77a3]::world::World>::run_schedule::<bevy_ecs[ae55bfe1c74e77a3]::intern::Interned<dyn bevy_ecs[ae55bfe1c74e77a3]::schedule::set::ScheduleLabel>>::{closure#0}
                               at /home/ssingh/Projects/bevy/crates/bevy_ecs/src/world/mod.rs:3673:57
  91:     0x5570696abc76 - <bevy_ecs[ae55bfe1c74e77a3]::world::World>::try_schedule_scope::<(), bevy_ecs[ae55bfe1c74e77a3]::intern::Interned<dyn bevy_ecs[ae55bfe1c74e77a3]::schedule::set::ScheduleLabel>, <bevy_ecs[ae55bfe1c74e77a3]::world::World>::run_schedule<bevy_ecs[ae55bfe1c74e77a3]::intern::Interned<dyn bevy_ecs[ae55bfe1c74e77a3]::schedule::set::ScheduleLabel>>::{closure#0}>
                               at /home/ssingh/Projects/bevy/crates/bevy_ecs/src/world/mod.rs:3591:21
  92:     0x5570696abad9 - <bevy_ecs[ae55bfe1c74e77a3]::world::World>::schedule_scope::<(), bevy_ecs[ae55bfe1c74e77a3]::intern::Interned<dyn bevy_ecs[ae55bfe1c74e77a3]::schedule::set::ScheduleLabel>, <bevy_ecs[ae55bfe1c74e77a3]::world::World>::run_schedule<bevy_ecs[ae55bfe1c74e77a3]::intern::Interned<dyn bevy_ecs[ae55bfe1c74e77a3]::schedule::set::ScheduleLabel>>::{closure#0}>
                               at /home/ssingh/Projects/bevy/crates/bevy_ecs/src/world/mod.rs:3643:14
  93:     0x5570696abab8 - <bevy_ecs[ae55bfe1c74e77a3]::world::World>::run_schedule::<bevy_ecs[ae55bfe1c74e77a3]::intern::Interned<dyn bevy_ecs[ae55bfe1c74e77a3]::schedule::set::ScheduleLabel>>
                               at /home/ssingh/Projects/bevy/crates/bevy_ecs/src/world/mod.rs:3673:14
  94:     0x5570696a8f93 - <bevy_app[8596c61a6a25de94]::sub_app::SubApp>::run_default_schedule
                               at /home/ssingh/Projects/bevy/crates/bevy_app/src/sub_app.rs:141:24
  95:     0x5570696a91e4 - <bevy_app[8596c61a6a25de94]::sub_app::SubApp>::update
                               at /home/ssingh/Projects/bevy/crates/bevy_app/src/sub_app.rs:147:14
  96:     0x55706707b40e - <bevy_render[cbe98d17828001b5]::pipelined_rendering::PipelinedRenderingPlugin as bevy_app[8596c61a6a25de94]::plugin::Plugin>::cleanup::{closure#0}
                               at /home/ssingh/Projects/bevy/crates/bevy_render/src/pipelined_rendering.rs:168:32
  97:     0x55706744e516 - std[cbf56a46dac989f5]::sys::backtrace::__rust_begin_short_backtrace::<<bevy_render[cbe98d17828001b5]::pipelined_rendering::PipelinedRenderingPlugin as bevy_app[8596c61a6a25de94]::plugin::Plugin>::cleanup::{closure#0}, ()>
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/std/src/sys/backtrace.rs:160:18
  98:     0x5570670439c0 - <std[cbf56a46dac989f5]::thread::Builder>::spawn_unchecked_::<<bevy_render[cbe98d17828001b5]::pipelined_rendering::PipelinedRenderingPlugin as bevy_app[8596c61a6a25de94]::plugin::Plugin>::cleanup::{closure#0}, ()>::{closure#1}::{closure#0}
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/std/src/thread/mod.rs:562:17
  99:     0x557066f925c1 - <core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<std[cbf56a46dac989f5]::thread::Builder>::spawn_unchecked_<<bevy_render[cbe98d17828001b5]::pipelined_rendering::PipelinedRenderingPlugin as bevy_app[8596c61a6a25de94]::plugin::Plugin>::cleanup::{closure#0}, ()>::{closure#1}::{closure#0}> as core[a3424aac13c77cf6]::ops::function::FnOnce<()>>::call_once
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/panic/unwind_safe.rs:274:9
 100:     0x55706703e4db - std[cbf56a46dac989f5]::panicking::catch_unwind::do_call::<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<std[cbf56a46dac989f5]::thread::Builder>::spawn_unchecked_<<bevy_render[cbe98d17828001b5]::pipelined_rendering::PipelinedRenderingPlugin as bevy_app[8596c61a6a25de94]::plugin::Plugin>::cleanup::{closure#0}, ()>::{closure#1}::{closure#0}>, ()>
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/std/src/panicking.rs:581:40
 101:     0x557067043a4b - __rust_try
 102:     0x5570670435ea - std[cbf56a46dac989f5]::panicking::catch_unwind::<(), core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<std[cbf56a46dac989f5]::thread::Builder>::spawn_unchecked_<<bevy_render[cbe98d17828001b5]::pipelined_rendering::PipelinedRenderingPlugin as bevy_app[8596c61a6a25de94]::plugin::Plugin>::cleanup::{closure#0}, ()>::{closure#1}::{closure#0}>>
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/std/src/panicking.rs:544:19
 103:     0x5570670435ea - std[cbf56a46dac989f5]::panic::catch_unwind::<core[a3424aac13c77cf6]::panic::unwind_safe::AssertUnwindSafe<<std[cbf56a46dac989f5]::thread::Builder>::spawn_unchecked_<<bevy_render[cbe98d17828001b5]::pipelined_rendering::PipelinedRenderingPlugin as bevy_app[8596c61a6a25de94]::plugin::Plugin>::cleanup::{closure#0}, ()>::{closure#1}::{closure#0}>, ()>
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/std/src/panic.rs:359:14
 104:     0x5570670435ea - <std[cbf56a46dac989f5]::thread::Builder>::spawn_unchecked_::<<bevy_render[cbe98d17828001b5]::pipelined_rendering::PipelinedRenderingPlugin as bevy_app[8596c61a6a25de94]::plugin::Plugin>::cleanup::{closure#0}, ()>::{closure#1}
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/std/src/thread/mod.rs:560:30
 105:     0x55706742811f - <<std[cbf56a46dac989f5]::thread::Builder>::spawn_unchecked_<<bevy_render[cbe98d17828001b5]::pipelined_rendering::PipelinedRenderingPlugin as bevy_app[8596c61a6a25de94]::plugin::Plugin>::cleanup::{closure#0}, ()>::{closure#1} as core[a3424aac13c77cf6]::ops::function::FnOnce<()>>::call_once::{shim:vtable#0}
                               at /home/ssingh/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/ops/function.rs:250:5
 106:     0x557069cd501f - <alloc[9fa3fef380221c31]::boxed::Box<dyn core[a3424aac13c77cf6]::ops::function::FnOnce<(), Output = ()>> as core[a3424aac13c77cf6]::ops::function::FnOnce<()>>::call_once
                               at /rustc/cc3eee7fbe17ea4b7238531cb97e1b7b8bd6afce/library/alloc/src/boxed.rs:2206:9
 107:     0x557069cd501f - <std[cbf56a46dac989f5]::sys::thread::unix::Thread>::new::thread_start
                               at /rustc/cc3eee7fbe17ea4b7238531cb97e1b7b8bd6afce/library/std/src/sys/thread/unix.rs:124:17
 108:     0x7f75f1a9698b - <unknown>
 109:     0x7f75f1b1a9cc - <unknown>
 110:                0x0 - <unknown>
Encountered a panic in system `bevy_render::renderer::render_system`!

```

</details>

## Solution

- Remove the `ViewTarget` when it becomes unavailable

## Testing

- Testing by running the bevy examples on linux

---------

Co-authored-by: IceSentry <IceSentry@users.noreply.github.com>
---
 crates/bevy_render/src/view/mod.rs | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/crates/bevy_render/src/view/mod.rs b/crates/bevy_render/src/view/mod.rs
index 9a3d610087c63..0226f22c770b8 100644
--- a/crates/bevy_render/src/view/mod.rs
+++ b/crates/bevy_render/src/view/mod.rs
@@ -1048,12 +1048,18 @@ pub fn prepare_view_targets(
 ) {
     let mut textures = <HashMap<_, _>>::default();
     for (entity, camera, view, texture_usage, msaa) in cameras.iter() {
-        let (Some(target_size), Some(target)) = (camera.physical_target_size, &camera.target)
-        else {
-            continue;
-        };
+        let (Some(target_size), Some(out_attachment)) = (
+            camera.physical_target_size,
+            camera
+                .target
+                .as_ref()
+                .and_then(|target| view_target_attachments.get(target)),
+        ) else {
+            // If we can't find an output attachment we need to remove the ViewTarget
+            // component to make sure the camera doesn't try rendering to an invalid
+            // output attachment.
+            commands.entity(entity).try_remove::<ViewTarget>();
 
-        let Some(out_attachment) = view_target_attachments.get(target) else {
             continue;
         };
 

From f9d59f82066e86d4cecc16df807e10b33db21879 Mon Sep 17 00:00:00 2001
From: Daniel Skates <zeophlite@gmail.com>
Date: Wed, 3 Dec 2025 01:03:54 +0800
Subject: [PATCH 006/133] Fix cargo features lint (#22008)

# Objective

`markdownlint` fails on `docs/cargo_features.md` as it doesn't like the
space before the pipe at the end of this line

## Solution

- Add a `.`

## Testing

- CI
---
 Cargo.toml             | 6 +++---
 docs/cargo_features.md | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index d039936d83779..aa3982b0c3a12 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -222,7 +222,7 @@ common_api = [
 # COLLECTION: Features used to build 2D Bevy apps (does not include a render backend). You generally don't need to worry about this unless you are using a custom renderer.
 2d_api = ["common_api", "bevy_sprite"]
 
-# COLLECTION: Bevy's built-in 2D renderer, built on top of `bevy_render` 
+# COLLECTION: Bevy's built-in 2D renderer, built on top of `bevy_render`.
 2d_bevy_render = [
   "2d_api",
   "bevy_render",
@@ -245,7 +245,7 @@ common_api = [
   "zstd_rust",
 ]
 
-# COLLECTION: Bevy's built-in 3D renderer, built on top of `bevy_render` 
+# COLLECTION: Bevy's built-in 3D renderer, built on top of `bevy_render`.
 3d_bevy_render = [
   "3d_api",
   "bevy_render",
@@ -261,7 +261,7 @@ common_api = [
 # COLLECTION: Features used to build UI Bevy apps (does not include a render backend). You generally don't need to worry about this unless you are using a custom renderer.
 ui_api = ["default_app", "common_api", "bevy_ui"]
 
-# COLLECTION: Bevy's built-in UI renderer, built on top of `bevy_render` 
+# COLLECTION: Bevy's built-in UI renderer, built on top of `bevy_render`.
 ui_bevy_render = [
   "ui_api",
   "bevy_render",
diff --git a/docs/cargo_features.md b/docs/cargo_features.md
index e26c8b51c38af..5f7e33960539d 100644
--- a/docs/cargo_features.md
+++ b/docs/cargo_features.md
@@ -44,11 +44,11 @@ collections to build your own "profile" equivalent, without needing to manually
 |default_platform|These are platform support features, such as OS support/features, windowing and input backends, etc.|
 |common_api|Default scene definition features. Note that this does not include an actual renderer, such as bevy_render (Bevy's default render backend).|
 |2d_api|Features used to build 2D Bevy apps (does not include a render backend). You generally don't need to worry about this unless you are using a custom renderer.|
-|2d_bevy_render|Bevy's built-in 2D renderer, built on top of `bevy_render` |
+|2d_bevy_render|Bevy's built-in 2D renderer, built on top of `bevy_render`.|
 |3d_api|Features used to build 3D Bevy apps (does not include a render backend). You generally don't need to worry about this unless you are using a custom renderer.|
-|3d_bevy_render|Bevy's built-in 3D renderer, built on top of `bevy_render` |
+|3d_bevy_render|Bevy's built-in 3D renderer, built on top of `bevy_render`.|
 |ui_api|Features used to build UI Bevy apps (does not include a render backend). You generally don't need to worry about this unless you are using a custom renderer.|
-|ui_bevy_render|Bevy's built-in UI renderer, built on top of `bevy_render` |
+|ui_bevy_render|Bevy's built-in UI renderer, built on top of `bevy_render`.|
 |default_no_std|Recommended defaults for no_std applications|
 
 ### Feature List

From 243d5627f26b5e1392cca3a61f8c2138819cf869 Mon Sep 17 00:00:00 2001
From: ickshonpe <david.curthoys@googlemail.com>
Date: Tue, 2 Dec 2025 17:04:24 +0000
Subject: [PATCH 007/133] remove unnecessary clone from `load_font_to_fontdb`
 (#22009)

# Objective

`load_font_to_fontdb` clones the font handle needlessly.

## Solution

Just call id() on it.
---
 crates/bevy_text/src/pipeline.rs | 36 +++++++++++++++-----------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/crates/bevy_text/src/pipeline.rs b/crates/bevy_text/src/pipeline.rs
index 0289b78dcdfa9..9fa918ba73ac0 100644
--- a/crates/bevy_text/src/pipeline.rs
+++ b/crates/bevy_text/src/pipeline.rs
@@ -620,25 +620,23 @@ pub fn load_font_to_fontdb(
     map_handle_to_font_id: &mut HashMap<AssetId<Font>, (cosmic_text::fontdb::ID, Arc<str>)>,
     fonts: &Assets<Font>,
 ) -> FontFaceInfo {
-    let font_handle = text_font.font.clone();
-    let (face_id, family_name) = map_handle_to_font_id
-        .entry(font_handle.id())
-        .or_insert_with(|| {
-            let font = fonts.get(font_handle.id()).expect(
-                "Tried getting a font that was not available, probably due to not being loaded yet",
-            );
-            let data = Arc::clone(&font.data);
-            let ids = font_system
-                .db_mut()
-                .load_font_source(cosmic_text::fontdb::Source::Binary(data));
-
-            // TODO: it is assumed this is the right font face
-            let face_id = *ids.last().unwrap();
-            let face = font_system.db().face(face_id).unwrap();
-
-            let family_name = Arc::from(face.families[0].0.as_str());
-            (face_id, family_name)
-        });
+    let font_id = text_font.font.id();
+    let (face_id, family_name) = map_handle_to_font_id.entry(font_id).or_insert_with(|| {
+        let font = fonts.get(font_id).expect(
+            "Tried getting a font that was not available, probably due to not being loaded yet",
+        );
+        let data = Arc::clone(&font.data);
+        let ids = font_system
+            .db_mut()
+            .load_font_source(cosmic_text::fontdb::Source::Binary(data));
+
+        // TODO: it is assumed this is the right font face
+        let face_id = *ids.last().unwrap();
+        let face = font_system.db().face(face_id).unwrap();
+
+        let family_name = Arc::from(face.families[0].0.as_str());
+        (face_id, family_name)
+    });
 
     let face = font_system.db().face(*face_id).unwrap();
 

From 71114e1ddece7e1be430205551c4804ff2b06160 Mon Sep 17 00:00:00 2001
From: IceSentry <IceSentry@users.noreply.github.com>
Date: Tue, 2 Dec 2025 12:33:32 -0500
Subject: [PATCH 008/133] Add debug_group to render graph (#22003)

# Objective

- Debugging an application with multiple cameras can be really annoying
because it's hard to know at a glance which pass is associated with
which camera.
- wgpu exposes a feature to set debug_group that will add labels around
groups of passes and draw commands

## Solution

- Expose the debug_group feature to the render graph.
	- Each sub graph can now specify a debug group
- Add a new debug group label to each camera with the camera order and
entity id
- I also added the new debug_group to the tracy span so you can more
easily see which span is associated with which camera

## Testing

- I tested the  3d_scene and split_screen examples

---

## Showcase

Here's what it looked like before

<img width="1626" height="98" alt="ngfx-ui_cH0BZAQWh9"
src="https://github.com/user-attachments/assets/ef8cdb59-f402-45cd-b2f9-90d315e8e411"
/>

Here's what the split_screen example looks like inside nvidia nsight
with the new debug group labels. You can clearly see each camera clearly
identified.

<img width="1933" height="125" alt="ngfx-ui_t4L2AheYS3"
src="https://github.com/user-attachments/assets/980c4c7f-c933-44b8-8bfb-34406221bf06"
/>
---
 .../src/render_graph/camera_driver_node.rs    | 10 +++++++-
 .../bevy_render/src/render_graph/context.rs   |  3 +++
 crates/bevy_render/src/render_graph/node.rs   |  2 +-
 .../bevy_render/src/renderer/graph_runner.rs  | 23 ++++++++++++++++---
 crates/bevy_ui_render/src/lib.rs              |  2 +-
 5 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/crates/bevy_render/src/render_graph/camera_driver_node.rs b/crates/bevy_render/src/render_graph/camera_driver_node.rs
index 5a8dc581625ec..4ba4e93d33f0c 100644
--- a/crates/bevy_render/src/render_graph/camera_driver_node.rs
+++ b/crates/bevy_render/src/render_graph/camera_driver_node.rs
@@ -54,7 +54,15 @@ impl Node for CameraDriverNode {
                 }
             }
             if run_graph {
-                graph.run_sub_graph(camera.render_graph, vec![], Some(sorted_camera.entity))?;
+                graph.run_sub_graph(
+                    camera.render_graph,
+                    vec![],
+                    Some(sorted_camera.entity),
+                    Some(format!(
+                        "Camera {} ({})",
+                        sorted_camera.order, sorted_camera.entity
+                    )),
+                )?;
             }
         }
 
diff --git a/crates/bevy_render/src/render_graph/context.rs b/crates/bevy_render/src/render_graph/context.rs
index 4c6ecd30c1d67..b1f35edc1d1d8 100644
--- a/crates/bevy_render/src/render_graph/context.rs
+++ b/crates/bevy_render/src/render_graph/context.rs
@@ -14,6 +14,7 @@ pub struct RunSubGraph {
     pub sub_graph: InternedRenderSubGraph,
     pub inputs: Vec<SlotValue>,
     pub view_entity: Option<Entity>,
+    pub debug_group: Option<String>,
 }
 
 /// The context with all graph information required to run a [`Node`](super::Node).
@@ -185,6 +186,7 @@ impl<'a> RenderGraphContext<'a> {
         name: impl RenderSubGraph,
         inputs: Vec<SlotValue>,
         view_entity: Option<Entity>,
+        debug_group: Option<String>,
     ) -> Result<(), RunSubGraphError> {
         let name = name.intern();
         let sub_graph = self
@@ -219,6 +221,7 @@ impl<'a> RenderGraphContext<'a> {
             sub_graph: name,
             inputs,
             view_entity,
+            debug_group,
         });
 
         Ok(())
diff --git a/crates/bevy_render/src/render_graph/node.rs b/crates/bevy_render/src/render_graph/node.rs
index 4355892487c00..c75218c0a2941 100644
--- a/crates/bevy_render/src/render_graph/node.rs
+++ b/crates/bevy_render/src/render_graph/node.rs
@@ -343,7 +343,7 @@ impl Node for RunGraphOnViewNode {
         _render_context: &mut RenderContext,
         _world: &World,
     ) -> Result<(), NodeRunError> {
-        graph.run_sub_graph(self.sub_graph, vec![], Some(graph.view_entity()))?;
+        graph.run_sub_graph(self.sub_graph, vec![], Some(graph.view_entity()), None)?;
         Ok(())
     }
 }
diff --git a/crates/bevy_render/src/renderer/graph_runner.rs b/crates/bevy_render/src/renderer/graph_runner.rs
index ff2e421982dc7..c1aa664a07bd4 100644
--- a/crates/bevy_render/src/renderer/graph_runner.rs
+++ b/crates/bevy_render/src/renderer/graph_runner.rs
@@ -76,7 +76,7 @@ impl RenderGraphRunner {
         }
 
         let mut render_context = RenderContext::new(render_device, diagnostics_recorder);
-        Self::run_graph(graph, None, &mut render_context, world, &[], None)?;
+        Self::run_graph(graph, None, &mut render_context, world, &[], None, None)?;
         finalizer(render_context.command_encoder());
 
         let (render_device, mut diagnostics_recorder) = {
@@ -108,18 +108,30 @@ impl RenderGraphRunner {
         world: &'w World,
         inputs: &[SlotValue],
         view_entity: Option<Entity>,
+        debug_group: Option<String>,
     ) -> Result<(), RenderGraphRunnerError> {
         let mut node_outputs: HashMap<InternedRenderLabel, SmallVec<[SlotValue; 4]>> =
             HashMap::default();
         #[cfg(feature = "trace")]
-        let span = if let Some(label) = &sub_graph {
-            info_span!("run_graph", name = format!("{label:?}"))
+        let span = if let Some(render_label) = &sub_graph {
+            let name = format!("{render_label:?}");
+            if let Some(debug_group) = debug_group.as_ref() {
+                info_span!("run_graph", name = name, debug_group = debug_group)
+            } else {
+                info_span!("run_graph", name = name)
+            }
         } else {
             info_span!("run_graph", name = "main_graph")
         };
         #[cfg(feature = "trace")]
         let _guard = span.enter();
 
+        if let Some(debug_group) = debug_group.as_ref() {
+            render_context
+                .command_encoder()
+                .push_debug_group(debug_group);
+        }
+
         // Queue up nodes without inputs, which can be run immediately
         let mut node_queue: VecDeque<&NodeState> = graph
             .iter_nodes()
@@ -235,6 +247,7 @@ impl RenderGraphRunner {
                         world,
                         &run_sub_graph.inputs,
                         run_sub_graph.view_entity,
+                        run_sub_graph.debug_group,
                     )?;
                 }
             }
@@ -262,6 +275,10 @@ impl RenderGraphRunner {
             }
         }
 
+        if debug_group.is_some() {
+            render_context.command_encoder().pop_debug_group();
+        }
+
         Ok(())
     }
 }
diff --git a/crates/bevy_ui_render/src/lib.rs b/crates/bevy_ui_render/src/lib.rs
index 4a292d86ba322..c385bca66d35d 100644
--- a/crates/bevy_ui_render/src/lib.rs
+++ b/crates/bevy_ui_render/src/lib.rs
@@ -426,7 +426,7 @@ impl RenderGraphNode for RunUiSubgraphOnUiViewNode {
         };
 
         // Run the subgraph on the UI view.
-        graph.run_sub_graph(SubGraphUi, vec![], Some(ui_camera_view.0))?;
+        graph.run_sub_graph(SubGraphUi, vec![], Some(ui_camera_view.0), None)?;
         Ok(())
     }
 }

From a06de1fb68f3c221b31514e738a00724f13d4d7e Mon Sep 17 00:00:00 2001
From: ickshonpe <david.curthoys@googlemail.com>
Date: Tue, 2 Dec 2025 19:19:37 +0000
Subject: [PATCH 009/133] UI text module refactor (#21630)

# Objective

The `measure_text_system` and `text_system` systems don't do anything
except iterate a query and then delegate to two other functions,
`create_text_measure` and `queue_text`, respectively. This doesn't serve
any purpose and just makes these systems harder to understand.

## Solution

Flatten the module by moving the code from `create_text_measure` and
`queue_text` into the systems and remove those functions.
---
 crates/bevy_ui/src/widget/text.rs | 249 ++++++++++++------------------
 1 file changed, 97 insertions(+), 152 deletions(-)

diff --git a/crates/bevy_ui/src/widget/text.rs b/crates/bevy_ui/src/widget/text.rs
index d604bc6977cd9..c84b463ddf3cb 100644
--- a/crates/bevy_ui/src/widget/text.rs
+++ b/crates/bevy_ui/src/widget/text.rs
@@ -12,7 +12,7 @@ use bevy_ecs::{
     query::With,
     reflect::ReflectComponent,
     system::{Query, Res, ResMut},
-    world::{Mut, Ref},
+    world::Ref,
 };
 use bevy_image::prelude::*;
 use bevy_math::Vec2;
@@ -223,55 +223,6 @@ impl Measure for TextMeasure {
     }
 }
 
-#[inline]
-fn create_text_measure<'a>(
-    entity: Entity,
-    fonts: &Assets<Font>,
-    scale_factor: f64,
-    spans: impl Iterator<Item = (Entity, usize, &'a str, &'a TextFont, Color, LineHeight)>,
-    block: Ref<TextLayout>,
-    text_pipeline: &mut TextPipeline,
-    mut content_size: Mut<ContentSize>,
-    mut text_flags: Mut<TextNodeFlags>,
-    mut computed: Mut<ComputedTextBlock>,
-    font_system: &mut CosmicFontSystem,
-) {
-    match text_pipeline.create_text_measure(
-        entity,
-        fonts,
-        spans,
-        scale_factor,
-        &block,
-        computed.as_mut(),
-        font_system,
-    ) {
-        Ok(measure) => {
-            if block.linebreak == LineBreak::NoWrap {
-                content_size.set(NodeMeasure::Fixed(FixedMeasure { size: measure.max }));
-            } else {
-                content_size.set(NodeMeasure::Text(TextMeasure { info: measure }));
-            }
-
-            // Text measure func created successfully, so set `TextNodeFlags` to schedule a recompute
-            text_flags.needs_measure_fn = false;
-            text_flags.needs_recompute = true;
-        }
-        Err(TextError::NoSuchFont) => {
-            // Try again next frame
-            text_flags.needs_measure_fn = true;
-        }
-        Err(
-            e @ (TextError::FailedToAddGlyph(_)
-            | TextError::FailedToGetGlyphImage(_)
-            | TextError::MissingAtlasLayout
-            | TextError::MissingAtlasTexture
-            | TextError::InconsistentAtlasState),
-        ) => {
-            panic!("Fatal error when processing text: {e}.");
-        }
-    };
-}
-
 /// Generates a new [`Measure`] for a text node on changes to its [`Text`] component.
 ///
 /// A `Measure` is used by the UI's layout algorithm to determine the appropriate amount of space
@@ -300,98 +251,61 @@ pub fn measure_text_system(
     mut text_pipeline: ResMut<TextPipeline>,
     mut font_system: ResMut<CosmicFontSystem>,
 ) {
-    for (entity, block, content_size, text_flags, computed, computed_target, computed_node) in
-        &mut text_query
+    for (
+        entity,
+        block,
+        mut content_size,
+        mut text_flags,
+        mut computed,
+        computed_target,
+        computed_node,
+    ) in &mut text_query
     {
         // Note: the ComputedTextBlock::needs_rerender bool is cleared in create_text_measure().
         // 1e-5 epsilon to ignore tiny scale factor float errors
-        if 1e-5
+        if !(1e-5
             < (computed_target.scale_factor() - computed_node.inverse_scale_factor.recip()).abs()
             || computed.needs_rerender()
             || text_flags.needs_measure_fn
-            || content_size.is_added()
+            || content_size.is_added())
         {
-            create_text_measure(
-                entity,
-                &fonts,
-                computed_target.scale_factor.into(),
-                text_reader.iter(entity),
-                block,
-                &mut text_pipeline,
-                content_size,
-                text_flags,
-                computed,
-                &mut font_system,
-            );
+            continue;
         }
-    }
-}
-
-#[inline]
-fn queue_text(
-    entity: Entity,
-    fonts: &Assets<Font>,
-    text_pipeline: &mut TextPipeline,
-    font_atlas_set: &mut FontAtlasSet,
-    texture_atlases: &mut Assets<TextureAtlasLayout>,
-    textures: &mut Assets<Image>,
-    scale_factor: f32,
-    inverse_scale_factor: f32,
-    block: &TextLayout,
-    node: Ref<ComputedNode>,
-    mut text_flags: Mut<TextNodeFlags>,
-    text_layout_info: Mut<TextLayoutInfo>,
-    computed: &mut ComputedTextBlock,
-    text_reader: &mut TextUiReader,
-    font_system: &mut CosmicFontSystem,
-    swash_cache: &mut SwashCache,
-) {
-    // Skip the text node if it is waiting for a new measure func
-    if text_flags.needs_measure_fn {
-        return;
-    }
 
-    let physical_node_size = if block.linebreak == LineBreak::NoWrap {
-        // With `NoWrap` set, no constraints are placed on the width of the text.
-        TextBounds::UNBOUNDED
-    } else {
-        // `scale_factor` is already multiplied by `UiScale`
-        TextBounds::new(node.unrounded_size.x, node.unrounded_size.y)
-    };
+        match text_pipeline.create_text_measure(
+            entity,
+            fonts.as_ref(),
+            text_reader.iter(entity),
+            computed_target.scale_factor.into(),
+            &block,
+            computed.as_mut(),
+            &mut font_system,
+        ) {
+            Ok(measure) => {
+                if block.linebreak == LineBreak::NoWrap {
+                    content_size.set(NodeMeasure::Fixed(FixedMeasure { size: measure.max }));
+                } else {
+                    content_size.set(NodeMeasure::Text(TextMeasure { info: measure }));
+                }
 
-    let text_layout_info = text_layout_info.into_inner();
-    match text_pipeline.queue_text(
-        text_layout_info,
-        fonts,
-        text_reader.iter(entity),
-        scale_factor.into(),
-        block,
-        physical_node_size,
-        font_atlas_set,
-        texture_atlases,
-        textures,
-        computed,
-        font_system,
-        swash_cache,
-    ) {
-        Err(TextError::NoSuchFont) => {
-            // There was an error processing the text layout, try again next frame
-            text_flags.needs_recompute = true;
-        }
-        Err(
-            e @ (TextError::FailedToAddGlyph(_)
-            | TextError::FailedToGetGlyphImage(_)
-            | TextError::MissingAtlasLayout
-            | TextError::MissingAtlasTexture
-            | TextError::InconsistentAtlasState),
-        ) => {
-            panic!("Fatal error when processing text: {e}.");
-        }
-        Ok(()) => {
-            text_layout_info.scale_factor = scale_factor;
-            text_layout_info.size *= inverse_scale_factor;
-            text_flags.needs_recompute = false;
-        }
+                // Text measure func created successfully, so set `TextNodeFlags` to schedule a recompute
+                text_flags.needs_measure_fn = false;
+                text_flags.needs_recompute = true;
+            }
+            Err(TextError::NoSuchFont) => {
+                // Try again next frame
+                text_flags.needs_measure_fn = true;
+            }
+            Err(
+                e @ (TextError::FailedToAddGlyph(_)
+                | TextError::FailedToGetGlyphImage(_)
+                | TextError::MissingAtlasLayout
+                | TextError::MissingAtlasTexture
+                | TextError::InconsistentAtlasState),
+            ) => {
+                panic!("Fatal error when processing text: {e}.");
+            }
+        };
     }
 }
 
@@ -421,26 +335,57 @@ pub fn text_system(
     mut font_system: ResMut<CosmicFontSystem>,
     mut swash_cache: ResMut<SwashCache>,
 ) {
-    for (entity, node, block, text_layout_info, text_flags, mut computed) in &mut text_query {
-        if node.is_changed() || text_flags.needs_recompute {
-            queue_text(
-                entity,
-                &fonts,
-                &mut text_pipeline,
-                &mut font_atlas_set,
-                &mut texture_atlases,
-                &mut textures,
-                node.inverse_scale_factor.recip(),
-                node.inverse_scale_factor,
-                block,
-                node,
-                text_flags,
-                text_layout_info,
-                computed.as_mut(),
-                &mut text_reader,
-                &mut font_system,
-                &mut swash_cache,
-            );
+    for (entity, node, block, text_layout_info, mut text_flags, mut computed) in &mut text_query {
+        // Skip the text node if it is waiting for a new measure func
+        if text_flags.needs_measure_fn {
+            continue;
+        }
+
+        if !(node.is_changed() || text_flags.needs_recompute) {
+            continue;
+        }
+
+        let physical_node_size = if block.linebreak == LineBreak::NoWrap {
+            // With `NoWrap` set, no constraints are placed on the width of the text.
+            TextBounds::UNBOUNDED
+        } else {
+            // `scale_factor` is already multiplied by `UiScale`
+            TextBounds::new(node.unrounded_size.x, node.unrounded_size.y)
+        };
+
+        let text_layout_info = text_layout_info.into_inner();
+        match text_pipeline.queue_text(
+            text_layout_info,
+            &fonts,
+            text_reader.iter(entity),
+            node.inverse_scale_factor.recip() as f64,
+            block,
+            physical_node_size,
+            &mut font_atlas_set,
+            &mut texture_atlases,
+            &mut textures,
+            &mut computed,
+            &mut font_system,
+            &mut swash_cache,
+        ) {
+            Err(TextError::NoSuchFont) => {
+                // There was an error processing the text layout, try again next frame
+                text_flags.needs_recompute = true;
+            }
+            Err(
+                e @ (TextError::FailedToAddGlyph(_)
+                | TextError::FailedToGetGlyphImage(_)
+                | TextError::MissingAtlasLayout
+                | TextError::MissingAtlasTexture
+                | TextError::InconsistentAtlasState),
+            ) => {
+                panic!("Fatal error when processing text: {e}.");
+            }
+            Ok(()) => {
+                text_layout_info.scale_factor = node.inverse_scale_factor.recip();
+                text_layout_info.size *= node.inverse_scale_factor;
+                text_flags.needs_recompute = false;
+            }
         }
     }
 }

From 8c78e46987aaa0036219ebc996ba0f1ad13dbe57 Mon Sep 17 00:00:00 2001
From: HeartofPhos <43216176+HeartofPhos@users.noreply.github.com>
Date: Wed, 3 Dec 2025 02:35:59 +0200
Subject: [PATCH 010/133] #21980 Fix Component/Relationship derive using non
 fully qualified path (#21981)

# Objective

Fixes #21980

## Solution

Use fully qualified path for `Entity`

## Testing

The following code now compiles
```rust
mod test {
    fn derive_component_relationship_hygiene() {
        #[derive(Debug, bevy::prelude::Component)]
        #[relationship(relationship_target = RelTarget)]
        struct Rel(pub bevy::prelude::Entity);

        #[derive(Debug, bevy::prelude::Component)]
        #[relationship_target(relationship = Rel)]
        struct RelTarget(bevy::prelude::Entity);
    }
}```

Co-authored-by: Heart <>
---
 crates/bevy_ecs/macros/src/component.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/bevy_ecs/macros/src/component.rs b/crates/bevy_ecs/macros/src/component.rs
index 5ec637da1a4f7..f37defab0b111 100644
--- a/crates/bevy_ecs/macros/src/component.rs
+++ b/crates/bevy_ecs/macros/src/component.rs
@@ -826,7 +826,7 @@ fn derive_relationship(
             }
 
             #[inline]
-            fn set_risky(&mut self, entity: Entity) {
+            fn set_risky(&mut self, entity: #bevy_ecs_path::entity::Entity) {
                 self.#relationship_member = entity;
             }
         }

From 8978b479912e3bba0aabd8939f7a4339b14157b9 Mon Sep 17 00:00:00 2001
From: ickshonpe <david.curthoys@googlemail.com>
Date: Wed, 3 Dec 2025 01:04:12 +0000
Subject: [PATCH 011/133] Fix dragging-over panic (#21999)

# Objective

Problems:

* If a drag starts over a hovered entity, `picking_events` doesn't add
the hovered entity to the `dragging_over` map in `PointerButtonState`.
This causes a panic when the pointer is moved and `picking_events` tries
to update the non-existant `dragging_over` state for the hovered entity.

* `DragEnter` isn't dispatched on `DragStart`. This doesn't seem ideal.
The drag isn't crossing a geometric boundary, but it is causing the
dragged over entities to enter into a dragged over state.

Fixes #21998

## Solution

* Update the `dragging_state` for all hovered entities every frame,
before handling any `PointerInput`s.
* Reworked the `DragEnter` dispatch logic. `DragEnter` now also fires
when a drag starts over an already hovered entity.

## Testing

The examples using drag events should no longer panic:

```
cargo run --example standard_widgets --features="experimental_bevy_ui_widgets"
```

```
cargo run --example ui_drag_and_drop
````

---------

Co-authored-by: Kevin Chen <chen.kevin.f@gmail.com>
---
 crates/bevy_picking/src/events.rs             | 75 +++++++++++++------
 .../dragenter-now-fires-on-drag-starts.md     |  6 ++
 2 files changed, 59 insertions(+), 22 deletions(-)
 create mode 100644 release-content/migration-guides/dragenter-now-fires-on-drag-starts.md

diff --git a/crates/bevy_picking/src/events.rs b/crates/bevy_picking/src/events.rs
index 4fb10121efde8..1385961e468d5 100644
--- a/crates/bevy_picking/src/events.rs
+++ b/crates/bevy_picking/src/events.rs
@@ -255,7 +255,7 @@ pub struct DragEnd {
     pub distance: Vec2,
 }
 
-/// Fires when a pointer dragging the `dragged` entity enters the [target entity](EntityEvent::event_target).
+/// Fires when a pointer dragging the `dragged` entity enters the [target entity](EntityEvent::event_target)
 #[derive(Clone, PartialEq, Debug, Reflect)]
 #[reflect(Clone, PartialEq)]
 pub struct DragEnter {
@@ -535,31 +535,33 @@ pub fn pointer_events(
         }
     }
 
-    // If the entity is hovered...
+    // Iterate all currently hovered entities for each pointer
     for (pointer_id, hovered_entity, hit) in hover_map
         .iter()
         .flat_map(|(id, hashmap)| hashmap.iter().map(|data| (*id, *data.0, data.1.clone())))
     {
-        // ...but was not hovered last frame...
-        if !previous_hover_map
-            .get(&pointer_id)
-            .iter()
-            .any(|e| e.contains_key(&hovered_entity))
-        {
-            let Some(location) = pointer_location(pointer_id) else {
-                debug!(
-                    "Unable to get location for pointer {:?} during pointer over",
-                    pointer_id
-                );
-                continue;
-            };
-
-            // Possibly send DragEnter events
-            for button in PointerButton::iter() {
-                let state = pointer_state.get_mut(pointer_id, button);
+        // Continue if the pointer does not have a valid location.
+        let Some(location) = pointer_location(pointer_id) else {
+            debug!(
+                "Unable to get location for pointer {:?} during pointer over",
+                pointer_id
+            );
+            continue;
+        };
 
+        // For each button update its `dragging_over` state and possibly emit DragEnter events.
+        for button in PointerButton::iter() {
+            let state = pointer_state.get_mut(pointer_id, button);
+
+            // Only update the `dragging_over` state if there is at least one entity being dragged.
+            // Only emit DragEnter events for this `hovered_entity`, if it had no previous `dragging_over` state.
+            if !state.dragging.is_empty()
+                && state
+                    .dragging_over
+                    .insert(hovered_entity, hit.clone())
+                    .is_none()
+            {
                 for drag_target in state.dragging.keys() {
-                    state.dragging_over.insert(hovered_entity, hit.clone());
                     let drag_enter_event = Pointer::new(
                         pointer_id,
                         location.clone(),
@@ -574,8 +576,14 @@ pub fn pointer_events(
                     message_writers.drag_enter_events.write(drag_enter_event);
                 }
             }
+        }
 
-            // Always send Over events
+        // Emit an Over event if the `hovered_entity` was not hovered by the same pointer the previous frame.
+        if !previous_hover_map
+            .get(&pointer_id)
+            .iter()
+            .any(|e| e.contains_key(&hovered_entity))
+        {
             let over_event = Pointer::new(
                 pointer_id,
                 location.clone(),
@@ -738,8 +746,32 @@ pub fn pointer_events(
                             },
                             *press_target,
                         );
+
                         commands.trigger(drag_start_event.clone());
                         message_writers.drag_start_events.write(drag_start_event);
+
+                        // Insert dragging over state and emit DragEnter for hovered entities.
+                        for (hovered_entity, hit) in hover_map
+                            .get(&pointer_id)
+                            .iter()
+                            .flat_map(|h| h.iter().map(|(entity, data)| (*entity, data.to_owned())))
+                            .filter(|(hovered_entity, _)| *hovered_entity != *press_target)
+                        {
+                            // Inserting the `dragging_over` state here ensures the `DragEnter` event won't be dispatched twice.
+                            state.dragging_over.insert(hovered_entity, hit.clone());
+                            let drag_enter_event = Pointer::new(
+                                pointer_id,
+                                location.clone(),
+                                DragEnter {
+                                    button,
+                                    dragged: *press_target,
+                                    hit: hit.clone(),
+                                },
+                                hovered_entity,
+                            );
+                            commands.trigger(drag_enter_event.clone());
+                            message_writers.drag_enter_events.write(drag_enter_event);
+                        }
                     }
 
                     // Emit Drag events to the entities we are dragging
@@ -771,7 +803,6 @@ pub fn pointer_events(
                             .flat_map(|h| h.iter().map(|(entity, data)| (*entity, data.to_owned())))
                             .filter(|(hovered_entity, _)| *hovered_entity != *drag_target)
                         {
-                            *state.dragging_over.get_mut(&hovered_entity).unwrap() = hit.clone();
                             let drag_over_event = Pointer::new(
                                 pointer_id,
                                 location.clone(),
diff --git a/release-content/migration-guides/dragenter-now-fires-on-drag-starts.md b/release-content/migration-guides/dragenter-now-fires-on-drag-starts.md
new file mode 100644
index 0000000000000..187067a05cb82
--- /dev/null
+++ b/release-content/migration-guides/dragenter-now-fires-on-drag-starts.md
@@ -0,0 +1,6 @@
+---
+title: "DragEnter now fires on drag starts"
+pull_requests: [21999]
+---
+
+`DragEnter` now also fires when a drag starts over an already hovered entity.

From aa14ada6d45225b0123b4799e7baf2722edabc6d Mon Sep 17 00:00:00 2001
From: Nico Zweifel <34443492+NicoZweifel@users.noreply.github.com>
Date: Wed, 3 Dec 2025 08:00:48 +0100
Subject: [PATCH 012/133] Fix extended_material_bindless example wgpu
 validation error on MacOS/Metal (#21729)

# Objective

- Fixes https://github.com/bevyengine/bevy/issues/21719

## Solution

- Implementing `bindless_supported` of the `AsBindGroup` trait for
`ExtendedMaterial`:
```rust
    fn bindless_supported(render_device: &RenderDevice) -> bool {
        B::bindless_supported(render_device) && E::bindless_supported(render_device)
    }
```
Before it just returned the default (true), leading to the mismatch.

I made small, mostly stylistic, improvements to `fn
bind_group_layout_entries` and a few other locations like a comment in
`extended_material` during debugging but I could move that out into a
separate PR as well. Since the changes are rather limited and related to
the issue I decided to leave it in for now.

## Testing

- Tested on Windows/NixOS and MacOS, tested multiple examples but most
testing happened on the `extended_material_bindless` and
`extended_material` examples.
---
 crates/bevy_pbr/src/extended_material.rs | 31 ++++++++++++++----------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/crates/bevy_pbr/src/extended_material.rs b/crates/bevy_pbr/src/extended_material.rs
index 258408cf4cc62..535128d00ec1e 100644
--- a/crates/bevy_pbr/src/extended_material.rs
+++ b/crates/bevy_pbr/src/extended_material.rs
@@ -196,6 +196,10 @@ impl<B: Material, E: MaterialExtension> AsBindGroup for ExtendedMaterial<B, E> {
         }
     }
 
+    fn bindless_supported(render_device: &RenderDevice) -> bool {
+        B::bindless_supported(render_device) && E::bindless_supported(render_device)
+    }
+
     fn label() -> &'static str {
         E::label()
     }
@@ -216,7 +220,7 @@ impl<B: Material, E: MaterialExtension> AsBindGroup for ExtendedMaterial<B, E> {
     ) -> Result<UnpreparedBindGroup, AsBindGroupError> {
         force_non_bindless = force_non_bindless || Self::bindless_slot_count().is_none();
 
-        // add together the bindings of the base material and the user material
+        // add together the bindings of the base material and the extension
         let UnpreparedBindGroup { mut bindings } = B::unprepared_bind_group(
             &self.base,
             layout,
@@ -224,7 +228,9 @@ impl<B: Material, E: MaterialExtension> AsBindGroup for ExtendedMaterial<B, E> {
             base_param,
             force_non_bindless,
         )?;
-        let extended_bindgroup = E::unprepared_bind_group(
+        let UnpreparedBindGroup {
+            bindings: extension_bindings,
+        } = E::unprepared_bind_group(
             &self.extension,
             layout,
             render_device,
@@ -232,7 +238,7 @@ impl<B: Material, E: MaterialExtension> AsBindGroup for ExtendedMaterial<B, E> {
             force_non_bindless,
         )?;
 
-        bindings.extend(extended_bindgroup.bindings.0);
+        bindings.extend(extension_bindings.0);
 
         Ok(UnpreparedBindGroup { bindings })
     }
@@ -251,17 +257,16 @@ impl<B: Material, E: MaterialExtension> AsBindGroup for ExtendedMaterial<B, E> {
         // when bindless mode is on, because of the common bindless resource
         // arrays, and we need to eliminate the duplicates or `wgpu` will
         // complain.
-        let mut entries = vec![];
-        let mut seen_bindings = HashSet::<_>::with_hasher(FixedHasher);
-        for entry in B::bind_group_layout_entries(render_device, force_non_bindless)
+        let base_entries = B::bind_group_layout_entries(render_device, force_non_bindless);
+        let extension_entries = E::bind_group_layout_entries(render_device, force_non_bindless);
+
+        let mut seen_bindings = HashSet::<u32>::with_hasher(FixedHasher);
+
+        base_entries
             .into_iter()
-            .chain(E::bind_group_layout_entries(render_device, force_non_bindless).into_iter())
-        {
-            if seen_bindings.insert(entry.binding) {
-                entries.push(entry);
-            }
-        }
-        entries
+            .chain(extension_entries)
+            .filter(|entry| seen_bindings.insert(entry.binding))
+            .collect()
     }
 
     fn bindless_descriptor() -> Option<BindlessDescriptor> {

From 41f59f1891067799eac93796b3e1ffb9775002b5 Mon Sep 17 00:00:00 2001
From: Carter Anderson <mcanders1@gmail.com>
Date: Wed, 3 Dec 2025 12:16:24 -0800
Subject: [PATCH 013/133] TypeData dependencies (#22016)

# Objective

The proposed ["Resources as
entities"](https://github.com/bevyengine/bevy/pull/20934 ) PR makes
Resource implement Component. This creates a situation where we need to
do:

```rust
#[derive(Resource, Reflect)]
#[reflect(Resource, Component)]
struct Thing;
```

I'm of the mind that we should add the ability for TypeData to have
"dependencies". Ex `reflect(Resource)` implies `reflect(Component)`. For
"subtrait" types, I think supporting this is logical / users would
appreciate it.

## Solution

1. Add a new `FromType<T>::insert_dependencies` function with a default
impl (which makes this a non-breaking change). This does kind of
overload the `FromType` trait (ex: a name like `GetTypeData` might be
better with this new context), but this is a pretty niche trait / piece
of functionality, and I like the idea of not breaking people.
2. Add a new `TypeRegistration::register_type_data<T, V>` function,
which initializes the TypeData `T` for a given type `V` , inserts that
type data, and also inserts any dependent type data using
`insert_dependencies`.
3. Adjust the `Reflect` macro to use `register_type_data` instead of
`insert(FromType::<Self>::from_type())`

This makes it possible to do the following:

```rust
impl<R: Resource + FromReflect + TypePath> FromType<R> for ReflectResource {
    fn from_type() -> Self {
        ReflectResource
    }

    fn insert_dependencies(type_registration: &mut TypeRegistration) {
        type_registration.register_type_data::<ReflectComponent, R>();
    }
}
```

Which then allows dropping `reflect(Component)`:

```rust
#[derive(Resource, Reflect)]
#[reflect(Resource)]
struct Thing;
```

## Testing

I added a unit test :stuck_out_tongue_winking_eye:
---
 .../bevy_reflect/derive/src/registration.rs   |  2 +-
 crates/bevy_reflect/src/lib.rs                | 30 +++++++++++++++++++
 crates/bevy_reflect/src/type_registry.rs      | 11 +++++++
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/crates/bevy_reflect/derive/src/registration.rs b/crates/bevy_reflect/derive/src/registration.rs
index 2d8174cfb6095..d3ec6e0ad68a7 100644
--- a/crates/bevy_reflect/derive/src/registration.rs
+++ b/crates/bevy_reflect/derive/src/registration.rs
@@ -49,7 +49,7 @@ pub(crate) fn impl_get_type_registration<'a>(
                 registration.insert::<#bevy_reflect_path::ReflectFromPtr>(#bevy_reflect_path::FromType::<Self>::from_type());
                 #from_reflect_data
                 #serialization_data
-                #(registration.insert::<#registration_data>(#bevy_reflect_path::FromType::<Self>::from_type());)*
+                #(registration.register_type_data::<#registration_data, Self>();)*
                 registration
             }
 
diff --git a/crates/bevy_reflect/src/lib.rs b/crates/bevy_reflect/src/lib.rs
index 72397bfe39674..7ead2e662e3f9 100644
--- a/crates/bevy_reflect/src/lib.rs
+++ b/crates/bevy_reflect/src/lib.rs
@@ -3606,6 +3606,36 @@ bevy_reflect::tests::Test {
             assert!(registry.contains(TypeId::of::<OpaqueStructReflect>()));
             assert!(registry.contains(TypeId::of::<ZSTOpaqueStructReflect>()));
         }
+
+        #[test]
+        fn type_data_dependency() {
+            #[derive(Reflect)]
+            #[reflect(A)]
+            struct X;
+
+            #[derive(Clone)]
+            struct ReflectA;
+
+            impl<T> FromType<T> for ReflectA {
+                fn from_type() -> Self {
+                    ReflectA
+                }
+
+                fn insert_dependencies(type_registration: &mut TypeRegistration) {
+                    type_registration.insert(ReflectB);
+                }
+            }
+
+            #[derive(Clone)]
+            struct ReflectB;
+
+            let mut registry = TypeRegistry::new();
+            registry.register::<X>();
+
+            let registration = registry.get(TypeId::of::<X>()).unwrap();
+            assert!(registration.data::<ReflectA>().is_some());
+            assert!(registration.data::<ReflectB>().is_some());
+        }
     }
 
     #[cfg(feature = "glam")]
diff --git a/crates/bevy_reflect/src/type_registry.rs b/crates/bevy_reflect/src/type_registry.rs
index 5c79a7bd77840..bf1950b7af9cb 100644
--- a/crates/bevy_reflect/src/type_registry.rs
+++ b/crates/bevy_reflect/src/type_registry.rs
@@ -588,6 +588,13 @@ impl TypeRegistration {
         self.data.insert(TypeId::of::<T>(), Box::new(data));
     }
 
+    /// Inserts the [`TypeData`] instance of `T` created for `V`, and inserts any
+    /// [`TypeData`] dependencies for that combination of `T` and `V`.
+    pub fn register_type_data<T: TypeData + FromType<V>, V>(&mut self) {
+        self.insert(T::from_type());
+        T::insert_dependencies(self);
+    }
+
     /// Returns a reference to the value of type `T` in this registration's
     /// [type data].
     ///
@@ -747,6 +754,10 @@ where
 pub trait FromType<T> {
     /// Creates an instance of `Self` for type `T`.
     fn from_type() -> Self;
+    /// Inserts [`TypeData`] dependencies of this [`TypeData`].
+    /// This is especially useful for trait [`TypeData`] that has a supertrait (ex: `A: B`).
+    /// When the [`TypeData`] for `A` is inserted, the `B` [`TypeData`] will also be inserted.
+    fn insert_dependencies(_type_registration: &mut TypeRegistration) {}
 }
 
 /// A struct used to serialize reflected instances of a type.

From 540d5853dae31006b3e2bef057c3c6299d1dba6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?charlotte=20=F0=9F=8C=B8?= <charlotte.c.mcelwain@gmail.com>
Date: Wed, 3 Dec 2025 14:29:39 -0800
Subject: [PATCH 014/133] Add Clone derive to ViewTarget (#22024)

For esoteric reasons we need to send this to the MainWorld for
processing. All the fields are GPU resources or Arc'd so it can be
trivially cloned.
---
 crates/bevy_render/src/view/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/bevy_render/src/view/mod.rs b/crates/bevy_render/src/view/mod.rs
index 0226f22c770b8..040d0ce7bc3cc 100644
--- a/crates/bevy_render/src/view/mod.rs
+++ b/crates/bevy_render/src/view/mod.rs
@@ -601,7 +601,7 @@ pub struct ViewUniformOffset {
     pub offset: u32,
 }
 
-#[derive(Component)]
+#[derive(Component, Clone)]
 pub struct ViewTarget {
     main_textures: MainTargetTextures,
     main_texture_format: TextureFormat,

From 1720e5b71b29a8b508ec0ab9f297a42c7ed16de2 Mon Sep 17 00:00:00 2001
From: ickshonpe <david.curthoys@googlemail.com>
Date: Thu, 4 Dec 2025 02:35:26 +0000
Subject: [PATCH 015/133] Ignore text buffer metrics (#22022)

# Objective

Since we set explicit font size and line height attributes for every
text section, the `Metrics` values passed to the text buffer don't
matter. We can just initialize the buffer with some dummy value and then
ignore it.

## Solution

* Initialize the text buffer to some dummy values.
* Remove the code that collects and sets the metrics during text
updates.
---
 crates/bevy_text/src/pipeline.rs | 15 +--------------
 crates/bevy_text/src/text.rs     |  2 +-
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/crates/bevy_text/src/pipeline.rs b/crates/bevy_text/src/pipeline.rs
index 9fa918ba73ac0..05f916f086462 100644
--- a/crates/bevy_text/src/pipeline.rs
+++ b/crates/bevy_text/src/pipeline.rs
@@ -105,8 +105,6 @@ impl TextPipeline {
 
         // Collect span information into a vec. This is necessary because font loading requires mut access
         // to FontSystem, which the cosmic-text Buffer also needs.
-        let mut max_font_size: f32 = 0.;
-        let mut max_line_height: f32 = 0.0;
         let mut spans: Vec<(usize, &str, &TextFont, FontFaceInfo, Color, LineHeight)> =
             core::mem::take(&mut self.spans_buffer)
                 .into_iter()
@@ -147,10 +145,6 @@ impl TextPipeline {
                 return Err(TextError::NoSuchFont);
             }
 
-            // Get max font size for use in cosmic Metrics.
-            max_font_size = max_font_size.max(text_font.font_size);
-            max_line_height = max_line_height.max(line_height.eval(text_font.font_size));
-
             // Load Bevy fonts into cosmic-text's font system.
             let face_info = load_font_to_fontdb(
                 text_font,
@@ -170,13 +164,6 @@ impl TextPipeline {
             spans.push((span_index, span, text_font, face_info, color, line_height));
         }
 
-        let mut metrics = Metrics::new(max_font_size, max_line_height).scale(scale_factor as f32);
-        // Metrics of 0.0 cause `Buffer::set_metrics` to panic. We hack around this by 'falling
-        // through' to call `Buffer::set_rich_text` with zero spans so any cached text will be cleared without
-        // deallocating the buffer.
-        metrics.font_size = metrics.font_size.max(0.000001);
-        metrics.line_height = metrics.line_height.max(0.000001);
-
         // Map text sections to cosmic-text spans, and ignore sections with negative or zero fontsizes,
         // since they cannot be rendered by cosmic-text.
         //
@@ -201,7 +188,7 @@ impl TextPipeline {
 
         // Update the buffer.
         let buffer = &mut computed.buffer;
-        buffer.set_metrics_and_size(font_system, metrics, bounds.width, bounds.height);
+        buffer.set_size(font_system, bounds.width, bounds.height);
 
         buffer.set_wrap(
             font_system,
diff --git a/crates/bevy_text/src/text.rs b/crates/bevy_text/src/text.rs
index f100eca0c786b..6b022487bca6e 100644
--- a/crates/bevy_text/src/text.rs
+++ b/crates/bevy_text/src/text.rs
@@ -18,7 +18,7 @@ pub struct CosmicBuffer(pub Buffer);
 
 impl Default for CosmicBuffer {
     fn default() -> Self {
-        Self(Buffer::new_empty(Metrics::new(0.0, 0.000001)))
+        Self(Buffer::new_empty(Metrics::new(20.0, 20.0)))
     }
 }
 

From 6cbc4b242096e9ef6cf6fc3bd07a3e06d9b916a6 Mon Sep 17 00:00:00 2001
From: ickshonpe <david.curthoys@googlemail.com>
Date: Thu, 4 Dec 2025 02:38:40 +0000
Subject: [PATCH 016/133] Remove redundant `shape_until_scroll` (#22020)

# Objective

In `TextPipeline::update_buffer` the `shape_until_scroll` call is
redundant.
The preceding line that calls `set_rich_text`, calls
`shape_until_scroll` itself before returning.

## Solution

Remove the `shape_until_scroll` call.

## Testing

The `testbed_ui` screenshot CI will fail with no text rendered if this
is incorrect.
---
 crates/bevy_text/src/pipeline.rs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/crates/bevy_text/src/pipeline.rs b/crates/bevy_text/src/pipeline.rs
index 05f916f086462..5d3fe166d1f82 100644
--- a/crates/bevy_text/src/pipeline.rs
+++ b/crates/bevy_text/src/pipeline.rs
@@ -208,8 +208,6 @@ impl TextPipeline {
             Some(justify.into()),
         );
 
-        buffer.shape_until_scroll(font_system, false);
-
         // Workaround for alignment not working for unbounded text.
         // See https://github.com/pop-os/cosmic-text/issues/343
         if bounds.width.is_none() && justify != Justify::Left {

From e8520c1faf5f0a1e164947bcfebf275f1c7e7942 Mon Sep 17 00:00:00 2001
From: Sigma-dev <72008323+Sigma-dev@users.noreply.github.com>
Date: Thu, 4 Dec 2025 07:19:30 +0100
Subject: [PATCH 017/133] Added required features data to docs export (#21975)

# Objective

This PR is a sister PR necessary for the website to have
`required_features` data.
You will find more information on the motivations there:
https://github.com/bevyengine/bevy-website/pull/2313

## Solution

- Add the required_features data to the examples docs export

## Testing

I tested both together and it worked fine
---
 tools/example-showcase/src/main.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/example-showcase/src/main.rs b/tools/example-showcase/src/main.rs
index a437533674fe1..dbc60564623bf 100644
--- a/tools/example-showcase/src/main.rs
+++ b/tools/example-showcase/src/main.rs
@@ -596,6 +596,7 @@ code_path = \"content/examples{}/{}\"
 shader_code_paths = {:?}
 github_code_path = \"{}\"
 header_message = \"Examples ({})\"
+required_features = {:?}
 +++
 
 {}
@@ -637,6 +638,7 @@ header_message = \"Examples ({})\"
                                 WebApi::Webgpu => "WebGPU",
                                 WebApi::Webgl2 => "WebGL2",
                             },
+                            to_show.required_features,
                             docblock,
                         )
                         .as_bytes(),

From 6e88ae2db28e5b365c7309f00efb871f210758cb Mon Sep 17 00:00:00 2001
From: Carter Anderson <mcanders1@gmail.com>
Date: Thu, 4 Dec 2025 18:31:59 -0800
Subject: [PATCH 018/133] Inline register_type_data to cut down on binary size
 (#22030)

# Objective

My [TypeData dependencies](#22016 ) PR regressed native binary size by
~8mb.

(thank you [twitcher](https://github.com/bevyengine/twitcher/))

<img width="858" height="306" alt="image"
src="https://github.com/user-attachments/assets/e6d86c67-33f6-4280-bee4-49771014b678"
/>

## Solution

- Inline `register_type_data`, which restores the original binary size:
  - `release breakout` before #22016: 127.3mb
  - `release breakout` after #22016: 136.4mb
  - `release breakout` after this PR: 127.4mb
---
 crates/bevy_reflect/src/type_registry.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/bevy_reflect/src/type_registry.rs b/crates/bevy_reflect/src/type_registry.rs
index bf1950b7af9cb..8ccd81ce710f7 100644
--- a/crates/bevy_reflect/src/type_registry.rs
+++ b/crates/bevy_reflect/src/type_registry.rs
@@ -590,6 +590,7 @@ impl TypeRegistration {
 
     /// Inserts the [`TypeData`] instance of `T` created for `V`, and inserts any
     /// [`TypeData`] dependencies for that combination of `T` and `V`.
+    #[inline]
     pub fn register_type_data<T: TypeData + FromType<V>, V>(&mut self) {
         self.insert(T::from_type());
         T::insert_dependencies(self);

From 700ee46292c68dfb8251e43690bbce56fe12f79b Mon Sep 17 00:00:00 2001
From: Mike <mike.hsu@gmail.com>
Date: Fri, 5 Dec 2025 00:01:33 -0800
Subject: [PATCH 019/133] Fix some lints from rust 1.89 bump (#22034)

# Objective

- In #21822 the MSRV bump triggers some new lint warnings, so this pr
fixes them.

## Solution

- Bumped the msrv in bevy_ecs and fixed the lints. But this pr does not
actually bump the msrv. These fixes are all for combining nested if's
together.
---
 crates/bevy_ecs/src/component/clone.rs       | 20 +++++-----
 crates/bevy_ecs/src/entity/clone_entities.rs | 10 ++---
 crates/bevy_ecs/src/observer/mod.rs          | 24 ++++++------
 crates/bevy_ecs/src/query/fetch.rs           |  8 ++--
 crates/bevy_ecs/src/relationship/mod.rs      | 41 ++++++++++----------
 crates/bevy_ecs/src/system/system.rs         |  8 ++--
 6 files changed, 54 insertions(+), 57 deletions(-)

diff --git a/crates/bevy_ecs/src/component/clone.rs b/crates/bevy_ecs/src/component/clone.rs
index 3a3784350e36a..a645463923bb6 100644
--- a/crates/bevy_ecs/src/component/clone.rs
+++ b/crates/bevy_ecs/src/component/clone.rs
@@ -110,20 +110,18 @@ pub fn component_clone_via_reflect(source: &SourceComponent, ctx: &mut Component
     // Try to clone using ReflectFromReflect
     if let Some(reflect_from_reflect) =
         registry.get_type_data::<bevy_reflect::ReflectFromReflect>(type_id)
-    {
-        if let Some(mut component) =
+        && let Some(mut component) =
             reflect_from_reflect.from_reflect(source_component_reflect.as_partial_reflect())
+    {
+        if let Some(reflect_component) =
+            registry.get_type_data::<crate::reflect::ReflectComponent>(type_id)
         {
-            if let Some(reflect_component) =
-                registry.get_type_data::<crate::reflect::ReflectComponent>(type_id)
-            {
-                reflect_component.map_entities(&mut *component, ctx.entity_mapper());
-            }
-            drop(registry);
-
-            ctx.write_target_component_reflect(component);
-            return;
+            reflect_component.map_entities(&mut *component, ctx.entity_mapper());
         }
+        drop(registry);
+
+        ctx.write_target_component_reflect(component);
+        return;
     }
     // Else, try to clone using ReflectDefault
     if let Some(reflect_default) =
diff --git a/crates/bevy_ecs/src/entity/clone_entities.rs b/crates/bevy_ecs/src/entity/clone_entities.rs
index ac0b8f3894ee6..0f7105e0eb0ce 100644
--- a/crates/bevy_ecs/src/entity/clone_entities.rs
+++ b/crates/bevy_ecs/src/entity/clone_entities.rs
@@ -1144,11 +1144,11 @@ impl OptOut {
     #[inline]
     fn filter_deny(&mut self, id: ComponentId, world: &World) {
         self.deny.insert(id);
-        if self.attach_required_by_components {
-            if let Some(required_by) = world.components().get_required_by(id) {
-                self.deny.extend(required_by.iter());
-            };
-        }
+        if self.attach_required_by_components
+            && let Some(required_by) = world.components().get_required_by(id)
+        {
+            self.deny.extend(required_by.iter());
+        };
     }
 }
 
diff --git a/crates/bevy_ecs/src/observer/mod.rs b/crates/bevy_ecs/src/observer/mod.rs
index 7ba90f68e06b2..e10ec4c5e0ddd 100644
--- a/crates/bevy_ecs/src/observer/mod.rs
+++ b/crates/bevy_ecs/src/observer/mod.rs
@@ -219,18 +219,18 @@ impl World {
                         && observers.entity_component_observers.is_empty()
                     {
                         cache.component_observers.remove(component);
-                        if let Some(flag) = Observers::is_archetype_cached(event_key) {
-                            if let Some(by_component) = archetypes.by_component.get(component) {
-                                for archetype in by_component.keys() {
-                                    let archetype = &mut archetypes.archetypes[archetype.index()];
-                                    if archetype.contains(*component) {
-                                        let no_longer_observed = archetype
-                                            .iter_components()
-                                            .all(|id| !cache.component_observers.contains_key(&id));
-
-                                        if no_longer_observed {
-                                            archetype.flags.set(flag, false);
-                                        }
+                        if let Some(flag) = Observers::is_archetype_cached(event_key)
+                            && let Some(by_component) = archetypes.by_component.get(component)
+                        {
+                            for archetype in by_component.keys() {
+                                let archetype = &mut archetypes.archetypes[archetype.index()];
+                                if archetype.contains(*component) {
+                                    let no_longer_observed = archetype
+                                        .iter_components()
+                                        .all(|id| !cache.component_observers.contains_key(&id));
+
+                                    if no_longer_observed {
+                                        archetype.flags.set(flag, false);
                                     }
                                 }
                             }
diff --git a/crates/bevy_ecs/src/query/fetch.rs b/crates/bevy_ecs/src/query/fetch.rs
index d672b6ae4d0b7..2cab429557c7c 100644
--- a/crates/bevy_ecs/src/query/fetch.rs
+++ b/crates/bevy_ecs/src/query/fetch.rs
@@ -3319,10 +3319,10 @@ mod tests {
 
         fn system(query: Query<EntityRef>) {
             for entity_ref in &query {
-                if let Some(c) = entity_ref.get_ref::<C>() {
-                    if !c.is_added() {
-                        panic!("Expected C to be added");
-                    }
+                if let Some(c) = entity_ref.get_ref::<C>()
+                    && !c.is_added()
+                {
+                    panic!("Expected C to be added");
                 }
             }
         }
diff --git a/crates/bevy_ecs/src/relationship/mod.rs b/crates/bevy_ecs/src/relationship/mod.rs
index 2778568dead6e..62849f4977675 100644
--- a/crates/bevy_ecs/src/relationship/mod.rs
+++ b/crates/bevy_ecs/src/relationship/mod.rs
@@ -188,28 +188,27 @@ pub trait Relationship: Component + Sized {
             }
         }
         let target_entity = world.entity(entity).get::<Self>().unwrap().get();
-        if let Ok(mut target_entity_mut) = world.get_entity_mut(target_entity) {
-            if let Some(mut relationship_target) =
+        if let Ok(mut target_entity_mut) = world.get_entity_mut(target_entity)
+            && let Some(mut relationship_target) =
                 target_entity_mut.get_mut::<Self::RelationshipTarget>()
-            {
-                relationship_target.collection_mut_risky().remove(entity);
-                if relationship_target.len() == 0 {
-                    let command = |mut entity: EntityWorldMut| {
-                        // this "remove" operation must check emptiness because in the event that an identical
-                        // relationship is inserted on top, this despawn would result in the removal of that identical
-                        // relationship ... not what we want!
-                        if entity
-                            .get::<Self::RelationshipTarget>()
-                            .is_some_and(RelationshipTarget::is_empty)
-                        {
-                            entity.remove::<Self::RelationshipTarget>();
-                        }
-                    };
-
-                    world
-                        .commands()
-                        .queue_silenced(command.with_entity(target_entity));
-                }
+        {
+            relationship_target.collection_mut_risky().remove(entity);
+            if relationship_target.len() == 0 {
+                let command = |mut entity: EntityWorldMut| {
+                    // this "remove" operation must check emptiness because in the event that an identical
+                    // relationship is inserted on top, this despawn would result in the removal of that identical
+                    // relationship ... not what we want!
+                    if entity
+                        .get::<Self::RelationshipTarget>()
+                        .is_some_and(RelationshipTarget::is_empty)
+                    {
+                        entity.remove::<Self::RelationshipTarget>();
+                    }
+                };
+
+                world
+                    .commands()
+                    .queue_silenced(command.with_entity(target_entity));
             }
         }
     }
diff --git a/crates/bevy_ecs/src/system/system.rs b/crates/bevy_ecs/src/system/system.rs
index a69a1355a66e1..234af6bdf2fee 100644
--- a/crates/bevy_ecs/src/system/system.rs
+++ b/crates/bevy_ecs/src/system/system.rs
@@ -442,10 +442,10 @@ where
         // Note that the `downcast_mut` check is based on the static type,
         // and can be optimized out after monomorphization.
         let any: &mut dyn Any = &mut value;
-        if let Some(err) = any.downcast_mut::<SystemParamValidationError>() {
-            if err.skipped {
-                return Self::Skipped(core::mem::replace(err, SystemParamValidationError::EMPTY));
-            }
+        if let Some(err) = any.downcast_mut::<SystemParamValidationError>()
+            && err.skipped
+        {
+            return Self::Skipped(core::mem::replace(err, SystemParamValidationError::EMPTY));
         }
         Self::Failed(From::from(value))
     }

From ecbb5626d41321f067c03b84cce68c4333ee89ea Mon Sep 17 00:00:00 2001
From: bilsen <40690317+bilsen@users.noreply.github.com>
Date: Fri, 5 Dec 2025 19:14:55 +0100
Subject: [PATCH 020/133] Clarify docs for `ExtractSchedule` (#22012)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The previous docs incorrectly states that the `ExtractSchedule` is run
on the main world. Also some small additional changes.

---------

Co-authored-by: Ivar Källström <ivar.kallstrom@nekohealth.com>
Co-authored-by: JMS55 <47158642+JMS55@users.noreply.github.com>
---
 crates/bevy_render/src/lib.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/bevy_render/src/lib.rs b/crates/bevy_render/src/lib.rs
index 11b6ceb63bce4..b1e7837b3ec04 100644
--- a/crates/bevy_render/src/lib.rs
+++ b/crates/bevy_render/src/lib.rs
@@ -247,13 +247,13 @@ impl Render {
     }
 }
 
-/// Schedule which extract data from the main world and inserts it into the render world.
+/// Schedule in which data from the main world is 'extracted' into the render world.
 ///
 /// This step should be kept as short as possible to increase the "pipelining potential" for
 /// running the next frame while rendering the current frame.
 ///
-/// This schedule is run on the main world, but its buffers are not applied
-/// until it is returned to the render world.
+/// This schedule is run on the render world, but it also has access to the main world.
+/// See [`MainWorld`] and [`Extract`] for details on how to access main world data from this schedule.
 #[derive(ScheduleLabel, PartialEq, Eq, Debug, Clone, Hash, Default)]
 pub struct ExtractSchedule;
 

From dba7c749649c257640489a7c2503d75aec197fd3 Mon Sep 17 00:00:00 2001
From: ickshonpe <david.curthoys@googlemail.com>
Date: Sat, 6 Dec 2025 17:10:14 +0000
Subject: [PATCH 021/133] Don't update the text buffer in `text_system`
 (#21966)

# Objective

Text is shaped in `measure_text_system`. When the schedule reaches
`text_system` there's no need to reupdate the cosmic-text buffer a
second time. `text_system` should only be updating any stale
`TextLayoutInfo` components.

## Solution

* Add a new method `update_text_layout_info` to `TextPipeline`. This
method updates the given `TextLayoutInfo` without performing any
shaping.
* Call `update_text_layout_info` instead of `queue_text` from
`text_system`.
* Only query for `TextFont`, instead of the full `TextUiReader`.

#

The next step is to remove `TextPipeline::queue_text`. I didn't do that
here as it's a fairly large refactor and I have a bunch of other open
text PRs I'd like to get merged first.

## Testing

#### yellow = this PR, red = main

```
cargo run --example many_glyphs --release --features trace_tracy,debug -- --no-text2d --recompute-text
```

<img width="1599" height="851" alt="Screenshot 2025-11-28 130411"
src="https://github.com/user-attachments/assets/d21a42bf-8ea9-48b9-8cf3-24f742cb4174"
/>

```
cargo run --example many_buttons --release --features trace_tracy,debug -- --text --respawn
```

<img width="1597" height="767" alt="Screenshot 2025-11-28 145240"
src="https://github.com/user-attachments/assets/75d2d989-37fc-4804-9c6d-6056413d91ef"
/>
---
 crates/bevy_text/src/pipeline.rs  | 190 +++++++++++++++++++++++++++++-
 crates/bevy_ui/src/widget/text.rs |  96 +++++++--------
 2 files changed, 233 insertions(+), 53 deletions(-)

diff --git a/crates/bevy_text/src/pipeline.rs b/crates/bevy_text/src/pipeline.rs
index 5d3fe166d1f82..08d98e8dbea14 100644
--- a/crates/bevy_text/src/pipeline.rs
+++ b/crates/bevy_text/src/pipeline.rs
@@ -4,8 +4,11 @@ use bevy_asset::{AssetId, Assets};
 use bevy_color::Color;
 use bevy_derive::{Deref, DerefMut};
 use bevy_ecs::{
-    component::Component, entity::Entity, reflect::ReflectComponent, resource::Resource,
-    system::ResMut,
+    component::Component,
+    entity::Entity,
+    reflect::ReflectComponent,
+    resource::Resource,
+    system::{Query, ResMut},
 };
 use bevy_image::prelude::*;
 use bevy_log::{once, warn};
@@ -498,6 +501,189 @@ impl TextPipeline {
             .cloned()
             .map(|(id, _)| id)
     }
+
+    /// Update [`TextLayoutInfo`] with the new [`PositionedGlyph`] layout.
+    pub fn update_text_layout_info<'a>(
+        &mut self,
+        layout_info: &mut TextLayoutInfo,
+        text_font_query: Query<&'a TextFont>,
+        scale_factor: f64,
+        font_atlas_set: &mut FontAtlasSet,
+        texture_atlases: &mut Assets<TextureAtlasLayout>,
+        textures: &mut Assets<Image>,
+        computed: &mut ComputedTextBlock,
+        font_system: &mut CosmicFontSystem,
+        swash_cache: &mut SwashCache,
+        bounds: TextBounds,
+    ) -> Result<(), TextError> {
+        layout_info.glyphs.clear();
+        layout_info.run_geometry.clear();
+        layout_info.size = Default::default();
+
+        self.glyph_info.clear();
+
+        for text_font in text_font_query.iter_many(computed.entities.iter().map(|e| e.entity)) {
+            let mut section_info = (
+                text_font.font.id(),
+                text_font.font_smoothing,
+                text_font.font_size,
+                0.0,
+                0.0,
+                0.0,
+            );
+
+            if let Some((id, _)) = self.map_handle_to_font_id.get(&section_info.0) {
+                let weight = font_system
+                    .db()
+                    .face(*id)
+                    .map(|f| f.weight)
+                    .unwrap_or(cosmic_text::Weight::NORMAL);
+                if let Some(font) = font_system.get_font(*id, weight) {
+                    let swash = font.as_swash();
+                    let metrics = swash.metrics(&[]);
+                    let upem = metrics.units_per_em as f32;
+                    let scalar = section_info.2 * scale_factor as f32 / upem;
+                    section_info.3 = (metrics.strikeout_offset * scalar).round();
+                    section_info.4 = (metrics.stroke_size * scalar).round().max(1.);
+                    section_info.5 = (metrics.underline_offset * scalar).round();
+                }
+            }
+            self.glyph_info.push(section_info);
+        }
+
+        let buffer = &mut computed.buffer;
+        buffer.set_size(font_system, bounds.width, bounds.height);
+        let box_size = buffer_dimensions(buffer);
+
+        let result = buffer.layout_runs().try_for_each(|run| {
+            let mut current_section: Option<usize> = None;
+            let mut start = 0.;
+            let mut end = 0.;
+            let result = run
+                .glyphs
+                .iter()
+                .map(move |layout_glyph| (layout_glyph, run.line_y, run.line_i))
+                .try_for_each(|(layout_glyph, line_y, line_i)| {
+                    match current_section {
+                        Some(section) => {
+                            if section != layout_glyph.metadata {
+                                layout_info.run_geometry.push(RunGeometry {
+                                    span_index: section,
+                                    bounds: Rect::new(
+                                        start,
+                                        run.line_top,
+                                        end,
+                                        run.line_top + run.line_height,
+                                    ),
+                                    strikethrough_y: (run.line_y - self.glyph_info[section].3)
+                                        .round(),
+                                    strikethrough_thickness: self.glyph_info[section].4,
+                                    underline_y: (run.line_y - self.glyph_info[section].5).round(),
+                                    underline_thickness: self.glyph_info[section].4,
+                                });
+                                start = end.max(layout_glyph.x);
+                                current_section = Some(layout_glyph.metadata);
+                            }
+                            end = layout_glyph.x + layout_glyph.w;
+                        }
+                        None => {
+                            current_section = Some(layout_glyph.metadata);
+                            start = layout_glyph.x;
+                            end = start + layout_glyph.w;
+                        }
+                    }
+
+                    let mut temp_glyph;
+                    let span_index = layout_glyph.metadata;
+                    let font_id = self.glyph_info[span_index].0;
+                    let font_smoothing = self.glyph_info[span_index].1;
+
+                    let layout_glyph = if font_smoothing == FontSmoothing::None {
+                        // If font smoothing is disabled, round the glyph positions and sizes,
+                        // effectively discarding all subpixel layout.
+                        temp_glyph = layout_glyph.clone();
+                        temp_glyph.x = temp_glyph.x.round();
+                        temp_glyph.y = temp_glyph.y.round();
+                        temp_glyph.w = temp_glyph.w.round();
+                        temp_glyph.x_offset = temp_glyph.x_offset.round();
+                        temp_glyph.y_offset = temp_glyph.y_offset.round();
+                        temp_glyph.line_height_opt = temp_glyph.line_height_opt.map(f32::round);
+
+                        &temp_glyph
+                    } else {
+                        layout_glyph
+                    };
+
+                    let physical_glyph = layout_glyph.physical((0., 0.), 1.);
+
+                    let font_atlases = font_atlas_set
+                        .entry(FontAtlasKey(
+                            font_id,
+                            physical_glyph.cache_key.font_size_bits,
+                            font_smoothing,
+                        ))
+                        .or_default();
+
+                    let atlas_info = get_glyph_atlas_info(font_atlases, physical_glyph.cache_key)
+                        .map(Ok)
+                        .unwrap_or_else(|| {
+                            add_glyph_to_atlas(
+                                font_atlases,
+                                texture_atlases,
+                                textures,
+                                &mut font_system.0,
+                                &mut swash_cache.0,
+                                layout_glyph,
+                                font_smoothing,
+                            )
+                        })?;
+
+                    let texture_atlas = texture_atlases.get(atlas_info.texture_atlas).unwrap();
+                    let location = atlas_info.location;
+                    let glyph_rect = texture_atlas.textures[location.glyph_index];
+                    let left = location.offset.x as f32;
+                    let top = location.offset.y as f32;
+                    let glyph_size = UVec2::new(glyph_rect.width(), glyph_rect.height());
+
+                    // offset by half the size because the origin is center
+                    let x = glyph_size.x as f32 / 2.0 + left + physical_glyph.x as f32;
+                    let y =
+                        line_y.round() + physical_glyph.y as f32 - top + glyph_size.y as f32 / 2.0;
+
+                    let position = Vec2::new(x, y);
+
+                    let pos_glyph = PositionedGlyph {
+                        position,
+                        size: glyph_size.as_vec2(),
+                        atlas_info,
+                        span_index,
+                        byte_index: layout_glyph.start,
+                        byte_length: layout_glyph.end - layout_glyph.start,
+                        line_index: line_i,
+                    };
+                    layout_info.glyphs.push(pos_glyph);
+                    Ok(())
+                });
+            if let Some(section) = current_section {
+                layout_info.run_geometry.push(RunGeometry {
+                    span_index: section,
+                    bounds: Rect::new(start, run.line_top, end, run.line_top + run.line_height),
+                    strikethrough_y: (run.line_y - self.glyph_info[section].3).round(),
+                    strikethrough_thickness: self.glyph_info[section].4,
+                    underline_y: (run.line_y - self.glyph_info[section].5).round(),
+                    underline_thickness: self.glyph_info[section].4,
+                });
+            }
+
+            result
+        });
+
+        // Check result.
+        result?;
+
+        layout_info.size = box_size;
+        Ok(())
+    }
 }
 
 /// Render information for a corresponding text block.
diff --git a/crates/bevy_ui/src/widget/text.rs b/crates/bevy_ui/src/widget/text.rs
index c84b463ddf3cb..c132bee60165d 100644
--- a/crates/bevy_ui/src/widget/text.rs
+++ b/crates/bevy_ui/src/widget/text.rs
@@ -319,72 +319,66 @@ pub fn measure_text_system(
 /// It does not modify or observe existing ones. The exception is when adding new glyphs to a [`bevy_text::FontAtlas`].
 pub fn text_system(
     mut textures: ResMut<Assets<Image>>,
-    fonts: Res<Assets<Font>>,
     mut texture_atlases: ResMut<Assets<TextureAtlasLayout>>,
     mut font_atlas_set: ResMut<FontAtlasSet>,
     mut text_pipeline: ResMut<TextPipeline>,
     mut text_query: Query<(
-        Entity,
         Ref<ComputedNode>,
         &TextLayout,
         &mut TextLayoutInfo,
         &mut TextNodeFlags,
         &mut ComputedTextBlock,
     )>,
-    mut text_reader: TextUiReader,
+    text_font_query: Query<&TextFont>,
     mut font_system: ResMut<CosmicFontSystem>,
     mut swash_cache: ResMut<SwashCache>,
 ) {
-    for (entity, node, block, text_layout_info, mut text_flags, mut computed) in &mut text_query {
-        // Skip the text node if it is waiting for a new measure func
-        if text_flags.needs_measure_fn {
-            continue;
-        }
-
-        if !(node.is_changed() || text_flags.needs_recompute) {
-            continue;
-        }
+    for (node, block, mut text_layout_info, mut text_flags, mut computed) in &mut text_query {
+        if node.is_changed() || text_flags.needs_recompute {
+            // Skip the text node if it is waiting for a new measure func
+            if text_flags.needs_measure_fn {
+                continue;
+            }
 
-        let physical_node_size = if block.linebreak == LineBreak::NoWrap {
-            // With `NoWrap` set, no constraints are placed on the width of the text.
-            TextBounds::UNBOUNDED
-        } else {
-            // `scale_factor` is already multiplied by `UiScale`
-            TextBounds::new(node.unrounded_size.x, node.unrounded_size.y)
-        };
+            let scale_factor = node.inverse_scale_factor().recip().into();
+            let physical_node_size = if block.linebreak == LineBreak::NoWrap {
+                // With `NoWrap` set, no constraints are placed on the width of the text.
+                TextBounds::UNBOUNDED
+            } else {
+                // `scale_factor` is already multiplied by `UiScale`
+                TextBounds::new(node.unrounded_size.x, node.unrounded_size.y)
+            };
 
-        let text_layout_info = text_layout_info.into_inner();
-        match text_pipeline.queue_text(
-            text_layout_info,
-            &fonts,
-            text_reader.iter(entity),
-            node.inverse_scale_factor.recip() as f64,
-            block,
-            physical_node_size,
-            &mut font_atlas_set,
-            &mut texture_atlases,
-            &mut textures,
-            &mut computed,
-            &mut font_system,
-            &mut swash_cache,
-        ) {
-            Err(TextError::NoSuchFont) => {
-                // There was an error processing the text layout, try again next frame
-                text_flags.needs_recompute = true;
-            }
-            Err(
-                e @ (TextError::FailedToAddGlyph(_)
-                | TextError::FailedToGetGlyphImage(_)
-                | TextError::MissingAtlasLayout
-                | TextError::MissingAtlasTexture
-                | TextError::InconsistentAtlasState),
-            ) => {
-                panic!("Fatal error when processing text: {e}.");
-            }
-            Ok(()) => {
-                text_layout_info.scale_factor = node.inverse_scale_factor.recip();
-                text_layout_info.size *= node.inverse_scale_factor;
-                text_flags.needs_recompute = false;
+            match text_pipeline.update_text_layout_info(
+                &mut text_layout_info,
+                text_font_query,
+                scale_factor,
+                &mut font_atlas_set,
+                &mut texture_atlases,
+                &mut textures,
+                &mut computed,
+                &mut font_system,
+                &mut swash_cache,
+                physical_node_size,
+            ) {
+                Err(TextError::NoSuchFont) => {
+                    // There was an error processing the text layout, try again next frame
+                    text_flags.needs_recompute = true;
+                }
+                Err(
+                    e @ (TextError::FailedToAddGlyph(_)
+                    | TextError::FailedToGetGlyphImage(_)
+                    | TextError::MissingAtlasLayout
+                    | TextError::MissingAtlasTexture
+                    | TextError::InconsistentAtlasState),
+                ) => {
+                    panic!("Fatal error when processing text: {e}.");
+                }
+                Ok(()) => {
+                    text_layout_info.scale_factor = scale_factor as f32;
+                    text_layout_info.size *= node.inverse_scale_factor();
+                    text_flags.needs_recompute = false;
+                }
             }
         }
     }

From 008ca5d1b3fb99ae866d9dfcf02e399f7e17d32e Mon Sep 17 00:00:00 2001
From: Kevin Reid <kpreid@switchb.org>
Date: Sat, 6 Dec 2025 18:39:24 -0800
Subject: [PATCH 022/133] Remove `getrandom` dependency from `bevy_platform`.
 (#21971)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Fixes #21336.

`bevy_platform` and dependents such as `bevy_ecs` may be used on web
without incurring the `RUSTFLAGS` requirement of `getrandom`.

## Solution

Remove dependency `bevy_platform` → `getrandom`.

Note: There was a suggestion of adding a dependency `bevy_math` →
`getrandom` to replace it, but `bevy_math` does not actually depend
transitively on `getrandom` at all (except in its examples), nor does
any other Bevy library. If making `getrandom` work is desired for
convenience of Bevy users, we could add `bevy_internal/web` →
`getrandom/wasm_js`, but that would not be for the use of Bevy itself at
all, and it would mean that Bevy users would hit the `RUSTFLAGS`
requirement even if they don't truly need it.

## Testing

- Ran `cargo run -p ci -- compile` and `cargo run -p ci -- test`.
- Tested depending on this version of `bevy_ecs` in my own wasm32
project.
- Have not tested any further feature combinations.
---
 crates/bevy_platform/Cargo.toml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/crates/bevy_platform/Cargo.toml b/crates/bevy_platform/Cargo.toml
index c428a6bf7b79d..e17d5a4bc0c72 100644
--- a/crates/bevy_platform/Cargo.toml
+++ b/crates/bevy_platform/Cargo.toml
@@ -50,7 +50,6 @@ critical-section = ["dep:critical-section", "portable-atomic/critical-section"]
 web = [
   "std",
   "dep:web-time",
-  "dep:getrandom",
   "dep:wasm-bindgen-futures",
   "dep:wasm-bindgen",
   "dep:js-sys",
@@ -76,9 +75,6 @@ rayon = { version = "1", default-features = false, optional = true }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 web-time = { version = "1.1", default-features = false, optional = true }
-getrandom = { version = "0.3.0", default-features = false, optional = true, features = [
-  "wasm_js",
-] }
 wasm-bindgen-futures = { version = "0.4", default-features = false, optional = true }
 futures-channel = { version = "0.3", default-features = false }
 js-sys = { version = "0.3", default-features = false, optional = true }

From ad1c38a3f9624b7883075e140eebe4977ed7fa53 Mon Sep 17 00:00:00 2001
From: andriyDev <andriydzikh@gmail.com>
Date: Sun, 7 Dec 2025 10:00:57 -0800
Subject: [PATCH 023/133] Fix the doc test for WebAssetPlugin (#21968)

# Objective

- Fix `cargo t -p bevy_asset --all-features`.
    - Note: `all-features` do not run on CI!
- The doc tests for the `WebAssetPlugin` don't compile at all. There are
bad imports and we don't even add the `AssetPlugin`.

## Solution

- Add missing imports, and add missing plugins to the `App`.

## Testing

- Ran `cargo t -p bevy_asset --all-features` and it passes now!
---
 crates/bevy_asset/src/io/web.rs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/crates/bevy_asset/src/io/web.rs b/crates/bevy_asset/src/io/web.rs
index 196e36325c1a2..e6ec6d615bf3a 100644
--- a/crates/bevy_asset/src/io/web.rs
+++ b/crates/bevy_asset/src/io/web.rs
@@ -23,12 +23,12 @@ use tracing::warn;
 /// Example usage:
 ///
 /// ```rust
-/// # use bevy_app::{App, Startup};
-/// # use bevy_ecs::prelude::{Commands, Res};
-/// # use bevy_asset::web::{WebAssetPlugin, AssetServer};
+/// # use bevy_app::{App, Startup, TaskPoolPlugin};
+/// # use bevy_ecs::prelude::{Commands, Component, Res};
+/// # use bevy_asset::{Asset, AssetApp, AssetPlugin, AssetServer, Handle, io::web::WebAssetPlugin};
+/// # use bevy_reflect::TypePath;
 /// # struct DefaultPlugins;
-/// # impl DefaultPlugins { fn set(plugin: WebAssetPlugin) -> WebAssetPlugin { plugin } }
-/// # use bevy_asset::web::AssetServer;
+/// # impl DefaultPlugins { fn set(&self, plugin: WebAssetPlugin) -> WebAssetPlugin { plugin } }
 /// # #[derive(Asset, TypePath, Default)]
 /// # struct Image;
 /// # #[derive(Component)]
@@ -39,6 +39,8 @@ use tracing::warn;
 ///     .add_plugins(DefaultPlugins.set(WebAssetPlugin {
 ///         silence_startup_warning: true,
 ///     }))
+/// #   .add_plugins((TaskPoolPlugin::default(), AssetPlugin::default()))
+/// #   .init_asset::<Image>()
 /// #   .add_systems(Startup, setup).run();
 /// # }
 /// // ...

From 25d4cedfc686bead62a7cbeb85a8312e7d8e1a5c Mon Sep 17 00:00:00 2001
From: Chris Biscardi <chris@christopherbiscardi.com>
Date: Sun, 7 Dec 2025 10:18:36 -0800
Subject: [PATCH 024/133] enable easier modification of image samplers in image
 loaders (#22042)

# Objective

Previously, to modify a sampler when loading an image with settings it
was required to set all fields individually. Much of the time, these
settings are all the same so to enable repeating textures you have to
set the address_mode 3 times. To set filters you have to set them
another 3 times.

```rust
MeshMaterial3d(materials.add(
    StandardMaterial {
        base_color_texture:
            Some(
                asset_server.load_with_settings(
                    "floor_graph_base_color.png",
                    |settings: &mut ImageLoaderSettings| {
                        let  descriptor = settings.sampler.get_or_init_descriptor();
                        descriptor.address_mode_u = bevy::image::ImageAddressMode::Repeat;
                        descriptor.address_mode_v = bevy::image::ImageAddressMode::Repeat;
                        descriptor.address_mode_w = bevy::image::ImageAddressMode::Repeat;
                        descriptor.mag_filter = ImageFilterMode::Linear;
                        descriptor.min_filter = ImageFilterMode::Linear;
                        descriptor.mipmap_filter = ImageFilterMode::Linear;
                    }
                ),
            ),
        unlit: true,
        cull_mode: None,
        uv_transform: Affine2::from_scale(Vec2::new(30., 90.)),
        ..default()
    },
)),
```

## Solution

Add two new helpers, loosely modeled after the `Transform::with_<field>`
functions. Further modifications can still be made to the descriptor for
use cases which want to set one of the three fields differently, or
additionally set anisotropy_clamp, etc.

```rust
let descriptor = settings
    .sampler
    .get_or_init_descriptor()
    .set_address_mode(ImageAddressMode::Repeat)
    .set_filter(ImageFilterMode::Linear);
```

## Testing

New test in bevy_image

## Showcase

```rust
MeshMaterial3d(materials.add(
    StandardMaterial {
        base_color_texture:
            Some(
                asset_server.load_with_settings(
                    "floor_graph_base_color.png",
                    |settings: &mut ImageLoaderSettings| {
                        let descriptor = settings
                            .sampler
                            .get_or_init_descriptor()
                            .set_address_mode(ImageAddressMode::Repeat)
                            .set_filter(ImageFilterMode::Linear);
                    }
                ),
            ),
        unlit: true,
        cull_mode: None,
        uv_transform: Affine2::from_scale(Vec2::new(30., 90.)),
        ..default()
    },
)),
```

This PR now includes:

- `set_filter`
- `set_address_mode`
- `set_anisotropic_filter`

---------

Co-authored-by: Greeble <166992735+greeble-dev@users.noreply.github.com>
---
 crates/bevy_image/src/image.rs | 60 ++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/crates/bevy_image/src/image.rs b/crates/bevy_image/src/image.rs
index b296ecdf9388c..aeeb58b1a7d98 100644
--- a/crates/bevy_image/src/image.rs
+++ b/crates/bevy_image/src/image.rs
@@ -699,6 +699,36 @@ impl ImageSamplerDescriptor {
         }
     }
 
+    /// Returns this sampler descriptor with a new `ImageFilterMode` min, mag, and mipmap filters
+    #[inline]
+    pub fn set_filter(&mut self, filter: ImageFilterMode) -> &mut Self {
+        self.mag_filter = filter;
+        self.min_filter = filter;
+        self.mipmap_filter = filter;
+        self
+    }
+
+    /// Returns this sampler descriptor with a new `ImageAddressMode` for u, v, and w
+    #[inline]
+    pub fn set_address_mode(&mut self, address_mode: ImageAddressMode) -> &mut Self {
+        self.address_mode_u = address_mode;
+        self.address_mode_v = address_mode;
+        self.address_mode_w = address_mode;
+        self
+    }
+
+    /// Returns this sampler descriptor with an `anisotropy_clamp` value and also
+    /// set filters to `ImageFilterMode::Linear`, which is required to
+    /// use anisotropy.
+    #[inline]
+    pub fn set_anisotropic_filter(&mut self, anisotropy_clamp: u16) -> &mut Self {
+        self.mag_filter = ImageFilterMode::Linear;
+        self.min_filter = ImageFilterMode::Linear;
+        self.mipmap_filter = ImageFilterMode::Linear;
+        self.anisotropy_clamp = anisotropy_clamp;
+        self
+    }
+
     pub fn as_wgpu(&self) -> SamplerDescriptor<Option<&str>> {
         SamplerDescriptor {
             label: self.label.as_deref(),
@@ -2212,4 +2242,34 @@ mod test {
 
         assert!(image.data.as_ref().unwrap().iter().all(|&p| p == 255));
     }
+
+    #[test]
+    fn get_or_init_sampler_modifications() {
+        // given some sampler
+        let mut default_sampler = ImageSampler::Default;
+        // a load_with_settings call wants to customize the descriptor
+        let my_sampler_in_a_loader = default_sampler
+            .get_or_init_descriptor()
+            .set_filter(ImageFilterMode::Linear)
+            .set_address_mode(ImageAddressMode::Repeat);
+
+        assert_eq!(
+            my_sampler_in_a_loader.address_mode_u,
+            ImageAddressMode::Repeat
+        );
+        assert_eq!(my_sampler_in_a_loader.min_filter, ImageFilterMode::Linear);
+    }
+
+    #[test]
+    fn get_or_init_sampler_anisotropy() {
+        // given some sampler
+        let mut default_sampler = ImageSampler::Default;
+        // a load_with_settings call wants to customize the descriptor
+        let my_sampler_in_a_loader = default_sampler
+            .get_or_init_descriptor()
+            .set_anisotropic_filter(8);
+
+        assert_eq!(my_sampler_in_a_loader.min_filter, ImageFilterMode::Linear);
+        assert_eq!(my_sampler_in_a_loader.anisotropy_clamp, 8);
+    }
 }

From 89e41937dd57b824ab8397e8c282b5eab0a4e68a Mon Sep 17 00:00:00 2001
From: JonasJebing <34072795+JonasJebing@users.noreply.github.com>
Date: Sun, 7 Dec 2025 19:20:44 +0100
Subject: [PATCH 025/133] add missing `Iterator::size_hint` overrides, most of
 which cause `ExactSizeIterator::len` to panic (#22035)

# Objective

- Fixes `ExactSizeIterator::len` panic in a few of these iterators.
Note: the std default impl of `ExactSizeIterator::len` has
`assert_eq!(Some(lower), upper);`. I am facing this issue myself with
`<index_set::Iter as ExactSizeIterator>::len`.
- Should slightly improve performance in some cases, where the more
precise `size_hint` causes less allocations (for example when collecting
into a `Vec`)

## Solution

- Add `size_hint` overrides that forward to inner iterators or an
`ExactSizeIterator::len` override in one specific case.

## Testing

- Since the overrides are pretty simple, I mostly didn't add any tests.
- I didn't feel 100% confident in the `WriteBatchIds::size_hint`
implementation, so I added a test there.
---
 crates/bevy_ecs/src/entity/hash_map.rs  |  8 ++++++++
 crates/bevy_ecs/src/entity/hash_set.rs  | 16 ++++++++++++++++
 crates/bevy_ecs/src/entity/index_map.rs | 24 ++++++++++++++++++++++++
 crates/bevy_ecs/src/entity/index_set.rs | 12 ++++++++++++
 crates/bevy_ecs/src/message/messages.rs | 20 ++++++++++++++++++++
 crates/bevy_mesh/src/index.rs           |  9 +++++++++
 6 files changed, 89 insertions(+)

diff --git a/crates/bevy_ecs/src/entity/hash_map.rs b/crates/bevy_ecs/src/entity/hash_map.rs
index d83ea7bae1dcc..505cc440f117f 100644
--- a/crates/bevy_ecs/src/entity/hash_map.rs
+++ b/crates/bevy_ecs/src/entity/hash_map.rs
@@ -176,6 +176,10 @@ impl<'a, V> Iterator for Keys<'a, V> {
     fn next(&mut self) -> Option<Self::Item> {
         self.0.next()
     }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.0.size_hint()
+    }
 }
 
 impl<V> ExactSizeIterator for Keys<'_, V> {}
@@ -234,6 +238,10 @@ impl<V> Iterator for IntoKeys<V> {
     fn next(&mut self) -> Option<Self::Item> {
         self.0.next()
     }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.0.size_hint()
+    }
 }
 
 impl<V> ExactSizeIterator for IntoKeys<V> {}
diff --git a/crates/bevy_ecs/src/entity/hash_set.rs b/crates/bevy_ecs/src/entity/hash_set.rs
index 7fd1ae9011273..8b2e5927e813e 100644
--- a/crates/bevy_ecs/src/entity/hash_set.rs
+++ b/crates/bevy_ecs/src/entity/hash_set.rs
@@ -238,6 +238,10 @@ impl<'a> Iterator for Iter<'a> {
     fn next(&mut self) -> Option<Self::Item> {
         self.0.next()
     }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.0.size_hint()
+    }
 }
 
 impl ExactSizeIterator for Iter<'_> {}
@@ -293,6 +297,10 @@ impl Iterator for IntoIter {
     fn next(&mut self) -> Option<Self::Item> {
         self.0.next()
     }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.0.size_hint()
+    }
 }
 
 impl ExactSizeIterator for IntoIter {}
@@ -345,6 +353,10 @@ impl<'a> Iterator for Drain<'a> {
     fn next(&mut self) -> Option<Self::Item> {
         self.0.next()
     }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.0.size_hint()
+    }
 }
 
 impl ExactSizeIterator for Drain<'_> {}
@@ -394,6 +406,10 @@ impl<'a, F: FnMut(&Entity) -> bool> Iterator for ExtractIf<'a, F> {
     fn next(&mut self) -> Option<Self::Item> {
         self.0.next()
     }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.0.size_hint()
+    }
 }
 
 impl<F: FnMut(&Entity) -> bool> FusedIterator for ExtractIf<'_, F> {}
diff --git a/crates/bevy_ecs/src/entity/index_map.rs b/crates/bevy_ecs/src/entity/index_map.rs
index 3e94f51362c29..1afd28c12b2a8 100644
--- a/crates/bevy_ecs/src/entity/index_map.rs
+++ b/crates/bevy_ecs/src/entity/index_map.rs
@@ -861,6 +861,10 @@ impl<'a, V> Iterator for Iter<'a, V> {
     fn next(&mut self) -> Option<Self::Item> {
         self.0.next()
     }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.0.size_hint()
+    }
 }
 
 impl<V> DoubleEndedIterator for Iter<'_, V> {
@@ -934,6 +938,10 @@ impl<'a, V> Iterator for IterMut<'a, V> {
     fn next(&mut self) -> Option<Self::Item> {
         self.0.next()
     }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.0.size_hint()
+    }
 }
 
 impl<V> DoubleEndedIterator for IterMut<'_, V> {
@@ -1004,6 +1012,10 @@ impl<V> Iterator for IntoIter<V> {
     fn next(&mut self) -> Option<Self::Item> {
         self.0.next()
     }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.0.size_hint()
+    }
 }
 
 impl<V> DoubleEndedIterator for IntoIter<V> {
@@ -1072,6 +1084,10 @@ impl<V> Iterator for Drain<'_, V> {
     fn next(&mut self) -> Option<Self::Item> {
         self.0.next()
     }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.0.size_hint()
+    }
 }
 
 impl<V> DoubleEndedIterator for Drain<'_, V> {
@@ -1120,6 +1136,10 @@ impl<'a, V> Iterator for Keys<'a, V> {
     fn next(&mut self) -> Option<Self::Item> {
         self.0.next()
     }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.0.size_hint()
+    }
 }
 
 impl<V> DoubleEndedIterator for Keys<'_, V> {
@@ -1188,6 +1208,10 @@ impl<V> Iterator for IntoKeys<V> {
     fn next(&mut self) -> Option<Self::Item> {
         self.0.next()
     }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.0.size_hint()
+    }
 }
 
 impl<V> DoubleEndedIterator for IntoKeys<V> {
diff --git a/crates/bevy_ecs/src/entity/index_set.rs b/crates/bevy_ecs/src/entity/index_set.rs
index 42f420a211a23..73bbecde6688b 100644
--- a/crates/bevy_ecs/src/entity/index_set.rs
+++ b/crates/bevy_ecs/src/entity/index_set.rs
@@ -582,6 +582,10 @@ impl<'a> Iterator for Iter<'a> {
     fn next(&mut self) -> Option<Self::Item> {
         self.0.next()
     }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.0.size_hint()
+    }
 }
 
 impl DoubleEndedIterator for Iter<'_> {
@@ -651,6 +655,10 @@ impl Iterator for IntoIter {
     fn next(&mut self) -> Option<Self::Item> {
         self.0.next()
     }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.0.size_hint()
+    }
 }
 
 impl DoubleEndedIterator for IntoIter {
@@ -723,6 +731,10 @@ impl<'a> Iterator for Drain<'a> {
     fn next(&mut self) -> Option<Self::Item> {
         self.0.next()
     }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.0.size_hint()
+    }
 }
 
 impl DoubleEndedIterator for Drain<'_> {
diff --git a/crates/bevy_ecs/src/message/messages.rs b/crates/bevy_ecs/src/message/messages.rs
index 39a3992298023..bc708c734daeb 100644
--- a/crates/bevy_ecs/src/message/messages.rs
+++ b/crates/bevy_ecs/src/message/messages.rs
@@ -382,6 +382,11 @@ impl<E: Message> Iterator for WriteBatchIds<E> {
 
         result
     }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        let len = <Self as ExactSizeIterator>::len(self);
+        (len, Some(len))
+    }
 }
 
 impl<E: Message> ExactSizeIterator for WriteBatchIds<E> {
@@ -425,4 +430,19 @@ mod tests {
         assert_eq!(test_messages.len(), 2); // Messages are double-buffered, so we see 2 + 0 = 2
         assert_eq!(test_messages.iter_current_update_messages().count(), 0);
     }
+
+    #[test]
+    fn write_batch_iter_size_hint() {
+        #[derive(Message, Clone, Copy)]
+        struct TestMessage;
+
+        let mut test_messages = Messages::<TestMessage>::default();
+        let write_batch_ids = test_messages.write_batch([TestMessage; 4]);
+        let expected_len = 4;
+        assert_eq!(write_batch_ids.len(), expected_len);
+        assert_eq!(
+            write_batch_ids.size_hint(),
+            (expected_len, Some(expected_len))
+        );
+    }
 }
diff --git a/crates/bevy_mesh/src/index.rs b/crates/bevy_mesh/src/index.rs
index 87d81cc3f2fa2..6f89f2dfd59a1 100644
--- a/crates/bevy_mesh/src/index.rs
+++ b/crates/bevy_mesh/src/index.rs
@@ -33,6 +33,15 @@ where
             FourIterators::Fourth(iter) => iter.next(),
         }
     }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        match self {
+            FourIterators::First(iter) => iter.size_hint(),
+            FourIterators::Second(iter) => iter.size_hint(),
+            FourIterators::Third(iter) => iter.size_hint(),
+            FourIterators::Fourth(iter) => iter.size_hint(),
+        }
+    }
 }
 
 /// An error that occurred while trying to invert the winding of a [`Mesh`](super::Mesh).

From 84e12788bd099623f02a8d97189e5a73b2537e2d Mon Sep 17 00:00:00 2001
From: ickshonpe <david.curthoys@googlemail.com>
Date: Sun, 7 Dec 2025 18:21:57 +0000
Subject: [PATCH 026/133] Update size and metrics after `set_rich_text` in
 `TextPipeline::update_buffer` (#22021)

# Objective

Rearrange the order that cosmic text's properties are set for improved
performance.

## Solution

Update size and metrics after `set_rich_text` in
`TextPipeline::update_buffer`

## Testing

yellow = this PR, red = main:

```
cargo run --example many_glyphs --features=trace_tracy,debug --release -- --recompute-text
```

<img width="1610" height="605" alt="reorder"
src="https://github.com/user-attachments/assets/4819aa79-a147-45ab-8636-3e17f81462b2"
/>

<img width="1603" height="617" alt="reorder-measure-text"
src="https://github.com/user-attachments/assets/eb74569d-79e1-4138-9283-641eae8fd2ab"
/>
---
 crates/bevy_text/src/pipeline.rs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/crates/bevy_text/src/pipeline.rs b/crates/bevy_text/src/pipeline.rs
index 08d98e8dbea14..e175c93f13791 100644
--- a/crates/bevy_text/src/pipeline.rs
+++ b/crates/bevy_text/src/pipeline.rs
@@ -191,7 +191,6 @@ impl TextPipeline {
 
         // Update the buffer.
         let buffer = &mut computed.buffer;
-        buffer.set_size(font_system, bounds.width, bounds.height);
 
         buffer.set_wrap(
             font_system,
@@ -213,11 +212,10 @@ impl TextPipeline {
 
         // Workaround for alignment not working for unbounded text.
         // See https://github.com/pop-os/cosmic-text/issues/343
-        if bounds.width.is_none() && justify != Justify::Left {
-            let dimensions = buffer_dimensions(buffer);
-            // `set_size` causes a re-layout to occur.
-            buffer.set_size(font_system, Some(dimensions.x), bounds.height);
-        }
+        let width = (bounds.width.is_none() && justify != Justify::Left)
+            .then(|| buffer_dimensions(buffer).x)
+            .or(bounds.width);
+        buffer.set_size(font_system, width, bounds.height);
 
         // Recover the spans buffer.
         spans.clear();

From 9f4b18d00eb7c6f90a37a4d822e89226846d05d8 Mon Sep 17 00:00:00 2001
From: andriyDev <andriydzikh@gmail.com>
Date: Sun, 7 Dec 2025 10:25:26 -0800
Subject: [PATCH 027/133] Release the asset infos lock before acquiring the
 file transaction lock. (#22017)

# Objective

- Fix the first flake related to #22001.
- We had a double lock problem. We would first lock `asset_infos`, then
lock one of the assets within `asset_infos` **and then dropped the
`asset_infos` lock**. This means however that if a process needs to
access `asset_infos` (which is necessary for loading nested assets
during processing), we'll have one thread trying to lock 1) asset_infos,
2) per-asset lock, and we'll have another thread trying to lock 1)
per-asset lock (we've already dropped the asset_infos lock), 2)
asset_infos. A classic deadlock!

## Solution

- Before locking the per-asset lock, we clone the `Arc<RwLock>` out of
the `asset_infos`, drop the `asset_infos`, and only then lock the
per-asset lock. This ensures that we never hang on the `asset_infos`
lock when just trying to fetch a single asset.
- Make all the access to `asset_infos` "short" - they get what they need
out of `asset_infos` and then drop the lock as soon as possible.
- I also used `?` to cleanup some methods in `ProcessorAssetInfos`,
where previously it was "remove the asset info, then have one big `if
let` after it". Now we just return early if the value is none.
- I also happened to fix a weird case where the new path in a rename
wasn't guarded by a transaction lock. Now it is!

## Testing

- Running without this fix I get "Ran out of loops" from the
`only_reprocesses_wrong_hash_on_startup` test quite quickly (after a
minute or so). With this fix, I now only get the assertion failure
problem. If I also skip that assertion, the test hasn't flaked for a
while! Yay, no more deadlock!
---
 crates/bevy_asset/src/processor/mod.rs | 233 ++++++++++++++-----------
 1 file changed, 131 insertions(+), 102 deletions(-)

diff --git a/crates/bevy_asset/src/processor/mod.rs b/crates/bevy_asset/src/processor/mod.rs
index 516f83448be1f..8e58b120fb934 100644
--- a/crates/bevy_asset/src/processor/mod.rs
+++ b/crates/bevy_asset/src/processor/mod.rs
@@ -642,15 +642,20 @@ impl AssetProcessor {
     async fn handle_removed_asset(&self, source: &AssetSource, path: PathBuf) {
         let asset_path = AssetPath::from(path).with_source(source.id());
         debug!("Removing processed {asset_path} because source was removed");
-        let mut infos = self.data.processing_state.asset_infos.write().await;
-        if let Some(info) = infos.get(&asset_path) {
-            // we must wait for uncontested write access to the asset source to ensure existing readers / writers
-            // can finish their operations
-            let _write_lock = info.file_transaction_lock.write();
-            self.remove_processed_asset_and_meta(source, asset_path.path())
-                .await;
-        }
-        infos.remove(&asset_path).await;
+        let lock = {
+            // Scope the infos lock so we don't hold up other processing for too long.
+            let mut infos = self.data.processing_state.asset_infos.write().await;
+            infos.remove(&asset_path).await
+        };
+        let Some(lock) = lock else {
+            return;
+        };
+
+        // we must wait for uncontested write access to the asset source to ensure existing
+        // readers/writers can finish their operations
+        let _write_lock = lock.write();
+        self.remove_processed_asset_and_meta(source, asset_path.path())
+            .await;
     }
 
     /// Handles a renamed source asset by moving its processed results to the new location and updating in-memory paths + metadata.
@@ -662,24 +667,29 @@ impl AssetProcessor {
         new: PathBuf,
         new_task_sender: &async_channel::Sender<(AssetSourceId<'static>, PathBuf)>,
     ) {
-        let mut infos = self.data.processing_state.asset_infos.write().await;
         let old = AssetPath::from(old).with_source(source.id());
         let new = AssetPath::from(new).with_source(source.id());
         let processed_writer = source.processed_writer().unwrap();
-        if let Some(info) = infos.get(&old) {
-            // we must wait for uncontested write access to the asset source to ensure existing readers / writers
-            // can finish their operations
-            let _write_lock = info.file_transaction_lock.write();
-            processed_writer
-                .rename(old.path(), new.path())
-                .await
-                .unwrap();
-            processed_writer
-                .rename_meta(old.path(), new.path())
-                .await
-                .unwrap();
-        }
-        infos.rename(&old, &new, new_task_sender).await;
+        let result = {
+            // Scope the infos lock so we don't hold up other processing for too long.
+            let mut infos = self.data.processing_state.asset_infos.write().await;
+            infos.rename(&old, &new, new_task_sender).await
+        };
+        let Some((old_lock, new_lock)) = result else {
+            return;
+        };
+        // we must wait for uncontested write access to both assets to ensure existing
+        // readers/writers can finish their operations
+        let _old_write_lock = old_lock.write();
+        let _new_write_lock = new_lock.write();
+        processed_writer
+            .rename(old.path(), new.path())
+            .await
+            .unwrap();
+        processed_writer
+            .rename_meta(old.path(), new.path())
+            .await
+            .unwrap();
     }
 
     async fn queue_processing_tasks_for_folder(
@@ -1069,9 +1079,15 @@ impl AssetProcessor {
         // Note: this lock must remain alive until all processed asset and meta writes have finished (or failed)
         // See ProcessedAssetInfo::file_transaction_lock docs for more info
         let _transaction_lock = {
-            let mut infos = self.data.processing_state.asset_infos.write().await;
-            let info = infos.get_or_insert(asset_path.clone());
-            info.file_transaction_lock.write_arc().await
+            let lock = {
+                let mut infos = self.data.processing_state.asset_infos.write().await;
+                let info = infos.get_or_insert(asset_path.clone());
+                // Clone out the transaction lock first and then lock after we've dropped the
+                // asset_infos. Otherwise, trying to lock a single path can block all other paths to
+                // (leading to deadlocks).
+                info.file_transaction_lock.clone()
+            };
+            lock.write_arc().await
         };
 
         // NOTE: if processing the asset fails this will produce an "unfinished" log entry, forcing a rebuild on next run.
@@ -1317,11 +1333,17 @@ impl ProcessingState {
         &self,
         path: &AssetPath<'static>,
     ) -> Result<RwLockReadGuardArc<()>, AssetReaderError> {
-        let infos = self.asset_infos.read().await;
-        let info = infos
-            .get(path)
-            .ok_or_else(|| AssetReaderError::NotFound(path.path().to_owned()))?;
-        Ok(info.file_transaction_lock.read_arc().await)
+        let lock = {
+            let infos = self.asset_infos.read().await;
+            let info = infos
+                .get(path)
+                .ok_or_else(|| AssetReaderError::NotFound(path.path().to_owned()))?;
+            // Clone out the transaction lock first and then lock after we've dropped the
+            // asset_infos. Otherwise, trying to lock a single path can block all other paths to
+            // (leading to deadlocks).
+            info.file_transaction_lock.clone()
+        };
+        Ok(lock.read_arc().await)
     }
 
     /// Returns a future that will not finish until the path has been processed.
@@ -1603,95 +1625,102 @@ impl ProcessorAssetInfos {
         }
     }
 
-    /// Remove the info for the given path. This should only happen if an asset's source is removed / non-existent
-    async fn remove(&mut self, asset_path: &AssetPath<'static>) {
-        let info = self.infos.remove(asset_path);
-        if let Some(info) = info {
-            if let Some(processed_info) = info.processed_info {
-                self.clear_dependencies(asset_path, processed_info);
-            }
-            // Tell all listeners this asset does not exist
-            info.status_sender
-                .broadcast(ProcessStatus::NonExistent)
-                .await
-                .unwrap();
-            if !info.dependents.is_empty() {
-                error!(
+    /// Remove the info for the given path. This should only happen if an asset's source is
+    /// removed/non-existent. Returns the transaction lock for the asset, or [`None`] if the asset
+    /// path does not exist.
+    async fn remove(
+        &mut self,
+        asset_path: &AssetPath<'static>,
+    ) -> Option<Arc<async_lock::RwLock<()>>> {
+        let info = self.infos.remove(asset_path)?;
+        if let Some(processed_info) = info.processed_info {
+            self.clear_dependencies(asset_path, processed_info);
+        }
+        // Tell all listeners this asset does not exist
+        info.status_sender
+            .broadcast(ProcessStatus::NonExistent)
+            .await
+            .unwrap();
+        if !info.dependents.is_empty() {
+            error!(
                     "The asset at {asset_path} was removed, but it had assets that depend on it to be processed. Consider updating the path in the following assets: {:?}",
                     info.dependents
                 );
-                self.non_existent_dependents
-                    .insert(asset_path.clone(), info.dependents);
-            }
+            self.non_existent_dependents
+                .insert(asset_path.clone(), info.dependents);
         }
+
+        Some(info.file_transaction_lock)
     }
 
-    /// Remove the info for the given path. This should only happen if an asset's source is removed / non-existent
+    /// Remove the info for the old path, and move over its info to the new path. This should only
+    /// happen if an asset's source is removed/non-existent. Returns the transaction locks for the
+    /// old and new assets respectively, or [`None`] if the old path does not exist.
     async fn rename(
         &mut self,
         old: &AssetPath<'static>,
         new: &AssetPath<'static>,
         new_task_sender: &async_channel::Sender<(AssetSourceId<'static>, PathBuf)>,
-    ) {
-        let info = self.infos.remove(old);
-        if let Some(mut info) = info {
-            if !info.dependents.is_empty() {
-                // TODO: We can't currently ensure "moved" folders with relative paths aren't broken because AssetPath
-                // doesn't distinguish between absolute and relative paths. We have "erased" relativeness. In the short term,
-                // we could do "remove everything in a folder and re-add", but that requires full rebuilds / destroying the cache.
-                // If processors / loaders could enumerate dependencies, we could check if the new deps line up with a rename.
-                // If deps encoded "relativeness" as part of loading, that would also work (this seems like the right call).
-                // TODO: it would be nice to log an error here for dependents that aren't also being moved + fixed.
-                // (see the remove impl).
-                error!(
+    ) -> Option<(Arc<async_lock::RwLock<()>>, Arc<async_lock::RwLock<()>>)> {
+        let mut info = self.infos.remove(old)?;
+        if !info.dependents.is_empty() {
+            // TODO: We can't currently ensure "moved" folders with relative paths aren't broken because AssetPath
+            // doesn't distinguish between absolute and relative paths. We have "erased" relativeness. In the short term,
+            // we could do "remove everything in a folder and re-add", but that requires full rebuilds / destroying the cache.
+            // If processors / loaders could enumerate dependencies, we could check if the new deps line up with a rename.
+            // If deps encoded "relativeness" as part of loading, that would also work (this seems like the right call).
+            // TODO: it would be nice to log an error here for dependents that aren't also being moved + fixed.
+            // (see the remove impl).
+            error!(
                     "The asset at {old} was removed, but it had assets that depend on it to be processed. Consider updating the path in the following assets: {:?}",
                     info.dependents
                 );
-                self.non_existent_dependents
-                    .insert(old.clone(), core::mem::take(&mut info.dependents));
-            }
-            if let Some(processed_info) = &info.processed_info {
-                // Update "dependent" lists for this asset's "process dependencies" to use new path.
-                for dep in &processed_info.process_dependencies {
-                    if let Some(info) = self.infos.get_mut(&dep.path) {
-                        info.dependents.remove(old);
-                        info.dependents.insert(new.clone());
-                    } else if let Some(dependents) = self.non_existent_dependents.get_mut(&dep.path)
-                    {
-                        dependents.remove(old);
-                        dependents.insert(new.clone());
-                    }
+            self.non_existent_dependents
+                .insert(old.clone(), core::mem::take(&mut info.dependents));
+        }
+        if let Some(processed_info) = &info.processed_info {
+            // Update "dependent" lists for this asset's "process dependencies" to use new path.
+            for dep in &processed_info.process_dependencies {
+                if let Some(info) = self.infos.get_mut(&dep.path) {
+                    info.dependents.remove(old);
+                    info.dependents.insert(new.clone());
+                } else if let Some(dependents) = self.non_existent_dependents.get_mut(&dep.path) {
+                    dependents.remove(old);
+                    dependents.insert(new.clone());
                 }
             }
-            // Tell all listeners this asset no longer exists
-            info.status_sender
-                .broadcast(ProcessStatus::NonExistent)
-                .await
-                .unwrap();
-            let dependents: Vec<AssetPath<'static>> = {
-                let new_info = self.get_or_insert(new.clone());
-                new_info.processed_info = info.processed_info;
-                new_info.status = info.status;
-                // Ensure things waiting on the new path are informed of the status of this asset
-                if let Some(status) = new_info.status {
-                    new_info.status_sender.broadcast(status).await.unwrap();
-                }
-                new_info.dependents.iter().cloned().collect()
-            };
-            // Queue the asset for a reprocess check, in case it needs new meta.
+        }
+        // Tell all listeners this asset no longer exists
+        info.status_sender
+            .broadcast(ProcessStatus::NonExistent)
+            .await
+            .unwrap();
+        let new_info = self.get_or_insert(new.clone());
+        new_info.processed_info = info.processed_info;
+        new_info.status = info.status;
+        // Ensure things waiting on the new path are informed of the status of this asset
+        if let Some(status) = new_info.status {
+            new_info.status_sender.broadcast(status).await.unwrap();
+        }
+        let dependents = new_info.dependents.iter().cloned().collect::<Vec<_>>();
+        // Queue the asset for a reprocess check, in case it needs new meta.
+        let _ = new_task_sender
+            .send((new.source().clone_owned(), new.path().to_owned()))
+            .await;
+        for dependent in dependents {
+            // Queue dependents for reprocessing because they might have been waiting for this asset.
             let _ = new_task_sender
-                .send((new.source().clone_owned(), new.path().to_owned()))
+                .send((
+                    dependent.source().clone_owned(),
+                    dependent.path().to_owned(),
+                ))
                 .await;
-            for dependent in dependents {
-                // Queue dependents for reprocessing because they might have been waiting for this asset.
-                let _ = new_task_sender
-                    .send((
-                        dependent.source().clone_owned(),
-                        dependent.path().to_owned(),
-                    ))
-                    .await;
-            }
         }
+
+        Some((
+            info.file_transaction_lock,
+            new_info.file_transaction_lock.clone(),
+        ))
     }
 
     fn clear_dependencies(&mut self, asset_path: &AssetPath<'static>, removed_info: ProcessedInfo) {

From 149cbabda7d99e54200a69aaba42a976a9fdf845 Mon Sep 17 00:00:00 2001
From: ickshonpe <david.curthoys@googlemail.com>
Date: Sun, 7 Dec 2025 18:27:00 +0000
Subject: [PATCH 028/133] compute the text buffer size during layout updates
 (#22010)

# Objective

`queue_text` does a second pass to compute the size of the text buffer,
this could be moved inside the layout update loop instead.

## Solution

Do the buffer size computation inside the update loop.
---
 crates/bevy_text/src/pipeline.rs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/crates/bevy_text/src/pipeline.rs b/crates/bevy_text/src/pipeline.rs
index e175c93f13791..f3ad73b1c9d99 100644
--- a/crates/bevy_text/src/pipeline.rs
+++ b/crates/bevy_text/src/pipeline.rs
@@ -313,9 +313,11 @@ impl TextPipeline {
         }
 
         let buffer = &mut computed.buffer;
-        let box_size = buffer_dimensions(buffer);
+        let mut box_size = Vec2::ZERO;
 
         let result = buffer.layout_runs().try_for_each(|run| {
+            box_size.x = box_size.x.max(run.line_w);
+            box_size.y += run.line_height;
             let mut current_section: Option<usize> = None;
             let mut start = 0.;
             let mut end = 0.;
@@ -441,7 +443,7 @@ impl TextPipeline {
         // Check result.
         result?;
 
-        layout_info.size = box_size;
+        layout_info.size = box_size.ceil();
         Ok(())
     }
 
@@ -551,9 +553,11 @@ impl TextPipeline {
 
         let buffer = &mut computed.buffer;
         buffer.set_size(font_system, bounds.width, bounds.height);
-        let box_size = buffer_dimensions(buffer);
+        let mut box_size = Vec2::ZERO;
 
         let result = buffer.layout_runs().try_for_each(|run| {
+            box_size.x = box_size.x.max(run.line_w);
+            box_size.y += run.line_height;
             let mut current_section: Option<usize> = None;
             let mut start = 0.;
             let mut end = 0.;

From 49d44332a53679f69eda380e9577222d55a65175 Mon Sep 17 00:00:00 2001
From: ickshonpe <david.curthoys@googlemail.com>
Date: Sun, 7 Dec 2025 18:28:35 +0000
Subject: [PATCH 029/133] `TextLayoutInfo::clear` (#22006)

# Objective

Bevy text cosmic text cleanup, add a `clear` method to `TextLayoutInfo`.

## Solution

Add a `clear` method to `TextLayoutInfo` instead of manual resetting
each field
---
 crates/bevy_text/src/pipeline.rs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/crates/bevy_text/src/pipeline.rs b/crates/bevy_text/src/pipeline.rs
index f3ad73b1c9d99..40a428510dfa8 100644
--- a/crates/bevy_text/src/pipeline.rs
+++ b/crates/bevy_text/src/pipeline.rs
@@ -254,9 +254,7 @@ impl TextPipeline {
         font_system: &mut CosmicFontSystem,
         swash_cache: &mut SwashCache,
     ) -> Result<(), TextError> {
-        layout_info.glyphs.clear();
-        layout_info.run_geometry.clear();
-        layout_info.size = Default::default();
+        layout_info.clear();
 
         // Clear this here at the focal point of text rendering to ensure the field's lifecycle has strong boundaries.
         computed.needs_rerender = false;
@@ -709,6 +707,16 @@ pub struct TextLayoutInfo {
     pub size: Vec2,
 }
 
+impl TextLayoutInfo {
+    /// Clear the layout, retaining capacity
+    pub fn clear(&mut self) {
+        self.scale_factor = 1.;
+        self.glyphs.clear();
+        self.run_geometry.clear();
+        self.size = Vec2::ZERO;
+    }
+}
+
 /// Geometry of a text run used to render text decorations like background colors, strikethrough, and underline.
 /// A run in `bevy_text` is a contiguous sequence of glyphs on a line that share the same text attributes like font,
 /// font size, and line height.

From ad15fdaa5f09f9683792b10e7931e97605787738 Mon Sep 17 00:00:00 2001
From: Christian Hughes <9044780+ItsDoot@users.noreply.github.com>
Date: Sun, 7 Dec 2025 12:30:43 -0600
Subject: [PATCH 030/133] Fix unsound `&EntityMutExcept` to `FilteredEntityMut`
 conversion (#21982)

# Objective

Fix an effectively `& &mut` -> `&mut` conversion.

## Solution

Switch it to `&mut &mut` -> `&mut`.
---
 crates/bevy_ecs/src/world/entity_access/except.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/bevy_ecs/src/world/entity_access/except.rs b/crates/bevy_ecs/src/world/entity_access/except.rs
index 92d372e26bd81..6a2261dbf2186 100644
--- a/crates/bevy_ecs/src/world/entity_access/except.rs
+++ b/crates/bevy_ecs/src/world/entity_access/except.rs
@@ -429,8 +429,8 @@ where
     }
 }
 
-impl<'w, 's, B: Bundle> From<&'w EntityMutExcept<'_, 's, B>> for FilteredEntityMut<'w, 's> {
-    fn from(value: &'w EntityMutExcept<'_, 's, B>) -> Self {
+impl<'w, 's, B: Bundle> From<&'w mut EntityMutExcept<'_, 's, B>> for FilteredEntityMut<'w, 's> {
+    fn from(value: &'w mut EntityMutExcept<'_, 's, B>) -> Self {
         // SAFETY:
         // - The FilteredEntityMut has the same component access as the given EntityMutExcept.
         unsafe { FilteredEntityMut::new(value.entity, value.access) }

From 7a7fe9f301634e2fcccb73e160286a70d4e275db Mon Sep 17 00:00:00 2001
From: databasedav <31483365+databasedav@users.noreply.github.com>
Date: Sun, 7 Dec 2025 10:52:57 -0800
Subject: [PATCH 031/133] remove newline between `CursorIcon` struct and its
 attributes (#22002)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

- there's an extra newline

## Solution

- remove the newline

Co-authored-by: François Mockers <francois.mockers@vleue.com>
---
 crates/bevy_window/src/cursor/mod.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/crates/bevy_window/src/cursor/mod.rs b/crates/bevy_window/src/cursor/mod.rs
index 257950d7f645f..bf9bd5c30449f 100644
--- a/crates/bevy_window/src/cursor/mod.rs
+++ b/crates/bevy_window/src/cursor/mod.rs
@@ -24,7 +24,6 @@ pub use crate::cursor::{CustomCursor, CustomCursorImage};
     derive(Reflect),
     reflect(Component, Debug, Default, PartialEq, Clone)
 )]
-
 pub enum CursorIcon {
     #[cfg(feature = "custom_cursor")]
     /// Custom cursor image.

From cb719bed1f456801144dd0f369f10bca5739e510 Mon Sep 17 00:00:00 2001
From: JMS55 <47158642+JMS55@users.noreply.github.com>
Date: Sun, 7 Dec 2025 17:45:55 -0500
Subject: [PATCH 032/133] Update meshlet asset URL (#22058)

Update URL after https://github.com/bevyengine/bevy_asset_files/pull/5

Fixes https://github.com/bevyengine/bevy/issues/21935
---
 examples/3d/meshlet.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/3d/meshlet.rs b/examples/3d/meshlet.rs
index e707de6ed8837..299df303cf263 100644
--- a/examples/3d/meshlet.rs
+++ b/examples/3d/meshlet.rs
@@ -12,7 +12,7 @@ use bevy::{
 use std::f32::consts::PI;
 
 const ASSET_URL: &str =
-    "https://github.com/bevyengine/bevy_asset_files/raw/9bf88c42b9d06a3634eed633d90ce5fab02c31da/meshlet/bunny.meshlet_mesh";
+    "https://github.com/bevyengine/bevy_asset_files/raw/6dccaef517bde74d1969734703709aead7211dbc/meshlet/bunny.meshlet_mesh";
 
 fn main() {
     App::new()

From 0235bdbf3cc1fbd08876a0bddb489b74c74bd3ae Mon Sep 17 00:00:00 2001
From: Christian Hughes <9044780+ItsDoot@users.noreply.github.com>
Date: Sun, 7 Dec 2025 16:48:45 -0600
Subject: [PATCH 033/133] Replace `BTreeMap` with `IndexMap` for stored
 `ScheduleBuildPass`es (#21930)

# Objective

- Part of #20115

We currently store schedule build passes as a `BTreeMap<TypeId, _>`;
however `TypeId` doesn't have a useful ordering for us, and is subject
to change across compiles.

## Solution

Switch to a `IndexMap<TypeId, _>`, so we can iterate in insertion order
instead.

## Testing

Added a test to ensure consistent iteration order.
---
 crates/bevy_ecs/src/schedule/schedule.rs | 70 ++++++++++++++++++++++--
 1 file changed, 64 insertions(+), 6 deletions(-)

diff --git a/crates/bevy_ecs/src/schedule/schedule.rs b/crates/bevy_ecs/src/schedule/schedule.rs
index 3119f322cbfc0..bc636ecfd1490 100644
--- a/crates/bevy_ecs/src/schedule/schedule.rs
+++ b/crates/bevy_ecs/src/schedule/schedule.rs
@@ -4,19 +4,23 @@
 )]
 use alloc::{
     boxed::Box,
-    collections::{BTreeMap, BTreeSet},
+    collections::BTreeSet,
     format,
     string::{String, ToString},
     vec,
     vec::Vec,
 };
-use bevy_platform::collections::{HashMap, HashSet};
+use bevy_platform::{
+    collections::{HashMap, HashSet},
+    hash::FixedHasher,
+};
 use bevy_utils::{default, TypeIdMap};
 use core::{
     any::{Any, TypeId},
     fmt::{Debug, Write},
 };
 use fixedbitset::FixedBitSet;
+use indexmap::IndexMap;
 use log::{info, warn};
 use pass::ScheduleBuildPassObj;
 use thiserror::Error;
@@ -465,7 +469,7 @@ impl Schedule {
 
     /// Remove a custom build pass.
     pub fn remove_build_pass<T: ScheduleBuildPass>(&mut self) {
-        self.graph.passes.remove(&TypeId::of::<T>());
+        self.graph.passes.shift_remove(&TypeId::of::<T>());
     }
 
     /// Changes miscellaneous build settings.
@@ -697,7 +701,7 @@ pub struct ScheduleGraph {
     anonymous_sets: usize,
     changed: bool,
     settings: ScheduleBuildSettings,
-    passes: BTreeMap<TypeId, Box<dyn ScheduleBuildPassObj>>,
+    passes: IndexMap<TypeId, Box<dyn ScheduleBuildPassObj>, FixedHasher>,
 }
 
 impl ScheduleGraph {
@@ -1586,14 +1590,17 @@ pub struct ScheduleNotInitialized;
 
 #[cfg(test)]
 mod tests {
+    use alloc::{vec, vec::Vec};
+    use core::any::TypeId;
+
     use bevy_ecs_macros::ScheduleLabel;
 
     use crate::{
         error::{ignore, panic, DefaultErrorHandler, Result},
         prelude::{ApplyDeferred, IntoSystemSet, Res, Resource},
         schedule::{
-            tests::ResMut, IntoScheduleConfigs, Schedule, ScheduleBuildSettings,
-            ScheduleCleanupPolicy, SystemSet,
+            passes::AutoInsertApplyDeferredPass, tests::ResMut, IntoScheduleConfigs, Schedule,
+            ScheduleBuildPass, ScheduleBuildSettings, ScheduleCleanupPolicy, SystemSet,
         },
         system::Commands,
         world::World,
@@ -2571,4 +2578,55 @@ mod tests {
         let conflicts = schedule.graph().conflicting_systems();
         assert!(conflicts.is_empty());
     }
+
+    #[test]
+    fn build_pass_iteration_order() {
+        #[derive(Debug)]
+        struct Pass<const N: usize>;
+
+        impl<const N: usize> ScheduleBuildPass for Pass<N> {
+            type EdgeOptions = ();
+            fn add_dependency(
+                &mut self,
+                _from: crate::schedule::NodeId,
+                _to: crate::schedule::NodeId,
+                _options: Option<&Self::EdgeOptions>,
+            ) {
+            }
+            fn build(
+                &mut self,
+                _world: &mut World,
+                _graph: &mut super::ScheduleGraph,
+                _dependency_flattened: &mut crate::schedule::graph::Dag<crate::schedule::SystemKey>,
+            ) -> core::result::Result<(), crate::schedule::ScheduleBuildError> {
+                Ok(())
+            }
+            fn collapse_set(
+                &mut self,
+                _set: crate::schedule::SystemSetKey,
+                _systems: &bevy_platform::collections::HashSet<crate::schedule::SystemKey>,
+                _dependency_flattening: &crate::schedule::graph::DiGraph<crate::schedule::NodeId>,
+            ) -> impl Iterator<Item = (crate::schedule::NodeId, crate::schedule::NodeId)>
+            {
+                core::iter::empty()
+            }
+        }
+
+        let mut schedule = Schedule::default();
+        schedule.add_build_pass(Pass::<0>);
+        schedule.add_build_pass(Pass::<1>);
+        schedule.add_build_pass(Pass::<2>);
+
+        let pass_order: Vec<TypeId> = schedule.graph().passes.keys().cloned().collect();
+
+        assert_eq!(
+            pass_order,
+            vec![
+                TypeId::of::<AutoInsertApplyDeferredPass>(),
+                TypeId::of::<Pass<0>>(),
+                TypeId::of::<Pass<1>>(),
+                TypeId::of::<Pass<2>>()
+            ]
+        );
+    }
 }

From d9c8330b1c56bab63dcce6b1ea5be5ebe4e02fbe Mon Sep 17 00:00:00 2001
From: Hennadii Chernyshchyk <genaloner@gmail.com>
Date: Mon, 8 Dec 2025 00:52:35 +0200
Subject: [PATCH 034/133] Add `Observer::with_components` (#21857)

# Objective

- Closes #21848.

## Solution

- Add `Observer::with_components`, for consistency with
`Observer::with_entities` for entities.

## Testing

- I didn't test it, but it's a very simple helper function, similar to
already existing `Observer::with_component` (singular).
---
 crates/bevy_ecs/src/observer/distributed_storage.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/crates/bevy_ecs/src/observer/distributed_storage.rs b/crates/bevy_ecs/src/observer/distributed_storage.rs
index f2af97d313d17..6f1ebebbc8cdc 100644
--- a/crates/bevy_ecs/src/observer/distributed_storage.rs
+++ b/crates/bevy_ecs/src/observer/distributed_storage.rs
@@ -301,6 +301,13 @@ impl Observer {
         self
     }
 
+    /// Observes the given `components`. This will cause the [`Observer`] to run whenever the [`Event`] has
+    /// an [`EntityComponentsTrigger`](crate::event::EntityComponentsTrigger) that targets any of the `components`.
+    pub fn with_components<I: IntoIterator<Item = ComponentId>>(mut self, components: I) -> Self {
+        self.descriptor.components.extend(components);
+        self
+    }
+
     /// Observes the given `event_key`. This will cause the [`Observer`] to run whenever an event with the given [`EventKey`]
     /// is triggered.
     /// # Safety

From 258a17561bac37940c5a808d651735f9ede14d0f Mon Sep 17 00:00:00 2001
From: ickshonpe <david.curthoys@googlemail.com>
Date: Sun, 7 Dec 2025 22:53:44 +0000
Subject: [PATCH 035/133] Fix comment in `pointer_events` (#21996)

# Objective

Comment from `bevy_picking::events::pointer_events`:
```
                // Emit Click and Up events on all the previously hovered entities.
```

The event is named `Release`, not `Up`.

## Solution

Replace `Up` with `Release`.
---
 crates/bevy_picking/src/events.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/bevy_picking/src/events.rs b/crates/bevy_picking/src/events.rs
index 1385961e468d5..c418323bc01c5 100644
--- a/crates/bevy_picking/src/events.rs
+++ b/crates/bevy_picking/src/events.rs
@@ -632,7 +632,7 @@ pub fn pointer_events(
             PointerAction::Release(button) => {
                 let state = pointer_state.get_mut(pointer_id, button);
 
-                // Emit Click and Up events on all the previously hovered entities.
+                // Emit Click and Release events on all the previously hovered entities.
                 for (hovered_entity, hit) in previous_hover_map
                     .get(&pointer_id)
                     .iter()

From d597657f28ce49d527a0c71f2a91266abebbf982 Mon Sep 17 00:00:00 2001
From: Tony <11652273+rmsthebest@users.noreply.github.com>
Date: Mon, 8 Dec 2025 00:02:03 +0100
Subject: [PATCH 036/133] Slightly improve the window settings example (#21862)

# Objective

Update the example to avoid teaching new people that the recommended way
of updating a component is to re-insert it.

## Solution

Instead of inserting the component every time we want to change it,
update the value.

## Testing

- Did you test these changes? If so, how? Yes, ran the example
- Are there any parts that need more testing? I don't think so?
- How can other people (reviewers) test your changes? Is there anything
specific they need to know? Run the example, press left and right mouse.
- If relevant, what platforms did you test these changes on, and are
there any important ones you can't test? (linux/wayland)
---
 examples/window/window_settings.rs | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/examples/window/window_settings.rs b/examples/window/window_settings.rs
index 6d64ca4754671..b02b7b7b06884 100644
--- a/examples/window/window_settings.rs
+++ b/examples/window/window_settings.rs
@@ -140,7 +140,7 @@ fn toggle_cursor(mut cursor_options: Single<&mut CursorOptions>, input: Res<Butt
     }
 }
 
-// This system will toggle the color theme used by the window
+/// This system will toggle the color theme used by the window
 fn toggle_theme(mut window: Single<&mut Window>, input: Res<ButtonInput<KeyCode>>) {
     if input.just_pressed(KeyCode::KeyF)
         && let Some(current_theme) = window.window_theme
@@ -152,14 +152,16 @@ fn toggle_theme(mut window: Single<&mut Window>, input: Res<ButtonInput<KeyCode>
     }
 }
 
+/// Resource with a set of cursor icons we want to cycle through
 #[derive(Resource)]
 struct CursorIcons(Vec<CursorIcon>);
 
 fn init_cursor_icons(
     mut commands: Commands,
+    window: Single<Entity, With<Window>>,
     #[cfg(feature = "custom_cursor")] asset_server: Res<AssetServer>,
 ) {
-    commands.insert_resource(CursorIcons(vec![
+    let cursor_icons = CursorIcons(vec![
         SystemCursorIcon::Default.into(),
         SystemCursorIcon::Pointer.into(),
         SystemCursorIcon::Wait.into(),
@@ -171,30 +173,28 @@ fn init_cursor_icons(
             ..Default::default()
         })
         .into(),
-    ]));
+    ]);
+    // By default the Window entity does not have a CursorIcon component, so we add it here.
+    commands.entity(*window).insert(cursor_icons.0[0].clone());
+    commands.insert_resource(cursor_icons);
 }
 
 /// This system cycles the cursor's icon through a small set of icons when clicking
 fn cycle_cursor_icon(
-    mut commands: Commands,
-    window: Single<Entity, With<Window>>,
+    mut cursor: Single<&mut CursorIcon>,
     input: Res<ButtonInput<MouseButton>>,
     mut index: Local<usize>,
     cursor_icons: Res<CursorIcons>,
 ) {
     if input.just_pressed(MouseButton::Left) {
         *index = (*index + 1) % cursor_icons.0.len();
-        commands
-            .entity(*window)
-            .insert(cursor_icons.0[*index].clone());
+        **cursor = cursor_icons.0[*index].clone();
     } else if input.just_pressed(MouseButton::Right) {
         *index = if *index == 0 {
             cursor_icons.0.len() - 1
         } else {
             *index - 1
         };
-        commands
-            .entity(*window)
-            .insert(cursor_icons.0[*index].clone());
+        **cursor = cursor_icons.0[*index].clone();
     }
 }

From e44d659a3f9426e12ab1db42f7f3ad0ee350b81b Mon Sep 17 00:00:00 2001
From: JMS55 <47158642+JMS55@users.noreply.github.com>
Date: Sun, 7 Dec 2025 18:30:14 -0500
Subject: [PATCH 037/133]  Solari: Misc improvements  (#21953)

* Search for a spatial neighbor up to 5 times for ReSTIR instead of just
once.
* Bump RAY_T_MIN to 0.001. Prevents artifacts and doesn't really cause
more self intersections.
* Re-calculate world cache cell_size after jittering the query position
to prevent creating extra cells at the wrong LOD for a given position.
* Prevent the unlikely event of something checksumming to 0, which is
reserved for empty cells.
---
 .../bevy_solari/src/realtime/restir_di.wgsl   | 16 +++++++-----
 .../bevy_solari/src/realtime/restir_gi.wgsl   | 26 +++++++++++--------
 .../src/realtime/world_cache_query.wgsl       |  5 ++--
 .../src/scene/raytracing_scene_bindings.wgsl  |  2 +-
 4 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/crates/bevy_solari/src/realtime/restir_di.wgsl b/crates/bevy_solari/src/realtime/restir_di.wgsl
index b31f70f49963e..e7492f3c47ff3 100644
--- a/crates/bevy_solari/src/realtime/restir_di.wgsl
+++ b/crates/bevy_solari/src/realtime/restir_di.wgsl
@@ -179,15 +179,19 @@ fn load_temporal_reservoir_inner(temporal_pixel_id: vec2<u32>, depth: f32, world
 }
 
 fn load_spatial_reservoir(pixel_id: vec2<u32>, depth: f32, world_position: vec3<f32>, world_normal: vec3<f32>, rng: ptr<function, u32>) -> Reservoir {
-    let spatial_pixel_id = get_neighbor_pixel_id(pixel_id, rng);
+    for (var i = 0u; i < 5u; i++) {
+        let spatial_pixel_id = get_neighbor_pixel_id(pixel_id, rng);
 
-    let spatial_depth = textureLoad(depth_buffer, spatial_pixel_id, 0);
-    let spatial_surface = gpixel_resolve(textureLoad(gbuffer, spatial_pixel_id, 0), spatial_depth, spatial_pixel_id, view.main_pass_viewport.zw, view.world_from_clip);
-    if pixel_dissimilar(depth, world_position, spatial_surface.world_position, world_normal, spatial_surface.world_normal, view) {
-        return empty_reservoir();
+        let spatial_depth = textureLoad(depth_buffer, spatial_pixel_id, 0);
+        let spatial_surface = gpixel_resolve(textureLoad(gbuffer, spatial_pixel_id, 0), spatial_depth, spatial_pixel_id, view.main_pass_viewport.zw, view.world_from_clip);
+        if pixel_dissimilar(depth, world_position, spatial_surface.world_position, world_normal, spatial_surface.world_normal, view) {
+            continue;
+        }
+
+        return load_reservoir_b(spatial_pixel_id);
     }
 
-    return load_reservoir_b(spatial_pixel_id);
+    return empty_reservoir();
 }
 
 fn get_neighbor_pixel_id(center_pixel_id: vec2<u32>, rng: ptr<function, u32>) -> vec2<u32> {
diff --git a/crates/bevy_solari/src/realtime/restir_gi.wgsl b/crates/bevy_solari/src/realtime/restir_gi.wgsl
index b0bbfa90ba421..a6355517af5c2 100644
--- a/crates/bevy_solari/src/realtime/restir_gi.wgsl
+++ b/crates/bevy_solari/src/realtime/restir_gi.wgsl
@@ -152,21 +152,25 @@ fn load_temporal_reservoir_inner(temporal_pixel_id: vec2<u32>, depth: f32, world
 }
 
 fn load_spatial_reservoir(pixel_id: vec2<u32>, depth: f32, world_position: vec3<f32>, world_normal: vec3<f32>, rng: ptr<function, u32>) -> NeighborInfo {
-    let spatial_pixel_id = get_neighbor_pixel_id(pixel_id, rng);
+    for (var i = 0u; i < 5u; i++) {
+        let spatial_pixel_id = get_neighbor_pixel_id(pixel_id, rng);
 
-    let spatial_depth = textureLoad(depth_buffer, spatial_pixel_id, 0);
-    let spatial_surface = gpixel_resolve(textureLoad(gbuffer, spatial_pixel_id, 0), spatial_depth, spatial_pixel_id, view.main_pass_viewport.zw, view.world_from_clip);
-    let spatial_diffuse_brdf = spatial_surface.material.base_color / PI;
-    if pixel_dissimilar(depth, world_position, spatial_surface.world_position, world_normal, spatial_surface.world_normal, view) {
-        return NeighborInfo(empty_reservoir(), spatial_surface.world_position, spatial_surface.world_normal, spatial_diffuse_brdf);
-    }
+        let spatial_depth = textureLoad(depth_buffer, spatial_pixel_id, 0);
+        let spatial_surface = gpixel_resolve(textureLoad(gbuffer, spatial_pixel_id, 0), spatial_depth, spatial_pixel_id, view.main_pass_viewport.zw, view.world_from_clip);
+        let spatial_diffuse_brdf = spatial_surface.material.base_color / PI;
+        if pixel_dissimilar(depth, world_position, spatial_surface.world_position, world_normal, spatial_surface.world_normal, view) {
+            continue;
+        }
+
+        let spatial_pixel_index = spatial_pixel_id.x + spatial_pixel_id.y * u32(view.main_pass_viewport.z);
+        var spatial_reservoir = gi_reservoirs_b[spatial_pixel_index];
 
-    let spatial_pixel_index = spatial_pixel_id.x + spatial_pixel_id.y * u32(view.main_pass_viewport.z);
-    var spatial_reservoir = gi_reservoirs_b[spatial_pixel_index];
+        spatial_reservoir.radiance *= trace_point_visibility(world_position, spatial_reservoir.sample_point_world_position);
 
-    spatial_reservoir.radiance *= trace_point_visibility(world_position, spatial_reservoir.sample_point_world_position);
+        return NeighborInfo(spatial_reservoir, spatial_surface.world_position, spatial_surface.world_normal, spatial_diffuse_brdf);
+    }
 
-    return NeighborInfo(spatial_reservoir, spatial_surface.world_position, spatial_surface.world_normal, spatial_diffuse_brdf);
+    return NeighborInfo(empty_reservoir(), world_position, world_normal, vec3(0.0));
 }
 
 fn get_neighbor_pixel_id(center_pixel_id: vec2<u32>, rng: ptr<function, u32>) -> vec2<u32> {
diff --git a/crates/bevy_solari/src/realtime/world_cache_query.wgsl b/crates/bevy_solari/src/realtime/world_cache_query.wgsl
index 64a7d67fdd4ee..cafefffac58a8 100644
--- a/crates/bevy_solari/src/realtime/world_cache_query.wgsl
+++ b/crates/bevy_solari/src/realtime/world_cache_query.wgsl
@@ -47,12 +47,13 @@ struct WorldCacheGeometryData {
 
 #ifndef WORLD_CACHE_NON_ATOMIC_LIFE_BUFFER
 fn query_world_cache(world_position: vec3<f32>, world_normal: vec3<f32>, view_position: vec3<f32>, cell_lifetime: u32, rng: ptr<function, u32>) -> vec3<f32> {
-    let cell_size = get_cell_size(world_position, view_position);
+    var cell_size = get_cell_size(world_position, view_position);
 
     // https://tomclabault.github.io/blog/2025/regir, jitter_world_position_tangent_plane
     let TBN = orthonormalize(world_normal);
     let offset = (rand_vec2f(rng) * 2.0 - 1.0) * cell_size * 0.5;
     let jittered_position = world_position + offset.x * TBN[0] + offset.y * TBN[1];
+    cell_size = get_cell_size(jittered_position, view_position);
 
     let world_position_quantized = bitcast<vec3<u32>>(quantize_position(jittered_position, cell_size));
     let world_normal_quantized = bitcast<vec3<u32>>(quantize_normal(world_normal));
@@ -121,7 +122,7 @@ fn compute_checksum(world_position: vec3<u32>, world_normal: vec3<u32>) -> u32 {
     key = iqint_hash(key + world_normal.x);
     key = iqint_hash(key + world_normal.y);
     key = iqint_hash(key + world_normal.z);
-    return key;
+    return max(key, 1u); // 0u is reserved for WORLD_CACHE_EMPTY_CELL
 }
 
 fn pcg_hash(input: u32) -> u32 {
diff --git a/crates/bevy_solari/src/scene/raytracing_scene_bindings.wgsl b/crates/bevy_solari/src/scene/raytracing_scene_bindings.wgsl
index 8b1e875fc5423..4d5ec4584db33 100644
--- a/crates/bevy_solari/src/scene/raytracing_scene_bindings.wgsl
+++ b/crates/bevy_solari/src/scene/raytracing_scene_bindings.wgsl
@@ -83,7 +83,7 @@ const LIGHT_NOT_PRESENT_THIS_FRAME = 0xFFFFFFFFu;
 @group(0) @binding(10) var<storage> directional_lights: array<DirectionalLight>;
 @group(0) @binding(11) var<storage> previous_frame_light_id_translations: array<u32>;
 
-const RAY_T_MIN = 0.01f;
+const RAY_T_MIN = 0.001f;
 const RAY_T_MAX = 100000.0f;
 
 const RAY_NO_CULL = 0xFFu;

From 6c22c9b444ab376d2af8db6423c57e5eea57ac4c Mon Sep 17 00:00:00 2001
From: JMS55 <47158642+JMS55@users.noreply.github.com>
Date: Sun, 7 Dec 2025 18:32:42 -0500
Subject: [PATCH 038/133] Solari: Improve specular GI (#21907)

Go back to only sampling the world cache for rough and non-first-bounce
surfaces, but sample direct lighting when that doesn't happen.

Mainline
<img width="3206" height="1875" alt="image"
src="https://github.com/user-attachments/assets/1247d357-d190-4fdc-a7b3-396d42478b99"
/>


This PR
<img width="3206" height="1875" alt="image"
src="https://github.com/user-attachments/assets/927bca68-4cac-4aef-87d5-dce079eb54af"
/>


Pathtraced reference
<img width="3206" height="1875" alt="image"
src="https://github.com/user-attachments/assets/d6668bde-521c-47c7-b4d5-0ba6c8db5cc8"
/>


Fixes https://github.com/bevyengine/bevy/issues/21967.
---
 .../src/pathtracer/pathtracer.wgsl            | 13 ++--
 .../bevy_solari/src/realtime/specular_gi.wgsl | 69 +++++++++++++++----
 crates/bevy_solari/src/scene/sampling.wgsl    | 12 ++--
 3 files changed, 73 insertions(+), 21 deletions(-)

diff --git a/crates/bevy_solari/src/pathtracer/pathtracer.wgsl b/crates/bevy_solari/src/pathtracer/pathtracer.wgsl
index 77fc834b2f5a5..c2402deef7e40 100644
--- a/crates/bevy_solari/src/pathtracer/pathtracer.wgsl
+++ b/crates/bevy_solari/src/pathtracer/pathtracer.wgsl
@@ -4,7 +4,7 @@
 #import bevy_render::maths::PI
 #import bevy_render::view::View
 #import bevy_solari::brdf::evaluate_brdf
-#import bevy_solari::sampling::{sample_random_light, random_light_pdf, sample_ggx_vndf, ggx_vndf_pdf, balance_heuristic, power_heuristic}
+#import bevy_solari::sampling::{sample_random_light, random_emissive_light_pdf, sample_ggx_vndf, ggx_vndf_pdf, power_heuristic}
 #import bevy_solari::scene_bindings::{trace_ray, resolve_ray_hit_full, ResolvedRayHitFull, RAY_T_MIN, RAY_T_MAX}
 
 @group(1) @binding(0) var accumulation_texture: texture_storage_2d<rgba32float, read_write>;
@@ -48,7 +48,7 @@ fn pathtrace(@builtin(global_invocation_id) global_id: vec3<u32>) {
 
             var mis_weight = 1.0;
             if !bounce_was_perfect_reflection {
-                let p_light = random_light_pdf(ray_hit);
+                let p_light = random_emissive_light_pdf(ray_hit);
                 mis_weight = power_heuristic(p_bounce, p_light);
             }
             radiance += mis_weight * throughput * ray_hit.material.emissive;
@@ -57,8 +57,13 @@ fn pathtrace(@builtin(global_invocation_id) global_id: vec3<u32>) {
             let is_perfectly_specular = ray_hit.material.roughness <= 0.001 && ray_hit.material.metallic > 0.9999;
             if !is_perfectly_specular {
                 let direct_lighting = sample_random_light(ray_hit.world_position, ray_hit.world_normal, &rng);
-                let pdf_of_bounce = brdf_pdf(wo, direct_lighting.wi, ray_hit);
-                mis_weight = power_heuristic(1.0 / direct_lighting.inverse_pdf, pdf_of_bounce);
+
+                mis_weight = 1.0;
+                if direct_lighting.brdf_rays_can_hit {
+                    let pdf_of_bounce = brdf_pdf(wo, direct_lighting.wi, ray_hit);
+                    mis_weight = power_heuristic(1.0 / direct_lighting.inverse_pdf, pdf_of_bounce);
+                }
+
                 let direct_lighting_brdf = evaluate_brdf(ray_hit.world_normal, wo, direct_lighting.wi, ray_hit.material);
                 radiance += mis_weight * throughput * direct_lighting.radiance * direct_lighting.inverse_pdf * direct_lighting_brdf;
             }
diff --git a/crates/bevy_solari/src/realtime/specular_gi.wgsl b/crates/bevy_solari/src/realtime/specular_gi.wgsl
index 335c5588271de..325cbdfda3a2d 100644
--- a/crates/bevy_solari/src/realtime/specular_gi.wgsl
+++ b/crates/bevy_solari/src/realtime/specular_gi.wgsl
@@ -3,8 +3,8 @@
 #import bevy_render::view::View
 #import bevy_solari::brdf::{evaluate_brdf, evaluate_specular_brdf}
 #import bevy_solari::gbuffer_utils::gpixel_resolve
-#import bevy_solari::sampling::{sample_ggx_vndf, ggx_vndf_pdf}
-#import bevy_solari::scene_bindings::{trace_ray, resolve_ray_hit_full, RAY_T_MIN, RAY_T_MAX}
+#import bevy_solari::sampling::{sample_random_light, random_emissive_light_pdf, sample_ggx_vndf, ggx_vndf_pdf, power_heuristic}
+#import bevy_solari::scene_bindings::{trace_ray, resolve_ray_hit_full, ResolvedRayHitFull, RAY_T_MIN, RAY_T_MAX}
 #import bevy_solari::world_cache::{query_world_cache, WORLD_CACHE_CELL_LIFETIME}
 
 @group(1) @binding(0) var view_output: texture_storage_2d<rgba16float, read_write>;
@@ -15,6 +15,9 @@
 struct PushConstants { frame_index: u32, reset: u32 }
 var<push_constant> constants: PushConstants;
 
+const DIFFUSE_GI_REUSE_ROUGHNESS_THRESHOLD: f32 = 0.4;
+const WORLD_CACHE_TERMINATION_ROUGHNESS_THRESHOLD: f32 = 0.4;
+
 @compute @workgroup_size(8, 8, 1)
 fn specular_gi(@builtin(global_invocation_id) global_id: vec3<u32>) {
     if any(global_id.xy >= vec2u(view.main_pass_viewport.zw)) { return; }
@@ -32,7 +35,7 @@ fn specular_gi(@builtin(global_invocation_id) global_id: vec3<u32>) {
 
     var radiance: vec3<f32>;
     var wi: vec3<f32>;
-    if surface.material.roughness > 0.1 {
+    if surface.material.roughness > DIFFUSE_GI_REUSE_ROUGHNESS_THRESHOLD {
         // Surface is very rough, reuse the ReSTIR GI reservoir
         let gi_reservoir = gi_reservoirs_a[pixel_index];
         wi = normalize(gi_reservoir.sample_point_world_position - surface.world_position);
@@ -68,6 +71,8 @@ fn specular_gi(@builtin(global_invocation_id) global_id: vec3<u32>) {
 fn trace_glossy_path(initial_ray_origin: vec3<f32>, initial_wi: vec3<f32>, rng: ptr<function, u32>) -> vec3<f32> {
     var ray_origin = initial_ray_origin;
     var wi = initial_wi;
+    var surface_perfectly_specular = false;
+    var p_bounce = 0.0;
 
     // Trace up to three bounces, getting the net throughput from them
     var radiance = vec3(0.0);
@@ -78,34 +83,72 @@ fn trace_glossy_path(initial_ray_origin: vec3<f32>, initial_wi: vec3<f32>, rng:
         if ray.kind == RAY_QUERY_INTERSECTION_NONE { break; }
         let ray_hit = resolve_ray_hit_full(ray);
 
-        // Add world cache contribution
-        let diffuse_brdf = ray_hit.material.base_color / PI;
-        radiance += throughput * diffuse_brdf * query_world_cache(ray_hit.world_position, ray_hit.geometric_world_normal, view.world_position, WORLD_CACHE_CELL_LIFETIME, rng);
-
-        // Surface is very rough, terminate path in the world cache
-        if ray_hit.material.roughness > 0.1 && i != 0u { break; }
-
-        // Sample new ray direction from the GGX BRDF for next bounce
         let TBN = calculate_tbn_mikktspace(ray_hit.world_normal, ray_hit.world_tangent);
         let T = TBN[0];
         let B = TBN[1];
         let N = TBN[2];
+
         let wo = -wi;
         let wo_tangent = vec3(dot(wo, T), dot(wo, B), dot(wo, N));
+
+        // Add emissive contribution (but not on the first bounce, since ReSTIR DI handles that)
+        if i != 0u {
+            radiance += throughput * emissive_mis_weight(p_bounce, ray_hit, surface_perfectly_specular) * ray_hit.material.emissive;
+        }
+
+        // Should not perform NEE for mirror-like surfaces
+        surface_perfectly_specular = ray_hit.material.roughness <= 0.001 && ray_hit.material.metallic > 0.9999;
+
+        if ray_hit.material.roughness > WORLD_CACHE_TERMINATION_ROUGHNESS_THRESHOLD && i != 0u {
+            // Surface is very rough, terminate path in the world cache
+            let diffuse_brdf = ray_hit.material.base_color / PI;
+            radiance += throughput * diffuse_brdf * query_world_cache(ray_hit.world_position, ray_hit.geometric_world_normal, view.world_position, WORLD_CACHE_CELL_LIFETIME, rng);
+            break;
+        } else if !surface_perfectly_specular {
+            // Sample direct lighting (NEE)
+            let direct_lighting = sample_random_light(ray_hit.world_position, ray_hit.world_normal, rng);
+            let direct_lighting_brdf = evaluate_brdf(ray_hit.world_normal, wo, direct_lighting.wi, ray_hit.material);
+            let mis_weight = nee_mis_weight(direct_lighting.inverse_pdf, direct_lighting.brdf_rays_can_hit, wo_tangent, direct_lighting.wi, ray_hit, TBN);
+            radiance += throughput * mis_weight * direct_lighting.radiance * direct_lighting.inverse_pdf * direct_lighting_brdf;
+        }
+
+        // Sample new ray direction from the GGX BRDF for next bounce
         let wi_tangent = sample_ggx_vndf(wo_tangent, ray_hit.material.roughness, rng);
         wi = wi_tangent.x * T + wi_tangent.y * B + wi_tangent.z * N;
         ray_origin = ray_hit.world_position;
 
         // Update throughput for next bounce
-        let pdf = ggx_vndf_pdf(wo_tangent, wi_tangent, ray_hit.material.roughness);
+        p_bounce = ggx_vndf_pdf(wo_tangent, wi_tangent, ray_hit.material.roughness);
         let brdf = evaluate_brdf(N, wo, wi, ray_hit.material);
         let cos_theta = saturate(dot(wi, N));
-        throughput *= (brdf * cos_theta) / pdf;
+        throughput *= (brdf * cos_theta) / p_bounce;
     }
 
     return radiance;
 }
 
+fn emissive_mis_weight(p_bounce: f32, ray_hit: ResolvedRayHitFull, previous_surface_perfectly_specular: bool) -> f32 {
+    if previous_surface_perfectly_specular { return 1.0; }
+
+    let p_light = random_emissive_light_pdf(ray_hit);
+    return power_heuristic(p_bounce, p_light);
+}
+
+fn nee_mis_weight(inverse_p_light: f32, brdf_rays_can_hit: bool, wo_tangent: vec3<f32>, wi: vec3<f32>, ray_hit: ResolvedRayHitFull, TBN: mat3x3<f32>) -> f32 {
+    if !brdf_rays_can_hit {
+        return 1.0;
+    }
+
+    let T = TBN[0];
+    let B = TBN[1];
+    let N = TBN[2];
+    let wi_tangent = vec3(dot(wi, T), dot(wi, B), dot(wi, N));
+
+    let p_light = 1.0 / inverse_p_light;
+    let p_bounce = ggx_vndf_pdf(wo_tangent, wi_tangent, ray_hit.material.roughness);
+    return max(0.0, power_heuristic(p_light, p_bounce));
+}
+
 // Don't adjust the size of this struct without also adjusting GI_RESERVOIR_STRUCT_SIZE.
 struct Reservoir {
     sample_point_world_position: vec3<f32>,
diff --git a/crates/bevy_solari/src/scene/sampling.wgsl b/crates/bevy_solari/src/scene/sampling.wgsl
index 8385f9b3999e6..b7fc2de2a0cc6 100644
--- a/crates/bevy_solari/src/scene/sampling.wgsl
+++ b/crates/bevy_solari/src/scene/sampling.wgsl
@@ -15,6 +15,10 @@ fn balance_heuristic(f: f32, g: f32) -> f32 {
 
 // https://gpuopen.com/download/Bounded_VNDF_Sampling_for_Smith-GGX_Reflections.pdf (Listing 1)
 fn sample_ggx_vndf(wi_tangent: vec3<f32>, roughness: f32, rng: ptr<function, u32>) -> vec3<f32> {
+    if roughness <= 0.01 {
+        return vec3(-wi_tangent.xy, wi_tangent.z);
+    }
+
     let i = wi_tangent;
     let rand = rand_vec2f(rng);
     let i_std = normalize(vec3(i.xy * roughness, i.z));
@@ -69,6 +73,7 @@ struct LightContribution {
     radiance: vec3<f32>,
     inverse_pdf: f32,
     wi: vec3<f32>,
+    brdf_rays_can_hit: bool,
 }
 
 struct LightContributionNoPdf {
@@ -88,10 +93,9 @@ fn sample_random_light(ray_origin: vec3<f32>, origin_world_normal: vec3<f32>, rn
     return light_contribution;
 }
 
-fn random_light_pdf(hit: ResolvedRayHitFull) -> f32 {
+fn random_emissive_light_pdf(hit: ResolvedRayHitFull) -> f32 {
     let light_count = arrayLength(&light_sources);
-    let p_light = 1.0 / f32(light_count);
-    return p_light / (hit.triangle_area * f32(hit.triangle_count));
+    return 1.0 / (f32(light_count) * f32(hit.triangle_count) * hit.triangle_area);
 }
 
 fn generate_random_light_sample(rng: ptr<function, u32>) -> GenerateRandomLightSampleResult {
@@ -169,7 +173,7 @@ fn calculate_resolved_light_contribution(resolved_light_sample: ResolvedLightSam
 
     let radiance = resolved_light_sample.radiance * cos_theta_origin * (cos_theta_light / light_distance_squared);
 
-    return LightContribution(radiance, resolved_light_sample.inverse_pdf, wi);
+    return LightContribution(radiance, resolved_light_sample.inverse_pdf, wi, resolved_light_sample.world_position.w == 1.0);
 }
 
 fn resolve_and_calculate_light_contribution(light_sample: LightSample, ray_origin: vec3<f32>, origin_world_normal: vec3<f32>) -> LightContributionNoPdf {

From 61e7b9a7bb5a5a42f053563ead1b8d732bc88076 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Sun, 7 Dec 2025 16:05:58 -0800
Subject: [PATCH 039/133] Increase the number of supported clustered decals if
 the `PARTIALLY_BOUND_BINDING_ARRAY` `wgpu` feature is present. (#22028)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The current clustered decal code predates
`PARTIALLY_BOUND_BINDING_ARRAY` support in `wgpu`. As a result, only 8
clustered decals are allowed in the scene in order to avoid paying a
high cost even if no decals of that type are present. This limitation
makes Bevy's current clustered decal support insufficient for many use
cases (e.g. bullet holes), so this patch increases the limit from 8 to
1024 if the `wgpu` features include `PARTIALLY_BOUND_BINDING_ARRAY`.

---------

Co-authored-by: François Mockers <francois.mockers@vleue.com>
---
 crates/bevy_pbr/src/decal/clustered.rs | 45 +++++++++++++++++++-------
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/crates/bevy_pbr/src/decal/clustered.rs b/crates/bevy_pbr/src/decal/clustered.rs
index 51a141d15ae22..ad32c7f5715b8 100644
--- a/crates/bevy_pbr/src/decal/clustered.rs
+++ b/crates/bevy_pbr/src/decal/clustered.rs
@@ -38,6 +38,7 @@ use bevy_render::{
         SamplerBindingType, ShaderType, TextureSampleType, TextureView,
     },
     renderer::{RenderAdapter, RenderDevice, RenderQueue},
+    settings::WgpuFeatures,
     sync_component::SyncComponentPlugin,
     sync_world::RenderEntity,
     texture::{FallbackImage, GpuImage},
@@ -49,13 +50,6 @@ use bytemuck::{Pod, Zeroable};
 
 use crate::{binding_arrays_are_usable, prepare_lights, GlobalClusterableObjectMeta};
 
-/// The maximum number of decals that can be present in a view.
-///
-/// This number is currently relatively low in order to work around the lack of
-/// first-class binding arrays in `wgpu`. When that feature is implemented, this
-/// limit can be increased.
-pub(crate) const MAX_VIEW_DECALS: usize = 8;
-
 /// A plugin that adds support for clustered decals.
 ///
 /// In environments where bindless textures aren't available, clustered decals
@@ -328,7 +322,7 @@ pub(crate) fn get_bind_group_layout_entries(
         binding_types::storage_buffer_read_only::<RenderClusteredDecal>(false),
         // `decal_textures`
         binding_types::texture_2d(TextureSampleType::Float { filterable: true })
-            .count(NonZero::<u32>::new(MAX_VIEW_DECALS as u32).unwrap()),
+            .count(NonZero::<u32>::new(max_view_decals(render_device)).unwrap()),
         // `decal_sampler`
         binding_types::sampler(SamplerBindingType::Filtering),
     ])
@@ -372,10 +366,16 @@ impl<'a> RenderViewClusteredDecalBindGroupEntries<'a> {
             }
         }
 
-        // Pad out the binding array to its maximum length, which is
-        // required on some platforms.
-        while texture_views.len() < MAX_VIEW_DECALS {
-            texture_views.push(&*fallback_image.d2.texture_view);
+        // If required on this platform, pad out the binding array to its
+        // maximum length.
+        if !render_device
+            .features()
+            .contains(WgpuFeatures::PARTIALLY_BOUND_BINDING_ARRAY)
+        {
+            let max_view_decals = max_view_decals(render_device);
+            while texture_views.len() < max_view_decals as usize {
+                texture_views.push(&*fallback_image.d2.texture_view);
+            }
         }
 
         Some(RenderViewClusteredDecalBindGroupEntries {
@@ -439,3 +439,24 @@ pub fn clustered_decals_are_usable(
     binding_arrays_are_usable(render_device, render_adapter)
         && cfg!(feature = "pbr_clustered_decals")
 }
+
+/// Returns the maximum number of decals that can be in the scene, taking
+/// platform limitations into account.
+fn max_view_decals(render_device: &RenderDevice) -> u32 {
+    // If the current `wgpu` platform doesn't support partially-bound binding
+    // arrays, limit the number of decals to a low number. If we didn't do this,
+    // then on such platforms we'd pay the maximum overhead even if there are no
+    // decals are in the scene.
+    if render_device
+        .features()
+        .contains(WgpuFeatures::PARTIALLY_BOUND_BINDING_ARRAY)
+    {
+        // This number was determined arbitrarily as a reasonable value that
+        // would encompass most use cases (e.g. bullet holes in walls) while
+        // offering a failsafe to prevent shaders becoming too slow if there are
+        // extremely large numbers of decals.
+        1024
+    } else {
+        8
+    }
+}

From 2403c41da483cf6e1c663dd9705b7d7f3cc04a44 Mon Sep 17 00:00:00 2001
From: Kevin Chen <chen.kevin.f@gmail.com>
Date: Sun, 7 Dec 2025 23:55:23 -0500
Subject: [PATCH 040/133] Fix flaky asset test, adds todo for a real fix
 (#22061)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

- Unblock pull requests and merges from the failings of this flaky asset
test
- Fixes the flakiness described in #22001

## Solution

Change the assertion to accept both 2 and 3. Add an explaination why,
and add a todo to resolve the underlying issue.

FYI @andriyDev since I don’t yet feel comfortable messing with the
locks, just figured I’d throw this up to reduce confusion about failing
builds in the meantime
---
 crates/bevy_asset/src/processor/tests.rs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/crates/bevy_asset/src/processor/tests.rs b/crates/bevy_asset/src/processor/tests.rs
index b31abb47bba02..c1c5f56d82e33 100644
--- a/crates/bevy_asset/src/processor/tests.rs
+++ b/crates/bevy_asset/src/processor/tests.rs
@@ -1495,10 +1495,11 @@ fn only_reprocesses_wrong_hash_on_startup() {
 
     // Only source_changed and dep_changed assets were reprocessed - all others still have the same
     // hashes.
-    assert_eq!(
-        *transformer.0.lock().unwrap_or_else(PoisonError::into_inner),
-        2
-    );
+    let num_processes = *transformer.0.lock().unwrap_or_else(PoisonError::into_inner);
+    // TODO: assert_eq! (num_processes == 2) only after we prevent double processing assets
+    // == 3 happens when the initial processing of an asset and the re-processing that its dependency
+    // triggers are both able to proceed. (dep_changed_asset in this case is processed twice)
+    assert!(num_processes == 2 || num_processes == 3);
 
     assert_eq!(
         read_asset_as_string(&default_processed_dir, no_deps_asset),

From 9ad7df93c6324b4d8be9264c15f5921cf5fe6be4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Dec 2025 08:37:45 +0100
Subject: [PATCH 041/133] Update ron requirement from 0.11 to 0.12 (#22063)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Updates the requirements on [ron](https://github.com/ron-rs/ron) to
permit the latest version.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/ron-rs/ron/releases">ron's
releases</a>.</em></p>
<blockquote>
<h2>v0.12.0</h2>
<h2>What's Changed</h2>
<ul>
<li>Add Serializer::into_inner method to extract the writer by <a
href="https://github.com/Thomas-Mewily"><code>@​Thomas-Mewily</code></a>
in <a
href="https://redirect.github.com/ron-rs/ron/pull/588">ron-rs/ron#588</a></li>
<li>Add <code>ron-lsp</code> to README by <a
href="https://github.com/jasonjmcghee"><code>@​jasonjmcghee</code></a>
in <a
href="https://redirect.github.com/ron-rs/ron/pull/589">ron-rs/ron#589</a></li>
<li>Fixed serde content detection for serde &gt;= 1.0.220 by <a
href="https://github.com/juntyr"><code>@​juntyr</code></a> in <a
href="https://redirect.github.com/ron-rs/ron/pull/582">ron-rs/ron#582</a></li>
<li>Further deprecate base64 byte strings by removing parsing support
outside the error path by <a
href="https://github.com/juntyr"><code>@​juntyr</code></a> in <a
href="https://redirect.github.com/ron-rs/ron/pull/566">ron-rs/ron#566</a></li>
<li>Bump ron to v0.12.0 by <a
href="https://github.com/juntyr"><code>@​juntyr</code></a> in <a
href="https://redirect.github.com/ron-rs/ron/pull/591">ron-rs/ron#591</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a
href="https://github.com/Thomas-Mewily"><code>@​Thomas-Mewily</code></a>
made their first contribution in <a
href="https://redirect.github.com/ron-rs/ron/pull/588">ron-rs/ron#588</a></li>
<li><a
href="https://github.com/jasonjmcghee"><code>@​jasonjmcghee</code></a>
made their first contribution in <a
href="https://redirect.github.com/ron-rs/ron/pull/589">ron-rs/ron#589</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/ron-rs/ron/compare/v0.11.0...v0.12.0">https://github.com/ron-rs/ron/compare/v0.11.0...v0.12.0</a></p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/ron-rs/ron/blob/master/CHANGELOG.md">ron's
changelog</a>.</em></p>
<blockquote>
<h2>[0.12.0] - 2025-11-12</h2>
<h3>API Changes</h3>
<ul>
<li>Breaking: Removed the <code>ron::error::Error::Base64Error</code>
variant. (<a
href="https://redirect.github.com/ron-rs/ron/pull/566">#566</a>)</li>
<li>Added <code>into_inner()</code> method to
<code>ron::ser::Serializer</code> to retrieve the inner writer. (<a
href="https://redirect.github.com/ron-rs/ron/pull/588">#588</a>)</li>
<li>Removed the <code>base64</code> dependency. (<a
href="https://redirect.github.com/ron-rs/ron/pull/566">#566</a>)</li>
</ul>
<h3>Format Changes</h3>
<ul>
<li><strong>Format-Breaking:</strong> Remote base64-encoded byte strings
deserialisation, replaced by Rusty byte strings in v0.9.0 (<a
href="https://redirect.github.com/ron-rs/ron/pull/566">#566</a>)</li>
</ul>
<h3>Bug Fixes</h3>
<ul>
<li>Fixed untagged enum deserialisation for serde &gt;= 1.0.220 with
better serde content detection (<a
href="https://redirect.github.com/ron-rs/ron/pull/582">#582</a>)</li>
</ul>
<h2>[0.11.0] - 2025-08-27</h2>
<h3>API Changes</h3>
<ul>
<li>Breaking: <code>SpannedError</code> now stores the full error span
in span: Span { start: Position, end: Position }`, to facilitate, e.g.,
language server highlighting of syntax errors.</li>
<li>Breaking: Added <code>no_std</code> support via a new
<code>std</code> feature (enabled by default). With default features
disabled, you must enable the <code>std</code> feature to access
<code>de::from_reader</code>, and the <code>std::io</code> operations on
<code>Options</code>, such as <code>from_reader</code>,
<code>from_reader_seed</code>, <code>to_io_writer</code>, and
<code>to_io_writer_pretty</code> (<a
href="https://redirect.github.com/ron-rs/ron/pull/567">#567</a>)</li>
<li>Breaking: Fixed (again) <code>ron::value::Number</code> to ensure it
is non-exhaustive, to avoid breaking <code>match</code>es when feature
unification enables more of its variants than expected (<a
href="https://redirect.github.com/ron-rs/ron/pull/568">#568</a>)</li>
</ul>
<h3>Examples</h3>
<ul>
<li>Add a new example <code>file_read_write_vec.rs</code> for reading
and writing <code>Vec&lt;T&gt;</code> to/from files. (<a
href="https://redirect.github.com/ron-rs/ron/pull/573">#573</a>)</li>
</ul>
<h2>[0.10.1] - 2025-04-08</h2>
<h3>API Changes</h3>
<ul>
<li>Add <code>ron::Options::to_io_writer</code> and
<code>ron::Options::to_io_writer_pretty</code> to allow writing into an
<code>io::Writer</code> (<a
href="https://redirect.github.com/ron-rs/ron/pull/561">#561</a>)</li>
<li>Breaking: <code>ron::value::Number</code> is now non-exhaustive, to
avoid breaking <code>match</code>es when feature unification enables
more of its variants than expected (<a
href="https://redirect.github.com/ron-rs/ron/pull/564">#564</a>)</li>
</ul>
<h2>[0.9.0] - 2025-03-18</h2>
<h3>API Changes</h3>
<ul>
<li>Add <code>ron::value::RawValue</code> helper type which can
(de)serialize any valid RON (<a
href="https://redirect.github.com/ron-rs/ron/pull/407">#407</a>)</li>
<li>Add <code>escape_strings</code> option to <code>PrettyConfig</code>
to allow serialising with or without escaping (<a
href="https://redirect.github.com/ron-rs/ron/pull/426">#426</a>)</li>
<li>Add <code>compact_maps</code> and <code>compact_structs</code>
options to <code>PrettyConfig</code> to allow serialising maps and
structs on a single line (<a
href="https://redirect.github.com/ron-rs/ron/pull/448">#448</a>)</li>
<li>Add minimal support for <code>#[serde(flatten)]</code> with
roundtripping through RON maps (<a
href="https://redirect.github.com/ron-rs/ron/pull/455">#455</a>)</li>
<li>Add minimal roundtripping support for <code>#[serde(tag =
&quot;tag&quot;)]</code>, <code>#[serde(tag = &quot;tag&quot;, content =
&quot;content&quot;)]</code>, and <code>#[serde(untagged)]</code> enums
(<a
href="https://redirect.github.com/ron-rs/ron/pull/451">#451</a>)</li>
<li>Breaking: Expand the <code>value::Number</code> enum to explicitly
encode all possible number types (<a
href="https://redirect.github.com/ron-rs/ron/pull/479">#479</a>)</li>
<li>Add <code>number_suffixes</code> option to <code>PrettyConfig</code>
to allow serialising numbers with their explicit type suffix, e.g.
<code>42i32</code> (<a
href="https://redirect.github.com/ron-rs/ron/pull/481">#481</a>)</li>
<li>Allow <code>ron::value::RawValue</code> to capture any whitespace to
the left and right of a ron value (<a
href="https://redirect.github.com/ron-rs/ron/pull/487">#487</a>)</li>
<li>Breaking: Enforce that ron always writes valid UTF-8 (<a
href="https://redirect.github.com/ron-rs/ron/pull/488">#488</a>)</li>
<li>Add convenient <code>Value::from</code> impls (<a
href="https://redirect.github.com/ron-rs/ron/pull/498">#498</a>)</li>
<li>Add new extension <code>explicit_struct_names</code> which requires
that struct names are included during deserialization (<a
href="https://redirect.github.com/ron-rs/ron/pull/522">#522</a>)</li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/ron-rs/ron/commit/c6a8cff1eff986cc1ad9b026e838335187d411f0"><code>c6a8cff</code></a>
Bump ron to v0.12.0 (<a
href="https://redirect.github.com/ron-rs/ron/issues/591">#591</a>)</li>
<li><a
href="https://github.com/ron-rs/ron/commit/f2c17284b4df666437614db57f5334c963dba201"><code>f2c1728</code></a>
v0.12: Further deprecate base64 byte strings by removing parsing support
outs...</li>
<li><a
href="https://github.com/ron-rs/ron/commit/5630b0f1843b2e3cb1c856961dfc941326bd225e"><code>5630b0f</code></a>
Fixed serde content detection for serde &gt;= 1.0.220 (<a
href="https://redirect.github.com/ron-rs/ron/issues/582">#582</a>)</li>
<li><a
href="https://github.com/ron-rs/ron/commit/3184df3d2c778cba512bcb3ae9ee4109ca7c01ea"><code>3184df3</code></a>
Add <code>ron-lsp</code> to README (<a
href="https://redirect.github.com/ron-rs/ron/issues/589">#589</a>)</li>
<li><a
href="https://github.com/ron-rs/ron/commit/9b9b88e70d64e24805fd7824192348d695480ee7"><code>9b9b88e</code></a>
Add Serializer::into_inner method to extract the writer (<a
href="https://redirect.github.com/ron-rs/ron/issues/588">#588</a>)</li>
<li>See full diff in <a
href="https://github.com/ron-rs/ron/compare/v0.11.0...v0.12.0">compare
view</a></li>
</ul>
</details>
<br />


Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.toml                       | 2 +-
 crates/bevy_animation/Cargo.toml | 2 +-
 crates/bevy_asset/Cargo.toml     | 2 +-
 crates/bevy_dev_tools/Cargo.toml | 2 +-
 crates/bevy_reflect/Cargo.toml   | 2 +-
 crates/bevy_scene/Cargo.toml     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index aa3982b0c3a12..4a1143d51cee7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -708,7 +708,7 @@ bevy_dylib = { path = "crates/bevy_dylib", version = "0.18.0-dev", default-featu
 [dev-dependencies]
 rand = "0.9.0"
 rand_chacha = "0.9.0"
-ron = "0.11"
+ron = "0.12"
 flate2 = "1.0"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1.0.140"
diff --git a/crates/bevy_animation/Cargo.toml b/crates/bevy_animation/Cargo.toml
index 27338adbb444a..047609fd84f07 100644
--- a/crates/bevy_animation/Cargo.toml
+++ b/crates/bevy_animation/Cargo.toml
@@ -33,7 +33,7 @@ bevy_platform = { path = "../bevy_platform", version = "0.18.0-dev", default-fea
 
 # other
 petgraph = { version = "0.8", features = ["serde-1"] }
-ron = "0.11"
+ron = "0.12"
 serde = "1"
 blake3 = { version = "1.0" }
 downcast-rs = { version = "2", default-features = false, features = ["std"] }
diff --git a/crates/bevy_asset/Cargo.toml b/crates/bevy_asset/Cargo.toml
index 39a363433dfbf..d20e9c0974ee7 100644
--- a/crates/bevy_asset/Cargo.toml
+++ b/crates/bevy_asset/Cargo.toml
@@ -59,7 +59,7 @@ futures-util = { version = "0.3", default-features = false, features = [
 futures-io = { version = "0.3", default-features = false }
 futures-lite = { version = "2.0.1", default-features = false }
 blake3 = { version = "1.5", default-features = false }
-ron = { version = "0.11", default-features = false }
+ron = { version = "0.12", default-features = false }
 serde = { version = "1", default-features = false, features = ["derive"] }
 thiserror = { version = "2", default-features = false }
 derive_more = { version = "2", default-features = false, features = ["from"] }
diff --git a/crates/bevy_dev_tools/Cargo.toml b/crates/bevy_dev_tools/Cargo.toml
index e3e063cdcfc79..9d8567af0a6eb 100644
--- a/crates/bevy_dev_tools/Cargo.toml
+++ b/crates/bevy_dev_tools/Cargo.toml
@@ -34,7 +34,7 @@ bevy_state = { path = "../bevy_state", version = "0.18.0-dev" }
 
 # other
 serde = { version = "1.0", features = ["derive"], optional = true }
-ron = { version = "0.11", optional = true }
+ron = { version = "0.12", optional = true }
 tracing = { version = "0.1", default-features = false, features = ["std"] }
 
 [lints]
diff --git a/crates/bevy_reflect/Cargo.toml b/crates/bevy_reflect/Cargo.toml
index 2308719106112..5d5dfe1bc3249 100644
--- a/crates/bevy_reflect/Cargo.toml
+++ b/crates/bevy_reflect/Cargo.toml
@@ -133,7 +133,7 @@ wgpu-types = { version = "26", features = [
 inventory = { version = "0.3", optional = true }
 
 [dev-dependencies]
-ron = "0.11"
+ron = "0.12"
 rmp-serde = "1.1"
 bincode = { version = "2.0", features = ["serde"] }
 serde_json = "1.0.140"
diff --git a/crates/bevy_scene/Cargo.toml b/crates/bevy_scene/Cargo.toml
index f61bfd2357093..fe716124d8774 100644
--- a/crates/bevy_scene/Cargo.toml
+++ b/crates/bevy_scene/Cargo.toml
@@ -33,7 +33,7 @@ bevy_platform = { path = "../bevy_platform", version = "0.18.0-dev", default-fea
 ] }
 
 # other
-ron = { version = "0.11", default-features = false, optional = true }
+ron = { version = "0.12", default-features = false, optional = true }
 serde = { version = "1.0", features = ["derive"], optional = true }
 uuid = { version = "1.13.1", features = ["v4"] }
 thiserror = { version = "2", default-features = false }

From 2144c03adadc30fd1992862617dc25a949bb83b9 Mon Sep 17 00:00:00 2001
From: Joda <joseph@josephbartley.dev>
Date: Mon, 8 Dec 2025 05:54:37 -0600
Subject: [PATCH 042/133] Prevent WebGL builds from crashing on startup when
 using FpsOverlayPlugin (#21885)

# Objective

- Fixes #21362
- The FrameTimeGraph uses a material that crashes in WebGL (but not
WebGPU) even if the FrameTimeGraph is disabled. We need to prevent the
FrameTimeGraph from being created when we build for WASM.

## Solution

- If the build is for WASM with only WebGL, we skip the ceration of the
FrameTimeGraph. Additionally, if the FrameTimeGraph is enabled, we
provide a warning to inform the user that the FrameTimeGraph isn't
supported on WebGL.

## Testing

- I used the repro provided in the issue.
---
 crates/bevy_dev_tools/Cargo.toml         |  2 +
 crates/bevy_dev_tools/src/fps_overlay.rs | 67 ++++++++++++++----------
 crates/bevy_internal/Cargo.toml          |  2 +
 3 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/crates/bevy_dev_tools/Cargo.toml b/crates/bevy_dev_tools/Cargo.toml
index 9d8567af0a6eb..dc218f023baef 100644
--- a/crates/bevy_dev_tools/Cargo.toml
+++ b/crates/bevy_dev_tools/Cargo.toml
@@ -10,6 +10,8 @@ keywords = ["bevy"]
 
 [features]
 bevy_ci_testing = ["serde", "ron"]
+webgl = ["bevy_render/webgl"]
+webgpu = ["bevy_render/webgpu"]
 
 [dependencies]
 # bevy
diff --git a/crates/bevy_dev_tools/src/fps_overlay.rs b/crates/bevy_dev_tools/src/fps_overlay.rs
index f180b6ef9e810..f6a3c10269856 100644
--- a/crates/bevy_dev_tools/src/fps_overlay.rs
+++ b/crates/bevy_dev_tools/src/fps_overlay.rs
@@ -188,35 +188,46 @@ fn setup(
             ))
             .with_child((TextSpan::default(), overlay_config.text_config.clone()));
 
-            let font_size = overlay_config.text_config.font_size;
-            p.spawn((
-                Node {
-                    width: Val::Px(font_size * FRAME_TIME_GRAPH_WIDTH_SCALE),
-                    height: Val::Px(font_size * FRAME_TIME_GRAPH_HEIGHT_SCALE),
-                    display: if overlay_config.frame_time_graph_config.enabled {
-                        bevy_ui::Display::DEFAULT
-                    } else {
-                        bevy_ui::Display::None
-                    },
-                    ..Default::default()
-                },
-                Pickable::IGNORE,
-                MaterialNode::from(frame_time_graph_materials.add(FrametimeGraphMaterial {
-                    values: buffers.add(ShaderStorageBuffer {
-                        // Initialize with dummy data because the default (`data: None`) will
-                        // cause a panic in the shader if the frame time graph is constructed
-                        // with `enabled: false`.
-                        data: Some(vec![0, 0, 0, 0]),
+            #[cfg(all(target_arch = "wasm32", not(feature = "webgpu")))]
+            {
+                if overlay_config.frame_time_graph_config.enabled {
+                    use tracing::warn;
+
+                    warn!("Frame time graph is not supported with WebGL. Consider if WebGPU is viable for your usecase.");
+                }
+            }
+            #[cfg(not(all(target_arch = "wasm32", not(feature = "webgpu"))))]
+            {
+                let font_size = overlay_config.text_config.font_size;
+                p.spawn((
+                    Node {
+                        width: Val::Px(font_size * FRAME_TIME_GRAPH_WIDTH_SCALE),
+                        height: Val::Px(font_size * FRAME_TIME_GRAPH_HEIGHT_SCALE),
+                        display: if overlay_config.frame_time_graph_config.enabled {
+                            bevy_ui::Display::DEFAULT
+                        } else {
+                            bevy_ui::Display::None
+                        },
                         ..Default::default()
-                    }),
-                    config: FrameTimeGraphConfigUniform::new(
-                        overlay_config.frame_time_graph_config.target_fps,
-                        overlay_config.frame_time_graph_config.min_fps,
-                        true,
-                    ),
-                })),
-                FrameTimeGraph,
-            ));
+                    },
+                    Pickable::IGNORE,
+                    MaterialNode::from(frame_time_graph_materials.add(FrametimeGraphMaterial {
+                        values: buffers.add(ShaderStorageBuffer {
+                            // Initialize with dummy data because the default (`data: None`) will
+                            // cause a panic in the shader if the frame time graph is constructed
+                            // with `enabled: false`.
+                            data: Some(vec![0, 0, 0, 0]),
+                            ..Default::default()
+                        }),
+                        config: FrameTimeGraphConfigUniform::new(
+                            overlay_config.frame_time_graph_config.target_fps,
+                            overlay_config.frame_time_graph_config.min_fps,
+                            true,
+                        ),
+                    })),
+                    FrameTimeGraph,
+                ));
+            }
         });
 }
 
diff --git a/crates/bevy_internal/Cargo.toml b/crates/bevy_internal/Cargo.toml
index f6872757b04a7..c894e3664405f 100644
--- a/crates/bevy_internal/Cargo.toml
+++ b/crates/bevy_internal/Cargo.toml
@@ -187,6 +187,7 @@ webgl = [
   "bevy_render?/webgl",
   "bevy_gizmos_render?/webgl",
   "bevy_sprite_render?/webgl",
+  "bevy_dev_tools?/webgl",
 ]
 
 webgpu = [
@@ -196,6 +197,7 @@ webgpu = [
   "bevy_render?/webgpu",
   "bevy_gizmos_render?/webgpu",
   "bevy_sprite_render?/webgpu",
+  "bevy_dev_tools?/webgpu",
 ]
 
 # Enable systems that allow for automated testing on CI

From d6ae071771e62b5e896752bd5ed1a3e29249291e Mon Sep 17 00:00:00 2001
From: Chris Biscardi <chris@christopherbiscardi.com>
Date: Mon, 8 Dec 2025 03:55:03 -0800
Subject: [PATCH 043/133] anchor layout example (#21225)

# Objective

There was [some discussion in
discord](https://discord.com/channels/691052431525675048/1264881140007702558/1420909052879175810)
about "anchor layouts".

They are, as far as I can tell, basically absolute positioning.

## Solution

Write an example that shows how to "anchor" elements to the
top/left/right/bottom of a box. Also optionally included "centering"
using auto margins.

## Testing

```
cargo run --example anchor_positioning
```

Moving the window around changes the gray box sizes, while the interior
labels are "anchored" to their respective positions, offset from their
specific side attachments by 10 pixels

## Showcase

<img width="1562" height="888" alt="screenshot-2025-09-26-at-02 17
31@2x"
src="https://github.com/user-attachments/assets/c9af868b-c412-4292-802e-076d2c98ca6b"
/>

---------

Co-authored-by: ickshonpe <david.curthoys@googlemail.com>
---
 Cargo.toml                   |  11 +++
 examples/README.md           |   1 +
 examples/ui/anchor_layout.rs | 146 +++++++++++++++++++++++++++++++++++
 3 files changed, 158 insertions(+)
 create mode 100644 examples/ui/anchor_layout.rs

diff --git a/Cargo.toml b/Cargo.toml
index 4a1143d51cee7..d0b21ce74bbe0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3414,6 +3414,17 @@ category = "Transforms"
 wasm = true
 
 # UI (User Interface)
+[[example]]
+name = "anchor_layout"
+path = "examples/ui/anchor_layout.rs"
+doc-scrape-examples = true
+
+[package.metadata.example.anchor_layout]
+name = "Anchor Layout"
+description = "Shows an 'anchor layout' style of ui layout"
+category = "UI (User Interface)"
+wasm = true
+
 [[example]]
 name = "borders"
 path = "examples/ui/borders.rs"
diff --git a/examples/README.md b/examples/README.md
index 440c54d0c2bdb..ab7402ee46a9c 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -553,6 +553,7 @@ Example | Description
 
 Example | Description
 --- | ---
+[Anchor Layout](../examples/ui/anchor_layout.rs) | Shows an 'anchor layout' style of ui layout
 [Automatic Directional Navigation](../examples/ui/auto_directional_navigation.rs) | Demonstration of automatic directional navigation graph generation based on UI element positions
 [Borders](../examples/ui/borders.rs) | Demonstrates how to create a node with a border
 [Box Shadow](../examples/ui/box_shadow.rs) | Demonstrates how to create a node with a shadow
diff --git a/examples/ui/anchor_layout.rs b/examples/ui/anchor_layout.rs
new file mode 100644
index 0000000000000..6509a7790a854
--- /dev/null
+++ b/examples/ui/anchor_layout.rs
@@ -0,0 +1,146 @@
+//! Shows an "anchor layout" style of ui layout
+use bevy::prelude::*;
+
+const MARGIN: Val = Val::Px(12.);
+
+fn main() {
+    App::new()
+        .add_plugins(DefaultPlugins.set(WindowPlugin {
+            primary_window: Some(Window {
+                title: "Bevy Anchor Layout Example".to_string(),
+                ..default()
+            }),
+            ..default()
+        }))
+        .add_systems(Startup, spawn_layout)
+        .run();
+}
+
+fn spawn_layout(mut commands: Commands, asset_server: Res<AssetServer>) {
+    let font = asset_server.load("fonts/FiraSans-Bold.ttf");
+    commands.spawn(Camera2d);
+
+    let rows = [
+        (
+            "left: 10px\ntop: 10px",
+            Node {
+                left: px(10),
+                top: px(10),
+                ..default()
+            },
+        ),
+        (
+            "center: 10px\ntop: 10px",
+            Node {
+                margin: auto().horizontal(),
+                top: px(10),
+                ..default()
+            },
+        ),
+        (
+            "right: 10px\ntop: 10px",
+            Node {
+                right: px(10),
+                top: px(10),
+                ..default()
+            },
+        ),
+        (
+            "left: 10px\ncenter: 10px",
+            Node {
+                left: px(10),
+                margin: UiRect::vertical(Val::Auto),
+                ..default()
+            },
+        ),
+        (
+            "center: 10px\ncenter: 10px",
+            Node {
+                margin: UiRect::all(Val::Auto),
+                ..default()
+            },
+        ),
+        (
+            "right: 10px\ncenter: 10px",
+            Node {
+                right: px(10),
+                margin: UiRect::vertical(Val::Auto),
+                ..default()
+            },
+        ),
+        (
+            "left: 10px\nbottom: 10px",
+            Node {
+                left: px(10),
+                bottom: px(10),
+                ..default()
+            },
+        ),
+        (
+            "center: 10px\nbottom: 10px",
+            Node {
+                margin: UiRect::horizontal(Val::Auto),
+                bottom: px(10),
+                ..default()
+            },
+        ),
+        (
+            "right: 10px\nbottom: 10px",
+            Node {
+                right: px(10),
+                bottom: px(10),
+                ..default()
+            },
+        ),
+    ];
+
+    // let font = font.clone();
+    commands.spawn((
+        Node {
+            // fill the entire window
+            width: percent(100),
+            height: percent(100),
+            padding: MARGIN.all(),
+            row_gap: MARGIN,
+            column_gap: MARGIN,
+            display: Display::Grid,
+            grid_template_columns: RepeatedGridTrack::fr(3, 1.),
+            grid_template_rows: RepeatedGridTrack::fr(3, 1.),
+            ..default()
+        },
+        BackgroundColor(Color::BLACK),
+        Children::spawn(SpawnIter(
+            rows.into_iter()
+                .map(move |v| anchored_node(font.clone(), v.1, v.0)),
+        )),
+    ));
+}
+
+fn anchored_node(font: Handle<Font>, node: Node, label: &str) -> impl Bundle {
+    (
+        // outer gray box
+        Node {
+            grid_column: GridPlacement::span(1),
+            grid_row: GridPlacement::span(1),
+            ..default()
+        },
+        BackgroundColor(Color::srgb(0.25, 0.25, 0.25)),
+        children![
+            // inner label box
+            (
+                Node {
+                    display: Display::Block,
+                    padding: UiRect::axes(px(5), px(1)),
+                    position_type: PositionType::Absolute,
+                    ..node
+                },
+                BackgroundColor(Color::srgb(1., 0.066, 0.349)),
+                children![(
+                    Text::new(label),
+                    TextFont { font, ..default() },
+                    TextColor::BLACK,
+                )],
+            )
+        ],
+    )
+}

From d13f60739e67fd032209429df0518b465b94f3ab Mon Sep 17 00:00:00 2001
From: natepiano <slicks.curable.0k@icloud.com>
Date: Mon, 8 Dec 2025 16:09:05 -0500
Subject: [PATCH 044/133] Fix macOS panic when exiting from exclusive
 fullscreen (#22060)

# Objective

Fix panic on macOS when exiting an app while in exclusive fullscreen
mode.

  ## Solution

Drop windows from `WINIT_WINDOWS` TLS in `fn exiting` before the event
loop returns.

  The panic occurs because:
  1. `WINIT_WINDOWS` is stored in TLS
  2. Windows are dropped during TLS destruction (after event loop exits)
3. winit's `Window::drop` calls `set_fullscreen(None)` for exclusive
fullscreen
4. macOS sends a callback that tries to access TLS already being
destroyed

By clearing windows in `fn exiting`, they're dropped while the event
loop is still active, avoiding the TLS access issue.

  ## Testing

  - Tested on macOS 26.1 (Sequoia) with M2 Max
  - Run `cargo run --example monitor_info`, then Cmd+Q to quit
- Without fix: panic with "cannot access a Thread Local Storage value
during or after destruction"
  - With fix: clean exit
  - Windows is unaffected

---------

Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
---
 crates/bevy_winit/src/state.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crates/bevy_winit/src/state.rs b/crates/bevy_winit/src/state.rs
index 08c9e36535bfa..9e347651f57e4 100644
--- a/crates/bevy_winit/src/state.rs
+++ b/crates/bevy_winit/src/state.rs
@@ -496,6 +496,10 @@ impl<M: Message> ApplicationHandler<M> for WinitAppRunnerState<M> {
     }
 
     fn exiting(&mut self, _event_loop: &ActiveEventLoop) {
+        // Drop windows while event loop is still active, before TLS destruction.
+        // Prevents panic on macOS when exiting from exclusive fullscreen.
+        WINIT_WINDOWS.with(|ww| ww.borrow_mut().windows.clear());
+
         let world = self.world_mut();
         world.clear_all();
     }

From d5dfab9361ac8a0f843ec0a089e557e119f034f9 Mon Sep 17 00:00:00 2001
From: ickshonpe <david.curthoys@googlemail.com>
Date: Mon, 8 Dec 2025 21:29:40 +0000
Subject: [PATCH 045/133] UI material z-offset override (#20279)

# Objective

In #20237 the swatch implementation uses a child node to display the
foreground color because UI materials have a higher local z offset than
everything else.

## Solution

Add a `stack_z_offset` function to the `UiMaterial` trait that can be
overriden to set a custom z-offset.
---
 crates/bevy_ui_render/src/ui_material.rs          | 4 ++++
 crates/bevy_ui_render/src/ui_material_pipeline.rs | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/crates/bevy_ui_render/src/ui_material.rs b/crates/bevy_ui_render/src/ui_material.rs
index fc3ff836bdc40..54610e5f2a44c 100644
--- a/crates/bevy_ui_render/src/ui_material.rs
+++ b/crates/bevy_ui_render/src/ui_material.rs
@@ -112,6 +112,10 @@ pub trait UiMaterial: AsBindGroup + Asset + Clone + Sized {
         ShaderRef::Default
     }
 
+    fn stack_z_offset() -> f32 {
+        crate::stack_z_offsets::MATERIAL
+    }
+
     #[expect(
         unused_variables,
         reason = "The parameters here are intentionally unused by the default implementation; however, putting underscores here will result in the underscores being copied by rust-analyzer's tab completion."
diff --git a/crates/bevy_ui_render/src/ui_material_pipeline.rs b/crates/bevy_ui_render/src/ui_material_pipeline.rs
index 7c32b90918805..5398dba2f08f7 100644
--- a/crates/bevy_ui_render/src/ui_material_pipeline.rs
+++ b/crates/bevy_ui_render/src/ui_material_pipeline.rs
@@ -636,7 +636,7 @@ pub fn queue_ui_material_nodes<M: UiMaterial>(
             draw_function,
             pipeline,
             entity: (extracted_uinode.render_entity, extracted_uinode.main_entity),
-            sort_key: FloatOrd(extracted_uinode.stack_index as f32 + stack_z_offsets::MATERIAL),
+            sort_key: FloatOrd(extracted_uinode.stack_index as f32 + M::stack_z_offset()),
             batch_range: 0..0,
             extra_index: PhaseItemExtraIndex::None,
             index,

From 0d13444db8c251e4f14444188c1e6975536d52f7 Mon Sep 17 00:00:00 2001
From: robtfm <50659922+robtfm@users.noreply.github.com>
Date: Mon, 8 Dec 2025 21:34:11 +0000
Subject: [PATCH 046/133] clear animation evaluator stack (#21118)

# Objective

A large complex animation (2642 curves over 62 joints) causes serious
residual noise on joints after it stops playing. here i start the
animation then quickly cancel it:


https://github.com/user-attachments/assets/9552d69e-bb10-400f-94a6-c93d301c689b

this also seems to affect entities that are animated, but not by the
player that fires the large animation, which is really bizarre (here i
do not cancel it):


https://github.com/user-attachments/assets/a0d99df5-f53d-4ff0-9cf1-87a0e78b8abd


## Solution

debugging i found that the curve evaluator stack is growing unbounded
while the complex animation is playing (100k items after a second or
two) and is not cleared after the animation is stopped / replaced, so i
tried clearing the evaluator stack and that seems to fix it.

i have no idea if this fix is sensible or if the root of the issue is
elsewhere. i don't see any knockon ill-effects but can't be sure there
aren't any. i do not understand this code at all and it's hard to get a
clear picture of what it's trying to do, so hopefully somebody who does
understand it can diagnose better.

i attached the gltf containing the animation that causes the issue but i
can't give a simple repro - in my code i have to retarget the animation
onto an avatar which isn't included in the animation gltf (i can provide
an example for that if anybody wants it).


[bafybeicoja22tkr2rxpccmwh74yehnurgolias77reztd2kuhtvsn2luue.glb.zip](https://github.com/user-attachments/files/22408365/bafybeicoja22tkr2rxpccmwh74yehnurgolias77reztd2kuhtvsn2luue.glb.zip)


## Testing

no

Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
---
 crates/bevy_animation/src/animation_curves.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/bevy_animation/src/animation_curves.rs b/crates/bevy_animation/src/animation_curves.rs
index a9468c0742d01..4bea4384f7cac 100644
--- a/crates/bevy_animation/src/animation_curves.rs
+++ b/crates/bevy_animation/src/animation_curves.rs
@@ -416,6 +416,7 @@ impl<A: Animatable> AnimationCurveEvaluator for AnimatableCurveEvaluator<A> {
             .pop()
             .ok_or_else(inconsistent::<AnimatableCurveEvaluator<A>>)?
             .value;
+        self.evaluator.stack.clear();
         Ok(())
     }
 }

From 0af6fc1c747c9df2b5b8c8b599c955e61bd10e44 Mon Sep 17 00:00:00 2001
From: Christophe Bronner <christophe.bronner@videotron.ca>
Date: Mon, 8 Dec 2025 16:37:20 -0500
Subject: [PATCH 047/133] Implement world.trigger_event remote method (#21798)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Tools using `bevy_remote` will be able to identify (via the schema) and
trigger events.

- [x] Document `bevy_ecs/src/reflect/event.rs`

## Solution

I've added a method `world.trigger_event`, added `Event` to the schema's
reflection metadata and `ReflectEvent` to allow this.

## Testing

I have copied the (tested) code from my game but have NOT tested this
branch yet.
I am new to Rust/Cargo and need to go to sleep now, I'll figure this out
and test it tomorrow.

---

## Showcase

Here's what I needed to add to my game in order to allow my editor to
access and trigger an event:

```rust
#[derive(Event, Reflect)]
#[reflect(Event)]
pub struct AssignToRoute {
    pub vehicle: Entity,
    pub route: Entity,
    pub origin: Entity,
}
```

Here's a screenshot of my editor using this feature:

<img width="1463" height="967" alt="Screenshot 2025-11-10 at 1 40 42 AM"
src="https://github.com/user-attachments/assets/7696ddb8-3552-4e0d-a78f-6178c0c66cbb"
/>
---
 crates/bevy_ecs/src/lib.rs                |  2 +-
 crates/bevy_ecs/src/reflect/event.rs      | 76 ++++++++++++++++++
 crates/bevy_ecs/src/reflect/mod.rs        |  2 +
 crates/bevy_remote/src/builtin_methods.rs | 98 ++++++++++++++++++++++-
 crates/bevy_remote/src/lib.rs             | 16 +++-
 crates/bevy_remote/src/schemas/mod.rs     |  3 +-
 6 files changed, 190 insertions(+), 7 deletions(-)
 create mode 100644 crates/bevy_ecs/src/reflect/event.rs

diff --git a/crates/bevy_ecs/src/lib.rs b/crates/bevy_ecs/src/lib.rs
index b8835257a66dd..4c8763ad66f64 100644
--- a/crates/bevy_ecs/src/lib.rs
+++ b/crates/bevy_ecs/src/lib.rs
@@ -109,7 +109,7 @@ pub mod prelude {
     #[doc(hidden)]
     #[cfg(feature = "bevy_reflect")]
     pub use crate::reflect::{
-        AppTypeRegistry, ReflectComponent, ReflectFromWorld, ReflectResource,
+        AppTypeRegistry, ReflectComponent, ReflectEvent, ReflectFromWorld, ReflectResource,
     };
 
     #[doc(hidden)]
diff --git a/crates/bevy_ecs/src/reflect/event.rs b/crates/bevy_ecs/src/reflect/event.rs
new file mode 100644
index 0000000000000..7ae2bcde8481a
--- /dev/null
+++ b/crates/bevy_ecs/src/reflect/event.rs
@@ -0,0 +1,76 @@
+//! Definitions for [`Event`] reflection.
+//! This allows triggering events whose type is only known at runtime.
+//!
+//! This module exports two types: [`ReflectEventFns`] and [`ReflectEvent`].
+//!
+//! Same as [`component`](`super::component`), but for events.
+
+use crate::{event::Event, reflect::from_reflect_with_fallback, world::World};
+use bevy_reflect::{FromReflect, FromType, PartialReflect, Reflect, TypePath, TypeRegistry};
+
+/// A struct used to operate on reflected [`Event`] trait of a type.
+///
+/// A [`ReflectEvent`] for type `T` can be obtained via
+/// [`bevy_reflect::TypeRegistration::data`].
+#[derive(Clone)]
+pub struct ReflectEvent(ReflectEventFns);
+
+/// The raw function pointers needed to make up a [`ReflectEvent`].
+///
+/// This is used when creating custom implementations of [`ReflectEvent`] with
+/// [`ReflectEventFns::new()`].
+///
+/// > **Note:**
+/// > Creating custom implementations of [`ReflectEvent`] is an advanced feature that most users
+/// > will not need.
+/// > Usually a [`ReflectEvent`] is created for a type by deriving [`Reflect`]
+/// > and adding the `#[reflect(Event)]` attribute.
+/// > After adding the component to the [`TypeRegistry`],
+/// > its [`ReflectEvent`] can then be retrieved when needed.
+///
+/// Creating a custom [`ReflectEvent`] may be useful if you need to create new component types
+/// at runtime, for example, for scripting implementations.
+///
+/// By creating a custom [`ReflectEvent`] and inserting it into a type's
+/// [`TypeRegistration`][bevy_reflect::TypeRegistration],
+/// you can modify the way that reflected event of that type will be triggered in the Bevy
+/// world.
+#[derive(Clone)]
+pub struct ReflectEventFns {
+    trigger: fn(&mut World, &dyn PartialReflect, &TypeRegistry),
+}
+
+impl ReflectEventFns {
+    /// Get the default set of [`ReflectEventFns`] for a specific event type using its
+    /// [`FromType`] implementation.
+    ///
+    /// This is useful if you want to start with the default implementation before overriding some
+    /// of the functions to create a custom implementation.
+    pub fn new<'a, T: Event + FromReflect + TypePath>() -> Self
+    where
+        T::Trigger<'a>: Default,
+    {
+        <ReflectEvent as FromType<T>>::from_type().0
+    }
+}
+
+impl ReflectEvent {
+    /// Triggers a reflected [`Event`] like [`trigger()`](World::trigger).
+    pub fn trigger(&self, world: &mut World, event: &dyn PartialReflect, registry: &TypeRegistry) {
+        (self.0.trigger)(world, event, registry);
+    }
+}
+
+impl<'a, E: Event + Reflect + TypePath> FromType<E> for ReflectEvent
+where
+    <E as Event>::Trigger<'a>: Default,
+{
+    fn from_type() -> Self {
+        ReflectEvent(ReflectEventFns {
+            trigger: |world, reflected_event, registry| {
+                let event = from_reflect_with_fallback::<E>(reflected_event, world, registry);
+                world.trigger(event);
+            },
+        })
+    }
+}
diff --git a/crates/bevy_ecs/src/reflect/mod.rs b/crates/bevy_ecs/src/reflect/mod.rs
index c306723f3a707..c0c5ee7ade282 100644
--- a/crates/bevy_ecs/src/reflect/mod.rs
+++ b/crates/bevy_ecs/src/reflect/mod.rs
@@ -14,6 +14,7 @@ use bevy_reflect::{
 mod bundle;
 mod component;
 mod entity_commands;
+mod event;
 mod from_world;
 mod map_entities;
 mod resource;
@@ -22,6 +23,7 @@ use bevy_utils::prelude::DebugName;
 pub use bundle::{ReflectBundle, ReflectBundleFns};
 pub use component::{ReflectComponent, ReflectComponentFns};
 pub use entity_commands::ReflectCommandExt;
+pub use event::{ReflectEvent, ReflectEventFns};
 pub use from_world::{ReflectFromWorld, ReflectFromWorldFns};
 pub use map_entities::ReflectMapEntities;
 pub use resource::{ReflectResource, ReflectResourceFns};
diff --git a/crates/bevy_remote/src/builtin_methods.rs b/crates/bevy_remote/src/builtin_methods.rs
index abe8881731fc0..5c359dab5b2e1 100644
--- a/crates/bevy_remote/src/builtin_methods.rs
+++ b/crates/bevy_remote/src/builtin_methods.rs
@@ -10,17 +10,17 @@ use bevy_ecs::{
     lifecycle::RemovedComponentEntity,
     message::MessageCursor,
     query::QueryBuilder,
-    reflect::{AppTypeRegistry, ReflectComponent, ReflectResource},
+    reflect::{AppTypeRegistry, ReflectComponent, ReflectEvent, ReflectResource},
     system::{In, Local},
-    world::{EntityRef, EntityWorldMut, FilteredEntityRef, World},
+    world::{EntityRef, EntityWorldMut, FilteredEntityRef, Mut, World},
 };
 use bevy_log::warn_once;
 use bevy_platform::collections::HashMap;
 use bevy_reflect::{
     serde::{ReflectSerializer, TypedReflectDeserializer},
-    GetPath, PartialReflect, TypeRegistration, TypeRegistry,
+    DynamicStruct, GetPath, PartialReflect, TypeRegistration, TypeRegistry,
 };
-use serde::{de::DeserializeSeed as _, Deserialize, Serialize};
+use serde::{de::DeserializeSeed as _, de::IntoDeserializer, Deserialize, Serialize};
 use serde_json::{Map, Value};
 
 use crate::{
@@ -83,6 +83,9 @@ pub const BRP_MUTATE_RESOURCE_METHOD: &str = "world.mutate_resources";
 /// The method path for a `world.list_resources` request.
 pub const BRP_LIST_RESOURCES_METHOD: &str = "world.list_resources";
 
+/// The method path for a `world.trigger_event` request.
+pub const BRP_TRIGGER_EVENT_METHOD: &str = "world.trigger_event";
+
 /// The method path for a `registry.schema` request.
 pub const BRP_REGISTRY_SCHEMA_METHOD: &str = "registry.schema";
 
@@ -299,6 +302,19 @@ pub struct BrpMutateResourcesParams {
     pub value: Value,
 }
 
+/// `world.trigger_event`:
+///
+/// The server responds with a null.
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
+struct BrpTriggerEventParams {
+    /// The [full path] of the event to trigger.
+    ///
+    /// [full path]: bevy_reflect::TypePath::type_path
+    pub event: String,
+    /// The serialized value of the event to be triggered, if any.
+    pub value: Option<Value>,
+}
+
 /// Describes the data that is to be fetched in a query.
 #[derive(Debug, Serialize, Deserialize, Clone, Default, PartialEq)]
 pub struct BrpQuery {
@@ -1348,6 +1364,44 @@ pub fn process_remote_list_components_watching_request(
     }
 }
 
+/// Handles a `world.trigger_event` request coming from a client.
+pub fn process_remote_trigger_event_request(
+    In(params): In<Option<Value>>,
+    world: &mut World,
+) -> BrpResult {
+    let BrpTriggerEventParams { event, value } = parse_some(params)?;
+
+    world.resource_scope(|world, registry: Mut<AppTypeRegistry>| {
+        let registry = registry.read();
+
+        let Some(registration) = registry.get_with_type_path(&event) else {
+            return Err(BrpError::resource_error(format!(
+                "Unknown event type: `{event}`"
+            )));
+        };
+        let Some(reflect_event) = registration.data::<ReflectEvent>() else {
+            return Err(BrpError::resource_error(format!(
+                "Event `{event}` is not reflectable"
+            )));
+        };
+
+        if let Some(payload) = value {
+            let payload: Box<dyn PartialReflect> =
+                TypedReflectDeserializer::new(registration, &registry)
+                    .deserialize(payload.into_deserializer())
+                    .map_err(|err| {
+                        BrpError::resource_error(format!("{event} is invalid: {err}"))
+                    })?;
+            reflect_event.trigger(world, &*payload, &registry);
+        } else {
+            let payload = DynamicStruct::default();
+            reflect_event.trigger(world, &payload, &registry);
+        }
+
+        Ok(Value::Null)
+    })
+}
+
 /// Handles a `registry.schema` request (list all registry types in form of schema) coming from a client.
 pub fn export_registry_types(In(params): In<Option<Value>>, world: &World) -> BrpResult {
     let filter: BrpJsonSchemaQueryFilter = match params {
@@ -1628,6 +1682,11 @@ mod tests {
     }
 
     use super::*;
+    use bevy_ecs::{
+        component::Component, event::Event, observer::On, resource::Resource, system::ResMut,
+    };
+    use bevy_reflect::Reflect;
+    use serde_json::Value::Null;
 
     #[test]
     fn insert_reflect_only_component() {
@@ -1659,6 +1718,37 @@ mod tests {
         insert_reflected_components(e, deserialized_components).expect("FAIL");
     }
 
+    #[test]
+    fn trigger_reflect_only_event() {
+        #[derive(Event, Reflect)]
+        #[reflect(Event)]
+        struct Pass;
+
+        #[derive(Resource)]
+        struct TestResult(pub bool);
+
+        let atr = AppTypeRegistry::default();
+        {
+            let mut register = atr.write();
+            register.register::<Pass>();
+        }
+        let mut world = World::new();
+        world.add_observer(move |_event: On<Pass>, mut result: ResMut<TestResult>| result.0 = true);
+        world.insert_resource(TestResult(false));
+        world.insert_resource(atr);
+
+        let params = serde_json::to_value(&BrpTriggerEventParams {
+            event: "bevy_remote::builtin_methods::tests::Pass".to_owned(),
+            value: None,
+        })
+        .expect("FAIL");
+        assert_eq!(
+            process_remote_trigger_event_request(In(Some(params)), &mut world),
+            Ok(Null)
+        );
+        assert!(world.resource::<TestResult>().0);
+    }
+
     #[test]
     fn serialization_tests() {
         test_serialize_deserialize(BrpQueryRow {
diff --git a/crates/bevy_remote/src/lib.rs b/crates/bevy_remote/src/lib.rs
index 4713f88451327..c30a8594900bd 100644
--- a/crates/bevy_remote/src/lib.rs
+++ b/crates/bevy_remote/src/lib.rs
@@ -455,6 +455,16 @@
 //!
 //! `result`: An array of [fully-qualified type names] of registered resource types.
 //!
+//! ### `world.trigger_event`
+//!
+//! Triggers an event.
+//!
+//! `params`:
+//! - `event`: The [fully-qualified type name] of the event to trigger.
+//! - `value`: The value of the event to trigger.
+//!
+//! `result`: null.
+//!
 //! ### `registry.schema`
 //!
 //! Retrieve schema information about registered types in the Bevy app's type registry.
@@ -669,6 +679,10 @@ impl Default for RemotePlugin {
                 builtin_methods::BRP_LIST_RESOURCES_METHOD,
                 builtin_methods::process_remote_list_resources_request,
             )
+            .with_method(
+                builtin_methods::BRP_TRIGGER_EVENT_METHOD,
+                builtin_methods::process_remote_trigger_event_request,
+            )
             .with_method(
                 builtin_methods::BRP_REGISTRY_SCHEMA_METHOD,
                 builtin_methods::export_registry_types,
@@ -915,7 +929,7 @@ impl From<BrpResult> for BrpPayload {
 }
 
 /// An error a request might return.
-#[derive(Debug, Serialize, Deserialize, Clone)]
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
 pub struct BrpError {
     /// Defines the general type of the error.
     pub code: i16,
diff --git a/crates/bevy_remote/src/schemas/mod.rs b/crates/bevy_remote/src/schemas/mod.rs
index 10cb2e942133a..c17016db9c4f0 100644
--- a/crates/bevy_remote/src/schemas/mod.rs
+++ b/crates/bevy_remote/src/schemas/mod.rs
@@ -1,6 +1,6 @@
 //! Module with schemas used for various BRP endpoints
 use bevy_ecs::{
-    reflect::{ReflectComponent, ReflectResource},
+    reflect::{ReflectComponent, ReflectEvent, ReflectResource},
     resource::Resource,
 };
 use bevy_platform::collections::HashMap;
@@ -29,6 +29,7 @@ impl Default for SchemaTypesMetadata {
         };
         data_types.map_type_data::<ReflectComponent>("Component");
         data_types.map_type_data::<ReflectResource>("Resource");
+        data_types.map_type_data::<ReflectEvent>("Event");
         data_types.map_type_data::<ReflectDefault>("Default");
         #[cfg(feature = "bevy_asset")]
         data_types.map_type_data::<bevy_asset::ReflectAsset>("Asset");

From d44b9f8694a418a2aa8a78351c967c3f5c0d51d9 Mon Sep 17 00:00:00 2001
From: Kevin Chen <chen.kevin.f@gmail.com>
Date: Mon, 8 Dec 2025 17:31:47 -0500
Subject: [PATCH 048/133] Adds UIDebug Overlay centered scene to
 examples/testbed/ui (#22052)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

- Fixes #22019

## Solution

- Adds a new scene in the ui testbed that tests the generation of the Ui
Debug Overlay. It only is viewable if you run the example with
`--features bevy_ui_debug`.
- Added a way to override the color used by the overlay to ensure that
screenshots are consistent between CI runs (the line colors are
generated based on the `Entity`, which changes every time you change the
scene.)
- Added the `--features bevy_ui_debug` flag to `example-run.yml`,
ensuring that screenshots and their validations take this new scene into
account. (I assumed I’m not supposed to add this to
`validation-jobs.yml` under `run-examples-on-wasm`, but if I’m supposed
to, let me know and I can add it. I figured a debug feature does not
need that specific validation).

## Testing

- I ran the command `cargo run --example testbed_ui --features
bevy_ui_debug` and verified that debug lines showed up for regular
outlines, for a node with `Visibility::Hidden` with `show_hidden =
true`, and that clipped areas have outlines with `show_clipped = true`.
I carouseled through all the scenes a couple of times
- I also ran `cargo run --example testbed_ui ` and made sure nothing was
ruined after multiple carousels through all the scenes.

---

## Showcase

`cargo run --example testbed_ui --features bevy_ui_debug` , press
spacebar 11x to see the scene.

<img width="1282" height="750" alt="Screenshot 2025-12-06 at 10 03
25 PM"
src="https://github.com/user-attachments/assets/f76ef3ac-b762-4eef-9843-573f362fe45a"
/>
---
 .github/workflows/example-run.yml          |  6 +-
 crates/bevy_ui_render/src/debug_overlay.rs |  8 +-
 examples/testbed/ui.rs                     | 97 ++++++++++++++++++++++
 3 files changed, 107 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/example-run.yml b/.github/workflows/example-run.yml
index 107da778429eb..c41396eab7078 100644
--- a/.github/workflows/example-run.yml
+++ b/.github/workflows/example-run.yml
@@ -48,7 +48,7 @@ jobs:
             example_name=`basename $example .ron`
             echo -n $example_name > last_example_run
             echo "running $example_name - "`date`
-            time TRACE_CHROME=trace-$example_name.json CI_TESTING_CONFIG=$example cargo run --example $example_name --features "bevy_ci_testing,trace,trace_chrome"
+            time TRACE_CHROME=trace-$example_name.json CI_TESTING_CONFIG=$example cargo run --example $example_name --features "bevy_ci_testing,trace,trace_chrome,bevy_ui_debug"
             sleep 10
             if [ `find ./ -maxdepth 1 -name 'screenshot-*.png' -print -quit` ]; then
               mkdir screenshots-$example_name
@@ -123,7 +123,7 @@ jobs:
             example_name=`basename $example .ron`
             echo -n $example_name > last_example_run
             echo "running $example_name - "`date`
-            time TRACE_CHROME=trace-$example_name.json CI_TESTING_CONFIG=$example xvfb-run cargo run --example $example_name --features "bevy_ci_testing,trace,trace_chrome"
+            time TRACE_CHROME=trace-$example_name.json CI_TESTING_CONFIG=$example xvfb-run cargo run --example $example_name --features "bevy_ci_testing,trace,trace_chrome,bevy_ui_debug"
             sleep 10
             if [ `find ./ -maxdepth 1 -name 'screenshot-*.png' -print -quit` ]; then
               mkdir screenshots-$example_name
@@ -187,7 +187,7 @@ jobs:
             example_name=`basename $example .ron`
             echo -n $example_name > last_example_run
             echo "running $example_name - "`date`
-            time WGPU_BACKEND=dx12 TRACE_CHROME=trace-$example_name.json CI_TESTING_CONFIG=$example cargo run --example $example_name --features "statically-linked-dxc,bevy_ci_testing,trace,trace_chrome"
+            time WGPU_BACKEND=dx12 TRACE_CHROME=trace-$example_name.json CI_TESTING_CONFIG=$example cargo run --example $example_name --features "statically-linked-dxc,bevy_ci_testing,trace,trace_chrome,bevy_ui_debug"
             sleep 10
             if [ `find ./ -maxdepth 1 -name 'screenshot-*.png' -print -quit` ]; then
               mkdir screenshots-$example_name
diff --git a/crates/bevy_ui_render/src/debug_overlay.rs b/crates/bevy_ui_render/src/debug_overlay.rs
index dacc52a195791..c528efecaf82c 100644
--- a/crates/bevy_ui_render/src/debug_overlay.rs
+++ b/crates/bevy_ui_render/src/debug_overlay.rs
@@ -7,6 +7,7 @@ use crate::shader_flags;
 use bevy_asset::AssetId;
 use bevy_camera::visibility::InheritedVisibility;
 use bevy_color::Hsla;
+use bevy_color::LinearRgba;
 use bevy_ecs::entity::Entity;
 use bevy_ecs::prelude::ReflectResource;
 use bevy_ecs::resource::Resource;
@@ -34,6 +35,8 @@ pub struct UiDebugOptions {
     pub enabled: bool,
     /// Width of the overlay's lines in logical pixels
     pub line_width: f32,
+    /// Override Color for the overlay's lines
+    pub line_color_override: Option<LinearRgba>,
     /// Show outlines for non-visible UI nodes
     pub show_hidden: bool,
     /// Show outlines for clipped sections of UI nodes
@@ -51,6 +54,7 @@ impl Default for UiDebugOptions {
         Self {
             enabled: false,
             line_width: 1.,
+            line_color_override: None,
             show_hidden: false,
             show_clipped: false,
         }
@@ -101,7 +105,9 @@ pub fn extract_debug_overlay(
             extracted_camera_entity,
             transform: transform.into(),
             item: ExtractedUiItem::Node {
-                color: Hsla::sequential_dispersed(entity.index_u32()).into(),
+                color: debug_options
+                    .line_color_override
+                    .unwrap_or_else(|| Hsla::sequential_dispersed(entity.index_u32()).into()),
                 rect: Rect {
                     min: Vec2::ZERO,
                     max: uinode.size,
diff --git a/examples/testbed/ui.rs b/examples/testbed/ui.rs
index 956dead5b1494..652408632e727 100644
--- a/examples/testbed/ui.rs
+++ b/examples/testbed/ui.rs
@@ -25,6 +25,12 @@ fn main() {
         .add_systems(OnEnter(Scene::Transformations), transformations::setup)
         .add_systems(Update, switch_scene);
 
+    #[cfg(feature = "bevy_ui_debug")]
+    {
+        app.add_systems(OnEnter(Scene::DebugOutlines), debug_outlines::setup);
+        app.add_systems(OnExit(Scene::DebugOutlines), debug_outlines::teardown);
+    }
+
     #[cfg(feature = "bevy_ci_testing")]
     app.add_systems(Update, helpers::switch_scene_in_ci::<Scene>);
 
@@ -47,6 +53,8 @@ enum Scene {
     LinearGradient,
     RadialGradient,
     Transformations,
+    #[cfg(feature = "bevy_ui_debug")]
+    DebugOutlines,
 }
 
 impl Next for Scene {
@@ -62,6 +70,11 @@ impl Next for Scene {
             Scene::Slice => Scene::LayoutRounding,
             Scene::LayoutRounding => Scene::LinearGradient,
             Scene::LinearGradient => Scene::RadialGradient,
+            #[cfg(feature = "bevy_ui_debug")]
+            Scene::RadialGradient => Scene::DebugOutlines,
+            #[cfg(feature = "bevy_ui_debug")]
+            Scene::DebugOutlines => Scene::Transformations,
+            #[cfg(not(feature = "bevy_ui_debug"))]
             Scene::RadialGradient => Scene::Transformations,
             Scene::Transformations => Scene::Image,
         }
@@ -969,3 +982,87 @@ mod transformations {
             });
     }
 }
+
+#[cfg(feature = "bevy_ui_debug")]
+mod debug_outlines {
+    use bevy::{
+        color::palettes::css::{BLUE, GRAY, RED},
+        prelude::*,
+        ui_render::UiDebugOptions,
+    };
+
+    pub fn setup(mut commands: Commands, mut debug_options: ResMut<UiDebugOptions>) {
+        debug_options.enabled = true;
+        debug_options.line_width = 5.;
+        debug_options.line_color_override = Some(LinearRgba::GREEN);
+        debug_options.show_hidden = true;
+        debug_options.show_clipped = true;
+        commands.spawn((Camera2d, DespawnOnExit(super::Scene::DebugOutlines)));
+        commands
+            .spawn((
+                Node {
+                    width: percent(100),
+                    height: percent(100),
+                    align_items: AlignItems::Center,
+                    justify_content: JustifyContent::SpaceAround,
+                    ..default()
+                },
+                DespawnOnExit(super::Scene::DebugOutlines),
+            ))
+            .with_children(|parent| {
+                parent.spawn((
+                    Node {
+                        width: px(100),
+                        height: px(100),
+                        ..default()
+                    },
+                    BackgroundColor(GRAY.into()),
+                    UiTransform::from_rotation(Rot2::degrees(45.)),
+                ));
+
+                parent.spawn((Text::new("Regular Text"), TextFont::default()));
+
+                parent.spawn((
+                    Node {
+                        width: px(100),
+                        height: px(100),
+                        ..default()
+                    },
+                    Text::new("Invisible"),
+                    BackgroundColor(GRAY.into()),
+                    TextFont::default(),
+                    Visibility::Hidden,
+                ));
+
+                parent
+                    .spawn((
+                        Node {
+                            width: px(100),
+                            height: px(100),
+                            padding: UiRect {
+                                left: px(25),
+                                top: px(25),
+                                ..Default::default()
+                            },
+                            overflow: Overflow::clip(),
+                            ..default()
+                        },
+                        BackgroundColor(RED.into()),
+                    ))
+                    .with_children(|child| {
+                        child.spawn((
+                            Node {
+                                min_width: px(100),
+                                min_height: px(100),
+                                ..default()
+                            },
+                            BackgroundColor(BLUE.into()),
+                        ));
+                    });
+            });
+    }
+
+    pub fn teardown(mut debug_options: ResMut<UiDebugOptions>) {
+        *debug_options = UiDebugOptions::default();
+    }
+}

From d76c3aab952239110e4c95767d2c8d21a9a712a6 Mon Sep 17 00:00:00 2001
From: Mike <mike.hsu@gmail.com>
Date: Mon, 8 Dec 2025 14:43:07 -0800
Subject: [PATCH 049/133] get_components_mut (#21780)

# Objective

- Add a checked version of `EntityMut::get_components_mut` and
`EntityWorldMut::get_components_mut` that does not allocate

## Solution

- Add a iterator over the access type to `QueryData`. This is then used
to iterate over the pairs of access to check if they are compatible or
not.

## Testing

- Added a unit test

### Bench checked vs unchecked (50000 entities)

| #components | unchecked | checked  | times slower |
|-------------|-----------|----------|----------|
| 2           | 509 us    | 1123 us  | 2.2x     |
| 5           | 903 us    | 2902us  | 3.2x     |
| 10          | 1700 us   | 11424 us | 6.72x    |

so at 10 components each call was taking about 0.22us vs 0.03 us

---

## ToDo

* [x] add release note
* [x] add migration guide
* [x] add macro for more benches
* [x] add bench results to pr description
* [ ] look into if this will help with uncached queries
* [x] see if we can optimize it a bit

---------

Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
---
 benches/Cargo.toml                            |   1 +
 benches/benches/bevy_ecs/world/mod.rs         |   3 +
 benches/benches/bevy_ecs/world/world_get.rs   |  65 ++-
 crates/bevy_ecs/macros/src/query_data.rs      |  12 +
 crates/bevy_ecs/src/event/trigger.rs          |   2 +-
 crates/bevy_ecs/src/query/access_iter.rs      | 467 ++++++++++++++++++
 crates/bevy_ecs/src/query/fetch.rs            | 100 +++-
 crates/bevy_ecs/src/query/mod.rs              |  10 +
 .../src/world/entity_access/entity_mut.rs     |  96 +++-
 .../src/world/entity_access/entity_ref.rs     |   4 +-
 .../bevy_ecs/src/world/entity_access/mod.rs   |  31 +-
 .../src/world/entity_access/world_mut.rs      |  97 +++-
 .../bevy_ecs/src/world/unsafe_world_cell.rs   |   9 +-
 crates/bevy_render/src/sync_world.rs          |  12 +
 .../migration-guides/get_components.md        |   7 +
 .../release-notes/get_components_mut.md       |  13 +
 16 files changed, 906 insertions(+), 23 deletions(-)
 create mode 100644 crates/bevy_ecs/src/query/access_iter.rs
 create mode 100644 release-content/migration-guides/get_components.md
 create mode 100644 release-content/release-notes/get_components_mut.md

diff --git a/benches/Cargo.toml b/benches/Cargo.toml
index 8940f1eed7105..a8bb418259a46 100644
--- a/benches/Cargo.toml
+++ b/benches/Cargo.toml
@@ -11,6 +11,7 @@ autobenches = false
 # The primary crate that runs and analyzes our benchmarks. This is a regular dependency because the
 # `bench!` macro refers to it in its documentation.
 criterion = { version = "0.8.0", features = ["html_reports"] }
+seq-macro = "0.3.6"
 
 [dev-dependencies]
 # Bevy crates
diff --git a/benches/benches/bevy_ecs/world/mod.rs b/benches/benches/bevy_ecs/world/mod.rs
index 7158f2f033498..b71b59bc69160 100644
--- a/benches/benches/bevy_ecs/world/mod.rs
+++ b/benches/benches/bevy_ecs/world/mod.rs
@@ -35,5 +35,8 @@ criterion_group!(
     query_get_many::<2>,
     query_get_many::<5>,
     query_get_many::<10>,
+    query_get_components_mut_2,
+    query_get_components_mut_5,
+    query_get_components_mut_10,
     entity_set_build_and_lookup,
 );
diff --git a/benches/benches/bevy_ecs/world/world_get.rs b/benches/benches/bevy_ecs/world/world_get.rs
index dc5c2c5caf420..080990f85d30b 100644
--- a/benches/benches/bevy_ecs/world/world_get.rs
+++ b/benches/benches/bevy_ecs/world/world_get.rs
@@ -1,3 +1,4 @@
+use benches::bench;
 use core::hint::black_box;
 
 use bevy_ecs::{
@@ -5,11 +6,12 @@ use bevy_ecs::{
     component::Component,
     entity::Entity,
     system::{Query, SystemState},
-    world::World,
+    world::{EntityMut, World},
 };
 use criterion::Criterion;
 use rand::{prelude::SliceRandom, SeedableRng};
 use rand_chacha::ChaCha8Rng;
+use seq_macro::seq;
 
 #[derive(Component, Default)]
 #[component(storage = "Table")]
@@ -357,3 +359,64 @@ pub fn query_get_many<const N: usize>(criterion: &mut Criterion) {
         });
     }
 }
+
+macro_rules! query_get_components_mut {
+    ($function_name:ident, $val:literal) => {
+        pub fn $function_name(criterion: &mut Criterion) {
+            let mut group = criterion.benchmark_group(bench!("world_query_get_components_mut"));
+            group.warm_up_time(core::time::Duration::from_millis(500));
+            group.measurement_time(core::time::Duration::from_secs(4));
+
+            for entity_count in RANGE.map(|i| i * 10_000) {
+                seq!(N in 0..$val {
+                    let (mut world, entities) = setup_wide::<(
+                        #(WideTable<N>,)*
+                    )>(entity_count);
+                });
+                let mut query = world.query::<EntityMut>();
+                group.bench_function(format!("{}_components_{entity_count}_entities", $val), |bencher| {
+                    bencher.iter(|| {
+                        for entity in &entities {
+                            seq!(N in 0..$val {
+                                assert!(query
+                                    .get_mut(&mut world, *entity)
+                                    .unwrap()
+                                    .get_components_mut::<(
+                                            #(&mut WideTable<N>,)*
+                                        )>()
+                                        .is_ok());
+                            });
+                        }
+                    });
+                });
+                group.bench_function(
+                    format!("unchecked_{}_components_{entity_count}_entities", $val),
+                    |bencher| {
+                        bencher.iter(|| {
+                            for entity in &entities {
+                                // SAFETY: no duplicate components are listed
+                                unsafe {
+                                    seq!(N in 0..$val {
+                                        assert!(query
+                                            .get_mut(&mut world, *entity)
+                                            .unwrap()
+                                            .get_components_mut_unchecked::<(
+                                                    #(&mut WideTable<N>,)*
+                                                )>()
+                                                .is_ok());
+                                    });
+                                }
+                            }
+                        });
+                    },
+                );
+            }
+
+            group.finish();
+        }
+    };
+}
+
+query_get_components_mut!(query_get_components_mut_2, 2);
+query_get_components_mut!(query_get_components_mut_5, 5);
+query_get_components_mut!(query_get_components_mut_10, 10);
diff --git a/crates/bevy_ecs/macros/src/query_data.rs b/crates/bevy_ecs/macros/src/query_data.rs
index 1e9dea94bbca3..a91dd193e51c1 100644
--- a/crates/bevy_ecs/macros/src/query_data.rs
+++ b/crates/bevy_ecs/macros/src/query_data.rs
@@ -267,6 +267,12 @@ pub fn derive_query_data_impl(input: TokenStream) -> TokenStream {
                             #(#field_members: <#read_only_field_types>::fetch(&_state.#field_aliases, &mut _fetch.#field_aliases, _entity, _table_row)?,)*
                         })
                     }
+
+                    fn iter_access(
+                        _state: &Self::State,
+                    ) -> impl core::iter::Iterator<Item = #path::query::EcsAccessType<'_>> {
+                        core::iter::empty() #(.chain(<#field_types>::iter_access(&_state.#field_aliases)))*
+                    }
                 }
 
                 impl #user_impl_generics #path::query::ReleaseStateQueryData
@@ -332,6 +338,12 @@ pub fn derive_query_data_impl(input: TokenStream) -> TokenStream {
                         #(#field_members: <#field_types>::fetch(&_state.#field_aliases, &mut _fetch.#field_aliases, _entity, _table_row)?,)*
                     })
                 }
+
+                fn iter_access(
+                    _state: &Self::State,
+                ) -> impl core::iter::Iterator<Item = #path::query::EcsAccessType<'_>> {
+                    core::iter::empty() #(.chain(<#field_types>::iter_access(&_state.#field_aliases)))*
+                }
             }
 
             impl #user_impl_generics #path::query::ReleaseStateQueryData
diff --git a/crates/bevy_ecs/src/event/trigger.rs b/crates/bevy_ecs/src/event/trigger.rs
index 9492380b63159..ba8a06bc2918d 100644
--- a/crates/bevy_ecs/src/event/trigger.rs
+++ b/crates/bevy_ecs/src/event/trigger.rs
@@ -301,7 +301,7 @@ unsafe impl<
                 return;
             }
             if let Ok(entity) = world.get_entity(current_entity)
-                && let Some(item) = entity.get_components::<T>()
+                && let Ok(item) = entity.get_components::<T>()
                 && let Some(traverse_to) = T::traverse(item, event)
             {
                 current_entity = traverse_to;
diff --git a/crates/bevy_ecs/src/query/access_iter.rs b/crates/bevy_ecs/src/query/access_iter.rs
new file mode 100644
index 0000000000000..9b79b8156edef
--- /dev/null
+++ b/crates/bevy_ecs/src/query/access_iter.rs
@@ -0,0 +1,467 @@
+use core::fmt::Display;
+
+use crate::{
+    component::{ComponentId, Components},
+    query::{Access, QueryData},
+};
+
+/// Check if `Q` has any internal conflicts.
+#[inline(never)]
+pub fn has_conflicts<Q: QueryData>(components: &Components) -> Result<(), QueryAccessError> {
+    // increasing this too much may slow down smaller queries
+    const MAX_SIZE: usize = 16;
+    let Some(state) = Q::get_state(components) else {
+        return Err(QueryAccessError::ComponentNotRegistered);
+    };
+    let iter = Q::iter_access(&state).enumerate();
+    let size = iter.size_hint().1.unwrap_or(MAX_SIZE);
+
+    if size > MAX_SIZE {
+        for (i, access) in iter {
+            for access_other in Q::iter_access(&state).take(i) {
+                if let Err(err) = access.is_compatible(access_other) {
+                    panic!("{}", err);
+                }
+            }
+        }
+    } else {
+        // we can optimize small sizes by caching the iteration result in an array on the stack
+        let mut inner_access = [EcsAccessType::Empty; MAX_SIZE];
+        for (i, access) in iter {
+            for access_other in inner_access.iter().take(i) {
+                if let Err(err) = access.is_compatible(*access_other) {
+                    panic!("{}", err);
+                }
+            }
+            inner_access[i] = access;
+        }
+    }
+
+    Ok(())
+}
+
+/// The data storage type that is being accessed.
+#[derive(Copy, Clone, Debug, PartialEq)]
+pub enum EcsAccessType<'a> {
+    /// Accesses [`Component`](crate::prelude::Component) data
+    Component(EcsAccessLevel),
+    /// Accesses [`Resource`](crate::prelude::Resource) data
+    Resource(ResourceAccessLevel),
+    /// borrowed access from [`WorldQuery::State`](crate::query::WorldQuery)
+    Access(&'a Access),
+    /// Does not access any data that can conflict.
+    Empty,
+}
+
+impl<'a> EcsAccessType<'a> {
+    /// Returns `Ok(())` if `self` and `other` are compatible. Returns a [`AccessConflictError`] otherwise.
+    #[inline(never)]
+    pub fn is_compatible(&self, other: Self) -> Result<(), AccessConflictError<'_>> {
+        use EcsAccessLevel::*;
+        use EcsAccessType::*;
+
+        match (*self, other) {
+            (Component(ReadAll), Component(Write(_)))
+            | (Component(Write(_)), Component(ReadAll))
+            | (Component(_), Component(WriteAll))
+            | (Component(WriteAll), Component(_)) => Err(AccessConflictError(*self, other)),
+
+            (Empty, _)
+            | (_, Empty)
+            | (Component(_), Resource(_))
+            | (Resource(_), Component(_))
+            // read only access doesn't conflict
+            | (Component(Read(_)), Component(Read(_)))
+            | (Component(ReadAll), Component(Read(_)))
+            | (Component(Read(_)), Component(ReadAll))
+            | (Component(ReadAll), Component(ReadAll))
+            | (Resource(ResourceAccessLevel::Read(_)), Resource(ResourceAccessLevel::Read(_))) => {
+                Ok(())
+            }
+
+            (Component(Read(id)), Component(Write(id_other)))
+            | (Component(Write(id)), Component(Read(id_other)))
+            | (Component(Write(id)), Component(Write(id_other)))
+            | (
+                Resource(ResourceAccessLevel::Read(id)),
+                Resource(ResourceAccessLevel::Write(id_other)),
+            )
+            | (
+                Resource(ResourceAccessLevel::Write(id)),
+                Resource(ResourceAccessLevel::Read(id_other)),
+            )
+            | (
+                Resource(ResourceAccessLevel::Write(id)),
+                Resource(ResourceAccessLevel::Write(id_other)),
+            ) => if id == id_other {
+                Err(AccessConflictError(*self, other))
+            } else {
+                Ok(())
+            },
+
+            // Borrowed Access
+            (Component(Read(component_id)), Access(access))
+            | (Access(access), Component(Read(component_id))) => if access.has_component_write(component_id) {
+                Err(AccessConflictError(*self, other))
+            } else {
+                Ok(())
+            },
+
+            (Component(Write(component_id)), Access(access))
+            | (Access(access), Component(Write(component_id))) => if access.has_component_read(component_id) {
+                Err(AccessConflictError(*self, other))
+            } else {
+                Ok(())
+            },
+
+            (Component(ReadAll), Access(access))
+            | (Access(access), Component(ReadAll)) => if access.has_any_component_write() {
+                Err(AccessConflictError(*self, other))
+            } else {
+                Ok(())
+            },
+
+            (Component(WriteAll), Access(access))
+            | (Access(access), Component(WriteAll))=> if access.has_any_component_read() {
+                Err(AccessConflictError(*self, other))
+            } else {
+                Ok(())
+            },
+
+            (Resource(ResourceAccessLevel::Read(component_id)), Access(access))
+            | (Access(access), Resource(ResourceAccessLevel::Read(component_id))) => if access.has_resource_write(component_id) {
+                Err(AccessConflictError(*self, other))
+            } else {
+                Ok(())
+            },
+            (Resource(ResourceAccessLevel::Write(component_id)), Access(access))
+            | (Access(access), Resource(ResourceAccessLevel::Write(component_id))) => if access.has_resource_read(component_id) {
+                Err(AccessConflictError(*self, other))
+            } else {
+                Ok(())
+            },
+
+            (Access(access), Access(other_access)) => if access.is_compatible(other_access) {
+                Ok(())
+            } else {
+                Err(AccessConflictError(*self, other))
+            },
+        }
+    }
+}
+
+/// The way the data will be accessed and whether we take access on all the components on
+/// an entity or just one component.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub enum EcsAccessLevel {
+    /// Reads [`Component`](crate::prelude::Component) with [`ComponentId`]
+    Read(ComponentId),
+    /// Writes [`Component`](crate::prelude::Component) with [`ComponentId`]
+    Write(ComponentId),
+    /// Potentially reads all [`Component`](crate::prelude::Component)'s in the [`World`](crate::prelude::World)
+    ReadAll,
+    /// Potentially writes all [`Component`](crate::prelude::Component)'s in the [`World`](crate::prelude::World)
+    WriteAll,
+}
+
+/// Access level needed by [`QueryData`] fetch to the resource.
+#[derive(Copy, Clone, Debug, PartialEq)]
+pub enum ResourceAccessLevel {
+    /// Reads the resource with [`ComponentId`]
+    Read(ComponentId),
+    /// Writes the resource with [`ComponentId`]
+    Write(ComponentId),
+}
+
+/// Error returned from [`EcsAccessType::is_compatible`]
+pub struct AccessConflictError<'a>(EcsAccessType<'a>, EcsAccessType<'a>);
+
+impl Display for AccessConflictError<'_> {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        use EcsAccessLevel::*;
+        use EcsAccessType::*;
+
+        let AccessConflictError(a, b) = self;
+        match (a, b) {
+            // ReadAll/WriteAll + Component conflicts
+            (Component(ReadAll), Component(Write(id)))
+            | (Component(Write(id)), Component(ReadAll)) => {
+                write!(
+                    f,
+                    "Component read all access conflicts with component {id:?} write."
+                )
+            }
+            (Component(WriteAll), Component(Write(id)))
+            | (Component(Write(id)), Component(WriteAll)) => {
+                write!(
+                    f,
+                    "Component write all access conflicts with component {id:?} write."
+                )
+            }
+            (Component(WriteAll), Component(Read(id)))
+            | (Component(Read(id)), Component(WriteAll)) => {
+                write!(
+                    f,
+                    "Component write all access conflicts with component {id:?} read."
+                )
+            }
+            (Component(WriteAll), Component(ReadAll))
+            | (Component(ReadAll), Component(WriteAll)) => {
+                write!(f, "Component write all conflicts with component read all.")
+            }
+            (Component(WriteAll), Component(WriteAll)) => {
+                write!(f, "Component write all conflicts with component write all.")
+            }
+
+            // Component + Component conflicts
+            (Component(Read(id)), Component(Write(id_other)))
+            | (Component(Write(id_other)), Component(Read(id))) => write!(
+                f,
+                "Component {id:?} read conflicts with component {id_other:?} write."
+            ),
+            (Component(Write(id)), Component(Write(id_other))) => write!(
+                f,
+                "Component {id:?} write conflicts with component {id_other:?} write."
+            ),
+
+            // Borrowed Access conflicts
+            (Access(_), Component(Read(id))) | (Component(Read(id)), Access(_)) => write!(
+                f,
+                "Access has a write that conflicts with component {id:?} read."
+            ),
+            (Access(_), Component(Write(id))) | (Component(Write(id)), Access(_)) => write!(
+                f,
+                "Access has a read that conflicts with component {id:?} write."
+            ),
+            (Access(_), Component(ReadAll)) | (Component(ReadAll), Access(_)) => write!(
+                f,
+                "Access has a write that conflicts with component read all"
+            ),
+            (Access(_), Component(WriteAll)) | (Component(WriteAll), Access(_)) => write!(
+                f,
+                "Access has a read that conflicts with component write all"
+            ),
+            (Access(_), Resource(ResourceAccessLevel::Read(id)))
+            | (Resource(ResourceAccessLevel::Read(id)), Access(_)) => write!(
+                f,
+                "Access has a write that conflicts with resource {id:?} read."
+            ),
+            (Access(_), Resource(ResourceAccessLevel::Write(id)))
+            | (Resource(ResourceAccessLevel::Write(id)), Access(_)) => write!(
+                f,
+                "Access has a read that conflicts with resource {id:?} write."
+            ),
+            (Access(_), Access(_)) => write!(f, "Access conflicts with other Access"),
+
+            _ => {
+                unreachable!("Other accesses should be compatible");
+            }
+        }
+    }
+}
+
+/// Error returned from [`has_conflicts`].
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub enum QueryAccessError {
+    /// Component was not registered on world
+    ComponentNotRegistered,
+    /// Entity did not have the requested components
+    EntityDoesNotMatch,
+}
+
+impl core::error::Error for QueryAccessError {}
+
+impl Display for QueryAccessError {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        match *self {
+            QueryAccessError::ComponentNotRegistered => {
+                write!(
+                    f,
+                    "At least one component in Q was not registered in world. 
+                    Consider calling `World::register_component`"
+                )
+            }
+            QueryAccessError::EntityDoesNotMatch => {
+                write!(f, "Entity does not match Q")
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::{
+        prelude::Component,
+        world::{EntityMut, EntityMutExcept, EntityRef, EntityRefExcept, World},
+    };
+
+    #[derive(Component)]
+    struct C1;
+
+    #[derive(Component)]
+    struct C2;
+
+    fn setup_world() -> World {
+        let world = World::new();
+        let mut world = world;
+        world.register_component::<C1>();
+        world.register_component::<C2>();
+        world
+    }
+
+    #[test]
+    fn simple_compatible() {
+        let world = setup_world();
+        let c = world.components();
+
+        // Compatible
+        assert!(has_conflicts::<&mut C1>(c).is_ok());
+        assert!(has_conflicts::<&C1>(c).is_ok());
+        assert!(has_conflicts::<(&C1, &C1)>(c).is_ok());
+    }
+
+    #[test]
+    #[should_panic(expected = "conflicts")]
+    fn conflict_component_read_conflicts_write() {
+        let _ = has_conflicts::<(&C1, &mut C1)>(setup_world().components());
+    }
+
+    #[test]
+    #[should_panic(expected = "conflicts")]
+    fn conflict_component_write_conflicts_read() {
+        let _ = has_conflicts::<(&mut C1, &C1)>(setup_world().components());
+    }
+
+    #[test]
+    #[should_panic(expected = "conflicts")]
+    fn conflict_component_write_conflicts_write() {
+        let _ = has_conflicts::<(&mut C1, &mut C1)>(setup_world().components());
+    }
+
+    #[test]
+    fn entity_ref_compatible() {
+        let world = setup_world();
+        let c = world.components();
+
+        // Compatible
+        assert!(has_conflicts::<(EntityRef, &C1)>(c).is_ok());
+        assert!(has_conflicts::<(&C1, EntityRef)>(c).is_ok());
+        assert!(has_conflicts::<(EntityRef, EntityRef)>(c).is_ok());
+    }
+
+    #[test]
+    #[should_panic(expected = "conflicts")]
+    fn entity_ref_conflicts_component_write() {
+        let _ = has_conflicts::<(EntityRef, &mut C1)>(setup_world().components());
+    }
+
+    #[test]
+    #[should_panic(expected = "conflicts")]
+    fn component_write_conflicts_entity_ref() {
+        let _ = has_conflicts::<(&mut C1, EntityRef)>(setup_world().components());
+    }
+
+    #[test]
+    #[should_panic(expected = "conflicts")]
+    fn entity_mut_conflicts_component_read() {
+        let _ = has_conflicts::<(EntityMut, &C1)>(setup_world().components());
+    }
+
+    #[test]
+    #[should_panic(expected = "conflicts")]
+    fn component_read_conflicts_entity_mut() {
+        let _ = has_conflicts::<(&C1, EntityMut)>(setup_world().components());
+    }
+
+    #[test]
+    #[should_panic(expected = "conflicts")]
+    fn entity_mut_conflicts_component_write() {
+        let _ = has_conflicts::<(EntityMut, &mut C1)>(setup_world().components());
+    }
+
+    #[test]
+    #[should_panic(expected = "conflicts")]
+    fn component_write_conflicts_entity_mut() {
+        let _ = has_conflicts::<(&mut C1, EntityMut)>(setup_world().components());
+    }
+
+    #[test]
+    #[should_panic(expected = "conflicts")]
+    fn entity_mut_conflicts_entity_ref() {
+        let _ = has_conflicts::<(EntityMut, EntityRef)>(setup_world().components());
+    }
+
+    #[test]
+    #[should_panic(expected = "conflicts")]
+    fn entity_ref_conflicts_entity_mut() {
+        let _ = has_conflicts::<(EntityRef, EntityMut)>(setup_world().components());
+    }
+
+    #[test]
+    fn entity_ref_except_compatible() {
+        let world = setup_world();
+        let c = world.components();
+
+        // Compatible
+        assert!(has_conflicts::<(EntityRefExcept<C1>, &mut C1)>(c).is_ok());
+        assert!(has_conflicts::<(&mut C1, EntityRefExcept<C1>)>(c).is_ok());
+        assert!(has_conflicts::<(&C2, EntityRefExcept<C1>)>(c).is_ok());
+        assert!(has_conflicts::<(&mut C1, EntityRefExcept<(C1, C2)>,)>(c).is_ok());
+        assert!(has_conflicts::<(EntityRefExcept<(C1, C2)>, &mut C1,)>(c).is_ok());
+        assert!(has_conflicts::<(&mut C1, &mut C2, EntityRefExcept<(C1, C2)>,)>(c).is_ok());
+        assert!(has_conflicts::<(&mut C1, EntityRefExcept<(C1, C2)>, &mut C2,)>(c).is_ok());
+        assert!(has_conflicts::<(EntityRefExcept<(C1, C2)>, &mut C1, &mut C2,)>(c).is_ok());
+    }
+
+    #[test]
+    #[should_panic(expected = "conflicts")]
+    fn entity_ref_except_conflicts_component_write() {
+        let _ = has_conflicts::<(EntityRefExcept<C1>, &mut C2)>(setup_world().components());
+    }
+
+    #[test]
+    #[should_panic(expected = "conflicts")]
+    fn component_write_conflicts_entity_ref_except() {
+        let _ = has_conflicts::<(&mut C2, EntityRefExcept<C1>)>(setup_world().components());
+    }
+
+    #[test]
+    fn entity_mut_except_compatible() {
+        let world = setup_world();
+        let c = world.components();
+
+        // Compatible
+        assert!(has_conflicts::<(EntityMutExcept<C1>, &mut C1)>(c).is_ok());
+        assert!(has_conflicts::<(&mut C1, EntityMutExcept<C1>)>(c).is_ok());
+        assert!(has_conflicts::<(&mut C1, EntityMutExcept<(C1, C2)>,)>(c).is_ok());
+        assert!(has_conflicts::<(EntityMutExcept<(C1, C2)>, &mut C1,)>(c).is_ok());
+        assert!(has_conflicts::<(&mut C1, &mut C2, EntityMutExcept<(C1, C2)>,)>(c).is_ok());
+        assert!(has_conflicts::<(&mut C1, EntityMutExcept<(C1, C2)>, &mut C2,)>(c).is_ok());
+        assert!(has_conflicts::<(EntityMutExcept<(C1, C2)>, &mut C1, &mut C2,)>(c).is_ok());
+    }
+
+    #[test]
+    #[should_panic(expected = "conflicts")]
+    fn entity_mut_except_conflicts_component_read() {
+        let _ = has_conflicts::<(EntityMutExcept<C1>, &C2)>(setup_world().components());
+    }
+
+    #[test]
+    #[should_panic(expected = "conflicts")]
+    fn component_read_conflicts_entity_mut_except() {
+        let _ = has_conflicts::<(&C2, EntityMutExcept<C1>)>(setup_world().components());
+    }
+
+    #[test]
+    #[should_panic(expected = "conflicts")]
+    fn entity_mut_except_conflicts_component_write() {
+        let _ = has_conflicts::<(EntityMutExcept<C1>, &mut C2)>(setup_world().components());
+    }
+
+    #[test]
+    #[should_panic(expected = "conflicts")]
+    fn component_write_conflicts_entity_mut_except() {
+        let _ = has_conflicts::<(&mut C2, EntityMutExcept<C1>)>(setup_world().components());
+    }
+}
diff --git a/crates/bevy_ecs/src/query/fetch.rs b/crates/bevy_ecs/src/query/fetch.rs
index 2cab429557c7c..d0b191513e8ed 100644
--- a/crates/bevy_ecs/src/query/fetch.rs
+++ b/crates/bevy_ecs/src/query/fetch.rs
@@ -4,7 +4,10 @@ use crate::{
     change_detection::{ComponentTicksMut, ComponentTicksRef, MaybeLocation, Tick},
     component::{Component, ComponentId, Components, Mutable, StorageType},
     entity::{Entities, Entity, EntityLocation},
-    query::{Access, DebugCheckedUnwrap, FilteredAccess, WorldQuery},
+    query::{
+        access_iter::{EcsAccessLevel, EcsAccessType},
+        Access, DebugCheckedUnwrap, FilteredAccess, WorldQuery,
+    },
     storage::{ComponentSparseSet, Table, TableRow},
     world::{
         unsafe_world_cell::UnsafeWorldCell, EntityMut, EntityMutExcept, EntityRef, EntityRefExcept,
@@ -13,7 +16,7 @@ use crate::{
 };
 use bevy_ptr::{ThinSlicePtr, UnsafeCellDeref};
 use bevy_utils::prelude::DebugName;
-use core::{cell::UnsafeCell, marker::PhantomData, panic::Location};
+use core::{cell::UnsafeCell, iter, marker::PhantomData, panic::Location};
 use variadics_please::all_tuples;
 
 /// Types that can be fetched from a [`World`] using a [`Query`].
@@ -342,6 +345,11 @@ pub unsafe trait QueryData: WorldQuery {
         entity: Entity,
         table_row: TableRow,
     ) -> Option<Self::Item<'w, 's>>;
+
+    /// Returns an iterator over the access needed by [`QueryData::fetch`]. Access conflicts are usually
+    /// checked in [`WorldQuery::update_component_access`], but in certain cases this method can be useful to implement
+    /// a way of checking for access conflicts in a non-allocating way.
+    fn iter_access(state: &Self::State) -> impl Iterator<Item = EcsAccessType<'_>>;
 }
 
 /// A [`QueryData`] that is read only.
@@ -450,6 +458,10 @@ unsafe impl QueryData for Entity {
     ) -> Option<Self::Item<'w, 's>> {
         Some(entity)
     }
+
+    fn iter_access(_state: &Self::State) -> impl Iterator<Item = EcsAccessType<'_>> {
+        iter::empty()
+    }
 }
 
 /// SAFETY: access is read only
@@ -543,6 +555,10 @@ unsafe impl QueryData for EntityLocation {
         // SAFETY: `fetch` must be called with an entity that exists in the world
         Some(unsafe { fetch.get_spawned(entity).debug_checked_unwrap() })
     }
+
+    fn iter_access(_state: &Self::State) -> impl Iterator<Item = EcsAccessType<'_>> {
+        iter::empty()
+    }
 }
 
 /// SAFETY: access is read only
@@ -719,6 +735,10 @@ unsafe impl QueryData for SpawnDetails {
             this_run: fetch.this_run,
         })
     }
+
+    fn iter_access(_state: &Self::State) -> impl Iterator<Item = EcsAccessType<'_>> {
+        iter::empty()
+    }
 }
 
 /// SAFETY: access is read only
@@ -838,6 +858,10 @@ unsafe impl<'a> QueryData for EntityRef<'a> {
         // SAFETY: Read-only access to every component has been registered.
         Some(unsafe { EntityRef::new(cell) })
     }
+
+    fn iter_access(_state: &Self::State) -> impl Iterator<Item = EcsAccessType<'_>> {
+        iter::once(EcsAccessType::Component(EcsAccessLevel::ReadAll))
+    }
 }
 
 /// SAFETY: access is read only
@@ -944,6 +968,10 @@ unsafe impl<'a> QueryData for EntityMut<'a> {
         // SAFETY: mutable access to every component has been registered.
         Some(unsafe { EntityMut::new(cell) })
     }
+
+    fn iter_access(_state: &Self::State) -> impl Iterator<Item = EcsAccessType<'_>> {
+        iter::once(EcsAccessType::Component(EcsAccessLevel::WriteAll))
+    }
 }
 
 impl ReleaseStateQueryData for EntityMut<'_> {
@@ -1020,7 +1048,7 @@ unsafe impl WorldQuery for FilteredEntityRef<'_, '_> {
 }
 
 /// SAFETY: `Self` is the same as `Self::ReadOnly`
-unsafe impl QueryData for FilteredEntityRef<'_, '_> {
+unsafe impl<'a, 'b> QueryData for FilteredEntityRef<'a, 'b> {
     const IS_READ_ONLY: bool = true;
     const IS_ARCHETYPAL: bool = true;
     type ReadOnly = Self;
@@ -1068,6 +1096,10 @@ unsafe impl QueryData for FilteredEntityRef<'_, '_> {
         // SAFETY: mutable access to every component has been registered.
         Some(unsafe { FilteredEntityRef::new(cell, access) })
     }
+
+    fn iter_access(state: &Self::State) -> impl Iterator<Item = EcsAccessType<'_>> {
+        iter::once(EcsAccessType::Access(state))
+    }
 }
 
 /// SAFETY: Access is read-only.
@@ -1187,6 +1219,10 @@ unsafe impl<'a, 'b> QueryData for FilteredEntityMut<'a, 'b> {
         // SAFETY: mutable access to every component has been registered.
         Some(unsafe { FilteredEntityMut::new(cell, access) })
     }
+
+    fn iter_access(state: &Self::State) -> impl Iterator<Item = EcsAccessType<'_>> {
+        iter::once(EcsAccessType::Access(state))
+    }
 }
 
 impl ArchetypeQueryData for FilteredEntityMut<'_, '_> {}
@@ -1297,6 +1333,10 @@ where
             .unwrap();
         Some(EntityRefExcept::new(cell, access))
     }
+
+    fn iter_access(state: &Self::State) -> impl Iterator<Item = EcsAccessType<'_>> {
+        iter::once(EcsAccessType::Access(state))
+    }
 }
 
 /// SAFETY: `EntityRefExcept` enforces read-only access to its contained
@@ -1412,6 +1452,10 @@ where
             .unwrap();
         Some(EntityMutExcept::new(cell, access))
     }
+
+    fn iter_access(state: &Self::State) -> impl Iterator<Item = EcsAccessType<'_>> {
+        iter::once(EcsAccessType::Access(state))
+    }
 }
 
 impl<B: Bundle> ArchetypeQueryData for EntityMutExcept<'_, '_, B> {}
@@ -1499,6 +1543,10 @@ unsafe impl QueryData for &Archetype {
         // SAFETY: The assigned archetype for a living entity must always be valid.
         Some(unsafe { archetypes.get(location.archetype_id).debug_checked_unwrap() })
     }
+
+    fn iter_access(_state: &Self::State) -> impl Iterator<Item = EcsAccessType<'_>> {
+        iter::empty()
+    }
 }
 
 /// SAFETY: access is read only
@@ -1668,6 +1716,10 @@ unsafe impl<T: Component> QueryData for &T {
             },
         ))
     }
+
+    fn iter_access(state: &Self::State) -> impl Iterator<Item = EcsAccessType<'_>> {
+        iter::once(EcsAccessType::Component(EcsAccessLevel::Read(*state)))
+    }
 }
 
 /// SAFETY: access is read only
@@ -1881,6 +1933,10 @@ unsafe impl<'__w, T: Component> QueryData for Ref<'__w, T> {
             },
         ))
     }
+
+    fn iter_access(state: &Self::State) -> impl Iterator<Item = EcsAccessType<'_>> {
+        iter::once(EcsAccessType::Component(EcsAccessLevel::Read(*state)))
+    }
 }
 
 /// SAFETY: access is read only
@@ -2094,6 +2150,10 @@ unsafe impl<'__w, T: Component<Mutability = Mutable>> QueryData for &'__w mut T
             },
         ))
     }
+
+    fn iter_access(state: &Self::State) -> impl Iterator<Item = EcsAccessType<'_>> {
+        iter::once(EcsAccessType::Component(EcsAccessLevel::Write(*state)))
+    }
 }
 
 impl<T: Component<Mutability = Mutable>> ReleaseStateQueryData for &mut T {
@@ -2209,6 +2269,10 @@ unsafe impl<'__w, T: Component<Mutability = Mutable>> QueryData for Mut<'__w, T>
     ) -> Option<Self::Item<'w, 's>> {
         <&mut T as QueryData>::fetch(state, fetch, entity, table_row)
     }
+
+    fn iter_access(state: &Self::State) -> impl Iterator<Item = EcsAccessType<'_>> {
+        iter::once(EcsAccessType::Component(EcsAccessLevel::Write(*state)))
+    }
 }
 
 impl<T: Component<Mutability = Mutable>> ReleaseStateQueryData for Mut<'_, T> {
@@ -2357,6 +2421,10 @@ unsafe impl<T: QueryData> QueryData for Option<T> {
                 .flatten(),
         )
     }
+
+    fn iter_access(state: &Self::State) -> impl Iterator<Item = EcsAccessType<'_>> {
+        T::iter_access(state)
+    }
 }
 
 /// SAFETY: [`OptionFetch`] is read only because `T` is read only
@@ -2533,6 +2601,10 @@ unsafe impl<T: Component> QueryData for Has<T> {
     ) -> Option<Self::Item<'w, 's>> {
         Some(*fetch)
     }
+
+    fn iter_access(_state: &Self::State) -> impl Iterator<Item = EcsAccessType<'_>> {
+        iter::empty()
+    }
 }
 
 /// SAFETY: [`Has`] is read only
@@ -2608,6 +2680,11 @@ macro_rules! impl_tuple_query_data {
                 // SAFETY: The invariants are upheld by the caller.
                 Some(($(unsafe { $name::fetch($state, $name, entity, table_row) }?,)*))
             }
+
+            fn iter_access(state: &Self::State) -> impl Iterator<Item = EcsAccessType<'_>> {
+                let ($($name,)*) = state;
+                iter::empty()$(.chain($name::iter_access($name)))*
+            }
         }
 
         $(#[$meta])*
@@ -2805,6 +2882,11 @@ macro_rules! impl_anytuple_fetch {
                     || !(false $(|| $name.1)*))
                 .then_some(result)
             }
+
+            fn iter_access(state: &Self::State) -> impl Iterator<Item = EcsAccessType<'_>> {
+                let ($($name,)*) = state;
+                iter::empty()$(.chain($name::iter_access($name)))*
+            }
         }
 
         $(#[$meta])*
@@ -2926,6 +3008,10 @@ unsafe impl<D: QueryData> QueryData for NopWorldQuery<D> {
     ) -> Option<Self::Item<'w, 's>> {
         Some(())
     }
+
+    fn iter_access(_state: &Self::State) -> impl Iterator<Item = EcsAccessType<'_>> {
+        iter::empty()
+    }
 }
 
 /// SAFETY: `NopFetch` never accesses any data
@@ -3011,6 +3097,10 @@ unsafe impl<T: ?Sized> QueryData for PhantomData<T> {
     ) -> Option<Self::Item<'w, 's>> {
         Some(())
     }
+
+    fn iter_access(_state: &Self::State) -> impl Iterator<Item = EcsAccessType<'_>> {
+        iter::empty()
+    }
 }
 
 /// SAFETY: `PhantomData` never accesses any world data.
@@ -3219,6 +3309,10 @@ mod tests {
             ) -> Option<Self::Item<'w, 's>> {
                 Some(())
             }
+
+            fn iter_access(_state: &Self::State) -> impl Iterator<Item = EcsAccessType<'_>> {
+                iter::empty()
+            }
         }
 
         /// SAFETY: access is read only
diff --git a/crates/bevy_ecs/src/query/mod.rs b/crates/bevy_ecs/src/query/mod.rs
index eb3dad12bd367..b5c1b3d7d18a5 100644
--- a/crates/bevy_ecs/src/query/mod.rs
+++ b/crates/bevy_ecs/src/query/mod.rs
@@ -1,6 +1,7 @@
 //! Contains APIs for retrieving component data from the world.
 
 mod access;
+mod access_iter;
 mod builder;
 mod error;
 mod fetch;
@@ -11,6 +12,7 @@ mod state;
 mod world_query;
 
 pub use access::*;
+pub use access_iter::*;
 pub use bevy_ecs_macros::{QueryData, QueryFilter};
 pub use builder::*;
 pub use error::*;
@@ -897,6 +899,14 @@ mod tests {
         ) -> Option<Self::Item<'w, 's>> {
             Some(())
         }
+
+        fn iter_access(
+            state: &Self::State,
+        ) -> impl Iterator<Item = super::access_iter::EcsAccessType<'_>> {
+            core::iter::once(super::access_iter::EcsAccessType::Resource(
+                super::access_iter::ResourceAccessLevel::Read(*state),
+            ))
+        }
     }
 
     /// SAFETY: access is read only
diff --git a/crates/bevy_ecs/src/world/entity_access/entity_mut.rs b/crates/bevy_ecs/src/world/entity_access/entity_mut.rs
index c7ecdb4adb62f..ed6ffbe1c9109 100644
--- a/crates/bevy_ecs/src/world/entity_access/entity_mut.rs
+++ b/crates/bevy_ecs/src/world/entity_access/entity_mut.rs
@@ -3,7 +3,7 @@ use crate::{
     change_detection::{ComponentTicks, MaybeLocation, Tick},
     component::{Component, ComponentId, Mutable},
     entity::{ContainsEntity, Entity, EntityEquivalent, EntityLocation},
-    query::{Access, ReadOnlyQueryData, ReleaseStateQueryData},
+    query::{has_conflicts, Access, QueryAccessError, ReadOnlyQueryData, ReleaseStateQueryData},
     world::{
         error::EntityComponentError, unsafe_world_cell::UnsafeEntityCell, DynamicComponentFetch,
         EntityRef, FilteredEntityMut, FilteredEntityRef, Mut, Ref,
@@ -152,7 +152,7 @@ impl<'w> EntityMut<'w> {
     /// or `None` if the entity does not have the components required by the query `Q`.
     pub fn get_components<Q: ReadOnlyQueryData + ReleaseStateQueryData>(
         &self,
-    ) -> Option<Q::Item<'_, 'static>> {
+    ) -> Result<Q::Item<'_, 'static>, QueryAccessError> {
         self.as_readonly().get_components::<Q>()
     }
 
@@ -184,13 +184,46 @@ impl<'w> EntityMut<'w> {
     /// # Safety
     /// It is the caller's responsibility to ensure that
     /// the `QueryData` does not provide aliasing mutable references to the same component.
+    ///
+    /// # See also
+    ///
+    /// - [`Self::get_components_mut`] for the safe version that performs aliasing checks
     pub unsafe fn get_components_mut_unchecked<Q: ReleaseStateQueryData>(
         &mut self,
-    ) -> Option<Q::Item<'_, 'static>> {
-        // SAFETY: Caller the `QueryData` does not provide aliasing mutable references to the same component
+    ) -> Result<Q::Item<'_, 'static>, QueryAccessError> {
+        // SAFETY: Caller ensures the `QueryData` does not provide aliasing mutable references to the same component
         unsafe { self.reborrow().into_components_mut_unchecked::<Q>() }
     }
 
+    /// Returns components for the current entity that match the query `Q`.
+    /// In the case of conflicting [`QueryData`](crate::query::QueryData), unregistered components, or missing components,
+    /// this will return a [`QueryAccessError`]
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// # use bevy_ecs::prelude::*;
+    /// #
+    /// #[derive(Component)]
+    /// struct X(usize);
+    /// #[derive(Component)]
+    /// struct Y(usize);
+    ///
+    /// # let mut world = World::default();
+    /// let mut entity = world.spawn((X(0), Y(0))).into_mutable();
+    /// // Get mutable access to two components at once
+    /// // SAFETY: X and Y are different components
+    /// let (mut x, mut y) = entity.get_components_mut::<(&mut X, &mut Y)>().unwrap();
+    /// ```
+    ///
+    /// Note that this does a O(n^2) check that the [`QueryData`](crate::query::QueryData) does not conflict. If performance is a
+    /// consideration you should use [`Self::get_components_mut_unchecked`] instead.
+    pub fn get_components_mut<Q: ReleaseStateQueryData>(
+        &mut self,
+    ) -> Result<Q::Item<'_, 'static>, QueryAccessError> {
+        self.reborrow().into_components_mut::<Q>()
+    }
+
     /// Consumes self and returns components for the current entity that match the query `Q` for the world lifetime `'w`,
     /// or `None` if the entity does not have the components required by the query `Q`.
     ///
@@ -219,15 +252,68 @@ impl<'w> EntityMut<'w> {
     /// # Safety
     /// It is the caller's responsibility to ensure that
     /// the `QueryData` does not provide aliasing mutable references to the same component.
+    ///
+    /// # See also
+    ///
+    /// - [`Self::into_components_mut`] for the safe version that performs aliasing checks
     pub unsafe fn into_components_mut_unchecked<Q: ReleaseStateQueryData>(
         self,
-    ) -> Option<Q::Item<'w, 'static>> {
+    ) -> Result<Q::Item<'w, 'static>, QueryAccessError> {
         // SAFETY:
         // - We have mutable access to all components of this entity.
         // - Caller asserts the `QueryData` does not provide aliasing mutable references to the same component
         unsafe { self.cell.get_components::<Q>() }
     }
 
+    /// Consumes self and returns components for the current entity that match the query `Q` for the world lifetime `'w`,
+    /// or `None` if the entity does not have the components required by the query `Q`.
+    ///
+    /// The checks for aliasing mutable references may be expensive.
+    /// If performance is a concern, consider making multiple calls to [`Self::get_mut`].
+    /// If that is not possible, consider using [`Self::into_components_mut_unchecked`] to skip the checks.
+    ///
+    /// # Panics
+    ///
+    /// If the `QueryData` provides aliasing mutable references to the same component.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// # use bevy_ecs::prelude::*;
+    /// #
+    /// #[derive(Component)]
+    /// struct X(usize);
+    /// #[derive(Component)]
+    /// struct Y(usize);
+    ///
+    /// # let mut world = World::default();
+    /// let mut entity = world.spawn((X(0), Y(0))).into_mutable();
+    /// // Get mutable access to two components at once
+    /// let (mut x, mut y) = entity.into_components_mut::<(&mut X, &mut Y)>().unwrap();
+    /// *x = X(1);
+    /// *y = Y(1);
+    /// ```
+    ///
+    /// ```should_panic
+    /// # use bevy_ecs::prelude::*;
+    /// #
+    /// # #[derive(Component)]
+    /// # struct X(usize);
+    /// #
+    /// # let mut world = World::default();
+    /// let mut entity = world.spawn((X(0))).into_mutable();
+    /// // This panics, as the `&mut X`s would alias:
+    /// entity.into_components_mut::<(&mut X, &mut X)>();
+    /// ```
+    pub fn into_components_mut<Q: ReleaseStateQueryData>(
+        self,
+    ) -> Result<Q::Item<'w, 'static>, QueryAccessError> {
+        has_conflicts::<Q>(self.cell.world().components())?;
+
+        // SAFETY: we checked that there were not conflicting components above
+        unsafe { self.into_components_mut_unchecked::<Q>() }
+    }
+
     /// Consumes `self` and gets access to the component of type `T` with the
     /// world `'w` lifetime for the current entity.
     ///
diff --git a/crates/bevy_ecs/src/world/entity_access/entity_ref.rs b/crates/bevy_ecs/src/world/entity_access/entity_ref.rs
index 9978c775bc4b7..abe884a1ccf0e 100644
--- a/crates/bevy_ecs/src/world/entity_access/entity_ref.rs
+++ b/crates/bevy_ecs/src/world/entity_access/entity_ref.rs
@@ -3,7 +3,7 @@ use crate::{
     change_detection::{ComponentTicks, MaybeLocation, Tick},
     component::{Component, ComponentId},
     entity::{ContainsEntity, Entity, EntityEquivalent, EntityLocation},
-    query::{Access, ReadOnlyQueryData, ReleaseStateQueryData},
+    query::{Access, QueryAccessError, ReadOnlyQueryData, ReleaseStateQueryData},
     world::{
         error::EntityComponentError, unsafe_world_cell::UnsafeEntityCell, DynamicComponentFetch,
         FilteredEntityRef, Ref,
@@ -270,7 +270,7 @@ impl<'w> EntityRef<'w> {
     /// or `None` if the entity does not have the components required by the query `Q`.
     pub fn get_components<Q: ReadOnlyQueryData + ReleaseStateQueryData>(
         &self,
-    ) -> Option<Q::Item<'w, 'static>> {
+    ) -> Result<Q::Item<'w, 'static>, QueryAccessError> {
         // SAFETY:
         // - We have read-only access to all components of this entity.
         // - The query is read-only, and read-only references cannot have conflicts.
diff --git a/crates/bevy_ecs/src/world/entity_access/mod.rs b/crates/bevy_ecs/src/world/entity_access/mod.rs
index 187540f868995..cc1bd85449761 100644
--- a/crates/bevy_ecs/src/world/entity_access/mod.rs
+++ b/crates/bevy_ecs/src/world/entity_access/mod.rs
@@ -23,6 +23,7 @@ mod tests {
 
     use crate::change_detection::Tick;
     use crate::lifecycle::HookContext;
+    use crate::query::QueryAccessError;
     use crate::{
         change_detection::{MaybeLocation, MutUntyped},
         component::ComponentId,
@@ -815,11 +816,35 @@ mod tests {
         let e3 = world.spawn_empty().id();
 
         assert_eq!(
-            Some((&X(7), &Y(10))),
+            Ok((&X(7), &Y(10))),
+            world.entity(e1).get_components::<(&X, &Y)>()
+        );
+        assert_eq!(
+            Err(QueryAccessError::EntityDoesNotMatch),
+            world.entity(e2).get_components::<(&X, &Y)>()
+        );
+        assert_eq!(
+            Err(QueryAccessError::EntityDoesNotMatch),
+            world.entity(e3).get_components::<(&X, &Y)>()
+        );
+    }
+
+    #[test]
+    fn get_components_mut() {
+        let mut world = World::default();
+        let e1 = world.spawn((X(7), Y(10))).id();
+
+        let mut entity_mut_1 = world.entity_mut(e1);
+        let Ok((mut x, mut y)) = entity_mut_1.get_components_mut::<(&mut X, &mut Y)>() else {
+            panic!("could not get components");
+        };
+        x.0 += 1;
+        y.0 += 1;
+
+        assert_eq!(
+            Ok((&X(8), &Y(11))),
             world.entity(e1).get_components::<(&X, &Y)>()
         );
-        assert_eq!(None, world.entity(e2).get_components::<(&X, &Y)>());
-        assert_eq!(None, world.entity(e3).get_components::<(&X, &Y)>());
     }
 
     #[test]
diff --git a/crates/bevy_ecs/src/world/entity_access/world_mut.rs b/crates/bevy_ecs/src/world/entity_access/world_mut.rs
index 1ca4e24c75f5b..97cb0e4007584 100644
--- a/crates/bevy_ecs/src/world/entity_access/world_mut.rs
+++ b/crates/bevy_ecs/src/world/entity_access/world_mut.rs
@@ -9,7 +9,10 @@ use crate::{
     event::{EntityComponentsTrigger, EntityEvent},
     lifecycle::{Despawn, Remove, Replace, DESPAWN, REMOVE, REPLACE},
     observer::Observer,
-    query::{Access, DebugCheckedUnwrap, ReadOnlyQueryData, ReleaseStateQueryData},
+    query::{
+        has_conflicts, Access, DebugCheckedUnwrap, QueryAccessError, ReadOnlyQueryData,
+        ReleaseStateQueryData,
+    },
     relationship::RelationshipHookMode,
     resource::Resource,
     storage::{SparseSets, Table},
@@ -284,7 +287,7 @@ impl<'w> EntityWorldMut<'w> {
     #[inline]
     pub fn get_components<Q: ReadOnlyQueryData + ReleaseStateQueryData>(
         &self,
-    ) -> Option<Q::Item<'_, 'static>> {
+    ) -> Result<Q::Item<'_, 'static>, QueryAccessError> {
         self.as_readonly().get_components::<Q>()
     }
 
@@ -316,13 +319,46 @@ impl<'w> EntityWorldMut<'w> {
     /// # Safety
     /// It is the caller's responsibility to ensure that
     /// the `QueryData` does not provide aliasing mutable references to the same component.
+    ///
+    /// /// # See also
+    ///
+    /// - [`Self::get_components_mut`] for the safe version that performs aliasing checks
     pub unsafe fn get_components_mut_unchecked<Q: ReleaseStateQueryData>(
         &mut self,
-    ) -> Option<Q::Item<'_, 'static>> {
+    ) -> Result<Q::Item<'_, 'static>, QueryAccessError> {
         // SAFETY: Caller the `QueryData` does not provide aliasing mutable references to the same component
         unsafe { self.as_mutable().into_components_mut_unchecked::<Q>() }
     }
 
+    /// Returns components for the current entity that match the query `Q`.
+    /// In the case of conflicting [`QueryData`](crate::query::QueryData), unregistered components, or missing components,
+    /// this will return a [`QueryAccessError`]
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// # use bevy_ecs::prelude::*;
+    /// #
+    /// #[derive(Component)]
+    /// struct X(usize);
+    /// #[derive(Component)]
+    /// struct Y(usize);
+    ///
+    /// # let mut world = World::default();
+    /// let mut entity = world.spawn((X(0), Y(0))).into_mutable();
+    /// // Get mutable access to two components at once
+    /// // SAFETY: X and Y are different components
+    /// let (mut x, mut y) = entity.get_components_mut::<(&mut X, &mut Y)>().unwrap();
+    /// ```
+    ///
+    /// Note that this does a O(n^2) check that the [`QueryData`](crate::query::QueryData) does not conflict. If performance is a
+    /// consideration you should use [`Self::get_components_mut_unchecked`] instead.
+    pub fn get_components_mut<Q: ReleaseStateQueryData>(
+        &mut self,
+    ) -> Result<Q::Item<'_, 'static>, QueryAccessError> {
+        self.as_mutable().into_components_mut::<Q>()
+    }
+
     /// Consumes self and returns components for the current entity that match the query `Q` for the world lifetime `'w`,
     /// or `None` if the entity does not have the components required by the query `Q`.
     ///
@@ -351,13 +387,66 @@ impl<'w> EntityWorldMut<'w> {
     /// # Safety
     /// It is the caller's responsibility to ensure that
     /// the `QueryData` does not provide aliasing mutable references to the same component.
+    ///
+    /// # See also
+    ///
+    /// - [`Self::into_components_mut`] for the safe version that performs aliasing checks
     pub unsafe fn into_components_mut_unchecked<Q: ReleaseStateQueryData>(
         self,
-    ) -> Option<Q::Item<'w, 'static>> {
+    ) -> Result<Q::Item<'w, 'static>, QueryAccessError> {
         // SAFETY: Caller the `QueryData` does not provide aliasing mutable references to the same component
         unsafe { self.into_mutable().into_components_mut_unchecked::<Q>() }
     }
 
+    /// Consumes self and returns components for the current entity that match the query `Q` for the world lifetime `'w`,
+    /// or `None` if the entity does not have the components required by the query `Q`.
+    ///
+    /// The checks for aliasing mutable references may be expensive.
+    /// If performance is a concern, consider making multiple calls to [`Self::get_mut`].
+    /// If that is not possible, consider using [`Self::into_components_mut_unchecked`] to skip the checks.
+    ///
+    /// # Panics
+    ///
+    /// - If the `QueryData` provides aliasing mutable references to the same component.
+    /// - If the entity has been despawned while this `EntityWorldMut` is still alive.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// # use bevy_ecs::prelude::*;
+    /// #
+    /// #[derive(Component)]
+    /// struct X(usize);
+    /// #[derive(Component)]
+    /// struct Y(usize);
+    ///
+    /// # let mut world = World::default();
+    /// let mut entity = world.spawn((X(0), Y(0)));
+    /// // Get mutable access to two components at once
+    /// let (mut x, mut y) = entity.into_components_mut::<(&mut X, &mut Y)>().unwrap();
+    /// *x = X(1);
+    /// *y = Y(1);
+    /// ```
+    ///
+    /// ```should_panic
+    /// # use bevy_ecs::prelude::*;
+    /// #
+    /// # #[derive(Component)]
+    /// # struct X(usize);
+    /// #
+    /// # let mut world = World::default();
+    /// let mut entity = world.spawn((X(0)));
+    /// // This panics, as the `&mut X`s would alias:
+    /// entity.into_components_mut::<(&mut X, &mut X)>();
+    /// ```
+    pub fn into_components_mut<Q: ReleaseStateQueryData>(
+        self,
+    ) -> Result<Q::Item<'w, 'static>, QueryAccessError> {
+        has_conflicts::<Q>(self.world.components())?;
+        // SAFETY: we checked that there were not conflicting components above
+        unsafe { self.into_mutable().into_components_mut_unchecked::<Q>() }
+    }
+
     /// Consumes `self` and gets access to the component of type `T` with
     /// the world `'w` lifetime for the current entity.
     /// Returns `None` if the entity does not have a component of type `T`.
diff --git a/crates/bevy_ecs/src/world/unsafe_world_cell.rs b/crates/bevy_ecs/src/world/unsafe_world_cell.rs
index 3b450e066e241..54a835e2863ab 100644
--- a/crates/bevy_ecs/src/world/unsafe_world_cell.rs
+++ b/crates/bevy_ecs/src/world/unsafe_world_cell.rs
@@ -16,7 +16,7 @@ use crate::{
     lifecycle::RemovedComponentMessages,
     observer::Observers,
     prelude::Component,
-    query::{DebugCheckedUnwrap, ReleaseStateQueryData},
+    query::{DebugCheckedUnwrap, QueryAccessError, ReleaseStateQueryData},
     resource::Resource,
     storage::{ComponentSparseSet, Storages, Table},
     world::RawCommandQueue,
@@ -983,11 +983,11 @@ impl<'w> UnsafeEntityCell<'w> {
     /// - The `QueryData` does not provide aliasing mutable references to the same component.
     pub(crate) unsafe fn get_components<Q: ReleaseStateQueryData>(
         &self,
-    ) -> Option<Q::Item<'w, 'static>> {
+    ) -> Result<Q::Item<'w, 'static>, QueryAccessError> {
         // SAFETY: World is only used to access query data and initialize query state
         let state = unsafe {
             let world = self.world().world();
-            Q::get_state(world.components())?
+            Q::get_state(world.components()).ok_or(QueryAccessError::ComponentNotRegistered)?
         };
         let location = self.location();
         // SAFETY: Location is guaranteed to exist
@@ -1015,8 +1015,9 @@ impl<'w> UnsafeEntityCell<'w> {
             // SAFETY: Called after set_archetype above. Entity and location are guaranteed to exist.
             let item = unsafe { Q::fetch(&state, &mut fetch, self.id(), location.table_row) };
             item.map(Q::release_state)
+                .ok_or(QueryAccessError::EntityDoesNotMatch)
         } else {
-            None
+            Err(QueryAccessError::EntityDoesNotMatch)
         }
     }
 
diff --git a/crates/bevy_render/src/sync_world.rs b/crates/bevy_render/src/sync_world.rs
index bac8c4a3c6202..6a1a1fa813a21 100644
--- a/crates/bevy_render/src/sync_world.rs
+++ b/crates/bevy_render/src/sync_world.rs
@@ -385,6 +385,12 @@ mod render_entities_world_query_impls {
                 unsafe { <&RenderEntity as QueryData>::fetch(state, fetch, entity, table_row) };
             component.map(RenderEntity::id)
         }
+
+        fn iter_access(
+            state: &Self::State,
+        ) -> impl Iterator<Item = bevy_ecs::query::EcsAccessType<'_>> {
+            <&RenderEntity as QueryData>::iter_access(state)
+        }
     }
 
     // SAFETY: the underlying `Entity` is copied, and no mutable access is provided.
@@ -494,6 +500,12 @@ mod render_entities_world_query_impls {
                 unsafe { <&MainEntity as QueryData>::fetch(state, fetch, entity, table_row) };
             component.map(MainEntity::id)
         }
+
+        fn iter_access(
+            state: &Self::State,
+        ) -> impl Iterator<Item = bevy_ecs::query::EcsAccessType<'_>> {
+            <&MainEntity as QueryData>::iter_access(state)
+        }
     }
 
     // SAFETY: the underlying `Entity` is copied, and no mutable access is provided.
diff --git a/release-content/migration-guides/get_components.md b/release-content/migration-guides/get_components.md
new file mode 100644
index 0000000000000..f91a5e44300d6
--- /dev/null
+++ b/release-content/migration-guides/get_components.md
@@ -0,0 +1,7 @@
+---
+title: get_components, get_components_mut_unchecked now return a Result
+pull_requests: [21780]
+---
+
+`get_components`, `get_components_mut_unchecked`, and `into_components_mut_unchecked`
+now return a `Result<_, QueryAccessError>` instead of an `Option`.
diff --git a/release-content/release-notes/get_components_mut.md b/release-content/release-notes/get_components_mut.md
new file mode 100644
index 0000000000000..85a300e9f1496
--- /dev/null
+++ b/release-content/release-notes/get_components_mut.md
@@ -0,0 +1,13 @@
+---
+title: get_components_mut
+authors: ["@hymm"]
+pull_requests: [21780]
+---
+
+A safe version of `EntityMut::get_components_mut` and `EntityWorldMut::get_components_mut`
+was added. Previously a unsafe version was added `get_components_mut_unchecked`. It needed
+to be unsafe because specifying (&mut T, &mut T) is possible which would return multiple
+mutable references to the same component. This was done by adding a O(n^2) check for
+conflicts which returns a `QueryAccessError::Conflict`. Because of the cost of the checks
+if your code is performance sensitive it may make sense to keep using
+`get_components_mut_unchecked`.

From 41bf46d8c3513b1e6a572b7b18bae3f344cefc45 Mon Sep 17 00:00:00 2001
From: Eric Kwoka <43540491+ekwoka@users.noreply.github.com>
Date: Tue, 9 Dec 2025 02:44:19 +0400
Subject: [PATCH 050/133] :bug: Fixes PropagateStop and PropagateOver (#21622)

# Objective

Fixes #21620

Ensures `PropagateStop` works as documented. At it stands,
`PropagateStop<C>` is described as only preventing it's Children from
inheriting `C` but in practice that entity itself would not inherit `C`.

Makes `PropagateOver` work. It just plain didn't work at all.

## Solution

Adjusted the flow to prevent recursively inheriting `Inherited` when
`PropagateStop` present, as opposed to not accessing `PropagateStop`
entities entirely.

Skips applying `C` when `Inherited<C>` and `PropagateOver<C>` are on the
entity.

## Testing

I updated the tests first to verify the test cases. They were incomplete
and didn't pass once checking for the proper end state.

After verifying those were not functioning, trimmed and adjusted code
until it functioned.

## Fuller Explanation

To my understanding of the goals (and my implementation) the idea is
that the result of these components would be like

```
(Propagate<C>, Inherited<C>, C)
  (Inherited<C>, C)
    (PropagateOver<C>, Inherited<C>)
      (Inherited<C>, C)
        (PropagateStop<C>, Inherited<C>, C)
```

While the previous (incorrect by my measure) appeared to be

```
(Propagate<C>, Inherited<C>, C)
  (Inherited<C>, C)
    (PropagateOver<C>, Inherited<C>, C)
      (Inherited<C>, C)
        (PropagateStop<C>)
```

So of note: The `PropagateOver<C>` is still getting `Inherited<C>` in
this current adjustment. I believe it was doing that before, but I
didn't fully understand the reasoning for the `Inherited<C>` at all? I
guess it's to properly mark that the `C` is an inherited one, so maybe I
do need to remove it on `PropagateOver<C>` as well, to ensure cleanup
doesn't also remove any separately applied `C`?

I didn't look closely at what all the other tests are attempting to test
(or if they are correctly testing those) to evaluate if other changes
need to be made.

if `PropagateOver<C>` doesn't have `Inherited<C>` and is reparented,
would it be simple to ensure that its children have their `Inherited<C>`
removed/updated properly?

Looking at the code more, chances are this can be simplified a lot with
the use of AncestorIter and DescendentIter, but I am not sure if jumping
into a fuller refactor makes sense at this moment as opposed to
attempting to fix this immediate issue and following up with a bigger
refactor?

thoughts?

---------

Co-authored-by: robtfm <50659922+robtfm@users.noreply.github.com>
---
 crates/bevy_app/src/propagate.rs | 506 +++++++++++++++++++++++--------
 1 file changed, 383 insertions(+), 123 deletions(-)

diff --git a/crates/bevy_app/src/propagate.rs b/crates/bevy_app/src/propagate.rs
index e0a02c86f2df5..ecdfa74b9dfda 100644
--- a/crates/bevy_app/src/propagate.rs
+++ b/crates/bevy_app/src/propagate.rs
@@ -5,6 +5,7 @@ use crate::{App, Plugin};
 #[cfg(feature = "bevy_reflect")]
 use bevy_ecs::reflect::ReflectComponent;
 use bevy_ecs::{
+    change_detection::DetectChangesMut,
     component::Component,
     entity::Entity,
     hierarchy::ChildOf,
@@ -88,7 +89,7 @@ pub struct PropagateSet<C: Component + Clone + PartialEq> {
 }
 
 /// Internal struct for managing propagation
-#[derive(Component, Clone, PartialEq)]
+#[derive(Component, Clone, PartialEq, Debug)]
 #[cfg_attr(
     feature = "bevy_reflect",
     derive(Reflect),
@@ -139,9 +140,9 @@ impl<C: Component + Clone + PartialEq, F: QueryFilter + 'static, R: Relationship
         app.add_systems(
             self.schedule,
             (
-                update_source::<C, F>,
-                update_stopped::<C, F>,
+                update_source::<C, F, R>,
                 update_reparented::<C, F, R>,
+                update_removed_limit::<C, F, R>,
                 propagate_inherited::<C, F, R>,
                 propagate_output::<C, F>,
             )
@@ -151,17 +152,13 @@ impl<C: Component + Clone + PartialEq, F: QueryFilter + 'static, R: Relationship
     }
 }
 
-/// add/remove `Inherited::<C>` and `C` for entities with a direct `Propagate::<C>`
-pub fn update_source<C: Component + Clone + PartialEq, F: QueryFilter>(
+/// add/remove `Inherited::<C>` for entities with a direct `Propagate::<C>`
+pub fn update_source<C: Component + Clone + PartialEq, F: QueryFilter, R: Relationship>(
     mut commands: Commands,
-    changed: Query<
-        (Entity, &Propagate<C>),
-        (
-            Or<(Changed<Propagate<C>>, Without<Inherited<C>>)>,
-            Without<PropagateStop<C>>,
-        ),
-    >,
+    changed: Query<(Entity, &Propagate<C>), (Or<(Changed<Propagate<C>>, Without<Inherited<C>>)>,)>,
     mut removed: RemovedComponents<Propagate<C>>,
+    relationship: Query<&R>,
+    relations: Query<&Inherited<C>, Without<PropagateStop<C>>>,
 ) {
     for (entity, source) in &changed {
         commands
@@ -169,49 +166,57 @@ pub fn update_source<C: Component + Clone + PartialEq, F: QueryFilter>(
             .try_insert(Inherited(source.0.clone()));
     }
 
+    // set `Inherited::<C>` based on ancestry when `Propagate::<C>` is removed
     for removed in removed.read() {
         if let Ok(mut commands) = commands.get_entity(removed) {
-            commands.remove::<(Inherited<C>, C)>();
+            if let Some(inherited) = relationship
+                .get(removed)
+                .ok()
+                .and_then(|r| relations.get(r.get()).ok())
+            {
+                commands.insert(inherited.clone());
+            } else {
+                commands.remove::<Inherited<C>>();
+            }
         }
     }
 }
 
-/// remove `Inherited::<C>` and `C` for entities with a `PropagateStop::<C>`
-pub fn update_stopped<C: Component + Clone + PartialEq, F: QueryFilter>(
-    mut commands: Commands,
-    q: Query<Entity, (With<Inherited<C>>, With<PropagateStop<C>>, F)>,
-) {
-    for entity in q.iter() {
-        let mut cmds = commands.entity(entity);
-        cmds.remove::<(Inherited<C>, C)>();
-    }
-}
-
-/// add/remove `Inherited::<C>` and `C` for entities which have changed relationship
+/// add/remove `Inherited::<C>` for entities which have changed relationship
 pub fn update_reparented<C: Component + Clone + PartialEq, F: QueryFilter, R: Relationship>(
     mut commands: Commands,
-    moved: Query<
-        (Entity, &R, Option<&Inherited<C>>),
-        (
-            Changed<R>,
-            Without<Propagate<C>>,
-            Without<PropagateStop<C>>,
-            F,
-        ),
-    >,
-    relations: Query<&Inherited<C>>,
+    moved: Query<(Entity, &R, Option<&Inherited<C>>), (Changed<R>, Without<Propagate<C>>, F)>,
+    relations: Query<&Inherited<C>, Without<PropagateStop<C>>>,
     orphaned: Query<Entity, (With<Inherited<C>>, Without<Propagate<C>>, Without<R>, F)>,
 ) {
     for (entity, relation, maybe_inherited) in &moved {
         if let Ok(inherited) = relations.get(relation.get()) {
             commands.entity(entity).try_insert(inherited.clone());
         } else if maybe_inherited.is_some() {
-            commands.entity(entity).remove::<(Inherited<C>, C)>();
+            commands.entity(entity).remove::<Inherited<C>>();
         }
     }
 
     for orphan in &orphaned {
-        commands.entity(orphan).remove::<(Inherited<C>, C)>();
+        commands.entity(orphan).remove::<Inherited<C>>();
+    }
+}
+
+/// When `PropagateOver` or `PropagateStop` is removed, update the `Inherited::<C>` to trigger propagation
+pub fn update_removed_limit<C: Component + Clone + PartialEq, F: QueryFilter, R: Relationship>(
+    mut inherited: Query<&mut Inherited<C>>,
+    mut removed_skip: RemovedComponents<PropagateOver<C>>,
+    mut removed_stop: RemovedComponents<PropagateStop<C>>,
+) {
+    for entity in removed_skip.read() {
+        if let Ok(mut inherited) = inherited.get_mut(entity) {
+            inherited.set_changed();
+        }
+    }
+    for entity in removed_stop.read() {
+        if let Ok(mut inherited) = inherited.get_mut(entity) {
+            inherited.set_changed();
+        }
     }
 }
 
@@ -223,8 +228,12 @@ pub fn propagate_inherited<C: Component + Clone + PartialEq, F: QueryFilter, R:
         (Changed<Inherited<C>>, Without<PropagateStop<C>>, F),
     >,
     recurse: Query<
-        (Option<&R::RelationshipTarget>, Option<&Inherited<C>>),
-        (Without<Propagate<C>>, Without<PropagateStop<C>>, F),
+        (
+            Option<&R::RelationshipTarget>,
+            Option<&Inherited<C>>,
+            Option<&PropagateStop<C>>,
+        ),
+        (Without<Propagate<C>>, F),
     >,
     mut removed: RemovedComponents<Inherited<C>>,
     mut to_process: Local<Vec<(Entity, Option<Inherited<C>>)>>,
@@ -240,14 +249,14 @@ pub fn propagate_inherited<C: Component + Clone + PartialEq, F: QueryFilter, R:
 
     // and removed
     for entity in removed.read() {
-        if let Ok((Some(targets), _)) = recurse.get(entity) {
+        if let Ok((Some(targets), _, _)) = recurse.get(entity) {
             to_process.extend(targets.iter().map(|target| (target, None)));
         }
     }
 
     // propagate
     while let Some((entity, maybe_inherited)) = (*to_process).pop() {
-        let Ok((maybe_targets, maybe_current)) = recurse.get(entity) else {
+        let Ok((maybe_targets, maybe_current, maybe_stop)) = recurse.get(entity) else {
             continue;
         };
 
@@ -255,7 +264,10 @@ pub fn propagate_inherited<C: Component + Clone + PartialEq, F: QueryFilter, R:
             continue;
         }
 
-        if let Some(targets) = maybe_targets {
+        // update children if required
+        if maybe_stop.is_none()
+            && let Some(targets) = maybe_targets
+        {
             to_process.extend(
                 targets
                     .iter()
@@ -263,21 +275,24 @@ pub fn propagate_inherited<C: Component + Clone + PartialEq, F: QueryFilter, R:
             );
         }
 
+        // update this node's `Inherited<C>`
         if let Some(inherited) = maybe_inherited {
-            commands.entity(entity).try_insert(inherited.clone());
+            commands.entity(entity).try_insert(inherited);
         } else {
-            commands.entity(entity).remove::<(Inherited<C>, C)>();
+            commands.entity(entity).remove::<Inherited<C>>();
         }
     }
 }
 
-/// add `C` to entities with `Inherited::<C>`
+/// add/remove `C` on entities with `Inherited::<C>`
 pub fn propagate_output<C: Component + Clone + PartialEq, F: QueryFilter>(
     mut commands: Commands,
     changed: Query<
         (Entity, &Inherited<C>, Option<&C>),
         (Changed<Inherited<C>>, Without<PropagateOver<C>>, F),
     >,
+    mut removed: RemovedComponents<Inherited<C>>,
+    skip: Query<(), With<PropagateOver<C>>>,
 ) {
     for (entity, inherited, maybe_current) in &changed {
         if maybe_current.is_some_and(|c| &inherited.0 == c) {
@@ -286,6 +301,12 @@ pub fn propagate_output<C: Component + Clone + PartialEq, F: QueryFilter>(
 
         commands.entity(entity).try_insert(inherited.0.clone());
     }
+
+    for removed in removed.read() {
+        if skip.get(removed).is_err() {
+            commands.entity(removed).remove::<C>();
+        }
+    }
 }
 
 #[cfg(test)]
@@ -305,6 +326,8 @@ mod tests {
         app.add_schedule(Schedule::new(Update));
         app.add_plugins(HierarchyPropagatePlugin::<TestValue>::new(Update));
 
+        let mut query = app.world_mut().query::<&TestValue>();
+
         let propagator = app.world_mut().spawn(Propagate(TestValue(1))).id();
         let intermediate = app
             .world_mut()
@@ -319,19 +342,49 @@ mod tests {
 
         app.update();
 
-        assert!(app
+        assert_eq!(
+            query.get_many(app.world(), [propagator, intermediate, propagatee]),
+            Ok([&TestValue(1), &TestValue(1), &TestValue(1)])
+        );
+    }
+
+    #[test]
+    fn test_remove_propagate() {
+        let mut app = App::new();
+        app.add_schedule(Schedule::new(Update));
+        app.add_plugins(HierarchyPropagatePlugin::<TestValue>::new(Update));
+
+        let mut query = app.world_mut().query::<&TestValue>();
+
+        let propagator = app.world_mut().spawn(Propagate(TestValue(1))).id();
+        let propagatee = app
             .world_mut()
-            .query::<&TestValue>()
-            .get(app.world(), propagatee)
-            .is_ok());
+            .spawn_empty()
+            .insert(ChildOf(propagator))
+            .id();
+
+        app.update();
+
+        assert_eq!(query.get(app.world(), propagatee), Ok(&TestValue(1)));
+
+        app.world_mut()
+            .commands()
+            .entity(propagator)
+            .remove::<Propagate<TestValue>>();
+        app.update();
+
+        assert!(query.get(app.world(), propagator).is_err());
+        assert!(query.get(app.world(), propagatee).is_err());
     }
 
     #[test]
-    fn test_reparented() {
+    fn test_remove_orphan() {
         let mut app = App::new();
         app.add_schedule(Schedule::new(Update));
         app.add_plugins(HierarchyPropagatePlugin::<TestValue>::new(Update));
 
+        let mut query = app.world_mut().query::<&TestValue>();
+
         let propagator = app.world_mut().spawn(Propagate(TestValue(1))).id();
         let propagatee = app
             .world_mut()
@@ -341,11 +394,45 @@ mod tests {
 
         app.update();
 
-        assert!(app
+        assert_eq!(query.get(app.world(), propagatee), Ok(&TestValue(1)));
+
+        app.world_mut()
+            .commands()
+            .entity(propagatee)
+            .remove::<ChildOf>();
+        app.update();
+
+        assert!(query.get(app.world(), propagatee).is_err());
+    }
+
+    #[test]
+    fn test_reparented() {
+        let mut app = App::new();
+        app.add_schedule(Schedule::new(Update));
+        app.add_plugins(HierarchyPropagatePlugin::<TestValue>::new(Update));
+
+        let mut query = app.world_mut().query::<&TestValue>();
+
+        let propagator_one = app.world_mut().spawn(Propagate(TestValue(1))).id();
+        let other_parent = app.world_mut().spawn_empty().id();
+        let propagatee = app
             .world_mut()
-            .query::<&TestValue>()
-            .get(app.world(), propagatee)
-            .is_ok());
+            .spawn_empty()
+            .insert(ChildOf(propagator_one))
+            .id();
+
+        app.update();
+
+        assert_eq!(query.get(app.world(), propagatee), Ok(&TestValue(1)));
+
+        app.world_mut()
+            .commands()
+            .entity(propagatee)
+            .insert(ChildOf(other_parent));
+
+        app.update();
+
+        assert!(query.get(app.world(), propagatee).is_err());
     }
 
     #[test]
@@ -354,6 +441,8 @@ mod tests {
         app.add_schedule(Schedule::new(Update));
         app.add_plugins(HierarchyPropagatePlugin::<TestValue>::new(Update));
 
+        let mut query = app.world_mut().query::<&TestValue>();
+
         let propagator_a = app.world_mut().spawn(Propagate(TestValue(1))).id();
         let propagator_b = app.world_mut().spawn(Propagate(TestValue(2))).id();
         let propagatee = app
@@ -363,98 +452,139 @@ mod tests {
             .id();
 
         app.update();
-        assert_eq!(
-            app.world_mut()
-                .query::<&TestValue>()
-                .get(app.world(), propagatee),
-            Ok(&TestValue(1))
-        );
+
+        assert_eq!(query.get(app.world(), propagatee), Ok(&TestValue(1)));
+
         app.world_mut()
             .commands()
             .entity(propagatee)
             .insert(ChildOf(propagator_b));
         app.update();
-        assert_eq!(
-            app.world_mut()
-                .query::<&TestValue>()
-                .get(app.world(), propagatee),
-            Ok(&TestValue(2))
-        );
+
+        assert_eq!(query.get(app.world(), propagatee), Ok(&TestValue(2)));
     }
 
     #[test]
-    fn test_remove_orphan() {
+    fn test_propagate_over() {
         let mut app = App::new();
         app.add_schedule(Schedule::new(Update));
         app.add_plugins(HierarchyPropagatePlugin::<TestValue>::new(Update));
 
+        let mut query = app.world_mut().query::<&TestValue>();
+
         let propagator = app.world_mut().spawn(Propagate(TestValue(1))).id();
+        let propagate_over = app
+            .world_mut()
+            .spawn(TestValue(2))
+            .insert((PropagateOver::<TestValue>::default(), ChildOf(propagator)))
+            .id();
         let propagatee = app
             .world_mut()
             .spawn_empty()
-            .insert(ChildOf(propagator))
+            .insert(ChildOf(propagate_over))
             .id();
 
         app.update();
-        assert!(app
+
+        assert_eq!(query.get(app.world(), propagate_over), Ok(&TestValue(2)));
+        assert_eq!(query.get(app.world(), propagatee), Ok(&TestValue(1)));
+    }
+
+    #[test]
+    fn test_remove_propagate_over() {
+        let mut app = App::new();
+        app.add_schedule(Schedule::new(Update));
+        app.add_plugins(HierarchyPropagatePlugin::<TestValue>::new(Update));
+
+        let mut query = app.world_mut().query::<&TestValue>();
+
+        let propagator = app.world_mut().spawn(Propagate(TestValue(1))).id();
+        let propagate_over = app
+            .world_mut()
+            .spawn(TestValue(2))
+            .insert((PropagateOver::<TestValue>::default(), ChildOf(propagator)))
+            .id();
+        let propagatee = app
             .world_mut()
-            .query::<&TestValue>()
-            .get(app.world(), propagatee)
-            .is_ok());
+            .spawn_empty()
+            .insert(ChildOf(propagate_over))
+            .id();
+
+        app.update();
+        assert_eq!(
+            app.world_mut()
+                .query::<&Inherited<TestValue>>()
+                .get(app.world(), propagate_over),
+            Ok(&Inherited(TestValue(1)))
+        );
+        assert_eq!(
+            app.world_mut()
+                .query::<&Inherited<TestValue>>()
+                .get(app.world(), propagatee),
+            Ok(&Inherited(TestValue(1)))
+        );
+        assert_eq!(
+            query.get_many(app.world(), [propagate_over, propagatee]),
+            Ok([&TestValue(2), &TestValue(1)])
+        );
+
         app.world_mut()
             .commands()
-            .entity(propagatee)
-            .remove::<ChildOf>();
+            .entity(propagate_over)
+            .remove::<PropagateOver<TestValue>>();
         app.update();
-        assert!(app
-            .world_mut()
-            .query::<&TestValue>()
-            .get(app.world(), propagatee)
-            .is_err());
+
+        assert_eq!(
+            query.get_many(app.world(), [propagate_over, propagatee]),
+            Ok([&TestValue(1), &TestValue(1)])
+        );
     }
 
     #[test]
-    fn test_remove_propagated() {
+    fn test_propagate_over_parent_removed() {
         let mut app = App::new();
         app.add_schedule(Schedule::new(Update));
         app.add_plugins(HierarchyPropagatePlugin::<TestValue>::new(Update));
 
+        let mut query = app.world_mut().query::<&TestValue>();
+
         let propagator = app.world_mut().spawn(Propagate(TestValue(1))).id();
-        let propagatee = app
+        let propagate_over = app
             .world_mut()
-            .spawn_empty()
-            .insert(ChildOf(propagator))
+            .spawn(TestValue(2))
+            .insert((PropagateOver::<TestValue>::default(), ChildOf(propagator)))
             .id();
 
         app.update();
-        assert!(app
-            .world_mut()
-            .query::<&TestValue>()
-            .get(app.world(), propagatee)
-            .is_ok());
+
+        assert_eq!(
+            query.get_many(app.world(), [propagator, propagate_over]),
+            Ok([&TestValue(1), &TestValue(2)])
+        );
+
         app.world_mut()
             .commands()
             .entity(propagator)
             .remove::<Propagate<TestValue>>();
         app.update();
-        assert!(app
-            .world_mut()
-            .query::<&TestValue>()
-            .get(app.world(), propagatee)
-            .is_err());
+
+        assert!(query.get(app.world(), propagator).is_err(),);
+        assert_eq!(query.get(app.world(), propagate_over), Ok(&TestValue(2)));
     }
 
     #[test]
-    fn test_propagate_over() {
+    fn test_orphaned_propagate_over() {
         let mut app = App::new();
         app.add_schedule(Schedule::new(Update));
         app.add_plugins(HierarchyPropagatePlugin::<TestValue>::new(Update));
 
+        let mut query = app.world_mut().query::<&TestValue>();
+
         let propagator = app.world_mut().spawn(Propagate(TestValue(1))).id();
         let propagate_over = app
             .world_mut()
             .spawn(TestValue(2))
-            .insert(ChildOf(propagator))
+            .insert((PropagateOver::<TestValue>::default(), ChildOf(propagator)))
             .id();
         let propagatee = app
             .world_mut()
@@ -463,12 +593,20 @@ mod tests {
             .id();
 
         app.update();
+
         assert_eq!(
-            app.world_mut()
-                .query::<&TestValue>()
-                .get(app.world(), propagatee),
-            Ok(&TestValue(1))
+            query.get_many(app.world(), [propagate_over, propagatee]),
+            Ok([&TestValue(2), &TestValue(1)])
         );
+
+        app.world_mut()
+            .commands()
+            .entity(propagate_over)
+            .remove::<ChildOf>();
+        app.update();
+
+        assert_eq!(query.get(app.world(), propagate_over), Ok(&TestValue(2)));
+        assert!(query.get(app.world(), propagatee).is_err());
     }
 
     #[test]
@@ -477,6 +615,8 @@ mod tests {
         app.add_schedule(Schedule::new(Update));
         app.add_plugins(HierarchyPropagatePlugin::<TestValue>::new(Update));
 
+        let mut query = app.world_mut().query::<&TestValue>();
+
         let propagator = app.world_mut().spawn(Propagate(TestValue(1))).id();
         let propagate_stop = app
             .world_mut()
@@ -490,11 +630,46 @@ mod tests {
             .id();
 
         app.update();
-        assert!(app
+
+        assert_eq!(query.get(app.world(), propagate_stop), Ok(&TestValue(1)));
+        assert!(query.get(app.world(), no_propagatee).is_err());
+    }
+
+    #[test]
+    fn test_remove_propagate_stop() {
+        let mut app = App::new();
+        app.add_schedule(Schedule::new(Update));
+        app.add_plugins(HierarchyPropagatePlugin::<TestValue>::new(Update));
+
+        let mut query = app.world_mut().query::<&TestValue>();
+
+        let propagator = app.world_mut().spawn(Propagate(TestValue(1))).id();
+        let propagate_stop = app
+            .world_mut()
+            .spawn(PropagateStop::<TestValue>::default())
+            .insert(ChildOf(propagator))
+            .id();
+        let no_propagatee = app
             .world_mut()
-            .query::<&TestValue>()
-            .get(app.world(), no_propagatee)
-            .is_err());
+            .spawn_empty()
+            .insert(ChildOf(propagate_stop))
+            .id();
+
+        app.update();
+
+        assert_eq!(query.get(app.world(), propagate_stop), Ok(&TestValue(1)));
+        assert!(query.get(app.world(), no_propagatee).is_err());
+
+        app.world_mut()
+            .commands()
+            .entity(propagate_stop)
+            .remove::<PropagateStop<TestValue>>();
+        app.update();
+
+        assert_eq!(
+            query.get_many(app.world(), [propagate_stop, no_propagatee]),
+            Ok([&TestValue(1), &TestValue(1)])
+        );
     }
 
     #[test]
@@ -503,6 +678,8 @@ mod tests {
         app.add_schedule(Schedule::new(Update));
         app.add_plugins(HierarchyPropagatePlugin::<TestValue>::new(Update));
 
+        let mut query = app.world_mut().query::<&TestValue>();
+
         let propagator = app.world_mut().spawn(Propagate(TestValue(1))).id();
         let intermediate = app
             .world_mut()
@@ -516,22 +693,22 @@ mod tests {
             .id();
 
         app.update();
+
         assert_eq!(
-            app.world_mut()
-                .query::<&TestValue>()
-                .get(app.world(), propagatee),
-            Ok(&TestValue(1))
+            query.get_many(app.world(), [propagator, intermediate, propagatee]),
+            Ok([&TestValue(1), &TestValue(1), &TestValue(1)])
         );
 
         app.world_mut()
             .entity_mut(intermediate)
             .insert(Propagate(TestValue(2)));
         app.update();
+
         assert_eq!(
             app.world_mut()
                 .query::<&TestValue>()
-                .get(app.world(), propagatee),
-            Ok(&TestValue(2))
+                .get_many(app.world(), [propagator, intermediate, propagatee]),
+            Ok([&TestValue(1), &TestValue(2), &TestValue(2)])
         );
     }
 
@@ -546,6 +723,8 @@ mod tests {
             Update,
         ));
 
+        let mut query = app.world_mut().query::<&TestValue>();
+
         let propagator = app.world_mut().spawn(Propagate(TestValue(1))).id();
         let propagatee = app
             .world_mut()
@@ -554,30 +733,111 @@ mod tests {
             .id();
 
         app.update();
-        assert!(app
-            .world_mut()
-            .query::<&TestValue>()
-            .get(app.world(), propagatee)
-            .is_err());
+
+        assert!(query.get(app.world(), propagator).is_err());
+        assert!(query.get(app.world(), propagatee).is_err());
 
         // NOTE: changes to the filter condition are not rechecked
         app.world_mut().entity_mut(propagator).insert(Marker);
+        app.update();
+
+        assert!(query.get(app.world(), propagator).is_err());
+        assert!(query.get(app.world(), propagatee).is_err());
+
+        app.world_mut()
+            .entity_mut(propagator)
+            .insert(Propagate(TestValue(1)));
+        app.update();
+
+        assert_eq!(query.get(app.world(), propagator), Ok(&TestValue(1)));
+        assert!(query.get(app.world(), propagatee).is_err());
+
         app.world_mut().entity_mut(propagatee).insert(Marker);
         app.update();
-        assert!(app
-            .world_mut()
-            .query::<&TestValue>()
-            .get(app.world(), propagatee)
-            .is_err());
+
+        assert_eq!(query.get(app.world(), propagator), Ok(&TestValue(1)));
+        assert!(query.get(app.world(), propagatee).is_err());
 
         app.world_mut()
             .entity_mut(propagator)
             .insert(Propagate(TestValue(1)));
         app.update();
-        assert!(app
+
+        assert_eq!(
+            app.world_mut()
+                .query::<&TestValue>()
+                .get_many(app.world(), [propagator, propagatee]),
+            Ok([&TestValue(1), &TestValue(1)])
+        );
+    }
+
+    #[test]
+    fn test_removed_propagate_still_inherits() {
+        let mut app = App::new();
+        app.add_schedule(Schedule::new(Update));
+        app.add_plugins(HierarchyPropagatePlugin::<TestValue>::new(Update));
+
+        let mut query = app.world_mut().query::<&TestValue>();
+
+        let propagator = app.world_mut().spawn(Propagate(TestValue(1))).id();
+        let propagatee = app
             .world_mut()
-            .query::<&TestValue>()
-            .get(app.world(), propagatee)
-            .is_ok());
+            .spawn(Propagate(TestValue(2)))
+            .insert(ChildOf(propagator))
+            .id();
+
+        app.update();
+
+        assert_eq!(
+            query.get_many(app.world(), [propagator, propagatee]),
+            Ok([&TestValue(1), &TestValue(2)])
+        );
+
+        app.world_mut()
+            .commands()
+            .entity(propagatee)
+            .remove::<Propagate<TestValue>>();
+        app.update();
+
+        assert_eq!(
+            query.get_many(app.world(), [propagator, propagatee]),
+            Ok([&TestValue(1), &TestValue(1)])
+        );
+    }
+
+    #[test]
+    fn test_reparent_respects_stop() {
+        let mut app = App::new();
+        app.add_schedule(Schedule::new(Update));
+        app.add_plugins(HierarchyPropagatePlugin::<TestValue>::new(Update));
+
+        let mut query = app.world_mut().query::<&TestValue>();
+
+        let propagator = app
+            .world_mut()
+            .spawn((
+                Propagate(TestValue(1)),
+                PropagateStop::<TestValue>::default(),
+            ))
+            .id();
+        let propagatee = app.world_mut().spawn(TestValue(2)).id();
+
+        app.update();
+
+        assert_eq!(
+            query.get_many(app.world(), [propagator, propagatee]),
+            Ok([&TestValue(1), &TestValue(2)])
+        );
+
+        app.world_mut()
+            .commands()
+            .entity(propagatee)
+            .insert(ChildOf(propagator));
+        app.update();
+
+        assert_eq!(
+            query.get_many(app.world(), [propagator, propagatee]),
+            Ok([&TestValue(1), &TestValue(2)])
+        );
     }
 }

From 80e17cce422bf682949e449123a3f6c7cde68773 Mon Sep 17 00:00:00 2001
From: Saratii <87591431+Saratii@users.noreply.github.com>
Date: Mon, 8 Dec 2025 16:51:33 -0600
Subject: [PATCH 051/133] Add optimized is_in_half_space_identity,
 contains_aabb_identity, and intersects_obb_identity (#21249)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

This adds an optimized version of is_in_half_space,
`Frustum::contains_aabb_identity`, `Aabb::is_in_half_space_identity`,
and `Frustum::intersects_obb_identity` that takes advantage of how
calling with IDENTITY (common) reduces the amount of matrix
multiplications.

## Solution

Add a specialized function without touching the original that assumes
Identity was passed to simplify math.

## Testing

I use this function extensively in my own project. I asserted the old
function called with identity always returns the same as my new
function.
I bench marked and profiled the usage in my real application and noticed
a 16% speed up on Linux and 20% on windows for contains_aabb.
I bench marked intersects_obb_identity and noticed a 39% increase on
linux and 38% on windows.
Both functions have unit tests that assert calling with identity yields
the same result in both versions.

---------

Co-authored-by: François Mockers <francois.mockers@vleue.com>
Co-authored-by: IQuick 143 <IQuick143cz@gmail.com>
---
 crates/bevy_camera/src/primitives.rs | 97 +++++++++++++++++++++++++++-
 1 file changed, 96 insertions(+), 1 deletion(-)

diff --git a/crates/bevy_camera/src/primitives.rs b/crates/bevy_camera/src/primitives.rs
index 1f3abe97ed6f3..db02eb80f96a5 100644
--- a/crates/bevy_camera/src/primitives.rs
+++ b/crates/bevy_camera/src/primitives.rs
@@ -133,6 +133,16 @@ impl Aabb {
         let signed_distance = p_normal.dot(aabb_center_world) + half_space.d();
         signed_distance > r
     }
+
+    /// Optimized version of [`Self::is_in_half_space`] when the AABB is already in world space.
+    /// Use this when `world_from_local` would be the identity transform.
+    #[inline]
+    pub fn is_in_half_space_identity(&self, half_space: &HalfSpace) -> bool {
+        let p_normal = half_space.normal();
+        let r = self.half_extents.abs().dot(p_normal.abs());
+        let signed_distance = p_normal.dot(self.center) + half_space.d();
+        signed_distance > r
+    }
 }
 
 impl From<Aabb3d> for Aabb {
@@ -369,7 +379,22 @@ impl Frustum {
         true
     }
 
-    /// Check if the frustum contains the Axis-Aligned Bounding Box (AABB).
+    /// Optimized version of [`Frustum::intersects_obb`]
+    /// where the transform is [`Affine3A::IDENTITY`] and both `intersect_near` and `intersect_far` are `true`.
+    #[inline]
+    pub fn intersects_obb_identity(&self, aabb: &Aabb) -> bool {
+        let aabb_center_world = aabb.center.extend(1.0);
+        for half_space in self.half_spaces.iter() {
+            let p_normal = half_space.normal();
+            let relative_radius = aabb.half_extents.abs().dot(p_normal.abs());
+            if half_space.normal_d().dot(aabb_center_world) + relative_radius <= 0.0 {
+                return false;
+            }
+        }
+        true
+    }
+
+    /// Check if the frustum contains the entire Axis-Aligned Bounding Box (AABB).
     /// Referenced from: [Frustum Culling](https://learnopengl.com/Guest-Articles/2021/Scene/Frustum-Culling)
     #[inline]
     pub fn contains_aabb(&self, aabb: &Aabb, world_from_local: &Affine3A) -> bool {
@@ -380,6 +405,18 @@ impl Frustum {
         }
         true
     }
+
+    /// Optimized version of [`Self::contains_aabb`] when the AABB is already in world space.
+    /// Use this when `world_from_local` would be [`Affine3A::IDENTITY`].
+    #[inline]
+    pub fn contains_aabb_identity(&self, aabb: &Aabb) -> bool {
+        for half_space in &self.half_spaces {
+            if !aabb.is_in_half_space_identity(half_space) {
+                return false;
+            }
+        }
+        true
+    }
 }
 
 pub struct CubeMapFace {
@@ -772,4 +809,62 @@ mod tests {
         );
         assert!(!frustum.contains_aabb(&aabb, &model));
     }
+
+    #[test]
+    fn test_identity_optimized_equivalence() {
+        let cases = vec![
+            (
+                Aabb {
+                    center: Vec3A::ZERO,
+                    half_extents: Vec3A::splat(1.0),
+                },
+                HalfSpace::new(Vec4::new(1.0, 0.0, 0.0, -0.5)),
+            ),
+            (
+                Aabb {
+                    center: Vec3A::new(2.0, -1.0, 0.5),
+                    half_extents: Vec3A::new(1.0, 2.0, 0.5),
+                },
+                HalfSpace::new(Vec4::new(1.0, 1.0, 1.0, -1.0).normalize()),
+            ),
+            (
+                Aabb {
+                    center: Vec3A::new(1.0, 1.0, 1.0),
+                    half_extents: Vec3A::ZERO,
+                },
+                HalfSpace::new(Vec4::new(0.0, 0.0, 1.0, -2.0)),
+            ),
+        ];
+        for (aabb, half_space) in cases {
+            let general = aabb.is_in_half_space(&half_space, &Affine3A::IDENTITY);
+            let identity = aabb.is_in_half_space_identity(&half_space);
+            assert_eq!(general, identity,);
+        }
+    }
+
+    #[test]
+    fn intersects_obb_identity_matches_standard_true_true() {
+        let frusta = [frustum(), long_frustum(), big_frustum()];
+        let aabbs = [
+            Aabb {
+                center: Vec3A::ZERO,
+                half_extents: Vec3A::new(0.5, 0.5, 0.5),
+            },
+            Aabb {
+                center: Vec3A::new(1.0, 0.0, 0.5),
+                half_extents: Vec3A::new(0.9, 0.9, 0.9),
+            },
+            Aabb {
+                center: Vec3A::new(100.0, 100.0, 100.0),
+                half_extents: Vec3A::new(1.0, 1.0, 1.0),
+            },
+        ];
+        for fr in &frusta {
+            for aabb in &aabbs {
+                let standard = fr.intersects_obb(aabb, &Affine3A::IDENTITY, true, true);
+                let optimized = fr.intersects_obb_identity(aabb);
+                assert_eq!(standard, optimized);
+            }
+        }
+    }
 }

From 8ca07c4727ee2cde23e7129014208cf96a08a2b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?charlotte=20=F0=9F=8C=B8?= <charlotte.c.mcelwain@gmail.com>
Date: Mon, 8 Dec 2025 15:57:25 -0800
Subject: [PATCH 052/133] Add flag to force MSAA writeback (#22066)

For Processing, we sometimes need to write out of band to the main view
target, which will get clobbered if it's the first camera and writeback
doesn't occur.
---
 crates/bevy_camera/src/camera.rs              | 12 +++++-------
 crates/bevy_camera/src/clear_color.rs         | 19 +++++++++++++++++++
 crates/bevy_camera/src/lib.rs                 |  4 ++--
 .../bevy_post_process/src/msaa_writeback.rs   | 13 +++++++++----
 crates/bevy_render/src/camera.rs              |  6 +++---
 5 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/crates/bevy_camera/src/camera.rs b/crates/bevy_camera/src/camera.rs
index 85280928931dd..d68f4c29b5bbf 100644
--- a/crates/bevy_camera/src/camera.rs
+++ b/crates/bevy_camera/src/camera.rs
@@ -2,7 +2,7 @@ use crate::primitives::Frustum;
 
 use super::{
     visibility::{Visibility, VisibleEntities},
-    ClearColorConfig,
+    ClearColorConfig, MsaaWriteback,
 };
 use bevy_asset::Handle;
 use bevy_derive::Deref;
@@ -360,11 +360,9 @@ pub struct Camera {
     pub target: RenderTarget,
     /// The [`CameraOutputMode`] for this camera.
     pub output_mode: CameraOutputMode,
-    /// If this is enabled, a previous camera exists that shares this camera's render target, and this camera has MSAA enabled, then the previous camera's
-    /// outputs will be written to the intermediate multi-sampled render target textures for this camera. This enables cameras with MSAA enabled to
-    /// "write their results on top" of previous camera results, and include them as a part of their render results. This is enabled by default to ensure
-    /// cameras with MSAA enabled layer their results in the same way as cameras without MSAA enabled by default.
-    pub msaa_writeback: bool,
+    /// Controls when MSAA writeback occurs for this camera.
+    /// See [`MsaaWriteback`] for available options.
+    pub msaa_writeback: MsaaWriteback,
     /// The clear color operation to perform on the render target.
     pub clear_color: ClearColorConfig,
     /// If set, this camera will be a sub camera of a large view, defined by a [`SubCameraView`].
@@ -380,7 +378,7 @@ impl Default for Camera {
             computed: Default::default(),
             target: Default::default(),
             output_mode: Default::default(),
-            msaa_writeback: true,
+            msaa_writeback: MsaaWriteback::default(),
             clear_color: Default::default(),
             sub_camera_view: None,
         }
diff --git a/crates/bevy_camera/src/clear_color.rs b/crates/bevy_camera/src/clear_color.rs
index aeff7b3428a66..979a9503cec56 100644
--- a/crates/bevy_camera/src/clear_color.rs
+++ b/crates/bevy_camera/src/clear_color.rs
@@ -22,6 +22,25 @@ pub enum ClearColorConfig {
     None,
 }
 
+/// Controls when MSAA writeback occurs for a camera.
+///
+/// MSAA writeback copies the previous camera's output into the MSAA sampled texture before
+/// rendering, allowing multiple cameras to layer their results when MSAA is enabled.
+#[derive(Reflect, Serialize, Deserialize, Copy, Clone, Debug, Default, PartialEq, Eq)]
+#[reflect(Serialize, Deserialize, Default, Clone)]
+pub enum MsaaWriteback {
+    /// Never perform MSAA writeback for this camera.
+    Off,
+    /// Perform MSAA writeback only when this camera is not the first one rendering to the target.
+    /// This is the default behavior - the first camera has nothing to write back.
+    #[default]
+    Auto,
+    /// Always perform MSAA writeback, even if this is the first camera rendering to the target.
+    /// This is useful when content has been written directly to the main texture (e.g., via
+    /// `write_texture`) and needs to be preserved through the MSAA render pass.
+    Always,
+}
+
 /// A [`Resource`] that stores the default color that cameras use to clear the screen between frames.
 ///
 /// This color appears as the "background" color for simple apps,
diff --git a/crates/bevy_camera/src/lib.rs b/crates/bevy_camera/src/lib.rs
index 298b2cde0b411..b8450dcada258 100644
--- a/crates/bevy_camera/src/lib.rs
+++ b/crates/bevy_camera/src/lib.rs
@@ -34,8 +34,8 @@ pub mod prelude {
     #[doc(hidden)]
     pub use crate::{
         visibility::{InheritedVisibility, ViewVisibility, Visibility},
-        Camera, Camera2d, Camera3d, ClearColor, ClearColorConfig, OrthographicProjection,
-        PerspectiveProjection, Projection,
+        Camera, Camera2d, Camera3d, ClearColor, ClearColorConfig, MsaaWriteback,
+        OrthographicProjection, PerspectiveProjection, Projection,
     };
 }
 
diff --git a/crates/bevy_post_process/src/msaa_writeback.rs b/crates/bevy_post_process/src/msaa_writeback.rs
index 859515ff5aee3..0a35088f7f0f4 100644
--- a/crates/bevy_post_process/src/msaa_writeback.rs
+++ b/crates/bevy_post_process/src/msaa_writeback.rs
@@ -1,4 +1,5 @@
 use bevy_app::{App, Plugin};
+use bevy_camera::MsaaWriteback;
 use bevy_color::LinearRgba;
 use bevy_core_pipeline::{
     blit::{BlitPipeline, BlitPipelineKey},
@@ -135,10 +136,14 @@ fn prepare_msaa_writeback_pipelines(
     view_targets: Query<(Entity, &ViewTarget, &ExtractedCamera, &Msaa)>,
 ) {
     for (entity, view_target, camera, msaa) in view_targets.iter() {
-        // only do writeback if writeback is enabled for the camera and this isn't the first camera in the target,
-        // as there is nothing to write back for the first camera.
-        if msaa.samples() > 1 && camera.msaa_writeback && camera.sorted_camera_index_for_target > 0
-        {
+        // Determine if we should do MSAA writeback based on the camera's setting
+        let should_writeback = match camera.msaa_writeback {
+            MsaaWriteback::Off => false,
+            MsaaWriteback::Auto => camera.sorted_camera_index_for_target > 0,
+            MsaaWriteback::Always => true,
+        };
+
+        if msaa.samples() > 1 && should_writeback {
             let key = BlitPipelineKey {
                 texture_format: view_target.main_texture_format(),
                 samples: msaa.samples(),
diff --git a/crates/bevy_render/src/camera.rs b/crates/bevy_render/src/camera.rs
index cb5bcb2500bbe..99ccffda26183 100644
--- a/crates/bevy_render/src/camera.rs
+++ b/crates/bevy_render/src/camera.rs
@@ -20,8 +20,8 @@ use bevy_camera::{
     primitives::Frustum,
     visibility::{self, RenderLayers, VisibleEntities},
     Camera, Camera2d, Camera3d, CameraMainTextureUsages, CameraOutputMode, CameraUpdateSystems,
-    ClearColor, ClearColorConfig, Exposure, ManualTextureViewHandle, NormalizedRenderTarget,
-    Projection, RenderTargetInfo, Viewport,
+    ClearColor, ClearColorConfig, Exposure, ManualTextureViewHandle, MsaaWriteback,
+    NormalizedRenderTarget, Projection, RenderTargetInfo, Viewport,
 };
 use bevy_derive::{Deref, DerefMut};
 use bevy_ecs::{
@@ -409,7 +409,7 @@ pub struct ExtractedCamera {
     pub render_graph: InternedRenderSubGraph,
     pub order: isize,
     pub output_mode: CameraOutputMode,
-    pub msaa_writeback: bool,
+    pub msaa_writeback: MsaaWriteback,
     pub clear_color: ClearColorConfig,
     pub sorted_camera_index_for_target: usize,
     pub exposure: f32,

From fca45967ec6439b17673dad8c7f6854f89082b51 Mon Sep 17 00:00:00 2001
From: Lyndon-Mackay <31716003+Lyndon-Mackay@users.noreply.github.com>
Date: Tue, 9 Dec 2025 13:45:11 +1300
Subject: [PATCH 053/133] DespawnOnExit / DespawnOnEnter fix log spam  (#21864)

if entity was despawned such as in a hierachy

# Objective

- DespawnOnExit / DespawnOnEnter logs errors with despawning.
Most if not all use cases don't care if the item is already despawned.
The user is typically saying "Ensure it is despawned" rather then "You
should be the one to despawn"
- Fixes #21832

## Solution

- Changes the state_scoped code to use try despawn

## Testing

- I updated example state_scoped to include children with
DespawnOnExit/DespawnOnEnter and added a brief explanation then I ran
the examples

---------

Co-authored-by: mgi388 <135186256+mgi388@users.noreply.github.com>
---
 crates/bevy_state/src/state_scoped.rs |  8 ++++++--
 examples/ecs/state_scoped.rs          | 11 +++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/crates/bevy_state/src/state_scoped.rs b/crates/bevy_state/src/state_scoped.rs
index 1d224da1c13ff..ea2acdcf816db 100644
--- a/crates/bevy_state/src/state_scoped.rs
+++ b/crates/bevy_state/src/state_scoped.rs
@@ -67,6 +67,8 @@ where
 
 /// Despawns entities marked with [`DespawnOnExit<S>`] when their state no
 /// longer matches the world state.
+///
+/// If the entity has already been despawned no warning will be emitted.
 pub fn despawn_entities_on_exit_state<S: States>(
     mut commands: Commands,
     mut transitions: MessageReader<StateTransitionEvent<S>>,
@@ -86,7 +88,7 @@ pub fn despawn_entities_on_exit_state<S: States>(
     };
     for (entity, binding) in &query {
         if binding.0 == *exited {
-            commands.entity(entity).despawn();
+            commands.entity(entity).try_despawn();
         }
     }
 }
@@ -133,6 +135,8 @@ pub struct DespawnOnEnter<S: States>(pub S);
 
 /// Despawns entities marked with [`DespawnOnEnter<S>`] when their state
 /// matches the world state.
+///
+/// If the entity has already been despawned no warning will be emitted.
 pub fn despawn_entities_on_enter_state<S: States>(
     mut commands: Commands,
     mut transitions: MessageReader<StateTransitionEvent<S>>,
@@ -152,7 +156,7 @@ pub fn despawn_entities_on_enter_state<S: States>(
     };
     for (entity, binding) in &query {
         if binding.0 == *entered {
-            commands.entity(entity).despawn();
+            commands.entity(entity).try_despawn();
         }
     }
 }
diff --git a/examples/ecs/state_scoped.rs b/examples/ecs/state_scoped.rs
index 8fd4f0a6196fd..ad8d2fac38fbb 100644
--- a/examples/ecs/state_scoped.rs
+++ b/examples/ecs/state_scoped.rs
@@ -3,6 +3,10 @@
 //!
 //! This pattern is useful for managing menus, levels, or other state-specific
 //! content that should only exist during certain states.
+//!
+//! If the entity was already despawned then no error will be logged. This means
+//! that you don't have to worry about duplicate [`DespawnOnExit`] and
+//! [`DespawnOnEnter`] components deep in your hierarchy.
 
 use bevy::prelude::*;
 
@@ -46,6 +50,7 @@ fn on_a_enter(mut commands: Commands) {
             left: px(0),
             ..default()
         },
+        (children![DespawnOnExit(GameState::A)]),
     ));
 }
 
@@ -65,6 +70,10 @@ fn on_a_exit(mut commands: Commands) {
             left: px(500),
             ..default()
         },
+        // You can apply this even when the parent has a state scoped component.
+        // It is unnecessary but in complex hierarchies it saves you from having to
+        // mentally track which components are found at the top level.
+        (children![DespawnOnEnter(GameState::A)]),
     ));
 }
 
@@ -84,6 +93,7 @@ fn on_b_enter(mut commands: Commands) {
             left: px(0),
             ..default()
         },
+        (children![DespawnOnExit(GameState::B)]),
     ));
 }
 
@@ -103,6 +113,7 @@ fn on_b_exit(mut commands: Commands) {
             left: px(500),
             ..default()
         },
+        (children![DespawnOnEnter(GameState::B)]),
     ));
 }
 

From 8c6e49018d3e11b77933544ff92b03fda63245ad Mon Sep 17 00:00:00 2001
From: BD103 <59022059+BD103@users.noreply.github.com>
Date: Tue, 9 Dec 2025 00:10:18 -0500
Subject: [PATCH 054/133] Remove `bevy_ptr::dangling_with_align()` and inline
 it (#21822)

# Objective

- `bevy_ptr::dangling_with_align()` is only used once, in `bevy_ecs`'s
`BlobArray::with_capacity()`, and it isn't generally useful outside of
the engine's internals. We can remove the function and inline its
implementation into its call site.
- Additionally, `bevy_ptr::dangling_with_align()` has a TODO comment
that was leftover from
https://github.com/bevyengine/bevy/pull/15311#discussion_r1768091379,
where it was suggested that `dangling_with_align()` should use
`without_provenance()`.
- `with_addr()`, mentioned in the TODO comment, could also be used, but
it's a more roundabout solution. The reason it was mentioned was because
the original author thought it would be stabilized before
`without_provenance()`.

## Solution

- Remove `dangling_with_align()`.
- Replace its usage with `NonNull::without_provenance()` (since it is
now stable and doesn't require `unsafe` or pointer math)

## Testing

- I ran Miri with strict provenance checking enabled to ensure the
behavior is maintained.
  - `MIRIFLAGS="-Zmiri-strict-provenance" cargo +nightly miri test`

## But what is this provenance thingy?

[The official docs provide a more in-depth
explanation](https://doc.rust-lang.org/stable/std/ptr/index.html#provenance),
but basically a pointer is more than just a number referring to a memory
address. Pointers have _permissions_ associated with them that track:

- What set of memory addresses are allowed to be accessed
- When the pointer is allowed to access those addresses
- If the pointer is allowed to mutate the memory, or just read it

These permissions are pointer provenance. They aren't stored at runtime,
the Rust compiler doesn't know them at compile time! Miri is the only
tool that I know of that tracks provenance, which it uses to ensure
pointers adheres to their spatial, temporal, and mutability permissions.
That's why I mentioned Miri in the Testing section. :)
---
 Cargo.toml                                    |  2 +-
 crates/bevy_ecs/Cargo.toml                    |  2 +-
 crates/bevy_ecs/src/error/bevy_error.rs       | 32 +++++++++----------
 crates/bevy_ecs/src/storage/blob_array.rs     |  5 ++-
 crates/bevy_ptr/src/lib.rs                    | 11 -------
 .../remove_dangling_with_align.md             | 14 ++++++++
 6 files changed, 36 insertions(+), 30 deletions(-)
 create mode 100644 release-content/migration-guides/remove_dangling_with_align.md

diff --git a/Cargo.toml b/Cargo.toml
index d0b21ce74bbe0..15ae77245973a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ keywords = ["game", "engine", "gamedev", "graphics", "bevy"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/bevyengine/bevy"
 documentation = "https://docs.rs/bevy"
-rust-version = "1.88.0"
+rust-version = "1.89.0"
 
 [workspace]
 resolver = "2"
diff --git a/crates/bevy_ecs/Cargo.toml b/crates/bevy_ecs/Cargo.toml
index 98b9c33bb07c8..14da777c6900d 100644
--- a/crates/bevy_ecs/Cargo.toml
+++ b/crates/bevy_ecs/Cargo.toml
@@ -8,7 +8,7 @@ repository = "https://github.com/bevyengine/bevy"
 license = "MIT OR Apache-2.0"
 keywords = ["ecs", "game", "bevy"]
 categories = ["game-engines", "data-structures"]
-rust-version = "1.86.0"
+rust-version = "1.89.0"
 
 [features]
 default = ["std", "bevy_reflect", "async_executor", "backtrace"]
diff --git a/crates/bevy_ecs/src/error/bevy_error.rs b/crates/bevy_ecs/src/error/bevy_error.rs
index c290e249b2cfd..352162ae826a1 100644
--- a/crates/bevy_ecs/src/error/bevy_error.rs
+++ b/crates/bevy_ecs/src/error/bevy_error.rs
@@ -191,10 +191,10 @@ mod tests {
 
         // On mac backtraces can start with Backtrace::create
         let mut skip = false;
-        if let Some(line) = lines.peek() {
-            if &line[6..] == "std::backtrace::Backtrace::create" {
-                skip = true;
-            }
+        if let Some(line) = lines.peek()
+            && &line[6..] == "std::backtrace::Backtrace::create"
+        {
+            skip = true;
         }
 
         if skip {
@@ -212,10 +212,10 @@ mod tests {
             let line = lines.next().unwrap();
             assert_eq!(&line[6..], expected);
             let mut skip = false;
-            if let Some(line) = lines.peek() {
-                if line.starts_with("             at") {
-                    skip = true;
-                }
+            if let Some(line) = lines.peek()
+                && line.starts_with("             at")
+            {
+                skip = true;
             }
 
             if skip {
@@ -225,19 +225,19 @@ mod tests {
 
         // on linux there is a second call_once
         let mut skip = false;
-        if let Some(line) = lines.peek() {
-            if &line[6..] == "core::ops::function::FnOnce::call_once" {
-                skip = true;
-            }
+        if let Some(line) = lines.peek()
+            && &line[6..] == "core::ops::function::FnOnce::call_once"
+        {
+            skip = true;
         }
         if skip {
             lines.next().unwrap();
         }
         let mut skip = false;
-        if let Some(line) = lines.peek() {
-            if line.starts_with("             at") {
-                skip = true;
-            }
+        if let Some(line) = lines.peek()
+            && line.starts_with("             at")
+        {
+            skip = true;
         }
 
         if skip {
diff --git a/crates/bevy_ecs/src/storage/blob_array.rs b/crates/bevy_ecs/src/storage/blob_array.rs
index 3ef2e5a90d007..bab0aad03c443 100644
--- a/crates/bevy_ecs/src/storage/blob_array.rs
+++ b/crates/bevy_ecs/src/storage/blob_array.rs
@@ -42,7 +42,10 @@ impl BlobArray {
     ) -> Self {
         if capacity == 0 {
             let align = NonZeroUsize::new(item_layout.align()).expect("alignment must be > 0");
-            let data = bevy_ptr::dangling_with_align(align);
+
+            // Create a dangling pointer with the given alignment.
+            let data = NonNull::without_provenance(align);
+
             Self {
                 item_layout,
                 drop: drop_fn,
diff --git a/crates/bevy_ptr/src/lib.rs b/crates/bevy_ptr/src/lib.rs
index e76fcc9f57250..f59a02496afda 100644
--- a/crates/bevy_ptr/src/lib.rs
+++ b/crates/bevy_ptr/src/lib.rs
@@ -12,7 +12,6 @@ use core::{
     fmt::{self, Debug, Formatter, Pointer},
     marker::PhantomData,
     mem::{self, ManuallyDrop, MaybeUninit},
-    num::NonZeroUsize,
     ops::{Deref, DerefMut},
     ptr::{self, NonNull},
 };
@@ -1139,16 +1138,6 @@ impl<'a, T> From<&'a [T]> for ThinSlicePtr<'a, T> {
     }
 }
 
-/// Creates a dangling pointer with specified alignment.
-/// See [`NonNull::dangling`].
-pub const fn dangling_with_align(align: NonZeroUsize) -> NonNull<u8> {
-    debug_assert!(align.is_power_of_two(), "Alignment must be power of two.");
-    // SAFETY: The pointer will not be null, since it was created
-    // from the address of a `NonZero<usize>`.
-    // TODO: use https://doc.rust-lang.org/std/ptr/struct.NonNull.html#method.with_addr once stabilized
-    unsafe { NonNull::new_unchecked(ptr::null_mut::<u8>().wrapping_add(align.get())) }
-}
-
 mod private {
     use core::cell::UnsafeCell;
 
diff --git a/release-content/migration-guides/remove_dangling_with_align.md b/release-content/migration-guides/remove_dangling_with_align.md
new file mode 100644
index 0000000000000..71fbd10e859c9
--- /dev/null
+++ b/release-content/migration-guides/remove_dangling_with_align.md
@@ -0,0 +1,14 @@
+---
+title: Remove `bevy::ptr::dangling_with_align()`
+pull_requests: [21822]
+---
+
+`bevy::ptr::dangling_with_align()` has been removed. Use `NonNull::without_provenance()` instead:
+
+```rust
+// 0.17
+let ptr = dangling_with_align(align);
+
+// 0.18
+let ptr = NonNull::without_provenance(align);
+```

From 8a0367e7eb5306761df85afc8632a3fc0b314d58 Mon Sep 17 00:00:00 2001
From: DuckyBlender <github@alanklas.com>
Date: Tue, 9 Dec 2025 06:16:59 +0100
Subject: [PATCH 055/133] Add vertical slider support to bevy_ui_widgets slider
 (#21827)

# Objective

- Fixes the issue of vertical sliders not being functional. Previously,
when creating a vertical slider, the slider drag behavior was still
horizontal, meaning dragging left/right would change the value instead
of dragging up/down. Additionally, clicking on the slider track was
offset and didn't correctly map to the clicked position.

## Solution

The slider widget now automatically detects its orientation based on the
node's dimensions (`height > width` for vertical, otherwise horizontal)
and adjusts its interaction behavior accordingly:

1. **Orientation Detection**: Added automatic detection of slider
orientation by comparing `node.size().y` to `node.size().x` in both
`slider_on_pointer_down` and `slider_on_drag` functions.

2. **Drag Direction Fix**:
- For vertical sliders, the drag calculation now uses the Y-axis
(`distance.y`) instead of X-axis
- The Y coordinate is properly inverted (since screen Y increases
downward) to match expected behavior (dragging up increases value)
- Thumb size calculation uses `thumb.size().y` for vertical sliders
instead of always using `thumb.size().x`

3. **Click Position Fix**:
- Fixed coordinate conversion from Bevy's center-origin coordinate
system to top/left-origin coordinates
- For vertical sliders: converts `local_pos.y` from `[-height/2,
+height/2]` to `[0, height]` before calculating the slider value
   - Accounts for thumb size offset to center the calculation properly
- Inverts the Y coordinate for vertical sliders since Y increases
downward

4. **Track Size Calculation**: Uses `node.size().y - thumb_size` for
vertical sliders and `node.size().x - thumb_size` for horizontal sliders
when calculating the available track space.

The changes are backward compatible - horizontal sliders continue to
work exactly as before, and the orientation detection is transparent to
users of the API.

## Testing

- **Manual Testing**: Created test application with both vertical and
horizontal sliders to verify:
- Vertical sliders respond correctly to vertical drag movements (up =
increase, down = decrease)
- Horizontal sliders continue to work correctly with horizontal drag
movements
- Clicking anywhere on the slider track correctly snaps to that position
for both orientations
  - Thumb positioning updates correctly during drag operations
  - Multiple sliders can coexist without interfering with each other

- **Edge Cases Tested**:
  - Clicking at the very top/bottom of vertical sliders
  - Clicking at the very left/right of horizontal sliders
  - Dragging from one extreme to the other
  - Rapid clicking and dragging interactions

**Areas that may need more testing:**
- Sliders with non-standard aspect ratios (very wide vertical sliders or
very tall horizontal sliders)
- Sliders with custom transforms/rotations applied
- Sliders in nested UI hierarchies with complex transforms

**How reviewers can test:**
1. Create a vertical slider (height > width) and verify:
   - Dragging up increases the value
   - Dragging down decreases the value
   - Clicking anywhere on the track snaps to that exact position
2. Create a horizontal slider (width > height) and verify it still works
as before
3. Test with multiple sliders of both orientations simultaneously

**Platforms tested:**
- macOS (Apple Silicon)

## Showcase

### Before
- Vertical sliders were unusable - dragging would move horizontally
instead of vertically
- Clicking on vertical slider tracks was offset, with clicks near the
bottom snapping to the middle instead


https://github.com/user-attachments/assets/9bda83e7-f46b-4626-9df3-a558526a8ab2



### After
- Vertical sliders work correctly with intuitive up/down drag behavior
- Clicking anywhere on the slider track accurately snaps to the clicked
position
- Both vertical and horizontal sliders work seamlessly together


https://github.com/user-attachments/assets/cca24288-4cbc-4ceb-828f-9ce7a735ade0



### Code Example

```rust
// Vertical slider - now works correctly!
commands.spawn((
    Node {
        width: Val::Px(12.0),
        height: Val::Px(300.0),  // height > width = vertical
        ..default()
    },
    Slider::default(),
    SliderValue(50.0),
    SliderRange::new(0.0, 100.0),
    // ... thumb and track children
));

// Horizontal slider - continues to work as before
commands.spawn((
    Node {
        width: Val::Px(300.0),
        height: Val::Px(12.0),  // width > height = horizontal
        ..default()
    },
    Slider::default(),
    SliderValue(50.0),
    SliderRange::new(0.0, 100.0),
    // ... thumb and track children
));
```

The orientation is automatically detected based on the node dimensions -
no API changes required!

---------

Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
---
 Cargo.toml                           |  12 +
 crates/bevy_ui_widgets/src/slider.rs |  77 +++++--
 examples/README.md                   |   1 +
 examples/ui/vertical_slider.rs       | 313 +++++++++++++++++++++++++++
 4 files changed, 386 insertions(+), 17 deletions(-)
 create mode 100644 examples/ui/vertical_slider.rs

diff --git a/Cargo.toml b/Cargo.toml
index 15ae77245973a..74b0ebe4ae6aa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3491,6 +3491,18 @@ description = "Illustrates how to access `winit::window::Window`'s `hittest` fun
 category = "UI (User Interface)"
 wasm = false
 
+[[example]]
+name = "vertical_slider"
+path = "examples/ui/vertical_slider.rs"
+doc-scrape-examples = true
+required-features = ["experimental_bevy_ui_widgets"]
+
+[package.metadata.example.vertical_slider]
+name = "Vertical Slider"
+description = "Simple example showing vertical and horizontal slider widgets with snap behavior and value labels"
+category = "UI (User Interface)"
+wasm = true
+
 [[example]]
 name = "font_atlas_debug"
 path = "examples/ui/font_atlas_debug.rs"
diff --git a/crates/bevy_ui_widgets/src/slider.rs b/crates/bevy_ui_widgets/src/slider.rs
index d19e344b29e4e..453aaa12e65ed 100644
--- a/crates/bevy_ui_widgets/src/slider.rs
+++ b/crates/bevy_ui_widgets/src/slider.rs
@@ -264,22 +264,49 @@ pub(crate) fn slider_on_pointer_down(
             return;
         }
 
+        // Detect orientation: vertical if height > width
+        let is_vertical = node.size().y > node.size().x;
+
         // Find thumb size by searching descendants for the first entity with SliderThumb
         let thumb_size = q_children
             .iter_descendants(press.entity)
-            .find_map(|child_id| q_thumb.get(child_id).ok().map(|thumb| thumb.size().x))
+            .find_map(|child_id| {
+                q_thumb.get(child_id).ok().map(|thumb| {
+                    if is_vertical {
+                        thumb.size().y
+                    } else {
+                        thumb.size().x
+                    }
+                })
+            })
             .unwrap_or(0.0);
 
         // Detect track click.
         let local_pos = transform.try_inverse().unwrap().transform_point2(
             press.pointer_location.position * node_target.scale_factor() / ui_scale.0,
         );
-        let track_width = node.size().x - thumb_size;
+        let track_size = if is_vertical {
+            node.size().y - thumb_size
+        } else {
+            node.size().x - thumb_size
+        };
+
         // Avoid division by zero
-        let click_val = if track_width > 0. {
-            local_pos.x * range.span() / track_width + range.center()
+        let click_val = if track_size > 0. {
+            if is_vertical {
+                // For vertical sliders: bottom-to-top (0 at bottom, max at top)
+                // local_pos.y ranges from -height/2 (top) to +height/2 (bottom)
+                let y_from_bottom = (node.size().y / 2.0) - local_pos.y;
+                let adjusted_y = y_from_bottom - thumb_size / 2.0;
+                adjusted_y * range.span() / track_size + range.start()
+            } else {
+                // For horizontal sliders: convert from center-origin to left-origin
+                let x_from_left = local_pos.x + node.size().x / 2.0;
+                let adjusted_x = x_from_left - thumb_size / 2.0;
+                adjusted_x * range.span() / track_size + range.start()
+            }
         } else {
-            0.
+            range.center()
         };
 
         // Compute new value from click position
@@ -330,7 +357,6 @@ pub(crate) fn slider_on_drag(
     mut event: On<Pointer<Drag>>,
     mut q_slider: Query<
         (
-            &SliderValue,
             &ComputedNode,
             &SliderRange,
             Option<&SliderPrecision>,
@@ -345,23 +371,42 @@ pub(crate) fn slider_on_drag(
     mut commands: Commands,
     ui_scale: Res<UiScale>,
 ) {
-    if let Ok((value, node, range, precision, transform, drag, disabled)) =
-        q_slider.get_mut(event.entity)
+    if let Ok((node, range, precision, transform, drag, disabled)) = q_slider.get_mut(event.entity)
     {
         event.propagate(false);
         if drag.dragging && !disabled {
+            // Detect orientation: vertical if height > width
+            let is_vertical = node.size().y > node.size().x;
+
             let mut distance = event.distance / ui_scale.0;
             distance.y *= -1.;
             let distance = transform.transform_vector2(distance);
+
             // Find thumb size by searching descendants for the first entity with SliderThumb
             let thumb_size = q_children
                 .iter_descendants(event.entity)
-                .find_map(|child_id| q_thumb.get(child_id).ok().map(|thumb| thumb.size().x))
+                .find_map(|child_id| {
+                    q_thumb.get(child_id).ok().map(|thumb| {
+                        if is_vertical {
+                            thumb.size().y
+                        } else {
+                            thumb.size().x
+                        }
+                    })
+                })
                 .unwrap_or(0.0);
-            let slider_width = ((node.size().x - thumb_size) * node.inverse_scale_factor).max(1.0);
+
+            let slider_size = if is_vertical {
+                ((node.size().y - thumb_size) * node.inverse_scale_factor).max(1.0)
+            } else {
+                ((node.size().x - thumb_size) * node.inverse_scale_factor).max(1.0)
+            };
+
+            let drag_distance = if is_vertical { distance.y } else { distance.x };
+
             let span = range.span();
             let new_value = if span > 0. {
-                drag.offset + (distance.x * span) / slider_width
+                drag.offset + (drag_distance * span) / slider_size
             } else {
                 range.start() + span * 0.5
             };
@@ -371,12 +416,10 @@ pub(crate) fn slider_on_drag(
                     .unwrap_or(new_value),
             );
 
-            if rounded_value != value.0 {
-                commands.trigger(ValueChange {
-                    source: event.entity,
-                    value: rounded_value,
-                });
-            }
+            commands.trigger(ValueChange {
+                source: event.entity,
+                value: rounded_value,
+            });
         }
     }
 }
diff --git a/examples/README.md b/examples/README.md
index ab7402ee46a9c..e119d412eb454 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -595,6 +595,7 @@ Example | Description
 [UI Texture Slice Flipping and Tiling](../examples/ui/ui_texture_slice_flip_and_tile.rs) | Illustrates how to flip and tile images with 9 Slicing in UI
 [UI Transform](../examples/ui/ui_transform.rs) | An example demonstrating how to translate, rotate and scale UI elements.
 [UI Z-Index](../examples/ui/z_index.rs) | Demonstrates how to control the relative depth (z-position) of UI elements
+[Vertical Slider](../examples/ui/vertical_slider.rs) | Simple example showing vertical and horizontal slider widgets with snap behavior and value labels
 [Viewport Debug](../examples/ui/viewport_debug.rs) | An example for debugging viewport coordinates
 [Viewport Node](../examples/ui/viewport_node.rs) | Demonstrates how to create a viewport node with picking support
 [Virtual Keyboard](../examples/ui/virtual_keyboard.rs) | Example demonstrating a virtual keyboard widget
diff --git a/examples/ui/vertical_slider.rs b/examples/ui/vertical_slider.rs
new file mode 100644
index 0000000000000..66dcccbad229c
--- /dev/null
+++ b/examples/ui/vertical_slider.rs
@@ -0,0 +1,313 @@
+//! Simple example showing vertical and horizontal slider widgets with snap behavior and value labels
+
+use bevy::{
+    input_focus::{
+        tab_navigation::{TabGroup, TabIndex, TabNavigationPlugin},
+        InputDispatchPlugin,
+    },
+    picking::hover::Hovered,
+    prelude::*,
+    ui_widgets::{
+        observe, slider_self_update, CoreSliderDragState, Slider, SliderRange, SliderThumb,
+        SliderValue, TrackClick, UiWidgetsPlugins,
+    },
+};
+
+const SLIDER_TRACK: Color = Color::srgb(0.05, 0.05, 0.05);
+const SLIDER_THUMB: Color = Color::srgb(0.35, 0.75, 0.35);
+
+fn main() {
+    App::new()
+        .add_plugins((
+            DefaultPlugins,
+            UiWidgetsPlugins,
+            InputDispatchPlugin,
+            TabNavigationPlugin,
+        ))
+        .add_systems(Startup, setup)
+        .add_systems(Update, (update_slider_visuals, update_value_labels))
+        .run();
+}
+
+#[derive(Component)]
+struct ValueLabel(Entity);
+
+#[derive(Component)]
+struct DemoSlider;
+
+#[derive(Component)]
+struct DemoSliderThumb;
+
+#[derive(Component)]
+struct VerticalSlider;
+
+fn setup(mut commands: Commands, assets: Res<AssetServer>) {
+    commands.spawn(Camera2d);
+
+    commands
+        .spawn((
+            Node {
+                width: percent(100),
+                height: percent(100),
+                align_items: AlignItems::Center,
+                justify_content: JustifyContent::Center,
+                display: Display::Flex,
+                flex_direction: FlexDirection::Row,
+                column_gap: px(50),
+                ..default()
+            },
+            TabGroup::default(),
+        ))
+        .with_children(|parent| {
+            // Vertical slider
+            parent
+                .spawn(Node {
+                    display: Display::Flex,
+                    flex_direction: FlexDirection::Column,
+                    align_items: AlignItems::Center,
+                    row_gap: px(10),
+                    ..default()
+                })
+                .with_children(|parent| {
+                    parent.spawn((
+                        Text::new("Vertical"),
+                        TextFont {
+                            font: assets.load("fonts/FiraSans-Bold.ttf"),
+                            font_size: 20.0,
+                            ..default()
+                        },
+                        TextColor(Color::srgb(0.9, 0.9, 0.9)),
+                    ));
+
+                    let label_id = parent
+                        .spawn((
+                            Text::new("50"),
+                            TextFont {
+                                font: assets.load("fonts/FiraSans-Bold.ttf"),
+                                font_size: 24.0,
+                                ..default()
+                            },
+                            TextColor(Color::srgb(0.9, 0.9, 0.9)),
+                        ))
+                        .id();
+
+                    parent.spawn((
+                        vertical_slider(),
+                        ValueLabel(label_id),
+                        observe(slider_self_update),
+                    ));
+                });
+
+            // Horizontal slider
+            parent
+                .spawn(Node {
+                    display: Display::Flex,
+                    flex_direction: FlexDirection::Column,
+                    align_items: AlignItems::Center,
+                    row_gap: px(10),
+                    ..default()
+                })
+                .with_children(|parent| {
+                    parent.spawn((
+                        Text::new("Horizontal"),
+                        TextFont {
+                            font: assets.load("fonts/FiraSans-Bold.ttf"),
+                            font_size: 20.0,
+                            ..default()
+                        },
+                        TextColor(Color::srgb(0.9, 0.9, 0.9)),
+                    ));
+
+                    let label_id = parent
+                        .spawn((
+                            Text::new("50"),
+                            TextFont {
+                                font: assets.load("fonts/FiraSans-Bold.ttf"),
+                                font_size: 24.0,
+                                ..default()
+                            },
+                            TextColor(Color::srgb(0.9, 0.9, 0.9)),
+                        ))
+                        .id();
+
+                    parent.spawn((
+                        horizontal_slider(),
+                        ValueLabel(label_id),
+                        observe(slider_self_update),
+                    ));
+                });
+        });
+}
+
+fn vertical_slider() -> impl Bundle {
+    (
+        Node {
+            display: Display::Flex,
+            flex_direction: FlexDirection::Row,
+            justify_content: JustifyContent::Center,
+            align_items: AlignItems::Stretch,
+            column_gap: px(4),
+            width: px(12),
+            height: px(200),
+            ..default()
+        },
+        DemoSlider,
+        VerticalSlider,
+        Hovered::default(),
+        Slider {
+            track_click: TrackClick::Snap,
+        },
+        SliderValue(50.0),
+        SliderRange::new(0.0, 100.0),
+        TabIndex(0),
+        Children::spawn((
+            Spawn((
+                Node {
+                    width: px(6),
+                    border_radius: BorderRadius::all(px(3)),
+                    ..default()
+                },
+                BackgroundColor(SLIDER_TRACK),
+            )),
+            Spawn((
+                Node {
+                    display: Display::Flex,
+                    position_type: PositionType::Absolute,
+                    top: px(12),
+                    bottom: px(0),
+                    left: px(0),
+                    right: px(0),
+                    ..default()
+                },
+                children![(
+                    DemoSliderThumb,
+                    SliderThumb,
+                    Node {
+                        display: Display::Flex,
+                        width: px(12),
+                        height: px(12),
+                        position_type: PositionType::Absolute,
+                        bottom: percent(0),
+                        border_radius: BorderRadius::MAX,
+                        ..default()
+                    },
+                    BackgroundColor(SLIDER_THUMB),
+                )],
+            )),
+        )),
+    )
+}
+
+fn horizontal_slider() -> impl Bundle {
+    (
+        Node {
+            display: Display::Flex,
+            flex_direction: FlexDirection::Column,
+            justify_content: JustifyContent::Center,
+            align_items: AlignItems::Stretch,
+            column_gap: px(4),
+            height: px(12),
+            width: px(200),
+            ..default()
+        },
+        DemoSlider,
+        Hovered::default(),
+        Slider {
+            track_click: TrackClick::Snap,
+        },
+        SliderValue(50.0),
+        SliderRange::new(0.0, 100.0),
+        TabIndex(0),
+        Children::spawn((
+            Spawn((
+                Node {
+                    height: px(6),
+                    border_radius: BorderRadius::all(px(3)),
+                    ..default()
+                },
+                BackgroundColor(SLIDER_TRACK),
+            )),
+            Spawn((
+                Node {
+                    display: Display::Flex,
+                    position_type: PositionType::Absolute,
+                    left: px(0),
+                    right: px(12),
+                    top: px(0),
+                    bottom: px(0),
+                    ..default()
+                },
+                children![(
+                    DemoSliderThumb,
+                    SliderThumb,
+                    Node {
+                        display: Display::Flex,
+                        width: px(12),
+                        height: px(12),
+                        position_type: PositionType::Absolute,
+                        left: percent(0),
+                        border_radius: BorderRadius::MAX,
+                        ..default()
+                    },
+                    BackgroundColor(SLIDER_THUMB),
+                )],
+            )),
+        )),
+    )
+}
+
+fn update_slider_visuals(
+    sliders: Query<
+        (
+            Entity,
+            &SliderValue,
+            &SliderRange,
+            &Hovered,
+            &CoreSliderDragState,
+            Has<VerticalSlider>,
+        ),
+        (
+            Or<(
+                Changed<SliderValue>,
+                Changed<Hovered>,
+                Changed<CoreSliderDragState>,
+            )>,
+            With<DemoSlider>,
+        ),
+    >,
+    children: Query<&Children>,
+    mut thumbs: Query<(&mut Node, &mut BackgroundColor, Has<DemoSliderThumb>), Without<DemoSlider>>,
+) {
+    for (slider_ent, value, range, hovered, drag_state, is_vertical) in sliders.iter() {
+        for child in children.iter_descendants(slider_ent) {
+            if let Ok((mut thumb_node, mut thumb_bg, is_thumb)) = thumbs.get_mut(child)
+                && is_thumb
+            {
+                let position = range.thumb_position(value.0) * 100.0;
+                if is_vertical {
+                    thumb_node.bottom = percent(position);
+                } else {
+                    thumb_node.left = percent(position);
+                }
+
+                let is_active = hovered.0 | drag_state.dragging;
+                thumb_bg.0 = if is_active {
+                    SLIDER_THUMB.lighter(0.3)
+                } else {
+                    SLIDER_THUMB
+                };
+            }
+        }
+    }
+}
+
+fn update_value_labels(
+    sliders: Query<(&SliderValue, &ValueLabel), (Changed<SliderValue>, With<DemoSlider>)>,
+    mut texts: Query<&mut Text>,
+) {
+    for (value, label) in sliders.iter() {
+        if let Ok(mut text) = texts.get_mut(label.0) {
+            **text = format!("{:.0}", value.0);
+        }
+    }
+}

From 1a9fee09fa6ba1b65c716d13bf33ce7f93beb547 Mon Sep 17 00:00:00 2001
From: newDINO <147262794+newDINO@users.noreply.github.com>
Date: Tue, 9 Dec 2025 13:20:10 +0800
Subject: [PATCH 056/133] Fix shader compilation fail when using visibility
 range (#21879)

# Objective
When using both deferred rendering and visibility range, shader
`pbr.wgsl` can't be compiled because `pbr_functions` is not imported.

The issue can be reproduced by using
`DefaultOpaqueRendererMethod::deferred()` and adding `DeferredPrepass`
to camera at the visibility_range example.

## Solution
Import `pbr_functions` when using `PREPASS_PIPELINE`.

## Testing
I tested on visibility_range and deferred_rendering example. However,
importing something usually doesn't break anything.

---------

Co-authored-by: Nico Zweifel <34443492+NicoZweifel@users.noreply.github.com>
---
 crates/bevy_pbr/src/render/pbr.wgsl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/crates/bevy_pbr/src/render/pbr.wgsl b/crates/bevy_pbr/src/render/pbr.wgsl
index 1722ab9d91940..e4d8fe63791d7 100644
--- a/crates/bevy_pbr/src/render/pbr.wgsl
+++ b/crates/bevy_pbr/src/render/pbr.wgsl
@@ -13,12 +13,15 @@
 #else
 #import bevy_pbr::{
     forward_io::{VertexOutput, FragmentOutput},
-    pbr_functions,
     pbr_functions::{apply_pbr_lighting, main_pass_post_lighting_processing},
     pbr_types::STANDARD_MATERIAL_FLAGS_UNLIT_BIT,
 }
 #endif
 
+#ifdef VISIBILITY_RANGE_DITHER
+#import bevy_pbr::pbr_functions::visibility_range_dither;
+#endif
+
 #ifdef MESHLET_MESH_MATERIAL_PASS
 #import bevy_pbr::meshlet_visibility_buffer_resolve::resolve_vertex_output
 #endif
@@ -50,7 +53,7 @@ fn fragment(
     // If we're in the crossfade section of a visibility range, conditionally
     // discard the fragment according to the visibility pattern.
 #ifdef VISIBILITY_RANGE_DITHER
-    pbr_functions::visibility_range_dither(in.position, in.visibility_range_dither);
+    visibility_range_dither(in.position, in.visibility_range_dither);
 #endif
 
 #ifdef FORWARD_DECAL

From ad48f39348a290f110845d77e83c066f8a1c64a0 Mon Sep 17 00:00:00 2001
From: ickshonpe <david.curthoys@googlemail.com>
Date: Tue, 9 Dec 2025 11:28:39 +0000
Subject: [PATCH 057/133] Skip picking for UI nodes if there is no pointer
 (#22074)

# Objective

`ui_picking` always iterates through all the uinodes even if no hits are
possible because there's no pointer above the current camera.

## Solution

Early continue if no pointers are found on the current camera.
---
 crates/bevy_ui/src/picking_backend.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/crates/bevy_ui/src/picking_backend.rs b/crates/bevy_ui/src/picking_backend.rs
index 99f00d5594f19..189de0a4d365a 100644
--- a/crates/bevy_ui/src/picking_backend.rs
+++ b/crates/bevy_ui/src/picking_backend.rs
@@ -174,7 +174,9 @@ pub fn ui_picking(
             continue;
         };
 
-        let pointers_on_this_cam = pointer_pos_by_camera.get(&camera_entity);
+        let Some(pointers_on_this_cam) = pointer_pos_by_camera.get(&camera_entity) else {
+            continue;
+        };
 
         // Reverse the iterator to traverse the tree from closest nodes to furthest
         for node_entity in uinodes.iter().rev().cloned() {
@@ -203,8 +205,7 @@ pub fn ui_picking(
             // Find the normalized cursor position relative to the node.
             // (±0., 0.) is the center with the corners at points (±0.5, ±0.5).
             // Coordinates are relative to the entire node, not just the visible region.
-            for (pointer_id, cursor_position) in pointers_on_this_cam.iter().flat_map(|h| h.iter())
-            {
+            for (pointer_id, cursor_position) in pointers_on_this_cam.iter() {
                 if node.node.contains_point(*node.transform, *cursor_position)
                     && clip_check_recursive(
                         *cursor_position,

From 6684682f290024c2a022f336f6445eb737115e87 Mon Sep 17 00:00:00 2001
From: Emerson Coskey <emerson@coskey.dev>
Date: Tue, 9 Dec 2025 03:33:18 -0800
Subject: [PATCH 058/133] remove empty_bind_group_layout (#22068)

# Objective

- Now that we have `BindGroupLayoutDescriptor`, we don't need this ugly
hack

## Solution

- Remove the ugly hack
---
 crates/bevy_render/src/lib.rs                 |  4 +---
 .../src/render_resource/bind_group_layout.rs  | 20 +------------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/crates/bevy_render/src/lib.rs b/crates/bevy_render/src/lib.rs
index b1e7837b3ec04..2325139a0af98 100644
--- a/crates/bevy_render/src/lib.rs
+++ b/crates/bevy_render/src/lib.rs
@@ -81,7 +81,7 @@ use crate::{
     gpu_readback::GpuReadbackPlugin,
     mesh::{MeshRenderAssetPlugin, RenderMesh},
     render_asset::prepare_assets,
-    render_resource::{init_empty_bind_group_layout, PipelineCache},
+    render_resource::PipelineCache,
     renderer::{render_system, RenderAdapterInfo},
     settings::RenderCreation,
     storage::StoragePlugin,
@@ -388,8 +388,6 @@ impl Plugin for RenderPlugin {
                     Render,
                     reset_render_asset_bytes_per_frame.in_set(RenderSystems::Cleanup),
                 );
-
-            render_app.add_systems(RenderStartup, init_empty_bind_group_layout);
         }
     }
 
diff --git a/crates/bevy_render/src/render_resource/bind_group_layout.rs b/crates/bevy_render/src/render_resource/bind_group_layout.rs
index fb52cedc2490a..3b8cc000802eb 100644
--- a/crates/bevy_render/src/render_resource/bind_group_layout.rs
+++ b/crates/bevy_render/src/render_resource/bind_group_layout.rs
@@ -1,6 +1,4 @@
-use crate::{define_atomic_id, renderer::RenderDevice, renderer::WgpuWrapper};
-use bevy_ecs::system::Res;
-use bevy_platform::sync::OnceLock;
+use crate::{define_atomic_id, renderer::WgpuWrapper};
 use core::ops::Deref;
 
 define_atomic_id!(BindGroupLayoutId);
@@ -63,19 +61,3 @@ impl Deref for BindGroupLayout {
         &self.value
     }
 }
-
-static EMPTY_BIND_GROUP_LAYOUT: OnceLock<BindGroupLayout> = OnceLock::new();
-
-pub(crate) fn init_empty_bind_group_layout(render_device: Res<RenderDevice>) {
-    let layout = render_device.create_bind_group_layout(Some("empty_bind_group_layout"), &[]);
-    EMPTY_BIND_GROUP_LAYOUT
-        .set(layout)
-        .expect("init_empty_bind_group_layout was called more than once");
-}
-
-pub fn empty_bind_group_layout() -> BindGroupLayout {
-    EMPTY_BIND_GROUP_LAYOUT
-        .get()
-        .expect("init_empty_bind_group_layout was not called")
-        .clone()
-}

From 5ffc1d6e3e18fcc31e14f3e84ca656d284efba62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20S=C3=B8holm?= <k.soeholm@gmail.com>
Date: Tue, 9 Dec 2025 19:05:39 +0100
Subject: [PATCH 059/133] Fix undefined behavior in screenshots on WASM
 (#22077)

# Objective

Currently the screenshot example on
https://bevy.org/examples/window/screenshot/ gives invalid PNG files
when I tried it. Looking at them they have some of the right bytes, but
also a bunch of garbage. The example works on native.

I narrowed it down to the one unsafe block in sight (thanks Rust!). I
don't fully understand why the code stopped working or if it was ever
valid, but in the meantime since it was written a safe API has been
added, and using it made the problem go away.

## Solution

Bump `js-sys`, use the safe API.

## Testing

I ran the example with `bevy run --example screenshot web`
---
 crates/bevy_render/Cargo.toml                    |  2 +-
 crates/bevy_render/src/view/window/screenshot.rs | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/crates/bevy_render/Cargo.toml b/crates/bevy_render/Cargo.toml
index 7b4fa6259f64b..6edeec51654c0 100644
--- a/crates/bevy_render/Cargo.toml
+++ b/crates/bevy_render/Cargo.toml
@@ -125,7 +125,7 @@ send_wrapper = { version = "0.6.0" }
 proptest = "1"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-js-sys = "0.3"
+js-sys = "0.3.83"
 web-sys = { version = "0.3.67", features = [
   'Blob',
   'Document',
diff --git a/crates/bevy_render/src/view/window/screenshot.rs b/crates/bevy_render/src/view/window/screenshot.rs
index 638d3cf7c6b68..4aba6c6cee791 100644
--- a/crates/bevy_render/src/view/window/screenshot.rs
+++ b/crates/bevy_render/src/view/window/screenshot.rs
@@ -151,11 +151,13 @@ pub fn save_to_disk(path: impl AsRef<Path>) -> impl FnMut(On<ScreenshotCaptured>
                             let mut image_buffer = std::io::Cursor::new(Vec::new());
                             img.write_to(&mut image_buffer, format)
                                 .map_err(|e| JsValue::from_str(&format!("{e}")))?;
-                            // SAFETY: `image_buffer` only exist in this closure, and is not used after this line
-                            let parts = js_sys::Array::of1(&unsafe {
-                                js_sys::Uint8Array::view(image_buffer.into_inner().as_bytes())
-                                    .into()
-                            });
+
+                            let parts = js_sys::Array::of1(
+                                &js_sys::Uint8Array::new_from_slice(
+                                    image_buffer.into_inner().as_bytes(),
+                                )
+                                .into(),
+                            );
                             let blob = web_sys::Blob::new_with_u8_array_sequence(&parts)?;
                             let url = web_sys::Url::create_object_url_with_blob(&blob)?;
                             let window = web_sys::window().unwrap();

From 617828cd1f33332fd4949abd7c26fc827ec9de71 Mon Sep 17 00:00:00 2001
From: ickshonpe <david.curthoys@googlemail.com>
Date: Tue, 9 Dec 2025 18:06:59 +0000
Subject: [PATCH 060/133] Simplify `ui_picking`'s camera search (#22075)

# Objective

In `ui_picking` the camera_query iterator is run through multiple
filters and maps, which could be replaced by a single filter. Also
camera_query retrieves the `Camera` component but then it is thrown away
and queried for again.

## Solution

* Just collapse all the maps and filters into one `filter`.
* Only query for `Camera` once and keep the result, remove the second
query.
---
 crates/bevy_ui/src/picking_backend.rs | 29 +++++++++------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/crates/bevy_ui/src/picking_backend.rs b/crates/bevy_ui/src/picking_backend.rs
index 189de0a4d365a..d3ef8abd80d0f 100644
--- a/crates/bevy_ui/src/picking_backend.rs
+++ b/crates/bevy_ui/src/picking_backend.rs
@@ -119,25 +119,16 @@ pub fn ui_picking(
     {
         // This pointer is associated with a render target, which could be used by multiple
         // cameras. We want to ensure we return all cameras with a matching target.
-        for camera in camera_query
-            .iter()
-            .filter(|(_, _, cam_can_pick)| !settings.require_markers || *cam_can_pick)
-            .map(|(entity, camera, _)| {
-                (
-                    entity,
-                    camera.target.normalize(primary_window.single().ok()),
-                )
-            })
-            .filter_map(|(entity, target)| Some(entity).zip(target))
-            .filter(|(_entity, target)| target == &pointer_location.target)
-            .map(|(cam_entity, _target)| cam_entity)
-        {
-            let Ok((_, camera_data, _)) = camera_query.get(camera) else {
-                continue;
-            };
+        for (entity, camera, _) in camera_query.iter().filter(|(_, camera, cam_can_pick)| {
+            (!settings.require_markers || *cam_can_pick)
+                && camera
+                    .target
+                    .normalize(primary_window.single().ok())
+                    .is_some_and(|target| target == pointer_location.target)
+        }) {
             let mut pointer_pos =
-                pointer_location.position * camera_data.target_scaling_factor().unwrap_or(1.);
-            if let Some(viewport) = camera_data.physical_viewport_rect() {
+                pointer_location.position * camera.target_scaling_factor().unwrap_or(1.);
+            if let Some(viewport) = camera.physical_viewport_rect() {
                 if !viewport.as_rect().contains(pointer_pos) {
                     // The pointer is outside the viewport, skip it
                     continue;
@@ -145,7 +136,7 @@ pub fn ui_picking(
                 pointer_pos -= viewport.min.as_vec2();
             }
             pointer_pos_by_camera
-                .entry(camera)
+                .entry(entity)
                 .or_default()
                 .insert(pointer_id, pointer_pos);
         }

From 695d9d4ef54ee6d74a089f3d76cfbfddcb8cf007 Mon Sep 17 00:00:00 2001
From: panpanpro888 <77934024+panpanpro888@users.noreply.github.com>
Date: Tue, 9 Dec 2025 20:14:01 +0200
Subject: [PATCH 061/133] Implement `Clone` and `Copy` for bevy_ptr's
 `ConstNonNull` for parity with `NonNull` (#22078)

# Objective

Fixes #22059

## Solution

Just `#[derive(Clone, Copy)]` on `ConstNonNull` since it`s just a
wrapper around `NonNull` which implements them

## Testing

Just tested if it compiles and functions as it should
---
 crates/bevy_ptr/src/lib.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/bevy_ptr/src/lib.rs b/crates/bevy_ptr/src/lib.rs
index f59a02496afda..ab05449566d0c 100644
--- a/crates/bevy_ptr/src/lib.rs
+++ b/crates/bevy_ptr/src/lib.rs
@@ -161,6 +161,7 @@ mod sealed {
 /// A newtype around [`NonNull`] that only allows conversion to read-only borrows or pointers.
 ///
 /// This type can be thought of as the `*const T` to [`NonNull<T>`]'s `*mut T`.
+#[derive(Clone, Copy)]
 #[repr(transparent)]
 pub struct ConstNonNull<T: ?Sized>(NonNull<T>);
 

From 185712fbeff61f9b5f10dddae38d25768e709353 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Tue, 9 Dec 2025 10:14:55 -0800
Subject: [PATCH 062/133] Add support for normal maps, metallic-roughness maps,
 and emissive maps to clustered decals. (#22039)

This commit expands the number of textures associated with each
clustered decal from 1 to 4. The additional 3 textures apply normal
maps, metallic-roughness maps, and emissive maps respectively to the
surfaces onto which decals are projected.

Normal maps are combined using the [*Whiteout* blending method] from
SIGGRAPH 2007. This approach was chosen because, subjectively, it
appeared better than the more complex [*reoriented normal mapping*
(RNM)] approach. Additionally, *Whiteout* normal map blending is
commutative and associative, unlike RNM, which is a useful property for
our decals, which are currently applied in an unspecified order. (The
fact that the order in which our decals are applied is unspecified is
unfortunate, but is a long-standing issue and should probably be fixed
in a followup.) In particular, commutativity is desirable because
otherwise one must specify which normal map is the *base* normal map and
which normal map is the *detail* normal map, but that's not a policy
decision that Bevy can unconditionally make, as decals aren't necessary
more detailed than the base normal map. (For instance, consider a bullet
hole decal embedded in a wall with a subtle rough texture; one might
reasonably argue that the base material's normal map is the detail map
and the bullet hole is the base map, even though the bullet hole's
normal map comes from a decal.)

Note that, with a custom material shader, it's possible for application
code to use the decal images for arbitrary other purposes. For example,
with a custom shader an application might use the metallic-roughness map
as a clearcoat map instead if it has no need for a metallic-roughness
map on a decal. And, of course, a custom material shader could adopt RNM
blending for decals if it wishes.

A new example, `clustered_decal_maps`, has been added. This example
demonstrates the new maps by spawning clustered decals with maps
randomly over time and projecting them onto a wall.

<img width="2564" height="1500" alt="Screenshot 2025-12-05 095953"
src="https://github.com/user-attachments/assets/255fca64-2b42-4794-a367-14336d023310"
/>
---
 Cargo.toml                                    |  12 +
 assets/shaders/custom_clustered_decal.wgsl    |   8 +-
 crates/bevy_light/src/cluster/mod.rs          |  59 ++-
 crates/bevy_pbr/src/decal/clustered.rs        | 141 +++++-
 crates/bevy_pbr/src/decal/clustered.wgsl      | 142 ++++--
 .../bevy_pbr/src/render/mesh_view_types.wgsl  |   6 +-
 crates/bevy_pbr/src/render/pbr.wgsl           |   8 +-
 crates/bevy_pbr/src/render/utils.wgsl         |   6 +
 examples/3d/clustered_decal_maps.rs           | 445 ++++++++++++++++++
 examples/3d/clustered_decals.rs               |   8 +-
 examples/README.md                            |   1 +
 typos.toml                                    |   1 +
 12 files changed, 760 insertions(+), 77 deletions(-)
 create mode 100644 examples/3d/clustered_decal_maps.rs

diff --git a/Cargo.toml b/Cargo.toml
index 74b0ebe4ae6aa..b7ab3efcdbd2a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4900,3 +4900,15 @@ name = "Pan Camera"
 description = "Example Pan-Camera Styled Camera Controller for 2D scenes"
 category = "Camera"
 wasm = true
+
+[[example]]
+name = "clustered_decal_maps"
+path = "examples/3d/clustered_decal_maps.rs"
+doc-scrape-examples = true
+required-features = ["pbr_clustered_decals", "https"]
+
+[package.metadata.example.clustered_decal_maps]
+name = "Clustered Decal Maps"
+description = "Demonstrates normal and metallic-roughness maps of decals"
+category = "3D Rendering"
+wasm = false
diff --git a/assets/shaders/custom_clustered_decal.wgsl b/assets/shaders/custom_clustered_decal.wgsl
index 6aaf408097ca9..13f404cebb262 100644
--- a/assets/shaders/custom_clustered_decal.wgsl
+++ b/assets/shaders/custom_clustered_decal.wgsl
@@ -22,11 +22,7 @@ fn fragment(
     pbr_input.material.base_color = alpha_discard(pbr_input.material, pbr_input.material.base_color);
 
     // Apply the normal decals.
-    pbr_input.material.base_color = clustered::apply_decal_base_color(
-        in.world_position.xyz,
-        in.position.xy,
-        pbr_input.material.base_color
-    );
+    clustered::apply_decals(&pbr_input);
 
     // Here we tint the color based on the tag of the decal.
     // We could optionally do other things, such as adjust the normal based on a normal map.
@@ -42,7 +38,7 @@ fn fragment(
     );
     while (clustered::clustered_decal_iterator_next(&decal_iterator)) {
         var decal_base_color = textureSampleLevel(
-            mesh_view_bindings::clustered_decal_textures[decal_iterator.texture_index],
+            mesh_view_bindings::clustered_decal_textures[decal_iterator.base_color_texture_index],
             mesh_view_bindings::clustered_decal_sampler,
             decal_iterator.uv,
             0.0
diff --git a/crates/bevy_light/src/cluster/mod.rs b/crates/bevy_light/src/cluster/mod.rs
index 92f1c5723eebd..17e3f1e418195 100644
--- a/crates/bevy_light/src/cluster/mod.rs
+++ b/crates/bevy_light/src/cluster/mod.rs
@@ -148,26 +148,71 @@ pub struct ClusterableObjectCounts {
 /// An object that projects a decal onto surfaces within its bounds.
 ///
 /// Conceptually, a clustered decal is a 1×1×1 cube centered on its origin. It
-/// projects the given [`Self::image`] onto surfaces in the -Z direction (thus
-/// you may find [`Transform::looking_at`] useful).
+/// projects its images onto surfaces in the -Z direction (thus you may find
+/// [`Transform::looking_at`] useful).
+///
+/// Each decal may project any of a base color texture, a normal map, a
+/// metallic/roughness map, and/or a texture that specifies emissive light. In
+/// addition, you may associate an arbitrary integer [`Self::tag`] with each
+/// clustered decal, which Bevy doesn't use, but that you can use in your
+/// shaders in order to associate application-specific data with your decals.
 ///
 /// Clustered decals are the highest-quality types of decals that Bevy supports,
 /// but they require bindless textures. This means that they presently can't be
 /// used on WebGL 2, WebGPU, macOS, or iOS. Bevy's clustered decals can be used
 /// with forward or deferred rendering and don't require a prepass.
-#[derive(Component, Debug, Clone, Reflect)]
-#[reflect(Component, Debug, Clone)]
+#[derive(Component, Debug, Clone, Default, Reflect)]
+#[reflect(Component, Debug, Clone, Default)]
 #[require(Transform, Visibility, VisibilityClass)]
 #[component(on_add = visibility::add_visibility_class::<ClusterVisibilityClass>)]
 pub struct ClusteredDecal {
-    /// The image that the clustered decal projects.
+    /// The image that the clustered decal projects onto the base color of the
+    /// surface material.
     ///
     /// This must be a 2D image. If it has an alpha channel, it'll be alpha
     /// blended with the underlying surface and/or other decals. All decal
     /// images in the scene must use the same sampler.
-    pub image: Handle<Image>,
+    pub base_color_texture: Option<Handle<Image>>,
+
+    /// The normal map that the clustered decal projects onto surfaces.
+    ///
+    /// Bevy uses the *Whiteout* method to combine normal maps from decals with
+    /// any normal map that the surface has, as described in the
+    /// [*Blending in Detail* article].
+    ///
+    /// Note that the normal map must be three-channel and must be in OpenGL
+    /// format, not DirectX format. That is, the green channel must point up,
+    /// not down.
+    ///
+    /// [*Blending in Detail* article]: https://blog.selfshadow.com/publications/blending-in-detail/
+    pub normal_map_texture: Option<Handle<Image>>,
+
+    /// The metallic-roughness map that the clustered decal projects onto
+    /// surfaces.
+    ///
+    /// Metallic and roughness PBR parameters are blended onto the base surface
+    /// using the alpha channel of the base color.
+    ///
+    /// Metallic is expected to be in the blue channel, while roughness is
+    /// expected to be in the green channel, following glTF conventions.
+    pub metallic_roughness_texture: Option<Handle<Image>>,
+
+    /// The emissive map that the clustered decal projects onto surfaces.
+    ///
+    /// Including this texture effectively causes the decal to glow. The
+    /// emissive component is blended onto the surface according to the alpha
+    /// channel.
+    pub emissive_texture: Option<Handle<Image>>,
 
-    /// An application-specific tag you can use for any purpose you want.
+    /// An application-specific tag you can use for any purpose you want, in
+    /// conjunction with a custom shader.
+    ///
+    /// This value is exposed to the shader via the iterator API
+    /// (`bevy_pbr::decal::clustered::clustered_decal_iterator_new` and
+    /// `bevy_pbr::decal::clustered::clustered_decal_iterator_next`).
+    ///
+    /// For example, you might use the tag to restrict the set of surfaces to
+    /// which a decal can be rendered.
     ///
     /// See the `clustered_decals` example for an example of use.
     pub tag: u32,
diff --git a/crates/bevy_pbr/src/decal/clustered.rs b/crates/bevy_pbr/src/decal/clustered.rs
index ad32c7f5715b8..1acbd2fbf9dad 100644
--- a/crates/bevy_pbr/src/decal/clustered.rs
+++ b/crates/bevy_pbr/src/decal/clustered.rs
@@ -9,15 +9,19 @@
 //! used on WebGL 2 or WebGPU. Bevy's clustered decals can be used
 //! with forward or deferred rendering and don't require a prepass.
 //!
-//! On their own, clustered decals only project the base color of a texture. You
-//! can, however, use the built-in *tag* field to customize the appearance of a
-//! clustered decal arbitrarily. See the documentation in `clustered.wgsl` for
-//! more information and the `clustered_decals` example for an example of use.
+//! Each clustered decal may contain up to 4 textures. By default, the 4
+//! textures correspond to the base color, a normal map, a metallic-roughness
+//! map, and an emissive map respectively. However, with a custom shader, you
+//! can use these 4 textures for whatever you wish. Additionally, you can use
+//! the built-in *tag* field to store additional application-specific data; by
+//! reading the tag in the shader, you can modify the appearance of a clustered
+//! decal arbitrarily. See the documentation in `clustered.wgsl` for more
+//! information and the `clustered_decals` example for an example of use.
 
 use core::{num::NonZero, ops::Deref};
 
 use bevy_app::{App, Plugin};
-use bevy_asset::AssetId;
+use bevy_asset::{AssetId, Handle};
 use bevy_camera::visibility::ViewVisibility;
 use bevy_derive::{Deref, DerefMut};
 use bevy_ecs::{
@@ -50,6 +54,9 @@ use bytemuck::{Pod, Zeroable};
 
 use crate::{binding_arrays_are_usable, prepare_lights, GlobalClusterableObjectMeta};
 
+/// The number of textures that can be associated with each clustered decal.
+const IMAGES_PER_DECAL: usize = 4;
+
 /// A plugin that adds support for clustered decals.
 ///
 /// In environments where bindless textures aren't available, clustered decals
@@ -66,7 +73,7 @@ pub struct RenderClusteredDecals {
     /// Maps a decal image to the shader binding array.
     ///
     /// [`Self::binding_index_to_textures`] holds the inverse mapping.
-    texture_to_binding_index: HashMap<AssetId<Image>, u32>,
+    texture_to_binding_index: HashMap<AssetId<Image>, i32>,
     /// The information concerning each decal that we provide to the shader.
     decals: Vec<RenderClusteredDecal>,
     /// Maps the [`bevy_render::sync_world::RenderEntity`] of each decal to the
@@ -87,18 +94,22 @@ impl RenderClusteredDecals {
     pub fn insert_decal(
         &mut self,
         entity: Entity,
-        image: &AssetId<Image>,
+        images: [Option<AssetId<Image>>; IMAGES_PER_DECAL],
         local_from_world: Mat4,
         tag: u32,
     ) {
-        let image_index = self.get_or_insert_image(image);
+        let image_indices = images.map(|maybe_image_id| match maybe_image_id {
+            Some(ref image_id) => self.get_or_insert_image(image_id),
+            None => -1,
+        });
         let decal_index = self.decals.len();
         self.decals.push(RenderClusteredDecal {
             local_from_world,
-            image_index,
+            image_indices,
             tag,
             pad_a: 0,
             pad_b: 0,
+            pad_c: 0,
         });
         self.entity_to_decal_index.insert(entity, decal_index);
     }
@@ -183,14 +194,23 @@ pub struct RenderClusteredDecal {
     /// The shader uses this in order to back-transform world positions into
     /// model space.
     local_from_world: Mat4,
-    /// The index of the decal texture in the binding array.
-    image_index: u32,
+    /// The index of each decal texture in the binding array.
+    ///
+    /// These are in the order of the base color texture, the normal map
+    /// texture, the metallic-roughness map texture, and finally the emissive
+    /// texture.
+    ///
+    /// If the decal doesn't have a texture assigned to a slot, the index at
+    /// that slot will be -1.
+    image_indices: [i32; 4],
     /// A custom tag available for application-defined purposes.
     tag: u32,
     /// Padding.
     pad_a: u32,
     /// Padding.
     pad_b: u32,
+    /// Padding.
+    pad_c: u32,
 }
 
 /// Extracts decals from the main world into the render world.
@@ -232,58 +252,129 @@ pub fn extract_decals(
     // Clear out the `RenderDecals` in preparation for a new frame.
     render_decals.clear();
 
+    extract_clustered_decals(&decals, &mut render_decals);
+    extract_spot_light_textures(&spot_light_textures, &mut render_decals);
+    extract_point_light_textures(&point_light_textures, &mut render_decals);
+    extract_directional_light_textures(&directional_light_textures, &mut render_decals);
+}
+
+/// Extracts all clustered decals and light textures from the scene and transfers
+/// them to the render world.
+fn extract_clustered_decals(
+    decals: &Extract<
+        Query<(
+            RenderEntity,
+            &ClusteredDecal,
+            &GlobalTransform,
+            &ViewVisibility,
+        )>,
+    >,
+    render_decals: &mut RenderClusteredDecals,
+) {
     // Loop over each decal.
-    for (decal_entity, clustered_decal, global_transform, view_visibility) in &decals {
+    for (decal_entity, clustered_decal, global_transform, view_visibility) in decals {
         // If the decal is invisible, skip it.
         if !view_visibility.get() {
             continue;
         }
 
+        // Insert the decal, grabbing the ID of every associated texture as we
+        // do.
         render_decals.insert_decal(
             decal_entity,
-            &clustered_decal.image.id(),
+            [
+                clustered_decal.base_color_texture.as_ref().map(Handle::id),
+                clustered_decal.normal_map_texture.as_ref().map(Handle::id),
+                clustered_decal
+                    .metallic_roughness_texture
+                    .as_ref()
+                    .map(Handle::id),
+                clustered_decal.emissive_texture.as_ref().map(Handle::id),
+            ],
             global_transform.affine().inverse().into(),
             clustered_decal.tag,
         );
     }
+}
 
-    for (decal_entity, texture, global_transform, view_visibility) in &spot_light_textures {
-        // If the decal is invisible, skip it.
+/// Extracts all textures from spot lights from the main world to the render
+/// world as clustered decals.
+fn extract_spot_light_textures(
+    spot_light_textures: &Extract<
+        Query<(
+            RenderEntity,
+            &SpotLightTexture,
+            &GlobalTransform,
+            &ViewVisibility,
+        )>,
+    >,
+    render_decals: &mut RenderClusteredDecals,
+) {
+    for (decal_entity, texture, global_transform, view_visibility) in spot_light_textures {
+        // If the texture is invisible, skip it.
         if !view_visibility.get() {
             continue;
         }
 
         render_decals.insert_decal(
             decal_entity,
-            &texture.image.id(),
+            [Some(texture.image.id()), None, None, None],
             global_transform.affine().inverse().into(),
             0,
         );
     }
+}
 
-    for (decal_entity, texture, global_transform, view_visibility) in &point_light_textures {
-        // If the decal is invisible, skip it.
+/// Extracts all textures from point lights from the main world to the render
+/// world as clustered decals.
+fn extract_point_light_textures(
+    point_light_textures: &Extract<
+        Query<(
+            RenderEntity,
+            &PointLightTexture,
+            &GlobalTransform,
+            &ViewVisibility,
+        )>,
+    >,
+    render_decals: &mut RenderClusteredDecals,
+) {
+    for (decal_entity, texture, global_transform, view_visibility) in point_light_textures {
+        // If the texture is invisible, skip it.
         if !view_visibility.get() {
             continue;
         }
 
         render_decals.insert_decal(
             decal_entity,
-            &texture.image.id(),
+            [Some(texture.image.id()), None, None, None],
             global_transform.affine().inverse().into(),
             texture.cubemap_layout as u32,
         );
     }
+}
 
-    for (decal_entity, texture, global_transform, view_visibility) in &directional_light_textures {
-        // If the decal is invisible, skip it.
+/// Extracts all textures from directional lights from the main world to the
+/// render world as clustered decals.
+fn extract_directional_light_textures(
+    directional_light_textures: &Extract<
+        Query<(
+            RenderEntity,
+            &DirectionalLightTexture,
+            &GlobalTransform,
+            &ViewVisibility,
+        )>,
+    >,
+    render_decals: &mut RenderClusteredDecals,
+) {
+    for (decal_entity, texture, global_transform, view_visibility) in directional_light_textures {
+        // If the texture is invisible, skip it.
         if !view_visibility.get() {
             continue;
         }
 
         render_decals.insert_decal(
             decal_entity,
-            &texture.image.id(),
+            [Some(texture.image.id()), None, None, None],
             global_transform.affine().inverse().into(),
             if texture.tiled { 1 } else { 0 },
         );
@@ -376,6 +467,8 @@ impl<'a> RenderViewClusteredDecalBindGroupEntries<'a> {
             while texture_views.len() < max_view_decals as usize {
                 texture_views.push(&*fallback_image.d2.texture_view);
             }
+        } else if texture_views.is_empty() {
+            texture_views.push(&*fallback_image.d2.texture_view);
         }
 
         Some(RenderViewClusteredDecalBindGroupEntries {
@@ -389,12 +482,12 @@ impl<'a> RenderViewClusteredDecalBindGroupEntries<'a> {
 impl RenderClusteredDecals {
     /// Returns the index of the given image in the decal texture binding array,
     /// adding it to the list if necessary.
-    fn get_or_insert_image(&mut self, image_id: &AssetId<Image>) -> u32 {
+    fn get_or_insert_image(&mut self, image_id: &AssetId<Image>) -> i32 {
         *self
             .texture_to_binding_index
             .entry(*image_id)
             .or_insert_with(|| {
-                let index = self.binding_index_to_textures.len() as u32;
+                let index = self.binding_index_to_textures.len() as i32;
                 self.binding_index_to_textures.push(*image_id);
                 index
             })
diff --git a/crates/bevy_pbr/src/decal/clustered.wgsl b/crates/bevy_pbr/src/decal/clustered.wgsl
index 874722a2aba80..a6404ecde0c67 100644
--- a/crates/bevy_pbr/src/decal/clustered.wgsl
+++ b/crates/bevy_pbr/src/decal/clustered.wgsl
@@ -31,14 +31,31 @@
 #import bevy_pbr::clustered_forward
 #import bevy_pbr::clustered_forward::ClusterableObjectIndexRanges
 #import bevy_pbr::mesh_view_bindings
+#import bevy_pbr::pbr_functions
+#import bevy_pbr::pbr_types::PbrInput
+#import bevy_pbr::utils::porter_duff_over
 #import bevy_render::maths
 
+#ifdef MESHLET_MESH_MATERIAL_PASS
+#import bevy_pbr::meshlet_visibility_buffer_resolve::VertexOutput
+#else ifdef PREPASS_PIPELINE
+#import bevy_pbr::prepass_io::VertexOutput
+#else
+#import bevy_pbr::forward_io::VertexOutput
+#endif
+
 // An object that allows stepping through all clustered decals that affect a
 // single fragment.
 struct ClusteredDecalIterator {
     // Public fields follow:
-    // The index of the decal texture in the binding array.
-    texture_index: i32,
+    // The index of the decal base color texture in the binding array.
+    base_color_texture_index: i32,
+    // The index of the decal normal map texture in the binding array.
+    normal_map_texture_index: i32,
+    // The index of the decal metallic-roughness texture in the binding array.
+    metallic_roughness_texture_index: i32,
+    // The index of the decal emissive texture in the binding array.
+    emissive_texture_index: i32,
     // The UV coordinates at which to sample that decal texture.
     uv: vec2<f32>,
     // A custom tag you can use for your own purposes.
@@ -71,6 +88,9 @@ fn clustered_decal_iterator_new(
     clusterable_object_index_ranges: ptr<function, ClusterableObjectIndexRanges>
 ) -> ClusteredDecalIterator {
     return ClusteredDecalIterator(
+        -1,
+        -1,
+        -1,
         -1,
         vec2(0.0),
         0u,
@@ -103,8 +123,20 @@ fn clustered_decal_iterator_next(iterator: ptr<function, ClusteredDecalIterator>
             vec4((*iterator).world_position, 1.0)).xyz;
 
         if (all(decal_space_vector >= vec3(-0.5)) && all(decal_space_vector <= vec3(0.5))) {
-            (*iterator).texture_index =
-                i32(mesh_view_bindings::clustered_decals.decals[decal_index].image_index);
+            (*iterator).base_color_texture_index = i32(
+                mesh_view_bindings::clustered_decals.decals[decal_index].base_color_texture_index
+            );
+            (*iterator).normal_map_texture_index = i32(
+                mesh_view_bindings::clustered_decals.decals[decal_index].normal_map_texture_index
+            );
+            (*iterator).metallic_roughness_texture_index = i32(
+                mesh_view_bindings::clustered_decals.decals[
+                    decal_index
+                ].metallic_roughness_texture_index
+            );
+            (*iterator).emissive_texture_index = i32(
+                mesh_view_bindings::clustered_decals.decals[decal_index].emissive_texture_index
+            );
             (*iterator).uv = decal_space_vector.xy * vec2(1.0, -1.0) + vec2(0.5);
             (*iterator).tag =
                 mesh_view_bindings::clustered_decals.decals[decal_index].tag;
@@ -135,17 +167,16 @@ fn view_is_orthographic() -> bool {
     return mesh_view_bindings::view.clip_from_view[3].w == 1.0;
 }
 
-// Modifies the base color at the given position to account for decals.
-//
-// Returns the new base color with decals taken into account. If no decals
-// overlap the current world position, returns the supplied base color
-// unmodified.
-fn apply_decal_base_color(
-    world_position: vec3<f32>,
-    frag_coord: vec2<f32>,
-    initial_base_color: vec4<f32>,
-) -> vec4<f32> {
-    var base_color = initial_base_color;
+fn apply_decals(pbr_input: ptr<function, PbrInput>) {
+    let world_position = (*pbr_input).world_position.xyz;
+    let world_normal = (*pbr_input).world_normal;
+    let frag_coord = (*pbr_input).frag_coord.xy;
+
+    var base_color = (*pbr_input).material.base_color;
+    var emissive = (*pbr_input).material.emissive;
+    var Nt = (*pbr_input).N;
+    var metallic = (*pbr_input).material.metallic;
+    var perceptual_roughness = (*pbr_input).material.perceptual_roughness;
 
 #ifdef CLUSTERED_DECALS_ARE_USABLE
     // Fetch the clusterable object index ranges for this world position.
@@ -162,22 +193,73 @@ fn apply_decal_base_color(
 
     var iterator = clustered_decal_iterator_new(world_position, &clusterable_object_index_ranges);
     while (clustered_decal_iterator_next(&iterator)) {
-        // Sample the current decal.
-        let decal_base_color = textureSampleLevel(
-            mesh_view_bindings::clustered_decal_textures[iterator.texture_index],
-            mesh_view_bindings::clustered_decal_sampler,
-            iterator.uv,
-            0.0
-        );
-
-        // Blend with the accumulated fragment.
-        base_color = vec4(
-            mix(base_color.rgb, decal_base_color.rgb, decal_base_color.a),
-            base_color.a + decal_base_color.a
-        );
+        // Apply base color and metallic/roughness.
+        if (iterator.base_color_texture_index >= 0) {
+            let decal_base_color = textureSampleLevel(
+                mesh_view_bindings::clustered_decal_textures[iterator.base_color_texture_index],
+                mesh_view_bindings::clustered_decal_sampler,
+                iterator.uv,
+                0.0
+            );
+
+            // Apply the metallic (blue channel) and the roughness (green channel) map.
+            if (iterator.metallic_roughness_texture_index >= 0) {
+                let metallic_roughness_sampler = textureSampleLevel(
+                    mesh_view_bindings::clustered_decal_textures[
+                        iterator.metallic_roughness_texture_index
+                    ],
+                    mesh_view_bindings::clustered_decal_sampler,
+                    iterator.uv,
+                    0.0
+                );
+                // Use OVER compositing using the base color alpha.
+                metallic = mix(
+                    metallic * base_color.a,
+                    metallic_roughness_sampler.b,
+                    decal_base_color.a
+                );
+                perceptual_roughness = mix(
+                    perceptual_roughness * base_color.a,
+                    metallic_roughness_sampler.g,
+                    decal_base_color.a
+                );
+            }
+
+            // Apply base color with the standard OVER compositing operator.
+            base_color = porter_duff_over(base_color, decal_base_color);
+        }
+
+#ifdef VERTEX_TANGENTS
+        if (iterator.normal_map_texture_index >= 0) {
+            let Nd = textureSampleLevel(
+                mesh_view_bindings::clustered_decal_textures[iterator.normal_map_texture_index],
+                mesh_view_bindings::clustered_decal_sampler,
+                iterator.uv,
+                0.0
+            ).rgb * 2.0 - 1.0;
+            // This is the *Whiteout* normal map blending operator from [1].
+            //
+            // [1]: https://blog.selfshadow.com/publications/blending-in-detail/
+            Nt = vec3(Nt.xy + Nd.xy, Nt.z * Nd.z);
+        }
+#endif  // VERTEX_TANGENTS
+
+        // Apply emissive.
+        if (iterator.emissive_texture_index >= 0) {
+            let decal_emissive = textureSampleLevel(
+                mesh_view_bindings::clustered_decal_textures[iterator.emissive_texture_index],
+                mesh_view_bindings::clustered_decal_sampler,
+                iterator.uv,
+                0.0
+            );
+            emissive += vec4(decal_emissive.rgb, 0.0);
+        }
     }
 #endif  // CLUSTERED_DECALS_ARE_USABLE
 
-    return base_color;
+    (*pbr_input).material.base_color = base_color;
+    (*pbr_input).material.emissive = emissive;
+    (*pbr_input).N = normalize(Nt);
+    (*pbr_input).material.metallic = metallic;
+    (*pbr_input).material.perceptual_roughness = perceptual_roughness;
 }
-
diff --git a/crates/bevy_pbr/src/render/mesh_view_types.wgsl b/crates/bevy_pbr/src/render/mesh_view_types.wgsl
index 19f87b37946a4..112556ee1eb76 100644
--- a/crates/bevy_pbr/src/render/mesh_view_types.wgsl
+++ b/crates/bevy_pbr/src/render/mesh_view_types.wgsl
@@ -176,10 +176,14 @@ struct OrderIndependentTransparencySettings {
 
 struct ClusteredDecal {
     local_from_world: mat4x4<f32>,
-    image_index: i32,
+    base_color_texture_index: i32,
+    normal_map_texture_index: i32,
+    metallic_roughness_texture_index: i32,
+    emissive_texture_index: i32,
     tag: u32,
     pad_a: u32,
     pad_b: u32,
+    pad_c: u32,
 }
 
 struct ClusteredDecals {
diff --git a/crates/bevy_pbr/src/render/pbr.wgsl b/crates/bevy_pbr/src/render/pbr.wgsl
index e4d8fe63791d7..ea2b33ee0ac11 100644
--- a/crates/bevy_pbr/src/render/pbr.wgsl
+++ b/crates/bevy_pbr/src/render/pbr.wgsl
@@ -2,7 +2,7 @@
     pbr_types,
     pbr_functions::alpha_discard,
     pbr_fragment::pbr_input_from_standard_material,
-    decal::clustered::apply_decal_base_color,
+    decal::clustered::apply_decals,
 }
 
 #ifdef PREPASS_PIPELINE
@@ -69,11 +69,7 @@ fn fragment(
     pbr_input.material.base_color = alpha_discard(pbr_input.material, pbr_input.material.base_color);
 
     // clustered decals
-    pbr_input.material.base_color = apply_decal_base_color(
-        in.world_position.xyz,
-        in.position.xy,
-        pbr_input.material.base_color
-    );
+    apply_decals(&pbr_input);
 
 #ifdef PREPASS_PIPELINE
     // write the gbuffer, lighting pass id, and optionally normal and motion_vector textures
diff --git a/crates/bevy_pbr/src/render/utils.wgsl b/crates/bevy_pbr/src/render/utils.wgsl
index 8e91aeb9c0361..706e30fb0b201 100644
--- a/crates/bevy_pbr/src/render/utils.wgsl
+++ b/crates/bevy_pbr/src/render/utils.wgsl
@@ -203,3 +203,9 @@ fn dir_to_cube_uv(dir: vec3f) -> CubeUV {
     // Convert from [-1,1] to [0,1]
     return CubeUV(uv * 0.5 + 0.5, face);
 }
+
+// The Porter-Duff OVER operator on RGBA, correctly computing alpha of the
+// result.
+fn porter_duff_over(bg: vec4<f32>, fg: vec4<f32>) -> vec4<f32> {
+    return vec4<f32>(mix(bg.rgb * bg.a, fg.rgb, fg.a), bg.a + fg.a * (1.0 - bg.a));
+}
diff --git a/examples/3d/clustered_decal_maps.rs b/examples/3d/clustered_decal_maps.rs
new file mode 100644
index 0000000000000..f72aa1df40b99
--- /dev/null
+++ b/examples/3d/clustered_decal_maps.rs
@@ -0,0 +1,445 @@
+//! Demonstrates the normal map, metallic-roughness map, and emissive features
+//! of clustered decals.
+
+use std::{f32::consts::PI, time::Duration};
+
+use bevy::{
+    asset::io::web::WebAssetPlugin,
+    color::palettes::css::{CRIMSON, GOLD},
+    image::ImageLoaderSettings,
+    light::ClusteredDecal,
+    prelude::*,
+    render::view::Hdr,
+};
+use rand::Rng;
+
+use crate::widgets::{RadioButton, RadioButtonText, WidgetClickEvent, WidgetClickSender};
+
+#[path = "../helpers/widgets.rs"]
+mod widgets;
+
+/// The demonstration textures that we use.
+///
+/// We cache these for efficiency.
+#[derive(Resource)]
+struct AppTextures {
+    /// The base color that all our decals have (the Bevy logo).
+    decal_base_color_texture: Handle<Image>,
+
+    /// A normal map that all our decals have.
+    ///
+    /// This provides a nice raised embossed look.
+    decal_normal_map_texture: Handle<Image>,
+
+    /// The metallic-roughness map that all our decals have.
+    ///
+    /// Metallic is in the blue channel and roughness is in the green channel,
+    /// like glTF requires.
+    decal_metallic_roughness_map_texture: Handle<Image>,
+
+    /// The emissive texture that can optionally be enabled.
+    ///
+    /// This causes the white bird to glow.
+    decal_emissive_texture: Handle<Image>,
+}
+
+impl FromWorld for AppTextures {
+    fn from_world(world: &mut World) -> Self {
+        // Load all the decal textures.
+        let asset_server = world.resource::<AssetServer>();
+        AppTextures {
+            decal_base_color_texture: asset_server.load("branding/bevy_bird_dark.png"),
+            decal_normal_map_texture: asset_server.load_with_settings(
+                get_web_asset_url("BevyLogo-Normal.png"),
+                |settings: &mut ImageLoaderSettings| settings.is_srgb = false,
+            ),
+            decal_metallic_roughness_map_texture: asset_server.load_with_settings(
+                get_web_asset_url("BevyLogo-MetallicRoughness.png"),
+                |settings: &mut ImageLoaderSettings| settings.is_srgb = false,
+            ),
+            decal_emissive_texture: asset_server.load(get_web_asset_url("BevyLogo-Emissive.png")),
+        }
+    }
+}
+
+/// A component that we place on our decals to track them for animation
+/// purposes.
+#[derive(Component)]
+struct ExampleDecal {
+    /// The width and height of the square decal in meters.
+    size: f32,
+    /// What state the decal is in (animating in, idling, or animating out).
+    state: ExampleDecalState,
+}
+
+/// The animation state of a decal.
+///
+/// When each [`Timer`] goes off, the decal advances to the next state.
+enum ExampleDecalState {
+    /// The decal has just been spawned and is animating in.
+    AnimatingIn(Timer),
+    /// The decal has animated in and is waiting to animate out.
+    Idling(Timer),
+    /// The decal is animating out.
+    ///
+    /// When this timer expires, the decal is despawned.
+    AnimatingOut(Timer),
+}
+
+/// All settings that the user can change.
+///
+/// This app only has one: whether newly-spawned decals are emissive.
+#[derive(Clone, Copy, PartialEq)]
+enum AppSetting {
+    /// True if newly-spawned decals have an emissive channel (i.e. they glow),
+    /// or false otherwise.
+    EmissiveDecals(bool),
+}
+
+/// The current values of the settings that the user can change.
+///
+/// This app only has one: whether newly-spawned decals are emissive.
+#[derive(Default, Resource)]
+struct AppStatus {
+    /// True if newly-spawned decals have an emissive channel (i.e. they glow),
+    /// or false otherwise.
+    emissive_decals: bool,
+}
+
+/// Half of the width and height of the plane onto which the decals are
+/// projected.
+const PLANE_HALF_SIZE: f32 = 2.0;
+/// The minimum width and height that a decal may have.
+///
+/// The actual size is determined randomly, using this value as a lower bound.
+const DECAL_MIN_SIZE: f32 = 0.5;
+/// The maximum width and height that a decal may have.
+///
+/// The actual size is determined randomly, using this value as an upper bound.
+const DECAL_MAX_SIZE: f32 = 1.5;
+
+/// How long it takes the decal to grow to its full size when animating in.
+const DECAL_ANIMATE_IN_DURATION: Duration = Duration::from_millis(300);
+/// How long a decal stays in the idle state before starting to animate out.
+const DECAL_IDLE_DURATION: Duration = Duration::from_secs(10);
+/// How long it takes the decal to shrink down to nothing when animating out.
+const DECAL_ANIMATE_OUT_DURATION: Duration = Duration::from_millis(300);
+
+/// The demo entry point.
+fn main() {
+    App::new()
+        .add_plugins(
+            DefaultPlugins
+                .set(WebAssetPlugin {
+                    silence_startup_warning: true,
+                })
+                .set(WindowPlugin {
+                    primary_window: Some(Window {
+                        title: "Bevy Clustered Decal Maps Example".into(),
+                        ..default()
+                    }),
+                    ..default()
+                }),
+        )
+        .add_message::<WidgetClickEvent<AppSetting>>()
+        .init_resource::<AppStatus>()
+        .init_resource::<AppTextures>()
+        .add_systems(Startup, setup)
+        .add_systems(Update, draw_gizmos)
+        .add_systems(Update, spawn_decal)
+        .add_systems(Update, animate_decals)
+        .add_systems(
+            Update,
+            (
+                widgets::handle_ui_interactions::<AppSetting>,
+                update_radio_buttons,
+            ),
+        )
+        .add_systems(
+            Update,
+            handle_emission_type_change.after(widgets::handle_ui_interactions::<AppSetting>),
+        )
+        .run();
+}
+
+/// Spawns all the objects in the scene.
+fn setup(
+    mut commands: Commands,
+    asset_server: Res<AssetServer>,
+    mut meshes: ResMut<Assets<Mesh>>,
+    mut materials: ResMut<Assets<StandardMaterial>>,
+) {
+    spawn_plane_mesh(&mut commands, &asset_server, &mut meshes, &mut materials);
+    spawn_light(&mut commands);
+    spawn_camera(&mut commands);
+    spawn_buttons(&mut commands);
+}
+
+/// Spawns the plane onto which the decals are projected.
+fn spawn_plane_mesh(
+    commands: &mut Commands,
+    asset_server: &AssetServer,
+    meshes: &mut Assets<Mesh>,
+    materials: &mut Assets<StandardMaterial>,
+) {
+    // Create a plane onto which we project decals.
+    //
+    // As the plane has a normal map, we must generate tangents for the
+    // vertices.
+    let plane_mesh = meshes.add(
+        Plane3d {
+            normal: Dir3::NEG_Z,
+            half_size: Vec2::splat(PLANE_HALF_SIZE),
+        }
+        .mesh()
+        .build()
+        .with_duplicated_vertices()
+        .with_computed_flat_normals()
+        .with_generated_tangents()
+        .unwrap(),
+    );
+
+    // Give the plane some texture.
+    //
+    // Note that, as this is a normal map, we must disable sRGB when loading.
+    let normal_map_texture = asset_server.load_with_settings(
+        "textures/ScratchedGold-Normal.png",
+        |settings: &mut ImageLoaderSettings| settings.is_srgb = false,
+    );
+
+    // Actually spawn the plane.
+    commands.spawn((
+        Mesh3d(plane_mesh),
+        MeshMaterial3d(materials.add(StandardMaterial {
+            base_color: Color::from(CRIMSON),
+            normal_map_texture: Some(normal_map_texture),
+            ..StandardMaterial::default()
+        })),
+        Transform::IDENTITY,
+    ));
+}
+
+/// Spawns a light to illuminate the scene.
+fn spawn_light(commands: &mut Commands) {
+    commands.spawn((
+        PointLight {
+            intensity: 10_000_000.,
+            range: 100.0,
+            ..default()
+        },
+        Transform::from_xyz(8.0, 16.0, -8.0),
+    ));
+}
+
+/// Spawns a camera.
+fn spawn_camera(commands: &mut Commands) {
+    commands.spawn((
+        Camera3d::default(),
+        Transform::from_xyz(2.0, 0.0, -7.0).looking_at(Vec3::ZERO, Vec3::Y),
+        Hdr,
+    ));
+}
+
+/// Spawns all the buttons at the bottom of the screen.
+fn spawn_buttons(commands: &mut Commands) {
+    commands.spawn((
+        widgets::main_ui_node(),
+        children![widgets::option_buttons(
+            "Emissive Decals",
+            &[
+                (AppSetting::EmissiveDecals(true), "On"),
+                (AppSetting::EmissiveDecals(false), "Off"),
+            ],
+        ),],
+    ));
+}
+
+/// Draws the outlines that show the bounds of the clustered decals.
+fn draw_gizmos(mut gizmos: Gizmos, decals: Query<&GlobalTransform, With<ClusteredDecal>>) {
+    for global_transform in &decals {
+        gizmos.primitive_3d(
+            &Cuboid {
+                // Since the clustered decal is a 1×1×1 cube in model space, its
+                // half-size is half of the scaling part of its transform.
+                half_size: global_transform.scale() * 0.5,
+            },
+            Isometry3d {
+                rotation: global_transform.rotation(),
+                translation: global_transform.translation_vec3a(),
+            },
+            GOLD,
+        );
+    }
+}
+
+/// A system that spawns new decals at fixed intervals.
+fn spawn_decal(
+    mut commands: Commands,
+    app_status: Res<AppStatus>,
+    app_textures: Res<AppTextures>,
+    time: Res<Time>,
+    mut decal_spawn_timer: Local<Option<Timer>>,
+) {
+    // Tick the decal spawn timer. Check to see if we should spawn a new decal,
+    // and bail out if it's not yet time to.
+    let decal_spawn_timer = decal_spawn_timer
+        .get_or_insert_with(|| Timer::new(Duration::from_millis(1000), TimerMode::Repeating));
+    decal_spawn_timer.tick(time.delta());
+    if !decal_spawn_timer.just_finished() {
+        return;
+    }
+
+    // Generate a random position along the plane.
+    let mut rng = rand::rng();
+    let decal_position = vec3(
+        rng.random_range(-PLANE_HALF_SIZE..PLANE_HALF_SIZE),
+        rng.random_range(-PLANE_HALF_SIZE..PLANE_HALF_SIZE),
+        0.0,
+    );
+
+    // Generate a random size for the decal.
+    let decal_size = rng.random_range(DECAL_MIN_SIZE..DECAL_MAX_SIZE);
+
+    // Generate a random rotation for the decal.
+    let theta = rng.random_range(0.0f32..PI);
+
+    // Now spawn the decal.
+    commands.spawn((
+        // Apply the textures.
+        ClusteredDecal {
+            base_color_texture: Some(app_textures.decal_base_color_texture.clone()),
+            normal_map_texture: Some(app_textures.decal_normal_map_texture.clone()),
+            metallic_roughness_texture: Some(
+                app_textures.decal_metallic_roughness_map_texture.clone(),
+            ),
+            emissive_texture: if app_status.emissive_decals {
+                Some(app_textures.decal_emissive_texture.clone())
+            } else {
+                None
+            },
+            ..ClusteredDecal::default()
+        },
+        // Spawn the decal at the right place. Note that the scale is initially
+        // zero; we'll animate it later.
+        Transform::from_translation(decal_position)
+            .with_scale(Vec3::ZERO)
+            .looking_to(Vec3::Z, Vec3::ZERO.with_xy(Vec2::from_angle(theta))),
+        // Create the component that tracks the animation state.
+        ExampleDecal {
+            size: decal_size,
+            state: ExampleDecalState::AnimatingIn(Timer::new(
+                DECAL_ANIMATE_IN_DURATION,
+                TimerMode::Once,
+            )),
+        },
+    ));
+}
+
+/// A system that animates the decals growing as they enter and shrinking as
+/// they leave.
+fn animate_decals(
+    mut commands: Commands,
+    mut decals_query: Query<(Entity, &mut ExampleDecal, &mut Transform)>,
+    time: Res<Time>,
+) {
+    for (decal_entity, mut example_decal, mut decal_transform) in decals_query.iter_mut() {
+        // Update the animation timers, and advance the animation state if the
+        // timer has expired.
+        match example_decal.state {
+            ExampleDecalState::AnimatingIn(ref mut timer) => {
+                timer.tick(time.delta());
+                if timer.just_finished() {
+                    example_decal.state =
+                        ExampleDecalState::Idling(Timer::new(DECAL_IDLE_DURATION, TimerMode::Once));
+                }
+            }
+            ExampleDecalState::Idling(ref mut timer) => {
+                timer.tick(time.delta());
+                if timer.just_finished() {
+                    example_decal.state = ExampleDecalState::AnimatingOut(Timer::new(
+                        DECAL_ANIMATE_OUT_DURATION,
+                        TimerMode::Once,
+                    ));
+                }
+            }
+            ExampleDecalState::AnimatingOut(ref mut timer) => {
+                timer.tick(time.delta());
+                if timer.just_finished() {
+                    commands.entity(decal_entity).despawn();
+                    continue;
+                }
+            }
+        }
+
+        // Actually animate the decal by adjusting its transform.
+        // All we have to do here is to compute the decal's scale as a fraction
+        // of its full size.
+        let new_decal_scale_factor = match example_decal.state {
+            ExampleDecalState::AnimatingIn(ref timer) => timer.fraction(),
+            ExampleDecalState::Idling(_) => 1.0,
+            ExampleDecalState::AnimatingOut(ref timer) => timer.fraction_remaining(),
+        };
+        decal_transform.scale =
+            Vec3::splat(example_decal.size * new_decal_scale_factor).with_z(1.0);
+    }
+}
+
+/// Updates the appearance of the radio buttons to reflect the current
+/// application status.
+fn update_radio_buttons(
+    mut widgets: Query<
+        (
+            Entity,
+            Option<&mut BackgroundColor>,
+            Has<Text>,
+            &WidgetClickSender<AppSetting>,
+        ),
+        Or<(With<RadioButton>, With<RadioButtonText>)>,
+    >,
+    app_status: Res<AppStatus>,
+    mut writer: TextUiWriter,
+) {
+    for (entity, image, has_text, sender) in widgets.iter_mut() {
+        // We only have one setting in this particular application.
+        let selected = match **sender {
+            AppSetting::EmissiveDecals(emissive_decals) => {
+                emissive_decals == app_status.emissive_decals
+            }
+        };
+
+        if let Some(mut bg_color) = image {
+            // Update the colors of the button itself.
+            widgets::update_ui_radio_button(&mut bg_color, selected);
+        }
+        if has_text {
+            // Update the colors of the button text.
+            widgets::update_ui_radio_button_text(entity, &mut writer, selected);
+        }
+    }
+}
+
+/// Handles the user's clicks on the radio button that determines whether the
+/// newly-spawned decals have an emissive map.
+fn handle_emission_type_change(
+    mut app_status: ResMut<AppStatus>,
+    mut events: MessageReader<WidgetClickEvent<AppSetting>>,
+) {
+    for event in events.read() {
+        let AppSetting::EmissiveDecals(on) = **event;
+        app_status.emissive_decals = on;
+    }
+}
+
+/// Returns the GitHub download URL for the given asset.
+///
+/// The files are expected to be in the `clustered_decal_maps` directory in the
+/// [repository].
+///
+/// [repository]: https://github.com/bevyengine/bevy_asset_files
+fn get_web_asset_url(name: &str) -> String {
+    format!(
+        "https://raw.githubusercontent.com/bevyengine/bevy_asset_files/refs/heads/main/\
+clustered_decal_maps/{}",
+        name
+    )
+}
diff --git a/examples/3d/clustered_decals.rs b/examples/3d/clustered_decals.rs
index 1358d79ecd324..d0b8b5bc11174 100644
--- a/examples/3d/clustered_decals.rs
+++ b/examples/3d/clustered_decals.rs
@@ -216,13 +216,14 @@ fn spawn_camera(commands: &mut Commands) {
 
 /// Spawns the actual clustered decals.
 fn spawn_decals(commands: &mut Commands, asset_server: &AssetServer) {
-    let image = asset_server.load("branding/icon.png");
+    let base_color_texture = asset_server.load("branding/icon.png");
 
     commands.spawn((
         ClusteredDecal {
-            image: image.clone(),
+            base_color_texture: Some(base_color_texture.clone()),
             // Tint with red.
             tag: 1,
+            ..ClusteredDecal::default()
         },
         calculate_initial_decal_transform(vec3(1.0, 3.0, 5.0), Vec3::ZERO, Vec2::splat(1.1)),
         Selection::DecalA,
@@ -230,9 +231,10 @@ fn spawn_decals(commands: &mut Commands, asset_server: &AssetServer) {
 
     commands.spawn((
         ClusteredDecal {
-            image: image.clone(),
+            base_color_texture: Some(base_color_texture.clone()),
             // Tint with blue.
             tag: 2,
+            ..ClusteredDecal::default()
         },
         calculate_initial_decal_transform(vec3(-2.0, -1.0, 4.0), Vec3::ZERO, Vec2::splat(2.0)),
         Selection::DecalB,
diff --git a/examples/README.md b/examples/README.md
index e119d412eb454..5e405d346f0cf 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -152,6 +152,7 @@ Example | Description
 [Built-in postprocessing](../examples/3d/post_processing.rs) | Demonstrates the built-in postprocessing features
 [Camera sub view](../examples/3d/camera_sub_view.rs) | Demonstrates using different sub view effects on a camera
 [Clearcoat](../examples/3d/clearcoat.rs) | Demonstrates the clearcoat PBR feature
+[Clustered Decal Maps](../examples/3d/clustered_decal_maps.rs) | Demonstrates normal and metallic-roughness maps of decals
 [Clustered Decals](../examples/3d/clustered_decals.rs) | Demonstrates clustered decals
 [Color grading](../examples/3d/color_grading.rs) | Demonstrates color grading
 [Decal](../examples/3d/decal.rs) | Decal rendering
diff --git a/typos.toml b/typos.toml
index 983a5fb15dc32..7ebcf6b5a7dd9 100644
--- a/typos.toml
+++ b/typos.toml
@@ -23,6 +23,7 @@ ba = "ba"         # Part of an accessor in WGSL - weights.ba
 fLenOt = "fLenOt"
 iFO_a = "iFO_a"
 iFO_b = "iFO_b"
+Nd = "Nd"         # Normal of Decal
 ser = "ser"       # ron::ser - Serializer
 toi = "toi"       # Time of impact
 vOt = "vOt"

From f860ee784b0b124cac8b8b782efa4512bc67fb20 Mon Sep 17 00:00:00 2001
From: JMS55 <47158642+JMS55@users.noreply.github.com>
Date: Tue, 9 Dec 2025 13:15:20 -0500
Subject: [PATCH 063/133] Solari: More accurate ReSTIR DI resampling (#22033)

* Adds MIS during reservoir merge which increases emissive light
brightness, bringing it a little closer to the pathtraced reference
* Tests final reservoir visibility for shading, but _not_ for
resampling, which greatly improves shadow accuracy compared to the
pathtraced reference, at the unfortunate cost of higher noise
---
 .../bevy_solari/src/realtime/restir_di.wgsl   | 117 ++++++++++++------
 .../bevy_solari/src/realtime/restir_gi.wgsl   |  10 +-
 .../bevy_solari/src/realtime/specular_gi.wgsl |   2 +-
 .../src/realtime/world_cache_query.wgsl       |  13 +-
 crates/bevy_solari/src/scene/sampling.wgsl    |   8 +-
 5 files changed, 92 insertions(+), 58 deletions(-)

diff --git a/crates/bevy_solari/src/realtime/restir_di.wgsl b/crates/bevy_solari/src/realtime/restir_di.wgsl
index e7492f3c47ff3..0601a6f153a6f 100644
--- a/crates/bevy_solari/src/realtime/restir_di.wgsl
+++ b/crates/bevy_solari/src/realtime/restir_di.wgsl
@@ -9,7 +9,7 @@
 #import bevy_solari::brdf::evaluate_brdf
 #import bevy_solari::gbuffer_utils::{gpixel_resolve, pixel_dissimilar, permute_pixel}
 #import bevy_solari::presample_light_tiles::{ResolvedLightSamplePacked, unpack_resolved_light_sample}
-#import bevy_solari::sampling::{LightSample, calculate_resolved_light_contribution, resolve_and_calculate_light_contribution, resolve_light_sample, trace_light_visibility}
+#import bevy_solari::sampling::{LightSample, calculate_resolved_light_contribution, resolve_and_calculate_light_contribution, resolve_light_sample, trace_light_visibility, balance_heuristic}
 #import bevy_solari::scene_bindings::{light_sources, previous_frame_light_id_translations, LIGHT_NOT_PRESENT_THIS_FRAME}
 
 @group(1) @binding(0) var view_output: texture_storage_2d<rgba16float, read_write>;
@@ -49,8 +49,9 @@ fn initial_and_temporal(@builtin(workgroup_id) workgroup_id: vec3<u32>, @builtin
 
     let diffuse_brdf = surface.material.base_color / PI;
     let initial_reservoir = generate_initial_reservoir(surface.world_position, surface.world_normal, diffuse_brdf, workgroup_id.xy, &rng);
-    let temporal_reservoir = load_temporal_reservoir(global_id.xy, depth, surface.world_position, surface.world_normal);
-    let merge_result = merge_reservoirs(initial_reservoir, temporal_reservoir, surface.world_position, surface.world_normal, diffuse_brdf, &rng);
+    let temporal = load_temporal_reservoir(global_id.xy, depth, surface.world_position, surface.world_normal);
+    let merge_result = merge_reservoirs(initial_reservoir, surface.world_position, surface.world_normal, diffuse_brdf,
+        temporal.reservoir, temporal.world_position, temporal.world_normal, temporal.diffuse_brdf, &rng);
 
     store_reservoir_b(global_id.xy, merge_result.merged_reservoir);
 }
@@ -71,16 +72,25 @@ fn spatial_and_shade(@builtin(global_invocation_id) global_id: vec3<u32>) {
 
     let diffuse_brdf = surface.material.base_color / PI;
     let input_reservoir = load_reservoir_b(global_id.xy);
-    let spatial_reservoir = load_spatial_reservoir(global_id.xy, depth, surface.world_position, surface.world_normal, &rng);
-    let merge_result = merge_reservoirs(input_reservoir, spatial_reservoir, surface.world_position, surface.world_normal, diffuse_brdf, &rng);
+    let spatial = load_spatial_reservoir(global_id.xy, depth, surface.world_position, surface.world_normal, &rng);
+    let merge_result = merge_reservoirs(input_reservoir, surface.world_position, surface.world_normal, diffuse_brdf,
+        spatial.reservoir, spatial.world_position, spatial.world_normal, spatial.diffuse_brdf, &rng);
     var combined_reservoir = merge_result.merged_reservoir;
 
+    // More accuracy, less stability
+#ifndef BIASED_RESAMPLING
+    store_reservoir_a(global_id.xy, combined_reservoir);
+#endif
+
     if reservoir_valid(combined_reservoir) {
         let resolved_light_sample = resolve_light_sample(combined_reservoir.sample, light_sources[combined_reservoir.sample.light_id >> 16u]);
         combined_reservoir.unbiased_contribution_weight *= trace_light_visibility(surface.world_position, resolved_light_sample.world_position);
     }
 
+    // More stability, less accuracy (shadows extend further out than they should)
+#ifdef BIASED_RESAMPLING
     store_reservoir_a(global_id.xy, combined_reservoir);
+#endif
 
     let wo = normalize(view.world_position - surface.world_position);
     let brdf = evaluate_brdf(surface.world_normal, wo, merge_result.wi, surface.material);
@@ -135,63 +145,67 @@ fn generate_initial_reservoir(world_position: vec3<f32>, world_normal: vec3<f32>
     return reservoir;
 }
 
-fn load_temporal_reservoir(pixel_id: vec2<u32>, depth: f32, world_position: vec3<f32>, world_normal: vec3<f32>) -> Reservoir {
+fn load_temporal_reservoir(pixel_id: vec2<u32>, depth: f32, world_position: vec3<f32>, world_normal: vec3<f32>) -> NeighborInfo {
     let motion_vector = textureLoad(motion_vectors, pixel_id, 0).xy;
     let temporal_pixel_id_float = round(vec2<f32>(pixel_id) - (motion_vector * view.main_pass_viewport.zw));
 
     // Check if the current pixel was off screen during the previous frame (current pixel is newly visible),
     // or if all temporal history should assumed to be invalid
     if any(temporal_pixel_id_float < vec2(0.0)) || any(temporal_pixel_id_float >= view.main_pass_viewport.zw) || bool(constants.reset) {
-        return empty_reservoir();
+        return NeighborInfo(empty_reservoir(), vec3(0.0), vec3(0.0), vec3(0.0));
     }
 
     let permuted_temporal_pixel_id = permute_pixel(vec2<u32>(temporal_pixel_id_float), constants.frame_index, view.viewport.zw);
-    var temporal_reservoir = load_temporal_reservoir_inner(permuted_temporal_pixel_id, depth, world_position, world_normal);
+    var temporal = load_temporal_reservoir_inner(permuted_temporal_pixel_id, depth, world_position, world_normal);
 
     // If permuted reprojection failed (tends to happen on object edges), try point reprojection
-    if !reservoir_valid(temporal_reservoir) {
-        temporal_reservoir = load_temporal_reservoir_inner(vec2<u32>(temporal_pixel_id_float), depth, world_position, world_normal);
+    if !reservoir_valid(temporal.reservoir) {
+        temporal = load_temporal_reservoir_inner(vec2<u32>(temporal_pixel_id_float), depth, world_position, world_normal);
     }
 
     // Check if the light selected in the previous frame no longer exists in the current frame (e.g. entity despawned)
-    let previous_light_id = temporal_reservoir.sample.light_id >> 16u;
-    let triangle_id = temporal_reservoir.sample.light_id & 0xFFFFu;
+    let previous_light_id = temporal.reservoir.sample.light_id >> 16u;
+    let triangle_id = temporal.reservoir.sample.light_id & 0xFFFFu;
     let light_id = previous_frame_light_id_translations[previous_light_id];
     if light_id == LIGHT_NOT_PRESENT_THIS_FRAME {
-        return empty_reservoir();
+        return NeighborInfo(empty_reservoir(), vec3(0.0), vec3(0.0), vec3(0.0));
     }
-    temporal_reservoir.sample.light_id = (light_id << 16u) | triangle_id;
+    temporal.reservoir.sample.light_id = (light_id << 16u) | triangle_id;
 
-    temporal_reservoir.confidence_weight = min(temporal_reservoir.confidence_weight, CONFIDENCE_WEIGHT_CAP);
+    temporal.reservoir.confidence_weight = min(temporal.reservoir.confidence_weight, CONFIDENCE_WEIGHT_CAP);
 
-    return temporal_reservoir;
+    return temporal;
 }
 
-fn load_temporal_reservoir_inner(temporal_pixel_id: vec2<u32>, depth: f32, world_position: vec3<f32>, world_normal: vec3<f32>) -> Reservoir {
+fn load_temporal_reservoir_inner(temporal_pixel_id: vec2<u32>, depth: f32, world_position: vec3<f32>, world_normal: vec3<f32>) -> NeighborInfo {
     // Check if the pixel features have changed heavily between the current and previous frame
     let temporal_depth = textureLoad(previous_depth_buffer, temporal_pixel_id, 0);
     let temporal_surface = gpixel_resolve(textureLoad(previous_gbuffer, temporal_pixel_id, 0), temporal_depth, temporal_pixel_id, view.main_pass_viewport.zw, previous_view.world_from_clip);
+    let temporal_diffuse_brdf = temporal_surface.material.base_color / PI;
     if pixel_dissimilar(depth, world_position, temporal_surface.world_position, world_normal, temporal_surface.world_normal, view) {
-        return empty_reservoir();
+        return NeighborInfo(empty_reservoir(), vec3(0.0), vec3(0.0), vec3(0.0));
     }
 
-    return load_reservoir_a(temporal_pixel_id);
+    let temporal_reservoir = load_reservoir_a(temporal_pixel_id);
+    return NeighborInfo(temporal_reservoir, temporal_surface.world_position, temporal_surface.world_normal, temporal_diffuse_brdf);
 }
 
-fn load_spatial_reservoir(pixel_id: vec2<u32>, depth: f32, world_position: vec3<f32>, world_normal: vec3<f32>, rng: ptr<function, u32>) -> Reservoir {
+fn load_spatial_reservoir(pixel_id: vec2<u32>, depth: f32, world_position: vec3<f32>, world_normal: vec3<f32>, rng: ptr<function, u32>) -> NeighborInfo {
     for (var i = 0u; i < 5u; i++) {
         let spatial_pixel_id = get_neighbor_pixel_id(pixel_id, rng);
 
         let spatial_depth = textureLoad(depth_buffer, spatial_pixel_id, 0);
         let spatial_surface = gpixel_resolve(textureLoad(gbuffer, spatial_pixel_id, 0), spatial_depth, spatial_pixel_id, view.main_pass_viewport.zw, view.world_from_clip);
+        let spatial_diffuse_brdf = spatial_surface.material.base_color / PI;
         if pixel_dissimilar(depth, world_position, spatial_surface.world_position, world_normal, spatial_surface.world_normal, view) {
             continue;
         }
 
-        return load_reservoir_b(spatial_pixel_id);
+        let spatial_reservoir = load_reservoir_b(spatial_pixel_id);
+        return NeighborInfo(spatial_reservoir, spatial_surface.world_position, spatial_surface.world_normal, spatial_diffuse_brdf);
     }
 
-    return empty_reservoir();
+    return NeighborInfo(empty_reservoir(), world_position, world_normal, vec3(0.0));
 }
 
 fn get_neighbor_pixel_id(center_pixel_id: vec2<u32>, rng: ptr<function, u32>) -> vec2<u32> {
@@ -200,6 +214,13 @@ fn get_neighbor_pixel_id(center_pixel_id: vec2<u32>, rng: ptr<function, u32>) ->
     return vec2<u32>(spatial_id);
 }
 
+struct NeighborInfo {
+    reservoir: Reservoir,
+    world_position: vec3<f32>,
+    world_normal: vec3<f32>,
+    diffuse_brdf: vec3<f32>,
+}
+
 struct Reservoir {
     sample: LightSample,
     confidence_weight: f32,
@@ -252,42 +273,56 @@ struct ReservoirMergeResult {
 
 fn merge_reservoirs(
     canonical_reservoir: Reservoir,
+    canonical_world_position: vec3<f32>,
+    canonical_world_normal: vec3<f32>,
+    canonical_diffuse_brdf: vec3<f32>,
     other_reservoir: Reservoir,
-    world_position: vec3<f32>,
-    world_normal: vec3<f32>,
-    diffuse_brdf: vec3<f32>,
+    other_world_position: vec3<f32>,
+    other_world_normal: vec3<f32>,
+    other_diffuse_brdf: vec3<f32>,
     rng: ptr<function, u32>,
 ) -> ReservoirMergeResult {
-    let canonical_contribution = reservoir_contribution(canonical_reservoir, world_position, world_normal, diffuse_brdf);
-    let other_contribution = reservoir_contribution(other_reservoir, world_position, world_normal, diffuse_brdf);
-
-    let mis_weight_denominator = 1.0 / (canonical_reservoir.confidence_weight + other_reservoir.confidence_weight);
-
-    let canonical_mis_weight = canonical_reservoir.confidence_weight * mis_weight_denominator;
-    let canonical_resampling_weight = canonical_mis_weight * (canonical_contribution.target_function * canonical_reservoir.unbiased_contribution_weight);
-
-    let other_mis_weight = other_reservoir.confidence_weight * mis_weight_denominator;
-    let other_resampling_weight = other_mis_weight * (other_contribution.target_function * other_reservoir.unbiased_contribution_weight);
+    // Contributions for resampling
+    let canonical_contribution_canonical_sample = reservoir_contribution(canonical_reservoir, canonical_world_position, canonical_world_normal, canonical_diffuse_brdf);
+    let canonical_contribution_other_sample = reservoir_contribution(other_reservoir, canonical_world_position, canonical_world_normal, canonical_diffuse_brdf);
+
+    // Extra contributions for MIS
+    let other_contribution_canonical_sample = reservoir_contribution(canonical_reservoir, other_world_position, other_world_normal, other_diffuse_brdf);
+    let other_contribution_other_sample = reservoir_contribution(other_reservoir, other_world_position, other_world_normal, other_diffuse_brdf);
+
+    // Resampling weight for canonical sample
+    let canonical_sample_mis_weight = balance_heuristic(
+        canonical_reservoir.confidence_weight * canonical_contribution_canonical_sample.target_function,
+        other_reservoir.confidence_weight * other_contribution_canonical_sample.target_function,
+    );
+    let canonical_sample_resampling_weight = canonical_sample_mis_weight * canonical_contribution_canonical_sample.target_function * canonical_reservoir.unbiased_contribution_weight;
 
-    let weight_sum = canonical_resampling_weight + other_resampling_weight;
+    // Resampling weight for other sample
+    let other_sample_mis_weight = balance_heuristic(
+        other_reservoir.confidence_weight * other_contribution_other_sample.target_function,
+        canonical_reservoir.confidence_weight * canonical_contribution_other_sample.target_function,
+    );
+    let other_sample_resampling_weight = other_sample_mis_weight * canonical_contribution_other_sample.target_function * other_reservoir.unbiased_contribution_weight;
 
+    // Perform resampling
     var combined_reservoir = empty_reservoir();
     combined_reservoir.confidence_weight = canonical_reservoir.confidence_weight + other_reservoir.confidence_weight;
+    let weight_sum = canonical_sample_resampling_weight + other_sample_resampling_weight;
 
-    if rand_f(rng) < other_resampling_weight / weight_sum {
+    if rand_f(rng) < other_sample_resampling_weight / weight_sum {
         combined_reservoir.sample = other_reservoir.sample;
 
-        let inverse_target_function = select(0.0, 1.0 / other_contribution.target_function, other_contribution.target_function > 0.0);
+        let inverse_target_function = select(0.0, 1.0 / canonical_contribution_other_sample.target_function, canonical_contribution_other_sample.target_function > 0.0);
         combined_reservoir.unbiased_contribution_weight = weight_sum * inverse_target_function;
 
-        return ReservoirMergeResult(combined_reservoir, other_contribution.radiance, other_contribution.wi);
+        return ReservoirMergeResult(combined_reservoir, canonical_contribution_other_sample.radiance, canonical_contribution_other_sample.wi);
     } else {
         combined_reservoir.sample = canonical_reservoir.sample;
 
-        let inverse_target_function = select(0.0, 1.0 / canonical_contribution.target_function, canonical_contribution.target_function > 0.0);
+        let inverse_target_function = select(0.0, 1.0 / canonical_contribution_canonical_sample.target_function, canonical_contribution_canonical_sample.target_function > 0.0);
         combined_reservoir.unbiased_contribution_weight = weight_sum * inverse_target_function;
 
-        return ReservoirMergeResult(combined_reservoir, canonical_contribution.radiance, canonical_contribution.wi);
+        return ReservoirMergeResult(combined_reservoir, canonical_contribution_canonical_sample.radiance, canonical_contribution_canonical_sample.wi);
     }
 }
 
diff --git a/crates/bevy_solari/src/realtime/restir_gi.wgsl b/crates/bevy_solari/src/realtime/restir_gi.wgsl
index a6355517af5c2..233c20897857b 100644
--- a/crates/bevy_solari/src/realtime/restir_gi.wgsl
+++ b/crates/bevy_solari/src/realtime/restir_gi.wgsl
@@ -7,7 +7,7 @@
 #import bevy_render::view::View
 #import bevy_solari::brdf::evaluate_diffuse_brdf
 #import bevy_solari::gbuffer_utils::{gpixel_resolve, pixel_dissimilar, permute_pixel}
-#import bevy_solari::sampling::{sample_random_light, trace_point_visibility}
+#import bevy_solari::sampling::{sample_random_light, trace_point_visibility, balance_heuristic}
 #import bevy_solari::scene_bindings::{trace_ray, resolve_ray_hit_full, RAY_T_MIN, RAY_T_MAX}
 #import bevy_solari::world_cache::{query_world_cache, WORLD_CACHE_CELL_LIFETIME}
 
@@ -321,11 +321,3 @@ fn merge_reservoirs(
         return ReservoirMergeResult(combined_reservoir, canonical_sample_radiance);
     }
 }
-
-fn balance_heuristic(x: f32, y: f32) -> f32 {
-    let sum = x + y;
-    if sum == 0.0 {
-        return 0.0;
-    }
-    return x / sum;
-}
diff --git a/crates/bevy_solari/src/realtime/specular_gi.wgsl b/crates/bevy_solari/src/realtime/specular_gi.wgsl
index 325cbdfda3a2d..176be1c619258 100644
--- a/crates/bevy_solari/src/realtime/specular_gi.wgsl
+++ b/crates/bevy_solari/src/realtime/specular_gi.wgsl
@@ -146,7 +146,7 @@ fn nee_mis_weight(inverse_p_light: f32, brdf_rays_can_hit: bool, wo_tangent: vec
 
     let p_light = 1.0 / inverse_p_light;
     let p_bounce = ggx_vndf_pdf(wo_tangent, wi_tangent, ray_hit.material.roughness);
-    return max(0.0, power_heuristic(p_light, p_bounce));
+    return power_heuristic(p_light, p_bounce);
 }
 
 // Don't adjust the size of this struct without also adjusting GI_RESERVOIR_STRUCT_SIZE.
diff --git a/crates/bevy_solari/src/realtime/world_cache_query.wgsl b/crates/bevy_solari/src/realtime/world_cache_query.wgsl
index cafefffac58a8..6414583dafe0e 100644
--- a/crates/bevy_solari/src/realtime/world_cache_query.wgsl
+++ b/crates/bevy_solari/src/realtime/world_cache_query.wgsl
@@ -46,16 +46,19 @@ struct WorldCacheGeometryData {
 @group(1) @binding(23) var<storage, read_write> world_cache_active_cells_count: u32;
 
 #ifndef WORLD_CACHE_NON_ATOMIC_LIFE_BUFFER
-fn query_world_cache(world_position: vec3<f32>, world_normal: vec3<f32>, view_position: vec3<f32>, cell_lifetime: u32, rng: ptr<function, u32>) -> vec3<f32> {
+fn query_world_cache(world_position_in: vec3<f32>, world_normal: vec3<f32>, view_position: vec3<f32>, cell_lifetime: u32, rng: ptr<function, u32>) -> vec3<f32> {
+    var world_position = world_position_in;
     var cell_size = get_cell_size(world_position, view_position);
 
     // https://tomclabault.github.io/blog/2025/regir, jitter_world_position_tangent_plane
+#ifndef NO_JITTER_WORLD_CACHE
     let TBN = orthonormalize(world_normal);
     let offset = (rand_vec2f(rng) * 2.0 - 1.0) * cell_size * 0.5;
-    let jittered_position = world_position + offset.x * TBN[0] + offset.y * TBN[1];
-    cell_size = get_cell_size(jittered_position, view_position);
+    world_position += offset.x * TBN[0] + offset.y * TBN[1];
+    cell_size = get_cell_size(world_position, view_position);
+#endif
 
-    let world_position_quantized = bitcast<vec3<u32>>(quantize_position(jittered_position, cell_size));
+    let world_position_quantized = bitcast<vec3<u32>>(quantize_position(world_position, cell_size));
     let world_normal_quantized = bitcast<vec3<u32>>(quantize_normal(world_normal));
     var key = compute_key(world_position_quantized, world_normal_quantized);
     let checksum = compute_checksum(world_position_quantized, world_normal_quantized);
@@ -77,7 +80,7 @@ fn query_world_cache(world_position: vec3<f32>, world_normal: vec3<f32>, view_po
             return world_cache_radiance[key].rgb;
         } else if existing_checksum == WORLD_CACHE_EMPTY_CELL {
             // Cell is empty - initialize it
-            world_cache_geometry_data[key].world_position = jittered_position;
+            world_cache_geometry_data[key].world_position = world_position;
             world_cache_geometry_data[key].world_normal = world_normal;
             return vec3(0.0);
         } else {
diff --git a/crates/bevy_solari/src/scene/sampling.wgsl b/crates/bevy_solari/src/scene/sampling.wgsl
index b7fc2de2a0cc6..d0f8d8bdb3ce3 100644
--- a/crates/bevy_solari/src/scene/sampling.wgsl
+++ b/crates/bevy_solari/src/scene/sampling.wgsl
@@ -6,11 +6,15 @@
 #import bevy_solari::scene_bindings::{trace_ray, RAY_T_MIN, RAY_T_MAX, light_sources, directional_lights, LightSource, LIGHT_SOURCE_KIND_DIRECTIONAL, resolve_triangle_data_full, ResolvedRayHitFull}
 
 fn power_heuristic(f: f32, g: f32) -> f32 {
-    return f * f / (f * f + g * g);
+    return balance_heuristic(f * f, g * g);
 }
 
 fn balance_heuristic(f: f32, g: f32) -> f32 {
-    return f / (f + g);
+    let sum = f + g;
+    if sum == 0.0 {
+        return 0.0;
+    }
+    return max(0.0, f / sum);
 }
 
 // https://gpuopen.com/download/Bounded_VNDF_Sampling_for_Smith-GGX_Reflections.pdf (Listing 1)

From 000ddcacc98ec2d2bd6fe177fa2d7c591164a2e7 Mon Sep 17 00:00:00 2001
From: Duncan <duncan.fairbanks@fslabs.ca>
Date: Tue, 9 Dec 2025 10:15:45 -0800
Subject: [PATCH 064/133] Support non-sRGB image formats for
 `RenderTarget::Image` (#22031)

# Objective

- Fixes #15201

## Solution

- It seems there was some confusion where
`OutputColorAttachment::format` could be different from the actual
underlying texture format (of `OutputColorAttachment::view`). This would
eventually lead to a texture format mismatch on the `BlitPipeline`. I
removed the `OutputColorAttachment::format` field to resolve this
conflict.
- Sim. for `ManualTextureView`.

## Testing

- The repro steps provided by #15201 no longer cause a WGPU validation
error.
- I tested the `pbr` example on native and WebGPU and it still works as
before.

## Future Work

Although the WGPU validation error is fixed, when using a non-sRGB
texture format for the GPU image in the `headless_renderer` example, the
output image seems to have incorrect gamma. I think this is because the
example does a byte-for-byte copy from the GPU image to the CPU image
without any gamma correction; and the `image` crate saves the image
assuming a nonlinear color space.

I don't think we need to fix this as part of this PR, but it might be
nice for `bevy_image::Image::try_into_dynamic` to eventually handle the
gamma correction when saving linear color images.

<details>
<summary>Here you can see a comparison</summary>
With sRGB
<img width="1920" height="1080" alt="with_srgb"
src="https://github.com/user-attachments/assets/b6d96072-2754-4fc3-bb5a-fc2994e65dc0"
/>

No sRGB
<img width="1920" height="1080" alt="no_srgb"
src="https://github.com/user-attachments/assets/46f83f85-2202-40f6-9a68-85bdf4631494"
/>
</details>
---
 crates/bevy_render/src/camera.rs                    |  6 +++---
 .../bevy_render/src/texture/manual_texture_view.rs  | 13 +++----------
 .../bevy_render/src/texture/texture_attachment.rs   |  6 ++----
 crates/bevy_render/src/view/mod.rs                  | 13 +++----------
 crates/bevy_render/src/view/window/screenshot.rs    | 10 +++++-----
 5 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/crates/bevy_render/src/camera.rs b/crates/bevy_render/src/camera.rs
index 99ccffda26183..41a5cd99d5d37 100644
--- a/crates/bevy_render/src/camera.rs
+++ b/crates/bevy_render/src/camera.rs
@@ -213,9 +213,9 @@ impl NormalizedRenderTargetExt for NormalizedRenderTarget {
             NormalizedRenderTarget::Image(image_target) => images
                 .get(&image_target.handle)
                 .map(|image| image.texture_format),
-            NormalizedRenderTarget::TextureView(id) => {
-                manual_texture_views.get(id).map(|tex| tex.format)
-            }
+            NormalizedRenderTarget::TextureView(id) => manual_texture_views
+                .get(id)
+                .map(|view| view.texture_view.texture().format()),
             NormalizedRenderTarget::None { .. } => None,
         }
     }
diff --git a/crates/bevy_render/src/texture/manual_texture_view.rs b/crates/bevy_render/src/texture/manual_texture_view.rs
index b9faa84ab78f6..b03943d3c2750 100644
--- a/crates/bevy_render/src/texture/manual_texture_view.rs
+++ b/crates/bevy_render/src/texture/manual_texture_view.rs
@@ -1,10 +1,8 @@
 use bevy_camera::ManualTextureViewHandle;
 use bevy_ecs::{prelude::Component, resource::Resource};
-use bevy_image::BevyDefault;
 use bevy_math::UVec2;
 use bevy_platform::collections::HashMap;
 use bevy_render_macros::ExtractResource;
-use wgpu::TextureFormat;
 
 use crate::render_resource::TextureView;
 
@@ -13,16 +11,11 @@ use crate::render_resource::TextureView;
 pub struct ManualTextureView {
     pub texture_view: TextureView,
     pub size: UVec2,
-    pub format: TextureFormat,
 }
 
 impl ManualTextureView {
-    pub fn with_default_format(texture_view: TextureView, size: UVec2) -> Self {
-        Self {
-            texture_view,
-            size,
-            format: TextureFormat::bevy_default(),
-        }
+    pub fn new(texture_view: TextureView, size: UVec2) -> Self {
+        Self { texture_view, size }
     }
 }
 
@@ -36,7 +29,7 @@ impl ManualTextureView {
 /// # world.insert_resource(ManualTextureViews::default());
 /// # let texture_view = todo!();
 /// let manual_views = world.resource_mut::<ManualTextureViews>();
-/// let manual_view = ManualTextureView::with_default_format(texture_view, UVec2::new(1024, 1024));
+/// let manual_view = ManualTextureView::new(texture_view, UVec2::new(1024, 1024));
 ///
 /// // Choose an unused handle value; it's likely only you are inserting manual views.
 /// const MANUAL_VIEW_HANDLE: ManualTextureViewHandle = ManualTextureViewHandle::new(42);
diff --git a/crates/bevy_render/src/texture/texture_attachment.rs b/crates/bevy_render/src/texture/texture_attachment.rs
index 269c2f1422820..26588212683c1 100644
--- a/crates/bevy_render/src/texture/texture_attachment.rs
+++ b/crates/bevy_render/src/texture/texture_attachment.rs
@@ -1,5 +1,5 @@
 use super::CachedTexture;
-use crate::render_resource::{TextureFormat, TextureView};
+use crate::render_resource::TextureView;
 use alloc::sync::Arc;
 use bevy_color::LinearRgba;
 use core::sync::atomic::{AtomicBool, Ordering};
@@ -127,15 +127,13 @@ impl DepthAttachment {
 #[derive(Clone)]
 pub struct OutputColorAttachment {
     pub view: TextureView,
-    pub format: TextureFormat,
     is_first_call: Arc<AtomicBool>,
 }
 
 impl OutputColorAttachment {
-    pub fn new(view: TextureView, format: TextureFormat) -> Self {
+    pub fn new(view: TextureView) -> Self {
         Self {
             view,
-            format,
             is_first_call: Arc::new(AtomicBool::new(true)),
         }
     }
diff --git a/crates/bevy_render/src/view/mod.rs b/crates/bevy_render/src/view/mod.rs
index 040d0ce7bc3cc..3c105a5774250 100644
--- a/crates/bevy_render/src/view/mod.rs
+++ b/crates/bevy_render/src/view/mod.rs
@@ -838,7 +838,7 @@ impl ViewTarget {
     /// The format of the final texture this view will render to
     #[inline]
     pub fn out_texture_format(&self) -> TextureFormat {
-        self.out_texture.format
+        self.out_texture.view.texture().format()
     }
 
     /// This will start a new "post process write", which assumes that the caller
@@ -1014,10 +1014,7 @@ pub fn prepare_view_attachments(
                 let Some(attachment) = target
                     .get_texture_view(&windows, &images, &manual_texture_views)
                     .cloned()
-                    .zip(target.get_texture_format(&windows, &images, &manual_texture_views))
-                    .map(|(view, format)| {
-                        OutputColorAttachment::new(view.clone(), format.add_srgb_suffix())
-                    })
+                    .map(OutputColorAttachment::new)
                 else {
                     continue;
                 };
@@ -1086,11 +1083,7 @@ pub fn prepare_view_targets(
                     dimension: TextureDimension::D2,
                     format: main_texture_format,
                     usage: texture_usage.0,
-                    view_formats: match main_texture_format {
-                        TextureFormat::Bgra8Unorm => &[TextureFormat::Bgra8UnormSrgb],
-                        TextureFormat::Rgba8Unorm => &[TextureFormat::Rgba8UnormSrgb],
-                        _ => &[],
-                    },
+                    view_formats: &[],
                 };
                 let a = texture_cache.get(
                     &render_device,
diff --git a/crates/bevy_render/src/view/window/screenshot.rs b/crates/bevy_render/src/view/window/screenshot.rs
index 4aba6c6cee791..4c5f60ac34c1c 100644
--- a/crates/bevy_render/src/view/window/screenshot.rs
+++ b/crates/bevy_render/src/view/window/screenshot.rs
@@ -295,7 +295,7 @@ fn prepare_screenshots(
                 prepared.insert(*entity, state);
                 view_target_attachments.insert(
                     target.clone(),
-                    OutputColorAttachment::new(texture_view.clone(), format.add_srgb_suffix()),
+                    OutputColorAttachment::new(texture_view.clone()),
                 );
             }
             NormalizedRenderTarget::Image(image) => {
@@ -315,7 +315,7 @@ fn prepare_screenshots(
                 prepared.insert(*entity, state);
                 view_target_attachments.insert(
                     target.clone(),
-                    OutputColorAttachment::new(texture_view.clone(), format.add_srgb_suffix()),
+                    OutputColorAttachment::new(texture_view.clone()),
                 );
             }
             NormalizedRenderTarget::TextureView(texture_view) => {
@@ -326,7 +326,7 @@ fn prepare_screenshots(
                     );
                     continue;
                 };
-                let format = manual_texture_view.format;
+                let format = manual_texture_view.texture_view.texture().format();
                 let size = manual_texture_view.size.to_extents();
                 let (texture_view, state) = prepare_screenshot_state(
                     size,
@@ -339,7 +339,7 @@ fn prepare_screenshots(
                 prepared.insert(*entity, state);
                 view_target_attachments.insert(
                     target.clone(),
-                    OutputColorAttachment::new(texture_view.clone(), format.add_srgb_suffix()),
+                    OutputColorAttachment::new(texture_view.clone()),
                 );
             }
             NormalizedRenderTarget::None { .. } => {
@@ -550,7 +550,7 @@ pub(crate) fn submit_screenshot_commands(world: &World, encoder: &mut CommandEnc
                 };
                 let width = texture_view.size.x;
                 let height = texture_view.size.y;
-                let texture_format = texture_view.format;
+                let texture_format = texture_view.texture_view.texture().format();
                 let texture_view = texture_view.texture_view.deref();
                 render_screenshot(
                     encoder,

From 3d700c48a548a34300ddd576733fa27343b16f13 Mon Sep 17 00:00:00 2001
From: Jan Hohenheim <jan@hohenheim.ch>
Date: Tue, 9 Dec 2025 19:16:05 +0100
Subject: [PATCH 065/133] Make default state change trigger self state
 transitions (#21792)

# Objective

- https://github.com/bevyengine/bevy/pull/19363 finally allows
self-state transitions
- The naming is a bit meh (`set_forced`)
- Many people expect this to work out of the box
- That PR also missed a few spots where this distinction applies

## Solution

- Expand on https://github.com/bevyengine/bevy/pull/19363 by making it
the default
- Rename `set` -> `set_if_neq`
- Rename `set_forced` -> `set`
- Add the two variants to
  - commands
  - reflection
  - computed states
- make the transition logs a bit less chatty in the common case
- add a test for the new behavior


## Testing

- CI
---
 crates/bevy_dev_tools/src/states.rs           | 12 +++--
 crates/bevy_state/src/app.rs                  | 15 ++++--
 crates/bevy_state/src/commands.rs             | 25 +++++++--
 crates/bevy_state/src/reflect.rs              | 21 ++++++++
 .../bevy_state/src/state/computed_states.rs   |  3 ++
 .../src/state/freely_mutable_state.rs         |  4 +-
 crates/bevy_state/src/state/mod.rs            | 53 ++++++++++++++++++-
 crates/bevy_state/src/state/resources.rs      | 30 +++++------
 crates/bevy_state/src/state/state_set.rs      |  8 ++-
 crates/bevy_state/src/state/transitions.rs    | 16 +++---
 .../same_state_transitions.md                 | 12 +++--
 11 files changed, 153 insertions(+), 46 deletions(-)

diff --git a/crates/bevy_dev_tools/src/states.rs b/crates/bevy_dev_tools/src/states.rs
index db0706575d0be..f0b4b22a4f350 100644
--- a/crates/bevy_dev_tools/src/states.rs
+++ b/crates/bevy_dev_tools/src/states.rs
@@ -16,10 +16,12 @@ pub fn log_transitions<S: States>(mut transitions: MessageReader<StateTransition
     let StateTransitionEvent {
         exited,
         entered,
-        same_state_enforced,
+        allow_same_state_transitions,
     } = transition;
-    info!(
-        "{} transition: {:?} => {:?} | same state enforced: {:?}",
-        name, exited, entered, same_state_enforced
-    );
+    let skip_text = if exited == entered && !*allow_same_state_transitions {
+        " (disallowing same-state transitions)"
+    } else {
+        ""
+    };
+    info!("{name} transition: {exited:?} => {entered:?}{skip_text}");
 }
diff --git a/crates/bevy_state/src/app.rs b/crates/bevy_state/src/app.rs
index a22ce701c842c..fb0bb6104366d 100644
--- a/crates/bevy_state/src/app.rs
+++ b/crates/bevy_state/src/app.rs
@@ -101,7 +101,8 @@ impl AppExtStates for SubApp {
             self.world_mut().write_message(StateTransitionEvent {
                 exited: None,
                 entered: Some(state),
-                same_state_enforced: false,
+                // makes no difference: the state didn't exist before anyways
+                allow_same_state_transitions: true,
             });
             enable_state_scoped_entities::<S>(self);
         } else {
@@ -125,7 +126,8 @@ impl AppExtStates for SubApp {
             self.world_mut().write_message(StateTransitionEvent {
                 exited: None,
                 entered: Some(state),
-                same_state_enforced: false,
+                // makes no difference: the state didn't exist before anyways
+                allow_same_state_transitions: true,
             });
             enable_state_scoped_entities::<S>(self);
         } else {
@@ -137,7 +139,9 @@ impl AppExtStates for SubApp {
             self.world_mut().write_message(StateTransitionEvent {
                 exited: None,
                 entered: Some(state),
-                same_state_enforced: false,
+                // Not configurable for the moment. This controls whether inserting a state with the same value as a pre-existing state should run state transitions.
+                // Leaving it at `true` makes state insertion idempotent. Neat!
+                allow_same_state_transitions: true,
             });
         }
 
@@ -162,7 +166,7 @@ impl AppExtStates for SubApp {
             self.world_mut().write_message(StateTransitionEvent {
                 exited: None,
                 entered: state,
-                same_state_enforced: false,
+                allow_same_state_transitions: S::ALLOW_SAME_STATE_TRANSITIONS,
             });
             enable_state_scoped_entities::<S>(self);
         } else {
@@ -192,7 +196,8 @@ impl AppExtStates for SubApp {
             self.world_mut().write_message(StateTransitionEvent {
                 exited: None,
                 entered: state,
-                same_state_enforced: false,
+                // makes no difference: the state didn't exist before anyways
+                allow_same_state_transitions: true,
             });
             enable_state_scoped_entities::<S>(self);
         } else {
diff --git a/crates/bevy_state/src/commands.rs b/crates/bevy_state/src/commands.rs
index 2484a2d8a2b95..d87f5fb5383cf 100644
--- a/crates/bevy_state/src/commands.rs
+++ b/crates/bevy_state/src/commands.rs
@@ -13,18 +13,37 @@ pub trait CommandsStatesExt {
     /// Note that commands introduce sync points to the ECS schedule, so modifying `NextState`
     /// directly may be more efficient depending on your use-case.
     fn set_state<S: FreelyMutableState>(&mut self, state: S);
+
+    /// Sets the next state the app should move to, skipping any state transitions if the next state is the same as the current state.
+    ///
+    /// Internally this schedules a command that updates the [`NextState<S>`](crate::prelude::NextState)
+    /// resource with `state`.
+    ///
+    /// Note that commands introduce sync points to the ECS schedule, so modifying `NextState`
+    /// directly may be more efficient depending on your use-case.
+    fn set_state_if_neq<S: FreelyMutableState>(&mut self, state: S);
 }
 
 impl CommandsStatesExt for Commands<'_, '_> {
     fn set_state<S: FreelyMutableState>(&mut self, state: S) {
         self.queue(move |w: &mut World| {
             let mut next = w.resource_mut::<NextState<S>>();
-            if let NextState::Pending(prev) = &*next
-                && *prev != state
-            {
+            if let NextState::PendingIfNeq(prev) = &*next {
                 debug!("overwriting next state {prev:?} with {state:?}");
             }
             next.set(state);
         });
     }
+
+    fn set_state_if_neq<S: FreelyMutableState>(&mut self, state: S) {
+        self.queue(move |w: &mut World| {
+            let mut next = w.resource_mut::<NextState<S>>();
+            if let NextState::PendingIfNeq(prev) = &*next
+                && *prev != state
+            {
+                debug!("overwriting next state {prev:?} with {state:?} if not equal");
+            }
+            next.set_if_neq(state);
+        });
+    }
 }
diff --git a/crates/bevy_state/src/reflect.rs b/crates/bevy_state/src/reflect.rs
index 0ff09c3759d21..1a2ffbfe0938e 100644
--- a/crates/bevy_state/src/reflect.rs
+++ b/crates/bevy_state/src/reflect.rs
@@ -59,6 +59,8 @@ pub struct ReflectFreelyMutableState(ReflectFreelyMutableStateFns);
 pub struct ReflectFreelyMutableStateFns {
     /// Function pointer implementing [`ReflectFreelyMutableState::set_next_state()`].
     pub set_next_state: fn(&mut World, &dyn Reflect, &TypeRegistry),
+    /// Function pointer implementing [`ReflectFreelyMutableState::set_next_state_if_neq()`].
+    pub set_next_state_if_neq: fn(&mut World, &dyn Reflect, &TypeRegistry),
 }
 
 impl ReflectFreelyMutableStateFns {
@@ -77,6 +79,15 @@ impl ReflectFreelyMutableState {
     pub fn set_next_state(&self, world: &mut World, state: &dyn Reflect, registry: &TypeRegistry) {
         (self.0.set_next_state)(world, state, registry);
     }
+    /// Tentatively set a pending state transition to a reflected [`ReflectFreelyMutableState`], skipping state transitions if the target state is the same as the current state.
+    pub fn set_next_state_if_neq(
+        &self,
+        world: &mut World,
+        state: &dyn Reflect,
+        registry: &TypeRegistry,
+    ) {
+        (self.0.set_next_state_if_neq)(world, state, registry);
+    }
 }
 
 impl<S: FreelyMutableState + Reflect + TypePath> FromType<S> for ReflectFreelyMutableState {
@@ -92,6 +103,16 @@ impl<S: FreelyMutableState + Reflect + TypePath> FromType<S> for ReflectFreelyMu
                     next_state.set(new_state);
                 }
             },
+            set_next_state_if_neq: |world, reflected_state, registry| {
+                let new_state: S = from_reflect_with_fallback(
+                    reflected_state.as_partial_reflect(),
+                    world,
+                    registry,
+                );
+                if let Some(mut next_state) = world.get_resource_mut::<NextState<S>>() {
+                    next_state.set_if_neq(new_state);
+                }
+            },
         })
     }
 }
diff --git a/crates/bevy_state/src/state/computed_states.rs b/crates/bevy_state/src/state/computed_states.rs
index b4bff084fc76d..c6bb153d53fe6 100644
--- a/crates/bevy_state/src/state/computed_states.rs
+++ b/crates/bevy_state/src/state/computed_states.rs
@@ -75,6 +75,9 @@ pub trait ComputedStates: 'static + Send + Sync + Clone + PartialEq + Eq + Hash
     /// For example, `(MapState, EnemyState)` is valid, as is `(MapState, Option<EnemyState>)`
     type SourceStates: StateSet;
 
+    /// Whether state transition schedules should be run when the state changes to the same value. Default is `true`.
+    const ALLOW_SAME_STATE_TRANSITIONS: bool = true;
+
     /// Computes the next value of [`State<Self>`](crate::state::State).
     /// This function gets called whenever one of the [`SourceStates`](Self::SourceStates) changes.
     ///
diff --git a/crates/bevy_state/src/state/freely_mutable_state.rs b/crates/bevy_state/src/state/freely_mutable_state.rs
index b4fd26481e62c..d16cf8ea42147 100644
--- a/crates/bevy_state/src/state/freely_mutable_state.rs
+++ b/crates/bevy_state/src/state/freely_mutable_state.rs
@@ -52,7 +52,7 @@ fn apply_state_transition<S: FreelyMutableState>(
     current_state: Option<ResMut<State<S>>>,
     next_state: Option<ResMut<NextState<S>>>,
 ) {
-    let Some((next_state, same_state_enforced)) = take_next_state(next_state) else {
+    let Some((next_state, allow_same_state_transitions)) = take_next_state(next_state) else {
         return;
     };
     let Some(current_state) = current_state else {
@@ -63,6 +63,6 @@ fn apply_state_transition<S: FreelyMutableState>(
         commands,
         Some(current_state),
         Some(next_state),
-        same_state_enforced,
+        allow_same_state_transitions,
     );
 }
diff --git a/crates/bevy_state/src/state/mod.rs b/crates/bevy_state/src/state/mod.rs
index a570e4ddfea9a..2e005ee40ac16 100644
--- a/crates/bevy_state/src/state/mod.rs
+++ b/crates/bevy_state/src/state/mod.rs
@@ -500,7 +500,7 @@ mod tests {
     }
 
     #[test]
-    fn same_state_transition_should_emit_event_and_not_run_schedules() {
+    fn same_state_transition_should_emit_event_and_run_schedules() {
         let mut world = World::new();
         setup_state_transitions_in_world(&mut world);
         MessageRegistry::register_message::<StateTransitionEvent<SimpleState>>(&mut world);
@@ -533,6 +533,57 @@ mod tests {
         world.insert_resource(NextState::Pending(SimpleState::A));
         world.run_schedule(StateTransition);
         assert_eq!(world.resource::<State<SimpleState>>().0, SimpleState::A);
+        assert_eq!(
+            *world.resource::<TransitionCounter>(),
+            TransitionCounter {
+                exit: 1,
+                transition: 1,
+                enter: 1
+            }
+        );
+        assert_eq!(
+            world
+                .resource::<Messages<StateTransitionEvent<SimpleState>>>()
+                .len(),
+            1
+        );
+    }
+
+    #[test]
+    fn same_state_transition_should_emit_event_and_not_run_schedules_if_same_state_transitions_are_disallowed(
+    ) {
+        let mut world = World::new();
+        setup_state_transitions_in_world(&mut world);
+        MessageRegistry::register_message::<StateTransitionEvent<SimpleState>>(&mut world);
+        world.init_resource::<State<SimpleState>>();
+        let mut schedules = world.resource_mut::<Schedules>();
+        let apply_changes = schedules.get_mut(StateTransition).unwrap();
+        SimpleState::register_state(apply_changes);
+
+        let mut on_exit = Schedule::new(OnExit(SimpleState::A));
+        on_exit.add_systems(|mut c: ResMut<TransitionCounter>| c.exit += 1);
+        schedules.insert(on_exit);
+        let mut on_transition = Schedule::new(OnTransition {
+            exited: SimpleState::A,
+            entered: SimpleState::A,
+        });
+        on_transition.add_systems(|mut c: ResMut<TransitionCounter>| c.transition += 1);
+        schedules.insert(on_transition);
+        let mut on_enter = Schedule::new(OnEnter(SimpleState::A));
+        on_enter.add_systems(|mut c: ResMut<TransitionCounter>| c.enter += 1);
+        schedules.insert(on_enter);
+        world.insert_resource(TransitionCounter::default());
+
+        world.run_schedule(StateTransition);
+        assert_eq!(world.resource::<State<SimpleState>>().0, SimpleState::A);
+        assert!(world
+            .resource::<Messages<StateTransitionEvent<SimpleState>>>()
+            .is_empty());
+
+        world.insert_resource(TransitionCounter::default());
+        world.insert_resource(NextState::PendingIfNeq(SimpleState::A));
+        world.run_schedule(StateTransition);
+        assert_eq!(world.resource::<State<SimpleState>>().0, SimpleState::A);
         assert_eq!(
             *world.resource::<TransitionCounter>(),
             TransitionCounter {
diff --git a/crates/bevy_state/src/state/resources.rs b/crates/bevy_state/src/state/resources.rs
index 0f5f0246289c7..e4376499f94e7 100644
--- a/crates/bevy_state/src/state/resources.rs
+++ b/crates/bevy_state/src/state/resources.rs
@@ -129,29 +129,27 @@ pub enum NextState<S: FreelyMutableState> {
     Pending(S),
     /// There is a pending transition for state `S`
     ///
-    /// This will trigger state transitions schedules even if the target state is the same as the current one.
-    ForcedPending(S),
+    /// This will not trigger state transitions schedules if the target state is the same as the current one.
+    PendingIfNeq(S),
 }
 
 impl<S: FreelyMutableState> NextState<S> {
     /// Tentatively set a pending state transition to `Some(state)`.
     ///
-    /// If `state` is the same as the current state, this will *not* trigger state
-    /// transition [`OnEnter`](crate::state::OnEnter) and [`OnExit`](crate::state::OnExit) schedules.
-    ///
-    /// If [`set_forced`](Self::set_forced) has already been called in the same frame with the same state, its behavior is kept.
+    /// This will run the state transition schedules [`OnEnter`](crate::state::OnEnter) and [`OnExit`](crate::state::OnExit).
+    /// If you want to skip those schedules for the same where we are transitioning to the same state, use [`set_if_neq`](Self::set_if_neq) instead.
     pub fn set(&mut self, state: S) {
-        if !matches!(self, Self::ForcedPending(s) if s == &state) {
-            *self = Self::Pending(state);
-        }
+        *self = Self::Pending(state);
     }
 
     /// Tentatively set a pending state transition to `Some(state)`.
     ///
-    /// If `state` is the same as the current state, this will trigger state
-    /// transition [`OnEnter`](crate::state::OnEnter) and [`OnExit`](crate::state::OnExit) schedules.
-    pub fn set_forced(&mut self, state: S) {
-        *self = Self::ForcedPending(state);
+    /// Like [`set`](Self::set), but will not run any state transition schedules if the target state is the same as the current one.
+    /// If [`set`](Self::set) has already been called in the same frame with the same state, the transition schedules will be run anyways.
+    pub fn set_if_neq(&mut self, state: S) {
+        if !matches!(self, Self::Pending(s) if s == &state) {
+            *self = Self::PendingIfNeq(state);
+        }
     }
 
     /// Remove any pending changes to [`State<S>`]
@@ -168,11 +166,11 @@ pub(crate) fn take_next_state<S: FreelyMutableState>(
     match core::mem::take(next_state.bypass_change_detection()) {
         NextState::Pending(x) => {
             next_state.set_changed();
-            Some((x, false))
+            Some((x, true))
         }
-        NextState::ForcedPending(x) => {
+        NextState::PendingIfNeq(x) => {
             next_state.set_changed();
-            Some((x, true))
+            Some((x, false))
         }
         NextState::Unchanged => None,
     }
diff --git a/crates/bevy_state/src/state/state_set.rs b/crates/bevy_state/src/state/state_set.rs
index b850af83ddd89..a9589f495b509 100644
--- a/crates/bevy_state/src/state/state_set.rs
+++ b/crates/bevy_state/src/state/state_set.rs
@@ -112,7 +112,13 @@ impl<S: InnerStateSet> StateSet for S {
                         None
                     };
 
-                internal_apply_state_transition(event, commands, current_state, new_state, false);
+                internal_apply_state_transition(
+                    event,
+                    commands,
+                    current_state,
+                    new_state,
+                    T::ALLOW_SAME_STATE_TRANSITIONS,
+                );
             };
 
         schedule.configure_sets((
diff --git a/crates/bevy_state/src/state/transitions.rs b/crates/bevy_state/src/state/transitions.rs
index 35d421bf0f711..deb6a63bab152 100644
--- a/crates/bevy_state/src/state/transitions.rs
+++ b/crates/bevy_state/src/state/transitions.rs
@@ -67,8 +67,8 @@ pub struct StateTransitionEvent<S: States> {
     pub exited: Option<S>,
     /// The state being entered.
     pub entered: Option<S>,
-    /// Enforce this transition even if `exited` and `entered` are the same
-    pub same_state_enforced: bool,
+    /// Allow running state transition events when `exited` and `entered` are the same
+    pub allow_same_state_transitions: bool,
 }
 
 /// Applies state transitions and runs transitions schedules in order.
@@ -137,7 +137,7 @@ pub(crate) fn internal_apply_state_transition<S: States>(
     mut commands: Commands,
     current_state: Option<ResMut<State<S>>>,
     new_state: Option<S>,
-    same_state_enforced: bool,
+    allow_same_state_transitions: bool,
 ) {
     match new_state {
         Some(entered) => {
@@ -156,7 +156,7 @@ pub(crate) fn internal_apply_state_transition<S: States>(
                     event.write(StateTransitionEvent {
                         exited: Some(exited.clone()),
                         entered: Some(entered.clone()),
-                        same_state_enforced,
+                        allow_same_state_transitions,
                     });
                 }
                 None => {
@@ -166,7 +166,7 @@ pub(crate) fn internal_apply_state_transition<S: States>(
                     event.write(StateTransitionEvent {
                         exited: None,
                         entered: Some(entered.clone()),
-                        same_state_enforced,
+                        allow_same_state_transitions,
                     });
                 }
             };
@@ -179,7 +179,7 @@ pub(crate) fn internal_apply_state_transition<S: States>(
                 event.write(StateTransitionEvent {
                     exited: Some(resource.get().clone()),
                     entered: None,
-                    same_state_enforced,
+                    allow_same_state_transitions,
                 });
             }
         }
@@ -223,7 +223,7 @@ pub(crate) fn run_enter<S: States>(
     let Some(transition) = transition.0 else {
         return;
     };
-    if transition.entered == transition.exited && !transition.same_state_enforced {
+    if transition.entered == transition.exited && !transition.allow_same_state_transitions {
         return;
     }
     let Some(entered) = transition.entered else {
@@ -240,7 +240,7 @@ pub(crate) fn run_exit<S: States>(
     let Some(transition) = transition.0 else {
         return;
     };
-    if transition.entered == transition.exited && !transition.same_state_enforced {
+    if transition.entered == transition.exited && !transition.allow_same_state_transitions {
         return;
     }
     let Some(exited) = transition.exited else {
diff --git a/release-content/migration-guides/same_state_transitions.md b/release-content/migration-guides/same_state_transitions.md
index 1ff1170003104..5ee41128332ac 100644
--- a/release-content/migration-guides/same_state_transitions.md
+++ b/release-content/migration-guides/same_state_transitions.md
@@ -1,13 +1,15 @@
 ---
 title: Same State Transitions
-pull_requests: [19363]
+pull_requests: [19363, 21792]
 ---
 
-It is now possible to change to the same state, triggering state transitions.
+Setting the next state will now always trigger state transitions like `OnEnter` and `OnExit`, even if the state is already the same.
+If you depend on the previous behavior, you can use the `set_if_neq` method instead.
 
 ```rust
-// Before: did nothing if the state was already `State::Menu`
+// 0.17
 next_state.set(State::Menu);
-// After: trigger state transitions even if the state is already `State::Menu`
-next_state.set_forced(State::Menu);
+
+// 0.18
+next_state.set_if_neq(State::Menu);
 ```

From 953a1cd734d56e2125b0e8ee68c492e378b8c052 Mon Sep 17 00:00:00 2001
From: IceSentry <IceSentry@users.noreply.github.com>
Date: Tue, 9 Dec 2025 13:26:13 -0500
Subject: [PATCH 066/133] Use insert_debug_marker instead of debug_group
 (#22079)

# Objective

- wgpu 27 changed debug_group validation which breaks the camera
debug_group

## Solution

- Use insert_debug_marker until we find an alternative to using a
debug_group

## Testing

- I tested my change with the wgpu 27 branch

---

## Showcase

Unfortunately, this means we lose the nice groupings for each camera but
we can still see each marker when a camera is being rendered

<img width="540" height="147" alt="ngfx-ui_0ejTHJqRDH"
src="https://github.com/user-attachments/assets/c5c3f697-fc63-450f-af43-7c6ba3e6e18d"
/>

<img width="548" height="109" alt="ngfx-ui_yCBEtE0i1E"
src="https://github.com/user-attachments/assets/7c29774c-1dda-4ca9-a9e4-37454f33ca04"
/>
---
 crates/bevy_render/src/renderer/graph_runner.rs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/crates/bevy_render/src/renderer/graph_runner.rs b/crates/bevy_render/src/renderer/graph_runner.rs
index c1aa664a07bd4..c54737241cbd1 100644
--- a/crates/bevy_render/src/renderer/graph_runner.rs
+++ b/crates/bevy_render/src/renderer/graph_runner.rs
@@ -127,9 +127,15 @@ impl RenderGraphRunner {
         let _guard = span.enter();
 
         if let Some(debug_group) = debug_group.as_ref() {
+            // wgpu 27 changed the debug_group validation which makes it impossible to have
+            // a debug_group that spans multiple command encoders.
+            //
+            // <https://github.com/gfx-rs/wgpu/pull/8048>
+            //
+            // For now, we use a debug_marker as a workaround
             render_context
                 .command_encoder()
-                .push_debug_group(debug_group);
+                .insert_debug_marker(&format!("Start {debug_group}"));
         }
 
         // Queue up nodes without inputs, which can be run immediately
@@ -275,8 +281,10 @@ impl RenderGraphRunner {
             }
         }
 
-        if debug_group.is_some() {
-            render_context.command_encoder().pop_debug_group();
+        if let Some(debug_group) = debug_group {
+            render_context
+                .command_encoder()
+                .insert_debug_marker(&format!("End {debug_group}"));
         }
 
         Ok(())

From 00f6eb7a1cb44a8e675f37fe901d331818961393 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Tue, 9 Dec 2025 15:08:15 -0800
Subject: [PATCH 067/133] Implement the infrastructure needed to support
 portals and mirrors. (#13797)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Implement the infrastructure needed to support portals and mirrors.

Bevy currently supports multiple cameras and rendering to off-screen
render targets, so one might naïvely think that the engine has support
for portals and mirrors already. However, Bevy is missing two key
features that enable portals and mirrors at present:

1. Bevy has support for neither custom clip planes nor oblique clip
planes. This prevents the construction of proper portals or mirrors, as
meshes that intersect the portal plane must be clipped to render
properly.

2. Bevy has no support for cameras that invert the culling mode, so
meshes that are reflected across a plane will render inside-out.

This PR addresses the two issues above:

1. This commit introduces a new field on `PerspectiveProjection`,
`near_plane`, which allows the application to specify a custom near
plane. That feature fully enables [Lengyel oblique clipping], which is
the most optimal way to achieve a custom near clipping plane. It allows
us to avoid having to support custom clip planes, which are often
implemented inefficiently in hardware.

2. This patch adds a new field on the `Camera` component,
`invert_culling`. This field causes the Bevy renderer to invert the
front face setting when rendering the objects visible from that camera.
When coupled with an appropriately-set [Householder matrix] on the
camera, this allows correct rendering of objects reflected across a
plane.

Additionally, this PR adds a new function to `bevy_math::mat3`,
`reflection_matrix`. This generates the matrix that reflects objects
across a plane, suitable for encoding into a `Transform`. It's fully
documented for ease of use.

Finally, a new example, `mirror`, has been added. This example is a
complete instance of a working mirror, combining a camera with a
Householder matrix, oblique projection, and inverted culling with a
custom material to render an animated mesh and its planar reflection.
The camera and mesh may be moved with the mouse, and the off-screen
render target that stores the rendered contents of the mirror world is
properly resized when the user resizes the window.

[Lengyel oblique clipping]:
https://terathon.com/lengyel/Lengyel-Oblique.pdf

[Householder matrix]:
https://en.wikipedia.org/wiki/Householder_transformation

<img width="2564" height="1500" alt="Screenshot 2025-12-05 212155"
src="https://github.com/user-attachments/assets/35652b58-a9a5-415a-bdff-367889a23b9f"
/>
---
 Cargo.toml                                    |  11 +
 .../screen_space_texture_material.wgsl        |  37 +
 crates/bevy_camera/src/camera.rs              |  10 +
 crates/bevy_camera/src/primitives.rs          |   2 +
 crates/bevy_camera/src/projection.rs          | 110 ++-
 crates/bevy_math/src/lib.rs                   |   2 +
 crates/bevy_math/src/mat3.rs                  |  30 +
 crates/bevy_pbr/src/deferred/mod.rs           |   4 +
 crates/bevy_pbr/src/pbr_material.rs           |  22 +-
 crates/bevy_pbr/src/render/light.rs           |   3 +
 crates/bevy_pbr/src/render/mesh.rs            |   7 +-
 crates/bevy_render/src/camera.rs              |   1 +
 crates/bevy_render/src/view/mod.rs            |  10 +
 crates/bevy_ui_render/src/lib.rs              |   1 +
 examples/3d/mirror.rs                         | 677 ++++++++++++++++++
 examples/README.md                            |   1 +
 examples/math/custom_primitives.rs            |   1 +
 17 files changed, 915 insertions(+), 14 deletions(-)
 create mode 100644 assets/shaders/screen_space_texture_material.wgsl
 create mode 100644 crates/bevy_math/src/mat3.rs
 create mode 100644 examples/3d/mirror.rs

diff --git a/Cargo.toml b/Cargo.toml
index b7ab3efcdbd2a..ce3b87468e628 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4912,3 +4912,14 @@ name = "Clustered Decal Maps"
 description = "Demonstrates normal and metallic-roughness maps of decals"
 category = "3D Rendering"
 wasm = false
+
+[[example]]
+name = "mirror"
+path = "examples/3d/mirror.rs"
+doc-scrape-examples = true
+
+[package.metadata.example.mirror]
+name = "Mirror"
+description = "Demonstrates how to create a mirror with a second camera"
+category = "3D Rendering"
+wasm = true
diff --git a/assets/shaders/screen_space_texture_material.wgsl b/assets/shaders/screen_space_texture_material.wgsl
new file mode 100644
index 0000000000000..141d75639b489
--- /dev/null
+++ b/assets/shaders/screen_space_texture_material.wgsl
@@ -0,0 +1,37 @@
+// A shader that samples its emissive texture at screen space positions rather
+// than UVs.
+//
+// This is used for the mirror example: `examples/3d/mirror.rs`.
+
+#import bevy_pbr::{
+    forward_io::{VertexOutput, FragmentOutput},
+    pbr_bindings::emissive_texture,
+    pbr_fragment::pbr_input_from_standard_material,
+    pbr_functions::{alpha_discard, apply_pbr_lighting, main_pass_post_lighting_processing}
+}
+
+// This is unused, but it's here to satisfy `ExtendedMaterial` requirements.
+// See the comment in `ScreenSpaceTextureExtension` in `examples/3d/mirror.rs`
+// for more information.
+struct ScreenSpaceTextureMaterial {
+    // An unused value.
+    dummy: f32,
+}
+
+@group(#{MATERIAL_BIND_GROUP}) @binding(100) var<uniform> material: ScreenSpaceTextureMaterial;
+
+@fragment
+fn fragment(in: VertexOutput, @builtin(front_facing) is_front: bool) -> FragmentOutput {
+    var pbr_input = pbr_input_from_standard_material(in, is_front);
+
+    // Use zero alpha to avoid multiplying the emissive by the view exposure.
+    pbr_input.material.emissive = vec4(
+        textureLoad(emissive_texture, vec2<i32>(floor(in.position.xy)), 0).rgb,
+        0.0
+    );
+
+    var out: FragmentOutput;
+    out.color = apply_pbr_lighting(pbr_input);
+    out.color = main_pass_post_lighting_processing(pbr_input, out.color);
+    return out;
+}
diff --git a/crates/bevy_camera/src/camera.rs b/crates/bevy_camera/src/camera.rs
index d68f4c29b5bbf..dd5f1019abe6e 100644
--- a/crates/bevy_camera/src/camera.rs
+++ b/crates/bevy_camera/src/camera.rs
@@ -365,6 +365,15 @@ pub struct Camera {
     pub msaa_writeback: MsaaWriteback,
     /// The clear color operation to perform on the render target.
     pub clear_color: ClearColorConfig,
+    /// Whether to switch culling mode so that materials that request backface
+    /// culling cull front faces, and vice versa.
+    ///
+    /// This is typically used for cameras that mirror the world that they
+    /// render across a plane, because doing that flips the winding of each
+    /// polygon.
+    ///
+    /// This setting doesn't affect materials that disable backface culling.
+    pub invert_culling: bool,
     /// If set, this camera will be a sub camera of a large view, defined by a [`SubCameraView`].
     pub sub_camera_view: Option<SubCameraView>,
 }
@@ -380,6 +389,7 @@ impl Default for Camera {
             output_mode: Default::default(),
             msaa_writeback: MsaaWriteback::default(),
             clear_color: Default::default(),
+            invert_culling: false,
             sub_camera_view: None,
         }
     }
diff --git a/crates/bevy_camera/src/primitives.rs b/crates/bevy_camera/src/primitives.rs
index db02eb80f96a5..628371d9bdb55 100644
--- a/crates/bevy_camera/src/primitives.rs
+++ b/crates/bevy_camera/src/primitives.rs
@@ -729,6 +729,7 @@ mod tests {
             aspect_ratio: 1.0,
             near: 1.0,
             far: 100.0,
+            ..PerspectiveProjection::default()
         };
         proj.compute_frustum(&GlobalTransform::from_translation(Vec3::new(2.0, 2.0, 0.0)))
     }
@@ -743,6 +744,7 @@ mod tests {
             near,
             far,
             fov,
+            ..PerspectiveProjection::default()
         };
         proj.compute_frustum(&GlobalTransform::IDENTITY)
     }
diff --git a/crates/bevy_camera/src/projection.rs b/crates/bevy_camera/src/projection.rs
index 12a6dd89e8d15..7fcbb6930b37e 100644
--- a/crates/bevy_camera/src/projection.rs
+++ b/crates/bevy_camera/src/projection.rs
@@ -4,7 +4,7 @@ use core::ops::{Deref, DerefMut};
 use crate::{primitives::Frustum, visibility::VisibilitySystems};
 use bevy_app::{App, Plugin, PostUpdate};
 use bevy_ecs::prelude::*;
-use bevy_math::{ops, AspectRatio, Mat4, Rect, Vec2, Vec3A, Vec4};
+use bevy_math::{ops, vec4, AspectRatio, Mat4, Rect, Vec2, Vec3A, Vec4};
 use bevy_reflect::{std_traits::ReflectDefault, Reflect, ReflectDeserialize, ReflectSerialize};
 use bevy_transform::{components::GlobalTransform, TransformSystems};
 use derive_more::derive::From;
@@ -307,11 +307,38 @@ pub struct PerspectiveProjection {
     ///
     /// Defaults to a value of `1000.0`.
     pub far: f32,
+
+    /// The orientation of a custom clipping plane, as well as its distance from
+    /// the camera.
+    ///
+    /// If you supply a plane here, anything in front of the plane will be
+    /// clipped out. This is useful for portals and mirrors, in order to clip
+    /// any geometry that would pass through the plane of the portal or mirror.
+    ///
+    /// The X, Y, and Z components of the vector describe its normal, in view
+    /// space. This normal vector must have length 1, and it should point away
+    /// from the camera. (That is, only geometry on the side of the plane that
+    /// the normal points toward will be rendered.) The W component of the
+    /// vector must be the *negative shortest signed distance* from the camera
+    /// to the plane, again in view space.  This final component can also be
+    /// computed as -(N ·  Q), where N is the normal of the plane and Q is any
+    /// point on it.
+    ///
+    /// By default, this is (0, 0, -1, -[`Self::near`]), which describes a near
+    /// plane located [`Self::near`] meters away pointing directly away from the
+    /// camera.
+    ///
+    /// See the `calculate_mirror_camera_transform_and_projection` function in
+    /// the `mirror` example for an exhaustive example of usage.
+    pub near_clip_plane: Vec4,
 }
 
 impl CameraProjection for PerspectiveProjection {
     fn get_clip_from_view(&self) -> Mat4 {
-        Mat4::perspective_infinite_reverse_rh(self.fov, self.aspect_ratio, self.near)
+        let mut matrix =
+            Mat4::perspective_infinite_reverse_rh(self.fov, self.aspect_ratio, self.near);
+        self.adjust_perspective_matrix_for_clip_plane(&mut matrix);
+        matrix
     }
 
     fn get_clip_from_view_for_sub(&self, sub_view: &super::SubCameraView) -> Mat4 {
@@ -347,12 +374,15 @@ impl CameraProjection for PerspectiveProjection {
         let a = (right_prime + left_prime) / (right_prime - left_prime);
         let b = (top_prime + bottom_prime) / (top_prime - bottom_prime);
 
-        Mat4::from_cols(
+        let mut matrix = Mat4::from_cols(
             Vec4::new(x, 0.0, 0.0, 0.0),
             Vec4::new(0.0, y, 0.0, 0.0),
             Vec4::new(a, b, 0.0, -1.0),
             Vec4::new(0.0, 0.0, self.near, 0.0),
-        )
+        );
+
+        self.adjust_perspective_matrix_for_clip_plane(&mut matrix);
+        matrix
     }
 
     fn update(&mut self, width: f32, height: f32) {
@@ -391,7 +421,79 @@ impl Default for PerspectiveProjection {
             near: 0.1,
             far: 1000.0,
             aspect_ratio: 1.0,
+            near_clip_plane: vec4(0.0, 0.0, -1.0, -0.1),
+        }
+    }
+}
+
+impl PerspectiveProjection {
+    /// Adjusts the perspective matrix for an oblique clip plane if necessary.
+    ///
+    /// This changes the near and (infinite) far planes so that they correctly
+    /// clip everything in front of the [`Self::near_clip_plane`]. See [Lengyel
+    /// 2005] for an exhaustive treatment of the way this works. Custom near
+    /// clip planes are typically used for portals and mirrors; see
+    /// `examples/3d/mirror.rs` for an example of usage.
+    fn adjust_perspective_matrix_for_clip_plane(&self, matrix: &mut Mat4) {
+        // If we don't have an oblique clip plane, save ourselves the trouble.
+        if self.near_clip_plane == vec4(0.0, 0.0, -1.0, -self.near) {
+            return;
         }
+
+        // To understand this, refer to [Lengyel 2005]. The notation follows the
+        // paper. The formulas are different because the paper uses a standard
+        // OpenGL convention (near -1, far 1), while we use a reversed Vulkan
+        // convention (near 1, far 0).
+        //
+        // [Lengyel 2005]: https://terathon.com/lengyel/Lengyel-Oblique.pdf
+        let c = self.near_clip_plane;
+
+        // First, calculate the position of Q′, the corner in clip space lying
+        // opposite from the near clip plane. This is identical to equation (7).
+        // Note that this is a point at infinity in view space, because we use
+        // an infinite far plane, but in clip space it's finite.
+        let q_prime = vec4(c.x.signum(), c.y.signum(), 0.0, 1.0);
+
+        // Now convert that point to view space. This *will* be a point at
+        // infinity, but that's OK because we're in homogeneous coordinates.
+        let q = matrix.inverse() * q_prime;
+
+        // Here we're computing the scaling factor to apply to the near plane so
+        // that the far plane will intersect Q. This one differs from the paper.
+        // Using the notation Mᵢ to mean the *i*th row of the matrix M, start by
+        // observing that the near plane (z = 1) is described by M₄ - M₃ and the
+        // far plane (z = 0) is described by simply M₃. So:
+        //
+        // * Equation (4) becomes C = M₄ - M₃.
+        // * Equation (5) becomes M′₃ = M₄ - C.
+        // * Equation (6) becomes F = M′₃ = M₄ - C.
+        // * Equation (8) becomes F = M₄ - aC.
+        // * Equation (9) becomes F ·  Q = 0 ⇒ (M₄ - aC) ·  Q = 0.
+        //
+        // And, solving the modified equation (9), we get:
+        //
+        //          M₄ ·  Q
+        //      a = ⎯⎯⎯⎯⎯⎯
+        //           C ·  Q
+        //
+        // Because M₄ = (0, 0, -1, 0) (just as it is in the paper), this reduces to:
+        //
+        //           -Qz
+        //      a = ⎯⎯⎯⎯⎯
+        //          C ·  Q
+        //
+        // Which is what we calculate here.
+        let a = -q.z / c.dot(q);
+
+        // Finally, we have the revised equation (10), which is M′₃ = M₄ - aC.
+        // Similarly to the above, this simplifies to M′₃ = (0, 0, -1, 0) - aC.
+        let m3_prime = Vec4::NEG_Z - c * a;
+
+        // We have the replacement third row; write it in.
+        matrix.x_axis.z = m3_prime.x;
+        matrix.y_axis.z = m3_prime.y;
+        matrix.z_axis.z = m3_prime.z;
+        matrix.w_axis.z = m3_prime.w;
     }
 }
 
diff --git a/crates/bevy_math/src/lib.rs b/crates/bevy_math/src/lib.rs
index cbf861d818870..f49c019bede78 100644
--- a/crates/bevy_math/src/lib.rs
+++ b/crates/bevy_math/src/lib.rs
@@ -35,6 +35,7 @@ pub mod cubic_splines;
 mod direction;
 mod float_ord;
 mod isometry;
+mod mat3;
 pub mod ops;
 pub mod primitives;
 mod ray;
@@ -54,6 +55,7 @@ pub use compass::{CompassOctant, CompassQuadrant};
 pub use direction::*;
 pub use float_ord::*;
 pub use isometry::{Isometry2d, Isometry3d};
+pub use mat3::*;
 pub use ops::FloatPow;
 pub use ray::{Ray2d, Ray3d};
 pub use rects::*;
diff --git a/crates/bevy_math/src/mat3.rs b/crates/bevy_math/src/mat3.rs
new file mode 100644
index 0000000000000..62cd1ee58c7f5
--- /dev/null
+++ b/crates/bevy_math/src/mat3.rs
@@ -0,0 +1,30 @@
+//! Extra utilities for 3×3 matrices.
+
+use glam::{Mat3A, Vec3, Vec3A};
+
+/// Creates a 3×3 matrix that reflects points across the plane at the origin
+/// with the given normal.
+///
+/// This is also known as a [Householder matrix]. It has the general form I -
+/// 2NNᵀ, where N is the normal of the plane and I is the identity matrix.
+///
+/// If the plane across which points are to be reflected isn't at the origin,
+/// you can create a translation matrix that translates the points to the
+/// origin, then apply the matrix that this function returns on top of that, and
+/// finally translate back to the original position.
+///
+/// See the `mirror` example for a demonstration of how you might use this
+/// function.
+///
+/// [Householder matrix]: https://en.wikipedia.org/wiki/Householder_transformation
+#[doc(alias = "householder")]
+pub fn reflection_matrix(plane_normal: Vec3) -> Mat3A {
+    // N times Nᵀ.
+    let n_nt = Mat3A::from_cols(
+        Vec3A::from(plane_normal) * plane_normal.x,
+        Vec3A::from(plane_normal) * plane_normal.y,
+        Vec3A::from(plane_normal) * plane_normal.z,
+    );
+
+    Mat3A::IDENTITY - n_nt * 2.0
+}
diff --git a/crates/bevy_pbr/src/deferred/mod.rs b/crates/bevy_pbr/src/deferred/mod.rs
index 10cd2b9c10074..41766372d9f36 100644
--- a/crates/bevy_pbr/src/deferred/mod.rs
+++ b/crates/bevy_pbr/src/deferred/mod.rs
@@ -501,6 +501,10 @@ pub fn prepare_deferred_lighting_pipelines(
             view_key |= MeshPipelineKey::ATMOSPHERE;
         }
 
+        if view.invert_culling {
+            view_key |= MeshPipelineKey::INVERT_CULLING;
+        }
+
         // Always true, since we're in the deferred lighting pipeline
         view_key |= MeshPipelineKey::DEFERRED_PREPASS;
 
diff --git a/crates/bevy_pbr/src/pbr_material.rs b/crates/bevy_pbr/src/pbr_material.rs
index 2d19f863efc7e..84bfc6ff53b39 100644
--- a/crates/bevy_pbr/src/pbr_material.rs
+++ b/crates/bevy_pbr/src/pbr_material.rs
@@ -1531,15 +1531,19 @@ impl Material for StandardMaterial {
             }
         }
 
-        descriptor.primitive.cull_mode = if key
-            .bind_group_data
-            .contains(StandardMaterialKey::CULL_FRONT)
-        {
-            Some(Face::Front)
-        } else if key.bind_group_data.contains(StandardMaterialKey::CULL_BACK) {
-            Some(Face::Back)
-        } else {
-            None
+        // Generally, we want to cull front faces if `CULL_FRONT` is present and
+        // backfaces if `CULL_BACK` is present. However, if the view has
+        // `INVERT_CULLING` on (usually used for mirrors and the like), we do
+        // the opposite.
+        descriptor.primitive.cull_mode = match (
+            key.bind_group_data
+                .contains(StandardMaterialKey::CULL_FRONT),
+            key.bind_group_data.contains(StandardMaterialKey::CULL_BACK),
+            key.mesh_key.contains(MeshPipelineKey::INVERT_CULLING),
+        ) {
+            (true, false, false) | (false, true, true) => Some(Face::Front),
+            (false, true, false) | (true, false, true) => Some(Face::Back),
+            _ => None,
         };
 
         if let Some(label) = &mut descriptor.label {
diff --git a/crates/bevy_pbr/src/render/light.rs b/crates/bevy_pbr/src/render/light.rs
index f6640a63985e7..9c95f0711493d 100644
--- a/crates/bevy_pbr/src/render/light.rs
+++ b/crates/bevy_pbr/src/render/light.rs
@@ -1344,6 +1344,7 @@ pub fn prepare_lights(
                         clip_from_view: cube_face_projection,
                         hdr: false,
                         color_grading: Default::default(),
+                        invert_culling: false,
                     },
                     *frustum,
                     LightEntity::Point {
@@ -1446,6 +1447,7 @@ pub fn prepare_lights(
                     clip_from_world: None,
                     hdr: false,
                     color_grading: Default::default(),
+                    invert_culling: false,
                 },
                 *spot_light_frustum.unwrap(),
                 LightEntity::Spot { light_entity },
@@ -1594,6 +1596,7 @@ pub fn prepare_lights(
                         clip_from_world: Some(cascade.clip_from_world),
                         hdr: false,
                         color_grading: Default::default(),
+                        invert_culling: false,
                     },
                     frustum,
                     LightEntity::Directional {
diff --git a/crates/bevy_pbr/src/render/mesh.rs b/crates/bevy_pbr/src/render/mesh.rs
index 6e4b3b8aebd8d..013849e8ee8d2 100644
--- a/crates/bevy_pbr/src/render/mesh.rs
+++ b/crates/bevy_pbr/src/render/mesh.rs
@@ -389,6 +389,10 @@ pub fn check_views_need_specialization(
             view_key |= MeshPipelineKey::ATMOSPHERE;
         }
 
+        if view.invert_culling {
+            view_key |= MeshPipelineKey::INVERT_CULLING;
+        }
+
         if let Some(projection) = projection {
             view_key |= match projection {
                 Projection::Perspective(_) => MeshPipelineKey::VIEW_PROJECTION_PERSPECTIVE,
@@ -2101,7 +2105,8 @@ bitflags::bitflags! {
         const OIT_ENABLED                       = 1 << 20;
         const DISTANCE_FOG                      = 1 << 21;
         const ATMOSPHERE                        = 1 << 22;
-        const LAST_FLAG                         = Self::ATMOSPHERE.bits();
+        const INVERT_CULLING                    = 1 << 23;
+        const LAST_FLAG                         = Self::INVERT_CULLING.bits();
 
         // Bitfields
         const MSAA_RESERVED_BITS                = Self::MSAA_MASK_BITS << Self::MSAA_SHIFT_BITS;
diff --git a/crates/bevy_render/src/camera.rs b/crates/bevy_render/src/camera.rs
index 41a5cd99d5d37..5c9cf002c2c07 100644
--- a/crates/bevy_render/src/camera.rs
+++ b/crates/bevy_render/src/camera.rs
@@ -552,6 +552,7 @@ pub fn extract_cameras(
                         viewport_size.y,
                     ),
                     color_grading,
+                    invert_culling: camera.invert_culling,
                 },
                 render_visible_entities,
                 *frustum,
diff --git a/crates/bevy_render/src/view/mod.rs b/crates/bevy_render/src/view/mod.rs
index 3c105a5774250..cc39266a6ddec 100644
--- a/crates/bevy_render/src/view/mod.rs
+++ b/crates/bevy_render/src/view/mod.rs
@@ -302,6 +302,16 @@ pub struct ExtractedView {
     // uvec4(origin.x, origin.y, width, height)
     pub viewport: UVec4,
     pub color_grading: ColorGrading,
+
+    /// Whether to switch culling mode so that materials that request backface
+    /// culling cull front faces, and vice versa.
+    ///
+    /// This is typically used for cameras that mirror the world that they
+    /// render across a plane, because doing that flips the winding of each
+    /// polygon.
+    ///
+    /// This setting doesn't affect materials that disable backface culling.
+    pub invert_culling: bool,
 }
 
 impl ExtractedView {
diff --git a/crates/bevy_ui_render/src/lib.rs b/crates/bevy_ui_render/src/lib.rs
index c385bca66d35d..c79c8c43e405d 100644
--- a/crates/bevy_ui_render/src/lib.rs
+++ b/crates/bevy_ui_render/src/lib.rs
@@ -808,6 +808,7 @@ pub fn extract_ui_camera_view(
                             physical_viewport_rect.size(),
                         )),
                         color_grading: Default::default(),
+                        invert_culling: false,
                     },
                     // Link to the main camera view.
                     UiViewTarget(render_entity),
diff --git a/examples/3d/mirror.rs b/examples/3d/mirror.rs
new file mode 100644
index 0000000000000..b6d0cf8cebadf
--- /dev/null
+++ b/examples/3d/mirror.rs
@@ -0,0 +1,677 @@
+//! Demonstrates how to create a mirror with a second camera.
+
+use std::f32::consts::FRAC_PI_2;
+
+use bevy::{
+    asset::RenderAssetUsages,
+    color::palettes::css::GREEN,
+    input::mouse::AccumulatedMouseMotion,
+    math::{reflection_matrix, uvec2, vec3},
+    pbr::{ExtendedMaterial, MaterialExtension},
+    prelude::*,
+    render::render_resource::{
+        AsBindGroup, Extent3d, TextureDimension, TextureFormat, TextureUsages,
+    },
+    shader::ShaderRef,
+    window::{PrimaryWindow, WindowResized},
+};
+
+use crate::widgets::{RadioButton, WidgetClickEvent, WidgetClickSender};
+
+#[path = "../helpers/widgets.rs"]
+mod widgets;
+
+/// A resource that stores a handle to the image that contains the rendered
+/// mirror world.
+#[derive(Resource)]
+struct MirrorImage(Handle<Image>);
+
+/// A marker component for the camera that renders the mirror world.
+#[derive(Component)]
+struct MirrorCamera;
+
+/// A marker component for the mirror mesh itself.
+#[derive(Component)]
+struct Mirror;
+
+/// The dummy material extension that we use for the mirror surface.
+///
+/// This shader samples its emissive texture at the screen space position of
+/// each fragment rather than at the UVs. Effectively, this uses a PBR shader as
+/// a mask that copies a portion of the emissive texture to the screen, all in
+/// screen space.
+///
+/// We use [`ExtendedMaterial`], as that's the easiest way to implement custom
+/// shaders that modify the built-in [`StandardMaterial`]. We don't require any
+/// extra data to be passed to the shader beyond the [`StandardMaterial`] PBR
+/// fields, but currently Bevy requires at least one field to be present in the
+/// extended material, so we simply have an unused field.
+#[derive(Clone, AsBindGroup, Asset, Reflect)]
+struct ScreenSpaceTextureExtension {
+    /// An unused value that we have just to satisfy [`ExtendedMaterial`]
+    /// requirements.
+    #[uniform(100)]
+    dummy: f32,
+}
+
+impl MaterialExtension for ScreenSpaceTextureExtension {
+    fn fragment_shader() -> ShaderRef {
+        "shaders/screen_space_texture_material.wgsl".into()
+    }
+}
+
+/// The action that will be performed when the user drags the mouse: either
+/// moving the camera or moving the rigged model.
+#[derive(Clone, Copy, PartialEq, Default)]
+enum DragAction {
+    /// Dragging will move the camera.
+    #[default]
+    MoveCamera,
+    /// Dragging will move the animated fox.
+    MoveFox,
+}
+
+/// The settings that the user has currently chosen.
+///
+/// Currently, this just consists of the [`DragAction`].
+#[derive(Resource, Default)]
+struct AppStatus {
+    /// The action that will be performed when the user drags the mouse: either
+    /// moving the camera or moving the rigged model.
+    drag_action: DragAction,
+}
+
+/// A marker component for the help text at the top of the screen.
+#[derive(Clone, Copy, Component)]
+struct HelpText;
+
+/// The coordinates that the camera looks at.
+const CAMERA_TARGET: Vec3 = vec3(-25.0, 20.0, 0.0);
+/// The camera stays this distance in meters from the camera target.
+const CAMERA_ORBIT_DISTANCE: f32 = 500.0;
+/// The speed at which the user can move the camera vertically, in radians per
+/// mouse input unit.
+const CAMERA_PITCH_SPEED: f32 = 0.003;
+/// The speed at which the user can move the camera horizontally, in radians per
+/// mouse input unit.
+const CAMERA_YAW_SPEED: f32 = 0.004;
+// Limiting pitch stops some unexpected rotation past 90° up or down.
+const CAMERA_PITCH_LIMIT: f32 = FRAC_PI_2 - 0.01;
+
+/// The angle that the mirror faces.
+///
+/// The mirror is rotated across the X axis in this many radians.
+const MIRROR_ROTATION_ANGLE: f32 = -FRAC_PI_2;
+const MIRROR_POSITION: Vec3 = vec3(-25.0, 75.0, 0.0);
+
+/// The path to the animated fox model.
+static FOX_ASSET_PATH: &str = "models/animated/Fox.glb";
+
+/// The app entry point.
+fn main() {
+    App::new()
+        .add_plugins(DefaultPlugins.set(WindowPlugin {
+            primary_window: Some(Window {
+                title: "Bevy Mirror Example".into(),
+                ..default()
+            }),
+            ..default()
+        }))
+        .add_plugins(MaterialPlugin::<
+            ExtendedMaterial<StandardMaterial, ScreenSpaceTextureExtension>,
+        >::default())
+        .init_resource::<AppStatus>()
+        .add_message::<WidgetClickEvent<DragAction>>()
+        .add_systems(Startup, setup)
+        .add_systems(Update, handle_window_resize_messages)
+        .add_systems(Update, (move_camera_on_mouse_down, move_fox_on_mouse_down))
+        .add_systems(Update, widgets::handle_ui_interactions::<DragAction>)
+        .add_systems(
+            Update,
+            (handle_mouse_action_change, update_radio_buttons)
+                .after(widgets::handle_ui_interactions::<DragAction>),
+        )
+        .add_systems(
+            Update,
+            update_mirror_camera_on_main_camera_transform_change.after(move_camera_on_mouse_down),
+        )
+        .add_systems(Update, play_fox_animation)
+        .add_systems(Update, update_help_text)
+        .run();
+}
+
+/// A startup system that spawns the scene and sets up the mirror render target.
+fn setup(
+    mut commands: Commands,
+    windows_query: Query<&Window>,
+    asset_server: Res<AssetServer>,
+    mut meshes: ResMut<Assets<Mesh>>,
+    mut standard_materials: ResMut<Assets<StandardMaterial>>,
+    mut screen_space_texture_materials: ResMut<
+        Assets<ExtendedMaterial<StandardMaterial, ScreenSpaceTextureExtension>>,
+    >,
+    mut images: ResMut<Assets<Image>>,
+    app_status: Res<AppStatus>,
+) {
+    // Spawn the main camera.
+    let camera_projection = PerspectiveProjection::default();
+    let camera_transform = spawn_main_camera(&mut commands, &camera_projection);
+
+    // Spawn the light.
+    spawn_light(&mut commands);
+
+    // Spawn the objects reflected in the mirror.
+    spawn_ground_plane(&mut commands, &mut meshes, &mut standard_materials);
+    spawn_fox(&mut commands, &asset_server);
+
+    // Spawn the mirror and associated camera.
+    let mirror_render_target_image =
+        create_mirror_texture_resource(&mut commands, &windows_query, &mut images);
+    let mirror_transform = spawn_mirror(
+        &mut commands,
+        &mut meshes,
+        &mut screen_space_texture_materials,
+        mirror_render_target_image.clone(),
+    );
+    spawn_mirror_camera(
+        &mut commands,
+        &camera_transform,
+        &camera_projection,
+        &mirror_transform,
+        mirror_render_target_image,
+    );
+
+    // Spawn the UI.
+    spawn_buttons(&mut commands);
+    spawn_help_text(&mut commands, &app_status);
+}
+
+/// Spawns the main camera (not the mirror camera).
+fn spawn_main_camera(
+    commands: &mut Commands,
+    camera_projection: &PerspectiveProjection,
+) -> Transform {
+    let camera_transform = Transform::from_translation(
+        vec3(-2.0, 1.0, -2.0).normalize_or_zero() * CAMERA_ORBIT_DISTANCE,
+    )
+    .looking_at(CAMERA_TARGET, Vec3::Y);
+
+    commands.spawn((
+        Camera3d::default(),
+        camera_transform,
+        Projection::Perspective(camera_projection.clone()),
+    ));
+
+    camera_transform
+}
+
+/// Spawns a directional light to illuminate the scene.
+fn spawn_light(commands: &mut Commands) {
+    commands.spawn((
+        DirectionalLight {
+            illuminance: 5000.0,
+            ..default()
+        },
+        Transform::from_xyz(-85.0, 16.0, -200.0).looking_at(vec3(-50.0, 0.0, 100.0), Vec3::Y),
+    ));
+}
+
+/// Spawns the circular ground plane object.
+fn spawn_ground_plane(
+    commands: &mut Commands,
+    meshes: &mut Assets<Mesh>,
+    standard_materials: &mut Assets<StandardMaterial>,
+) {
+    commands.spawn((
+        Mesh3d(meshes.add(Circle::new(200.0))),
+        MeshMaterial3d(standard_materials.add(Color::from(GREEN))),
+        Transform::from_rotation(Quat::from_rotation_x(-FRAC_PI_2))
+            .with_translation(vec3(-25.0, 0.0, 0.0)),
+    ));
+}
+
+/// Creates the initial image that the mirror camera will render the mirror
+/// world to.
+fn create_mirror_texture_resource(
+    commands: &mut Commands,
+    windows_query: &Query<&Window>,
+    images: &mut Assets<Image>,
+) -> Handle<Image> {
+    let window = windows_query.iter().next().expect("No window found");
+    let window_size = uvec2(window.physical_width(), window.physical_height());
+    let image = create_mirror_texture_image(images, window_size);
+    commands.insert_resource(MirrorImage(image.clone()));
+    image
+}
+
+/// Spawns the camera that renders the mirror world.
+fn spawn_mirror_camera(
+    commands: &mut Commands,
+    camera_transform: &Transform,
+    camera_projection: &PerspectiveProjection,
+    mirror_transform: &Transform,
+    mirror_render_target: Handle<Image>,
+) {
+    let (mirror_camera_transform, mirror_camera_projection) =
+        calculate_mirror_camera_transform_and_projection(
+            camera_transform,
+            camera_projection,
+            mirror_transform,
+        );
+
+    commands.spawn((
+        Camera3d::default(),
+        Camera {
+            order: -1,
+            target: mirror_render_target.clone().into(),
+            // Reflecting the model across the mirror will flip the winding of
+            // all the polygons. Therefore, in order to properly backface cull,
+            // we need to turn on `invert_culling`.
+            invert_culling: true,
+            ..default()
+        },
+        mirror_camera_transform,
+        Projection::Perspective(mirror_camera_projection),
+        MirrorCamera,
+    ));
+}
+
+/// Spawns the animated fox.
+///
+/// Note that this doesn't play the animation; that's handled in
+/// [`play_fox_animation`].
+fn spawn_fox(commands: &mut Commands, asset_server: &AssetServer) {
+    commands.spawn((
+        SceneRoot(asset_server.load(GltfAssetLabel::Scene(0).from_asset(FOX_ASSET_PATH))),
+        Transform::from_xyz(-50.0, 0.0, -100.0),
+    ));
+}
+
+/// Spawns the mirror plane mesh and returns its transform.
+fn spawn_mirror(
+    commands: &mut Commands,
+    meshes: &mut Assets<Mesh>,
+    screen_space_texture_materials: &mut Assets<
+        ExtendedMaterial<StandardMaterial, ScreenSpaceTextureExtension>,
+    >,
+    mirror_render_target: Handle<Image>,
+) -> Transform {
+    let mirror_transform = Transform::from_scale(vec3(300.0, 1.0, 150.0))
+        .with_rotation(Quat::from_rotation_x(MIRROR_ROTATION_ANGLE))
+        .with_translation(MIRROR_POSITION);
+
+    commands.spawn((
+        Mesh3d(meshes.add(Plane3d::default().mesh().size(1.0, 1.0))),
+        MeshMaterial3d(screen_space_texture_materials.add(ExtendedMaterial {
+            base: StandardMaterial {
+                base_color: Color::BLACK,
+                emissive: Color::WHITE.into(),
+                emissive_texture: Some(mirror_render_target),
+                perceptual_roughness: 0.0,
+                metallic: 1.0,
+                ..default()
+            },
+            extension: ScreenSpaceTextureExtension { dummy: 0.0 },
+        })),
+        mirror_transform,
+        Mirror,
+    ));
+
+    mirror_transform
+}
+
+/// Spawns the buttons at the bottom of the screen.
+fn spawn_buttons(commands: &mut Commands) {
+    // Spawn the radio buttons that allow the user to select an object to
+    // control.
+    commands.spawn((
+        widgets::main_ui_node(),
+        children![widgets::option_buttons(
+            "Drag Action",
+            &[
+                (DragAction::MoveCamera, "Move Camera"),
+                (DragAction::MoveFox, "Move Fox"),
+            ],
+        )],
+    ));
+}
+
+/// Given the transform and projection of the main camera, returns an
+/// appropriate transform and projection for the mirror camera.
+fn calculate_mirror_camera_transform_and_projection(
+    main_camera_transform: &Transform,
+    main_camera_projection: &PerspectiveProjection,
+    mirror_transform: &Transform,
+) -> (Transform, PerspectiveProjection) {
+    // Calculate the reflection matrix (a.k.a. Householder matrix) that will
+    // reflect the scene across the mirror plane.
+    //
+    // Note that you must calculate this in *matrix* form and only *afterward*
+    // convert to a `Transform` instead of composing `Transform`s. This is
+    // because the reflection matrix has non-uniform scale, and composing
+    // transforms can't always handle composition of matrices with non-uniform
+    // scales.
+    let mirror_camera_transform = Transform::from_matrix(
+        Mat4::from_mat3a(reflection_matrix(Vec3::NEG_Z)) * main_camera_transform.to_matrix(),
+    );
+
+    // Compute the distance from the camera to the mirror plane. This will be
+    // used to calculate the distance to the near clip plane for the mirror
+    // world.
+    let distance_from_camera_to_mirror = InfinitePlane3d::new(mirror_transform.rotation * Vec3::Y)
+        .signed_distance(
+            Isometry3d::IDENTITY,
+            mirror_transform.translation - main_camera_transform.translation,
+        );
+
+    // Compute the normal of the mirror plane in view space.
+    let view_from_world = main_camera_transform.compute_affine().matrix3.inverse();
+    let mirror_projection_plane_normal =
+        (view_from_world * (mirror_transform.rotation * Vec3::NEG_Y)).normalize();
+
+    // Compute the final projection. It should match the main camera projection,
+    // except that `near` and `near_normal` should be set to the updated near
+    // plane and near normal plane as above.
+    let mirror_camera_projection = PerspectiveProjection {
+        near_clip_plane: mirror_projection_plane_normal.extend(distance_from_camera_to_mirror),
+        ..*main_camera_projection
+    };
+
+    (mirror_camera_transform, mirror_camera_projection)
+}
+
+/// A system that resizes the render target image when the user resizes the window.
+///
+/// Since the image that stores the rendered mirror world has the same physical
+/// size as the window, we need to reallocate it and reattach it to the mirror
+/// material whenever the window size changes.
+fn handle_window_resize_messages(
+    windows_query: Query<&Window>,
+    mut mirror_cameras_query: Query<&mut Camera, With<MirrorCamera>>,
+    mut images: ResMut<Assets<Image>>,
+    mut mirror_image: ResMut<MirrorImage>,
+    mut screen_space_texture_materials: ResMut<
+        Assets<ExtendedMaterial<StandardMaterial, ScreenSpaceTextureExtension>>,
+    >,
+    mut resize_messages: MessageReader<WindowResized>,
+) {
+    // We run at most once, regardless of the number of window resize messages
+    // there were this frame.
+    let Some(resize_message) = resize_messages.read().next() else {
+        return;
+    };
+    let Ok(window) = windows_query.get(resize_message.window) else {
+        return;
+    };
+
+    let window_size = uvec2(window.physical_width(), window.physical_height());
+    let image = create_mirror_texture_image(&mut images, window_size);
+    images.remove(mirror_image.0.id());
+
+    mirror_image.0 = image.clone();
+
+    for mut mirror_camera in mirror_cameras_query.iter_mut() {
+        mirror_camera.target = image.clone().into();
+    }
+
+    for (_, material) in screen_space_texture_materials.iter_mut() {
+        material.base.emissive_texture = Some(image.clone());
+    }
+}
+
+/// Creates the image that will be used to store the reflected scene.
+fn create_mirror_texture_image(images: &mut Assets<Image>, window_size: UVec2) -> Handle<Image> {
+    let mirror_image_extent = Extent3d {
+        width: window_size.x,
+        height: window_size.y,
+        depth_or_array_layers: 1,
+    };
+
+    let mut image = Image::new_uninit(
+        mirror_image_extent,
+        TextureDimension::D2,
+        TextureFormat::Bgra8UnormSrgb,
+        RenderAssetUsages::MAIN_WORLD | RenderAssetUsages::RENDER_WORLD,
+    );
+    image.texture_descriptor.usage |=
+        TextureUsages::TEXTURE_BINDING | TextureUsages::COPY_DST | TextureUsages::RENDER_ATTACHMENT;
+
+    images.add(image)
+}
+
+// Moves the fox when the user moves the mouse with the left button down.
+fn move_fox_on_mouse_down(
+    mut scene_roots_query: Query<&mut Transform, With<SceneRoot>>,
+    windows_query: Query<&Window, With<PrimaryWindow>>,
+    cameras_query: Query<(&Camera, &GlobalTransform)>,
+    interactions_query: Query<&Interaction, With<RadioButton>>,
+    buttons: Res<ButtonInput<MouseButton>>,
+    app_status: Res<AppStatus>,
+) {
+    // Only process the mouse motion if the left mouse button is pressed, the
+    // mouse action is set to move the fox, and the pointer isn't over a UI
+    // widget.
+    if app_status.drag_action != DragAction::MoveFox
+        || !buttons.pressed(MouseButton::Left)
+        || interactions_query
+            .iter()
+            .any(|interaction| *interaction != Interaction::None)
+    {
+        return;
+    }
+
+    // Find out where the user clicked the mouse.
+    let Some(mouse_position) = windows_query
+        .iter()
+        .next()
+        .and_then(Window::cursor_position)
+    else {
+        return;
+    };
+
+    // Grab the camera.
+    let Some((camera, camera_transform)) = cameras_query.iter().next() else {
+        return;
+    };
+
+    // Figure out where the user clicked on the plane.
+    let Ok(ray) = camera.viewport_to_world(camera_transform, mouse_position) else {
+        return;
+    };
+    let Some(ray_distance) = ray.intersect_plane(Vec3::ZERO, InfinitePlane3d::new(Vec3::Y)) else {
+        return;
+    };
+    let plane_intersection = ray.origin + ray.direction.normalize() * ray_distance;
+
+    // Move the fox.
+    for mut transform in scene_roots_query.iter_mut() {
+        transform.translation = transform.translation.with_xz(plane_intersection.xz());
+    }
+}
+
+/// A system that changes the drag action when the user clicks on one of the
+/// radio buttons.
+fn handle_mouse_action_change(
+    mut app_status: ResMut<AppStatus>,
+    mut messages: MessageReader<WidgetClickEvent<DragAction>>,
+) {
+    for message in messages.read() {
+        app_status.drag_action = **message;
+    }
+}
+
+/// A system that updates the radio buttons at the bottom of the screen to
+/// reflect the current drag action.
+fn update_radio_buttons(
+    mut widgets_query: Query<(
+        Entity,
+        Option<&mut BackgroundColor>,
+        Has<Text>,
+        &WidgetClickSender<DragAction>,
+    )>,
+    app_status: Res<AppStatus>,
+    mut text_ui_writer: TextUiWriter,
+) {
+    for (entity, maybe_bg_color, has_text, sender) in &mut widgets_query {
+        let selected = app_status.drag_action == **sender;
+        if let Some(mut bg_color) = maybe_bg_color {
+            widgets::update_ui_radio_button(&mut bg_color, selected);
+        }
+        if has_text {
+            widgets::update_ui_radio_button_text(entity, &mut text_ui_writer, selected);
+        }
+    }
+}
+
+/// A system that processes user mouse actions that move the camera.
+///
+/// This is mostly copied from `examples/camera/camera_orbit.rs`.
+fn move_camera_on_mouse_down(
+    mut main_cameras_query: Query<&mut Transform, (With<Camera>, Without<MirrorCamera>)>,
+    interactions_query: Query<&Interaction, With<RadioButton>>,
+    mouse_buttons: Res<ButtonInput<MouseButton>>,
+    mouse_motion: Res<AccumulatedMouseMotion>,
+    app_status: Res<AppStatus>,
+) {
+    // Only process the mouse motion if the left mouse button is pressed, the
+    // mouse action is set to move the fox, and the pointer isn't over a UI
+    // widget.
+    if app_status.drag_action != DragAction::MoveCamera
+        || !mouse_buttons.pressed(MouseButton::Left)
+        || interactions_query
+            .iter()
+            .any(|interaction| *interaction != Interaction::None)
+    {
+        return;
+    }
+
+    let delta = mouse_motion.delta;
+
+    // Mouse motion is one of the few inputs that should not be multiplied by delta time,
+    // as we are already receiving the full movement since the last frame was rendered. Multiplying
+    // by delta time here would make the movement slower that it should be.
+    let delta_pitch = delta.y * CAMERA_PITCH_SPEED;
+    let delta_yaw = delta.x * CAMERA_YAW_SPEED;
+
+    for mut main_camera_transform in &mut main_cameras_query {
+        // Obtain the existing pitch and yaw values from the transform.
+        let (yaw, pitch, _) = main_camera_transform.rotation.to_euler(EulerRot::YXZ);
+
+        // Establish the new yaw and pitch, preventing the pitch value from exceeding our limits.
+        let pitch = (pitch + delta_pitch).clamp(-CAMERA_PITCH_LIMIT, CAMERA_PITCH_LIMIT);
+        let yaw = yaw + delta_yaw;
+        main_camera_transform.rotation = Quat::from_euler(EulerRot::YXZ, yaw, pitch, 0.0);
+
+        // Adjust the translation to maintain the correct orientation toward the orbit target.
+        // In our example it's a static target, but this could easily be customized.
+        let target = Vec3::ZERO;
+        main_camera_transform.translation =
+            target - main_camera_transform.forward() * CAMERA_ORBIT_DISTANCE;
+    }
+}
+
+/// Updates the position, rotation, and projection of the mirror camera when the
+/// main camera is moved.
+///
+/// When the main camera is moved, the mirror camera must be moved to match it.
+/// The *projection* on the mirror camera must also be altered, because the
+/// projection takes the view-space rotation of and distance to the mirror into
+/// account.
+fn update_mirror_camera_on_main_camera_transform_change(
+    main_cameras_query: Query<
+        (&Transform, &Projection),
+        (Changed<Transform>, With<Camera>, Without<MirrorCamera>),
+    >,
+    mut mirror_cameras_query: Query<
+        (&mut Transform, &mut Projection),
+        (With<Camera>, With<MirrorCamera>, Without<Mirror>),
+    >,
+    mirrors_query: Query<&Transform, (Without<MirrorCamera>, With<Mirror>)>,
+) {
+    let Some((main_camera_transform, Projection::Perspective(main_camera_projection))) =
+        main_cameras_query.iter().next()
+    else {
+        return;
+    };
+
+    let Some(mirror_transform) = mirrors_query.iter().next() else {
+        return;
+    };
+
+    // Here we need the transforms of both the camera and the mirror in order to
+    // properly calculate the new projection.
+    let (new_mirror_camera_transform, new_mirror_camera_projection) =
+        calculate_mirror_camera_transform_and_projection(
+            main_camera_transform,
+            main_camera_projection,
+            mirror_transform,
+        );
+
+    for (mut mirror_camera_transform, mut mirror_camera_projection) in &mut mirror_cameras_query {
+        *mirror_camera_transform = new_mirror_camera_transform;
+        *mirror_camera_projection = Projection::Perspective(new_mirror_camera_projection.clone());
+    }
+}
+
+/// Plays the initial animation on the fox model.
+fn play_fox_animation(
+    mut commands: Commands,
+    mut animation_players_query: Query<
+        (Entity, &mut AnimationPlayer),
+        Without<AnimationGraphHandle>,
+    >,
+    asset_server: Res<AssetServer>,
+    mut animation_graphs: ResMut<Assets<AnimationGraph>>,
+) {
+    // Only pick up animation players that don't already have an animation graph
+    // handle.
+    // This ensures that we only start playing the animation once.
+    if animation_players_query.is_empty() {
+        return;
+    }
+
+    let fox_animation = asset_server.load(GltfAssetLabel::Animation(0).from_asset(FOX_ASSET_PATH));
+    let (fox_animation_graph, fox_animation_node) =
+        AnimationGraph::from_clip(fox_animation.clone());
+    let fox_animation_graph = animation_graphs.add(fox_animation_graph);
+
+    for (entity, mut animation_player) in animation_players_query.iter_mut() {
+        commands
+            .entity(entity)
+            .insert(AnimationGraphHandle(fox_animation_graph.clone()));
+        animation_player.play(fox_animation_node).repeat();
+    }
+}
+
+/// Spawns the help text at the top of the screen.
+fn spawn_help_text(commands: &mut Commands, app_status: &AppStatus) {
+    commands.spawn((
+        Text::new(create_help_string(app_status)),
+        Node {
+            position_type: PositionType::Absolute,
+            top: px(12),
+            left: px(12),
+            ..default()
+        },
+        HelpText,
+    ));
+}
+
+/// Creates the help string at the top left of the screen.
+fn create_help_string(app_status: &AppStatus) -> String {
+    format!(
+        "Click and drag to move the {}",
+        match app_status.drag_action {
+            DragAction::MoveCamera => "camera",
+            DragAction::MoveFox => "fox",
+        }
+    )
+}
+
+/// Updates the help text in the top left of the screen to reflect the current
+/// drag mode.
+fn update_help_text(mut help_text: Query<&mut Text, With<HelpText>>, app_status: Res<AppStatus>) {
+    for mut text in &mut help_text {
+        text.0 = create_help_string(&app_status);
+    }
+}
diff --git a/examples/README.md b/examples/README.md
index 5e405d346f0cf..324fac7163be3 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -168,6 +168,7 @@ Example | Description
 [Lines](../examples/3d/lines.rs) | Create a custom material to draw 3d lines
 [Mesh Ray Cast](../examples/3d/mesh_ray_cast.rs) | Demonstrates ray casting with the `MeshRayCast` system parameter
 [Meshlet](../examples/3d/meshlet.rs) | Meshlet rendering for dense high-poly scenes (experimental)
+[Mirror](../examples/3d/mirror.rs) | Demonstrates how to create a mirror with a second camera
 [Mixed lighting](../examples/3d/mixed_lighting.rs) | Demonstrates how to combine baked and dynamic lighting
 [Motion Blur](../examples/3d/motion_blur.rs) | Demonstrates per-pixel motion blur
 [Occlusion Culling](../examples/3d/occlusion_culling.rs) | Demonstration of Occlusion Culling
diff --git a/examples/math/custom_primitives.rs b/examples/math/custom_primitives.rs
index a7e5777dfd21c..ba2976d7a8472 100644
--- a/examples/math/custom_primitives.rs
+++ b/examples/math/custom_primitives.rs
@@ -70,6 +70,7 @@ const PROJECTION_3D: Projection = Projection::Perspective(PerspectiveProjection
     near: 0.1,
     far: 1000.0,
     aspect_ratio: 1.0,
+    near_clip_plane: vec4(0.0, 0.0, -1.0, -0.1),
 });
 
 /// State for tracking the currently displayed shape

From fe6e04ff2cef94806fbc487109306be368c06eb5 Mon Sep 17 00:00:00 2001
From: bloopyboop <186878072+bloopyboop@users.noreply.github.com>
Date: Wed, 10 Dec 2025 00:23:22 +0100
Subject: [PATCH 068/133] Use RayMap and RenderLayers in
 bevy_sprite/picking_backend (#21959)

# Credit
- @bytemunch for the original PR and the brunt of the work
- @akimakinai for reviewing and introducing an important change to the
RenderLayers logic

# Objective

- Adoption of the PR found
[here](https://github.com/bevyengine/bevy/pull/18069) (as was
recommended to me on the bevy discord)
- I upgraded the changes proposed there to work with bevy/main
- This likely fixes a bunch of unintuitive picking behavior around
Viewports and RenderLayers. See the original PR for details.

## Solution

- Rewrote parts of `bevy_sprite/picking_backend.rs`. It now iterates
over bevy_picking's `RayMap` to generate `PointerHit`s for each viable
`Camera`, rather than just the first viable `Camera` found.
- Introduced checking if the `Camera`'s and `Sprite`'s `RenderLayers`
intersect before generating a hit.

## Testing

- I tested it with my own game, running on bevy 0.17.3
- I don't expect the behavior to be different for a game built with
bevy/main, as it's just the picking backend. However, that is still open
for testing.

## What reviewers can test
- Before this change, `PointerHit`s would not generate on viewports of
higher order, if their area overlapped with a viewport of lower order.
For example, if you had a `Camera` render to the entire window, and then
a second `Camera` render a smaller viewport on top, the smaller viewport
would not detect `PointerHit`s. This should be fixed now.
- Before this change, a `Camera` not on the default `RenderLayers`
layer, would generate and consume `PointerHit`s, even if it did not
share any layers with the picked `Sprite`s. This could also block
`Sprite`s from being picked at all. This should be fixed now.

## Extra note
The behavior of the picking backend is now to produce `PointerHit`s for
each viable viewport under the cursor. This can lead to the unintuitive
result, that you can pick a `Sprite` you can not see, due to being
obscured by another viewport.
I have a solution for this and it would be a flag in
`SpritePickingSettings`. Should I open a new PR for this or enter a
discussion?
---
 crates/bevy_sprite/src/picking_backend.rs | 265 ++++++++++++----------
 1 file changed, 150 insertions(+), 115 deletions(-)

diff --git a/crates/bevy_sprite/src/picking_backend.rs b/crates/bevy_sprite/src/picking_backend.rs
index e861fe10907ad..9dbd3ac2d413a 100644
--- a/crates/bevy_sprite/src/picking_backend.rs
+++ b/crates/bevy_sprite/src/picking_backend.rs
@@ -13,7 +13,10 @@
 use crate::{Anchor, Sprite};
 use bevy_app::prelude::*;
 use bevy_asset::prelude::*;
-use bevy_camera::{visibility::ViewVisibility, Camera, Projection};
+use bevy_camera::{
+    visibility::{RenderLayers, ViewVisibility},
+    Camera, Projection,
+};
 use bevy_color::Alpha;
 use bevy_ecs::prelude::*;
 use bevy_image::prelude::*;
@@ -88,6 +91,7 @@ fn sprite_picking(
         &GlobalTransform,
         &Projection,
         Has<SpritePickingCamera>,
+        Option<&RenderLayers>,
     )>,
     primary_window: Query<Entity, With<PrimaryWindow>>,
     images: Res<Assets<Image>>,
@@ -100,157 +104,188 @@ fn sprite_picking(
         &Anchor,
         &Pickable,
         &ViewVisibility,
+        Option<&RenderLayers>,
     )>,
     mut pointer_hits_writer: MessageWriter<PointerHits>,
+    ray_map: Res<RayMap>,
 ) {
     let mut sorted_sprites: Vec<_> = sprite_query
         .iter()
-        .filter_map(|(entity, sprite, transform, anchor, pickable, vis)| {
-            if !transform.affine().is_nan() && vis.get() {
-                Some((entity, sprite, transform, anchor, pickable))
-            } else {
-                None
-            }
-        })
+        .filter_map(
+            |(entity, sprite, transform, anchor, pickable, vis, render_layers)| {
+                if !transform.affine().is_nan() && vis.get() {
+                    Some((entity, sprite, transform, anchor, pickable, render_layers))
+                } else {
+                    None
+                }
+            },
+        )
         .collect();
 
     // radsort is a stable radix sort that performed better than `slice::sort_by_key`
-    radsort::sort_by_key(&mut sorted_sprites, |(_, _, transform, _, _)| {
+    radsort::sort_by_key(&mut sorted_sprites, |(_, _, transform, _, _, _)| {
         -transform.translation().z
     });
 
     let primary_window = primary_window.single().ok();
 
-    for (pointer, location) in pointers.iter().filter_map(|(pointer, pointer_location)| {
-        pointer_location.location().map(|loc| (pointer, loc))
-    }) {
+    let pick_sets = ray_map.iter().flat_map(|(ray_id, ray)| {
         let mut blocked = false;
-        let Some((cam_entity, camera, cam_transform, Projection::Orthographic(cam_ortho), _)) =
-            cameras
-                .iter()
-                .filter(|(_, camera, _, _, cam_can_pick)| {
-                    let marker_requirement = !settings.require_markers || *cam_can_pick;
-                    camera.is_active && marker_requirement
-                })
-                .find(|(_, camera, _, _, _)| {
-                    camera
-                        .target
-                        .normalize(primary_window)
-                        .is_some_and(|x| x == location.target)
-                })
+
+        let Ok((
+            cam_entity,
+            camera,
+            cam_transform,
+            Projection::Orthographic(cam_ortho),
+            cam_can_pick,
+            cam_render_layers,
+        )) = cameras.get(ray_id.camera)
         else {
-            continue;
+            return None;
         };
 
+        let marker_requirement = !settings.require_markers || cam_can_pick;
+        if !camera.is_active || !marker_requirement {
+            return None;
+        }
+
+        let location = pointers.iter().find_map(|(id, loc)| {
+            if *id == ray_id.pointer {
+                return loc.location.as_ref();
+            }
+            None
+        })?;
+
+        if camera
+            .target
+            .normalize(primary_window)
+            .is_none_or(|x| x != location.target)
+        {
+            return None;
+        }
+
         let viewport_pos = location.position;
         if let Some(viewport) = camera.logical_viewport_rect()
             && !viewport.contains(viewport_pos)
         {
             // The pointer is outside the viewport, skip it
-            continue;
+            return None;
         }
 
-        let Ok(cursor_ray_world) = camera.viewport_to_world(cam_transform, viewport_pos) else {
-            continue;
-        };
         let cursor_ray_len = cam_ortho.far - cam_ortho.near;
-        let cursor_ray_end = cursor_ray_world.origin + cursor_ray_world.direction * cursor_ray_len;
+        let cursor_ray_end = ray.origin + ray.direction * cursor_ray_len;
 
         let picks: Vec<(Entity, HitData)> = sorted_sprites
             .iter()
             .copied()
-            .filter_map(|(entity, sprite, sprite_transform, anchor, pickable)| {
-                if blocked {
-                    return None;
-                }
+            .filter_map(
+                |(entity, sprite, sprite_transform, anchor, pickable, sprite_render_layers)| {
+                    if blocked {
+                        return None;
+                    }
 
-                // Transform cursor line segment to sprite coordinate system
-                let world_to_sprite = sprite_transform.affine().inverse();
-                let cursor_start_sprite = world_to_sprite.transform_point3(cursor_ray_world.origin);
-                let cursor_end_sprite = world_to_sprite.transform_point3(cursor_ray_end);
+                    // Filter out sprites based on whether they share RenderLayers with the current
+                    // ray's associated camera.
+                    // Any entity without a RenderLayers component will by default be
+                    // on RenderLayers::layer(0) only.
+                    if !cam_render_layers
+                        .unwrap_or_default()
+                        .intersects(sprite_render_layers.unwrap_or_default())
+                    {
+                        return None;
+                    }
 
-                // Find where the cursor segment intersects the plane Z=0 (which is the sprite's
-                // plane in sprite-local space). It may not intersect if, for example, we're
-                // viewing the sprite side-on
-                if cursor_start_sprite.z == cursor_end_sprite.z {
-                    // Cursor ray is parallel to the sprite and misses it
-                    return None;
-                }
-                let lerp_factor =
-                    f32::inverse_lerp(cursor_start_sprite.z, cursor_end_sprite.z, 0.0);
-                if !(0.0..=1.0).contains(&lerp_factor) {
-                    // Lerp factor is out of range, meaning that while an infinite line cast by
-                    // the cursor would intersect the sprite, the sprite is not between the
-                    // camera's near and far planes
-                    return None;
-                }
-                // Otherwise we can interpolate the xy of the start and end positions by the
-                // lerp factor to get the cursor position in sprite space!
-                let cursor_pos_sprite = cursor_start_sprite
-                    .lerp(cursor_end_sprite, lerp_factor)
-                    .xy();
+                    // Transform cursor line segment to sprite coordinate system
+                    let world_to_sprite = sprite_transform.affine().inverse();
+                    let cursor_start_sprite = world_to_sprite.transform_point3(ray.origin);
+                    let cursor_end_sprite = world_to_sprite.transform_point3(cursor_ray_end);
+
+                    // Find where the cursor segment intersects the plane Z=0 (which is the sprite's
+                    // plane in sprite-local space). It may not intersect if, for example, we're
+                    // viewing the sprite side-on
+                    if cursor_start_sprite.z == cursor_end_sprite.z {
+                        // Cursor ray is parallel to the sprite and misses it
+                        return None;
+                    }
+                    let lerp_factor =
+                        f32::inverse_lerp(cursor_start_sprite.z, cursor_end_sprite.z, 0.0);
+                    if !(0.0..=1.0).contains(&lerp_factor) {
+                        // Lerp factor is out of range, meaning that while an infinite line cast by
+                        // the cursor would intersect the sprite, the sprite is not between the
+                        // camera's near and far planes
+                        return None;
+                    }
+                    // Otherwise we can interpolate the xy of the start and end positions by the
+                    // lerp factor to get the cursor position in sprite space!
+                    let cursor_pos_sprite = cursor_start_sprite
+                        .lerp(cursor_end_sprite, lerp_factor)
+                        .xy();
 
-                let Ok(cursor_pixel_space) = sprite.compute_pixel_space_point(
-                    cursor_pos_sprite,
-                    *anchor,
-                    &images,
-                    &texture_atlas_layout,
-                ) else {
-                    return None;
-                };
+                    let Ok(cursor_pixel_space) = sprite.compute_pixel_space_point(
+                        cursor_pos_sprite,
+                        *anchor,
+                        &images,
+                        &texture_atlas_layout,
+                    ) else {
+                        return None;
+                    };
 
-                // Since the pixel space coordinate is `Ok`, we know the cursor is in the bounds of
-                // the sprite.
+                    // Since the pixel space coordinate is `Ok`, we know the cursor is in the bounds of
+                    // the sprite.
 
-                let cursor_in_valid_pixels_of_sprite = 'valid_pixel: {
-                    match settings.picking_mode {
-                        SpritePickingMode::AlphaThreshold(cutoff) => {
-                            let Some(image) = images.get(&sprite.image) else {
-                                // [`Sprite::from_color`] returns a defaulted handle.
-                                // This handle doesn't return a valid image, so returning false here would make picking "color sprites" impossible
-                                break 'valid_pixel true;
-                            };
-                            // grab pixel and check alpha
-                            let Ok(color) = image.get_color_at(
-                                cursor_pixel_space.x as u32,
-                                cursor_pixel_space.y as u32,
-                            ) else {
-                                // We don't know how to interpret the pixel.
-                                break 'valid_pixel false;
-                            };
-                            // Check the alpha is above the cutoff.
-                            color.alpha() > cutoff
+                    let cursor_in_valid_pixels_of_sprite = 'valid_pixel: {
+                        match settings.picking_mode {
+                            SpritePickingMode::AlphaThreshold(cutoff) => {
+                                let Some(image) = images.get(&sprite.image) else {
+                                    // [`Sprite::from_color`] returns a defaulted handle.
+                                    // This handle doesn't return a valid image, so returning false here would make picking "color sprites" impossible
+                                    break 'valid_pixel true;
+                                };
+                                // grab pixel and check alpha
+                                let Ok(color) = image.get_color_at(
+                                    cursor_pixel_space.x as u32,
+                                    cursor_pixel_space.y as u32,
+                                ) else {
+                                    // We don't know how to interpret the pixel.
+                                    break 'valid_pixel false;
+                                };
+                                // Check the alpha is above the cutoff.
+                                color.alpha() > cutoff
+                            }
+                            SpritePickingMode::BoundingBox => true,
                         }
-                        SpritePickingMode::BoundingBox => true,
-                    }
-                };
+                    };
 
-                blocked = cursor_in_valid_pixels_of_sprite && pickable.should_block_lower;
+                    blocked = cursor_in_valid_pixels_of_sprite && pickable.should_block_lower;
 
-                cursor_in_valid_pixels_of_sprite.then(|| {
-                    let hit_pos_world =
-                        sprite_transform.transform_point(cursor_pos_sprite.extend(0.0));
-                    // Transform point from world to camera space to get the Z distance
-                    let hit_pos_cam = cam_transform
-                        .affine()
-                        .inverse()
-                        .transform_point3(hit_pos_world);
-                    // HitData requires a depth as calculated from the camera's near clipping plane
-                    let depth = -cam_ortho.near - hit_pos_cam.z;
-                    (
-                        entity,
-                        HitData::new(
-                            cam_entity,
-                            depth,
-                            Some(hit_pos_world),
-                            Some(*sprite_transform.back()),
-                        ),
-                    )
-                })
-            })
+                    cursor_in_valid_pixels_of_sprite.then(|| {
+                        let hit_pos_world =
+                            sprite_transform.transform_point(cursor_pos_sprite.extend(0.0));
+                        // Transform point from world to camera space to get the Z distance
+                        let hit_pos_cam = cam_transform
+                            .affine()
+                            .inverse()
+                            .transform_point3(hit_pos_world);
+                        // HitData requires a depth as calculated from the camera's near clipping plane
+                        let depth = -cam_ortho.near - hit_pos_cam.z;
+                        (
+                            entity,
+                            HitData::new(
+                                cam_entity,
+                                depth,
+                                Some(hit_pos_world),
+                                Some(*sprite_transform.back()),
+                            ),
+                        )
+                    })
+                },
+            )
             .collect();
 
-        let order = camera.order as f32;
-        pointer_hits_writer.write(PointerHits::new(*pointer, picks, order));
-    }
+        Some((ray_id.pointer, picks, camera.order))
+    });
+
+    pick_sets.for_each(|(pointer, picks, order)| {
+        pointer_hits_writer.write(PointerHits::new(pointer, picks, order as f32));
+    });
 }

From 863a27efffe9ff90c9d914fe5131103c156ee853 Mon Sep 17 00:00:00 2001
From: Mike <mike.hsu@gmail.com>
Date: Tue, 9 Dec 2025 15:26:52 -0800
Subject: [PATCH 069/133] Change a function system to be exclusive (#21742)

# Objective

- I was experimenting with a library for combining multiple systems into
one system that could be scheduled, but there wasn't a way of marking a
function system run exclusively.

## Solution

- Add a method to `SystemMeta` to set the exclusive flag. Note that this
PR doesn't add anyway to actually set the flag easily. You would have to
create a custom system param to be able to set it.
- Add a system param to mark a function system to run exclusively.

## Testing

- Haven't tested. The one worry would be how it interacts with the
executor, but in theory this should just work, since the flag is the
only way the executor knows that a system is exclusive or not.

---------

Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
Co-authored-by: Christian Hughes <9044780+ItsDoot@users.noreply.github.com>
---
 crates/bevy_ecs/src/system/function_system.rs |  5 +++
 crates/bevy_ecs/src/system/mod.rs             | 22 ++++++++++--
 crates/bevy_ecs/src/system/system_param.rs    | 34 +++++++++++++++++++
 3 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/crates/bevy_ecs/src/system/function_system.rs b/crates/bevy_ecs/src/system/function_system.rs
index 5f6653be39834..4aeb704ecf9f2 100644
--- a/crates/bevy_ecs/src/system/function_system.rs
+++ b/crates/bevy_ecs/src/system/function_system.rs
@@ -105,6 +105,11 @@ impl SystemMeta {
     pub fn set_has_deferred(&mut self) {
         self.flags |= SystemStateFlags::DEFERRED;
     }
+
+    /// Mark the system to run exclusively. i.e. no other systems will run at the same time.
+    pub fn set_exclusive(&mut self) {
+        self.flags |= SystemStateFlags::EXCLUSIVE;
+    }
 }
 
 // TODO: Actually use this in FunctionSystem. We should probably only do this once Systems are constructed using a World reference
diff --git a/crates/bevy_ecs/src/system/mod.rs b/crates/bevy_ecs/src/system/mod.rs
index eeecf4b7ac5db..f729731ea327a 100644
--- a/crates/bevy_ecs/src/system/mod.rs
+++ b/crates/bevy_ecs/src/system/mod.rs
@@ -418,8 +418,8 @@ mod tests {
             SystemCondition,
         },
         system::{
-            Commands, In, InMut, IntoSystem, Local, NonSend, NonSendMut, ParamSet, Query, Res,
-            ResMut, Single, StaticSystemParam, System, SystemState,
+            Commands, ExclusiveMarker, In, InMut, IntoSystem, Local, NonSend, NonSendMut, ParamSet,
+            Query, Res, ResMut, Single, StaticSystemParam, System, SystemState,
         },
         world::{DeferredWorld, EntityMut, FromWorld, World},
     };
@@ -1049,6 +1049,24 @@ mod tests {
         assert_eq!(*world.resource::<SystemRan>(), SystemRan::Yes);
     }
 
+    #[test]
+    fn function_system_as_exclusive() {
+        let mut world = World::default();
+
+        world.insert_resource(SystemRan::No);
+
+        fn sys(_marker: ExclusiveMarker, mut system_ran: ResMut<SystemRan>) {
+            *system_ran = SystemRan::Yes;
+        }
+
+        let mut sys = IntoSystem::into_system(sys);
+        sys.initialize(&mut world);
+        assert!(sys.is_exclusive());
+
+        run_system(&mut world, sys);
+        assert_eq!(*world.resource::<SystemRan>(), SystemRan::Yes);
+    }
+
     #[test]
     fn removal_tracking() {
         let mut world = World::new();
diff --git a/crates/bevy_ecs/src/system/system_param.rs b/crates/bevy_ecs/src/system/system_param.rs
index 80d449017d2eb..32b4044e6f25b 100644
--- a/crates/bevy_ecs/src/system/system_param.rs
+++ b/crates/bevy_ecs/src/system/system_param.rs
@@ -1359,6 +1359,40 @@ unsafe impl<T: SystemBuffer> SystemParam for Deferred<'_, T> {
     }
 }
 
+/// A dummy type to tell the executor to run the system exclusively.
+pub struct ExclusiveMarker(PhantomData<()>);
+
+// SAFETY: No world access.
+unsafe impl SystemParam for ExclusiveMarker {
+    type State = ();
+    type Item<'w, 's> = Self;
+
+    #[inline]
+    fn init_state(_world: &mut World) -> Self::State {}
+
+    fn init_access(
+        _state: &Self::State,
+        system_meta: &mut SystemMeta,
+        _component_access_set: &mut FilteredAccessSet,
+        _world: &mut World,
+    ) {
+        system_meta.set_exclusive();
+    }
+
+    #[inline]
+    unsafe fn get_param<'world, 'state>(
+        _state: &'state mut Self::State,
+        _system_meta: &SystemMeta,
+        _world: UnsafeWorldCell<'world>,
+        _change_tick: Tick,
+    ) -> Self::Item<'world, 'state> {
+        Self(PhantomData)
+    }
+}
+
+// SAFETY: Does not read any world state
+unsafe impl ReadOnlySystemParam for ExclusiveMarker {}
+
 /// A dummy type that is [`!Send`](Send), to force systems to run on the main thread.
 pub struct NonSendMarker(PhantomData<*mut ()>);
 

From b7fc4d44ef084b0eb7492c43992a9859a316ffc9 Mon Sep 17 00:00:00 2001
From: andriyDev <andriydzikh@gmail.com>
Date: Tue, 9 Dec 2025 15:27:31 -0800
Subject: [PATCH 070/133] Fix immediate nested loaded assets not loading their
 dependencies. (#21863)

# Objective

- Previously if you loaded an immediate nested asset, it would **not**
load any of its dependencies. This means that you could have handles in
your asset that would never load.
- Fixes #20988

## Solution

- Propagate loading dependencies to immediate asset loads.
- I also deduped some test App setup code.

## Testing

- Added a test.

One case that does have a slightly undesirable effect is when you
immediately-load an asset, take some data from it (but no dependency
handles), and then drop the immediately-loaded asset. This change will
now also initiate a dependency load, even though we won't use it.

However, A) it is much more surprising to have a handle that will never
be loaded, B) we should end up cancelling the dependency load once we
drop the handle, so we shouldn't pay too much of the cost of loading.
---
 crates/bevy_asset/src/lib.rs    | 258 ++++++++++++++++++++------------
 crates/bevy_asset/src/loader.rs |   6 +-
 2 files changed, 167 insertions(+), 97 deletions(-)

diff --git a/crates/bevy_asset/src/lib.rs b/crates/bevy_asset/src/lib.rs
index df47416193387..cdaf34bffe8c2 100644
--- a/crates/bevy_asset/src/lib.rs
+++ b/crates/bevy_asset/src/lib.rs
@@ -716,8 +716,8 @@ mod tests {
         },
         loader::{AssetLoader, LoadContext},
         Asset, AssetApp, AssetEvent, AssetId, AssetLoadError, AssetLoadFailedEvent, AssetPath,
-        AssetPlugin, AssetServer, Assets, InvalidGenerationError, LoadState, UnapprovedPathMode,
-        UntypedHandle,
+        AssetPlugin, AssetServer, Assets, InvalidGenerationError, LoadState, LoadedAsset,
+        UnapprovedPathMode, UntypedHandle,
     };
     use alloc::{
         boxed::Box,
@@ -741,6 +741,7 @@ mod tests {
     };
     use bevy_reflect::TypePath;
     use core::time::Duration;
+    use futures_lite::AsyncReadExt;
     use serde::{Deserialize, Serialize};
     use std::path::{Path, PathBuf};
     use thiserror::Error;
@@ -760,7 +761,7 @@ mod tests {
         pub text: String,
     }
 
-    #[derive(Serialize, Deserialize)]
+    #[derive(Serialize, Deserialize, Default)]
     pub struct CoolTextRon {
         pub text: String,
         pub dependencies: Vec<String>,
@@ -899,7 +900,28 @@ mod tests {
         }
     }
 
-    fn test_app(dir: Dir) -> (App, GateOpener) {
+    /// Creates a basic asset app and an in-memory file system.
+    fn create_app() -> (App, Dir) {
+        let mut app = App::new();
+        let dir = Dir::default();
+        let dir_clone = dir.clone();
+        app.register_asset_source(
+            AssetSourceId::Default,
+            AssetSourceBuilder::new(move || {
+                Box::new(MemoryAssetReader {
+                    root: dir_clone.clone(),
+                })
+            }),
+        )
+        .add_plugins((
+            TaskPoolPlugin::default(),
+            AssetPlugin::default(),
+            DiagnosticsPlugin,
+        ));
+        (app, dir)
+    }
+
+    fn create_app_with_gate(dir: Dir) -> (App, GateOpener) {
         let mut app = App::new();
         let (gated_memory_reader, gate_opener) = GatedReader::new(MemoryAssetReader { root: dir });
         app.register_asset_source(
@@ -1005,7 +1027,7 @@ mod tests {
             d_id: AssetId<CoolText>,
         }
 
-        let (mut app, gate_opener) = test_app(dir);
+        let (mut app, gate_opener) = create_app_with_gate(dir);
         app.init_asset::<CoolText>()
             .init_asset::<SubText>()
             .init_resource::<StoredEvents>()
@@ -1310,7 +1332,7 @@ mod tests {
         dir.insert_asset_text(Path::new(c_path), c_ron);
         dir.insert_asset_text(Path::new(d_path), d_ron);
 
-        let (mut app, gate_opener) = test_app(dir);
+        let (mut app, gate_opener) = create_app_with_gate(dir);
         app.init_asset::<CoolText>()
             .register_asset_loader(CoolTextLoader);
         let asset_server = app.world().resource::<AssetServer>().clone();
@@ -1435,7 +1457,7 @@ mod tests {
         dir.insert_asset_text(Path::new(b_path), b_ron);
         dir.insert_asset_text(Path::new(c_path), c_ron);
 
-        let (mut app, gate_opener) = test_app(dir);
+        let (mut app, gate_opener) = create_app_with_gate(dir);
         app.init_asset::<CoolText>()
             .register_asset_loader(CoolTextLoader);
         let asset_server = app.world().resource::<AssetServer>().clone();
@@ -1512,7 +1534,7 @@ mod tests {
         let dir = Dir::default();
         dir.insert_asset_text(Path::new("dep.cool.ron"), SIMPLE_TEXT);
 
-        let (mut app, _) = test_app(dir);
+        let (mut app, _) = create_app_with_gate(dir);
         app.init_asset::<CoolText>()
             .init_asset::<SubText>()
             .init_resource::<StoredEvents>()
@@ -1549,7 +1571,7 @@ mod tests {
 
         dir.insert_asset_text(Path::new(dep_path), SIMPLE_TEXT);
 
-        let (mut app, gate_opener) = test_app(dir);
+        let (mut app, gate_opener) = create_app_with_gate(dir);
         app.init_asset::<CoolText>()
             .init_asset::<SubText>()
             .init_resource::<StoredEvents>()
@@ -1690,7 +1712,7 @@ mod tests {
         dir.insert_asset_text(Path::new(b_path), b_ron);
         dir.insert_asset_text(Path::new(c_path), c_ron);
 
-        let (mut app, gate_opener) = test_app(dir);
+        let (mut app, gate_opener) = create_app_with_gate(dir);
         app.init_asset::<CoolText>()
             .init_asset::<SubText>()
             .register_asset_loader(CoolTextLoader);
@@ -1876,9 +1898,8 @@ mod tests {
 
     #[test]
     fn ignore_system_ambiguities_on_assets() {
-        let mut app = App::new();
-        app.add_plugins(AssetPlugin::default())
-            .init_asset::<CoolText>();
+        let mut app = create_app().0;
+        app.init_asset::<CoolText>();
 
         fn uses_assets(_asset: ResMut<Assets<CoolText>>) {}
         app.add_systems(Update, (uses_assets, uses_assets));
@@ -1897,9 +1918,7 @@ mod tests {
     // not capable of loading subassets when doing nested immediate loads.
     #[test]
     fn error_on_nested_immediate_load_of_subasset() {
-        let mut app = App::new();
-
-        let dir = Dir::default();
+        let (mut app, dir) = create_app();
         dir.insert_asset_text(
             Path::new("a.cool.ron"),
             r#"(
@@ -1911,12 +1930,6 @@ mod tests {
         );
         dir.insert_asset_text(Path::new("empty.txt"), "");
 
-        app.register_asset_source(
-            AssetSourceId::Default,
-            AssetSourceBuilder::new(move || Box::new(MemoryAssetReader { root: dir.clone() })),
-        )
-        .add_plugins((TaskPoolPlugin::default(), AssetPlugin::default()));
-
         app.init_asset::<CoolText>()
             .init_asset::<SubText>()
             .register_asset_loader(CoolTextLoader);
@@ -2108,10 +2121,9 @@ mod tests {
 
     #[test]
     fn insert_dropped_handle_returns_error() {
-        let mut app = App::new();
+        let mut app = create_app().0;
 
-        app.add_plugins((TaskPoolPlugin::default(), AssetPlugin::default()))
-            .init_asset::<TestAsset>();
+        app.init_asset::<TestAsset>();
 
         let handle = app.world().resource::<Assets<TestAsset>>().reserve_handle();
         // We still have the asset ID, but we've dropped the handle so the asset is no longer live.
@@ -2169,14 +2181,7 @@ mod tests {
 
     #[test]
     fn dropping_handle_while_loading_cancels_load() {
-        let dir = Dir::default();
-        let mut app = App::new();
-        let reader = MemoryAssetReader { root: dir.clone() };
-        app.register_asset_source(
-            AssetSourceId::Default,
-            AssetSourceBuilder::new(move || Box::new(reader.clone())),
-        )
-        .add_plugins((TaskPoolPlugin::default(), AssetPlugin::default()));
+        let (mut app, dir) = create_app();
 
         let (in_loader_sender, in_loader_receiver) = async_channel::bounded(1);
         let (gate_sender, gate_receiver) = async_channel::bounded(1);
@@ -2225,14 +2230,7 @@ mod tests {
 
     #[test]
     fn dropping_subasset_handle_while_loading_cancels_load() {
-        let dir = Dir::default();
-        let mut app = App::new();
-        let reader = MemoryAssetReader { root: dir.clone() };
-        app.register_asset_source(
-            AssetSourceId::Default,
-            AssetSourceBuilder::new(move || Box::new(reader.clone())),
-        )
-        .add_plugins((TaskPoolPlugin::default(), AssetPlugin::default()));
+        let (mut app, dir) = create_app();
 
         let (in_loader_sender, in_loader_receiver) = async_channel::bounded(1);
         let (gate_sender, gate_receiver) = async_channel::bounded(1);
@@ -2479,22 +2477,12 @@ mod tests {
             }
         }
 
-        // Create a test asset.
+        // Create a test asset and setup the app.
 
-        let dir = Dir::default();
+        let (mut app, dir) = create_app();
         dir.insert_asset(Path::new("test.u8"), &[]);
 
-        let asset_source =
-            AssetSourceBuilder::new(move || Box::new(MemoryAssetReader { root: dir.clone() }));
-
-        // Set up the app.
-
-        let mut app = App::new();
-
-        app.register_asset_source(AssetSourceId::Default, asset_source)
-            .add_plugins((TaskPoolPlugin::default(), AssetPlugin::default()))
-            .init_asset::<U8Asset>()
-            .register_asset_loader(U8Loader);
+        app.init_asset::<U8Asset>().register_asset_loader(U8Loader);
 
         let asset_server = app.world().resource::<AssetServer>();
 
@@ -2543,18 +2531,9 @@ mod tests {
 
     #[test]
     fn loading_two_subassets_does_not_start_two_loads() {
-        let mut app = App::new();
-
-        let dir = Dir::default();
+        let (mut app, dir) = create_app();
         dir.insert_asset(Path::new("test.txt"), &[]);
 
-        let asset_source =
-            AssetSourceBuilder::new(move || Box::new(MemoryAssetReader { root: dir.clone() }));
-
-        app.register_asset_source(AssetSourceId::Default, asset_source)
-            .add_plugins((TaskPoolPlugin::default(), AssetPlugin::default()))
-            .init_asset::<TestAsset>();
-
         struct TwoSubassetLoader;
 
         impl AssetLoader for TwoSubassetLoader {
@@ -2578,7 +2557,8 @@ mod tests {
             }
         }
 
-        app.register_asset_loader(TwoSubassetLoader);
+        app.init_asset::<TestAsset>()
+            .register_asset_loader(TwoSubassetLoader);
 
         let asset_server = app.world().resource::<AssetServer>().clone();
         let _subasset_1: Handle<TestAsset> = asset_server.load("test.txt#A");
@@ -2593,42 +2573,35 @@ mod tests {
         assert_eq!(get_started_load_count(app.world()), 2);
     }
 
-    #[test]
-    fn get_strong_handle_prevents_reload_when_asset_still_alive() {
-        let mut app = App::new();
-
-        let dir = Dir::default();
-        dir.insert_asset(Path::new("test.txt"), &[]);
-
-        let asset_source =
-            AssetSourceBuilder::new(move || Box::new(MemoryAssetReader { root: dir.clone() }));
-
-        app.register_asset_source(AssetSourceId::Default, asset_source)
-            .add_plugins((TaskPoolPlugin::default(), AssetPlugin::default()))
-            .init_asset::<TestAsset>();
+    /// A loader that immediately returns a [`TestAsset`].
+    struct TrivialLoader;
 
-        struct TrivialLoader;
-
-        impl AssetLoader for TrivialLoader {
-            type Asset = TestAsset;
-            type Settings = ();
-            type Error = std::io::Error;
+    impl AssetLoader for TrivialLoader {
+        type Asset = TestAsset;
+        type Settings = ();
+        type Error = std::io::Error;
 
-            async fn load(
-                &self,
-                _reader: &mut dyn Reader,
-                _settings: &Self::Settings,
-                _load_context: &mut LoadContext<'_>,
-            ) -> Result<Self::Asset, Self::Error> {
-                Ok(TestAsset)
-            }
+        async fn load(
+            &self,
+            _reader: &mut dyn Reader,
+            _settings: &Self::Settings,
+            _load_context: &mut LoadContext<'_>,
+        ) -> Result<Self::Asset, Self::Error> {
+            Ok(TestAsset)
+        }
 
-            fn extensions(&self) -> &[&str] {
-                &["txt"]
-            }
+        fn extensions(&self) -> &[&str] {
+            &["txt"]
         }
+    }
+
+    #[test]
+    fn get_strong_handle_prevents_reload_when_asset_still_alive() {
+        let (mut app, dir) = create_app();
+        dir.insert_asset(Path::new("test.txt"), &[]);
 
-        app.register_asset_loader(TrivialLoader);
+        app.init_asset::<TestAsset>()
+            .register_asset_loader(TrivialLoader);
 
         let asset_server = app.world().resource::<AssetServer>().clone();
         let original_handle: Handle<TestAsset> = asset_server.load("test.txt");
@@ -2670,4 +2643,97 @@ mod tests {
         // assert_eq!(get_started_load_count(app.world()), 1);
         assert_eq!(get_started_load_count(app.world()), 2);
     }
+
+    #[test]
+    fn immediate_nested_asset_loads_dependency() {
+        let (mut app, dir) = create_app();
+
+        /// This asset holds a handle to its dependency.
+        #[derive(Asset, TypePath)]
+        struct DeferredNested(Handle<TestAsset>);
+
+        struct DeferredNestedLoader;
+
+        impl AssetLoader for DeferredNestedLoader {
+            type Asset = DeferredNested;
+            type Settings = ();
+            type Error = std::io::Error;
+
+            async fn load(
+                &self,
+                reader: &mut dyn Reader,
+                _: &Self::Settings,
+                load_context: &mut LoadContext<'_>,
+            ) -> Result<Self::Asset, Self::Error> {
+                let mut nested_path = String::new();
+                reader.read_to_string(&mut nested_path).await?;
+                Ok(DeferredNested(load_context.load(nested_path)))
+            }
+
+            fn extensions(&self) -> &[&str] {
+                &["defer"]
+            }
+        }
+
+        /// This asset holds a handle a dependency of one of its dependencies.
+        #[derive(Asset, TypePath)]
+        struct ImmediateNested(Handle<TestAsset>);
+
+        struct ImmediateNestedLoader;
+
+        impl AssetLoader for ImmediateNestedLoader {
+            type Asset = ImmediateNested;
+            type Settings = ();
+            type Error = std::io::Error;
+
+            async fn load(
+                &self,
+                reader: &mut dyn Reader,
+                _: &Self::Settings,
+                load_context: &mut LoadContext<'_>,
+            ) -> Result<Self::Asset, Self::Error> {
+                let mut nested_path = String::new();
+                reader.read_to_string(&mut nested_path).await?;
+                let deferred_nested: LoadedAsset<DeferredNested> = load_context
+                    .loader()
+                    .immediate()
+                    .load(nested_path)
+                    .await
+                    .unwrap();
+                Ok(ImmediateNested(deferred_nested.get().0.clone()))
+            }
+
+            fn extensions(&self) -> &[&str] {
+                &["immediate"]
+            }
+        }
+
+        app.init_asset::<TestAsset>()
+            .init_asset::<DeferredNested>()
+            .init_asset::<ImmediateNested>()
+            .register_asset_loader(TrivialLoader)
+            .register_asset_loader(DeferredNestedLoader)
+            .register_asset_loader(ImmediateNestedLoader);
+
+        dir.insert_asset_text(Path::new("a.immediate"), "b.defer");
+        dir.insert_asset_text(Path::new("b.defer"), "c.txt");
+        dir.insert_asset_text(Path::new("c.txt"), "hiya");
+
+        let server = app.world().resource::<AssetServer>().clone();
+        let immediate_handle: Handle<ImmediateNested> = server.load("a.immediate");
+
+        run_app_until(&mut app, |world| {
+            let immediate_assets = world.resource::<Assets<ImmediateNested>>();
+            let immediate = immediate_assets.get(&immediate_handle)?;
+
+            let test_asset_handle = immediate.0.clone();
+            world
+                .resource::<Assets<TestAsset>>()
+                .get(&test_asset_handle)?;
+
+            // The immediate asset is loaded, and the asset it got from its immediate load is also
+            // loaded.
+            Some(())
+        });
+    }
 }
diff --git a/crates/bevy_asset/src/loader.rs b/crates/bevy_asset/src/loader.rs
index a56aab4a05740..cf40e8840ad50 100644
--- a/crates/bevy_asset/src/loader.rs
+++ b/crates/bevy_asset/src/loader.rs
@@ -321,6 +321,10 @@ pub enum DeserializeMetaError {
 /// Any asset state accessed by [`LoadContext`] will be tracked and stored for use in dependency events and asset preprocessing.
 pub struct LoadContext<'a> {
     pub(crate) asset_server: &'a AssetServer,
+    /// Specifies whether dependencies that are loaded deferred should be loaded.
+    ///
+    /// This allows us to skip loads for cases where we're never going to use the asset and we just
+    /// need the dependency information, for example during asset processing.
     pub(crate) should_load_dependencies: bool,
     populate_hashes: bool,
     asset_path: AssetPath<'static>,
@@ -536,7 +540,7 @@ impl<'a> LoadContext<'a> {
                 meta,
                 loader,
                 reader,
-                false,
+                self.should_load_dependencies,
                 self.populate_hashes,
             )
             .await

From 2dbed925337187131a061f29bd5e656e633310bc Mon Sep 17 00:00:00 2001
From: Joda <joseph@josephbartley.dev>
Date: Tue, 9 Dec 2025 17:28:08 -0600
Subject: [PATCH 071/133] Fix skybox example crashing in WASM by skipping
 unsupported TAA (#21887)

# Objective

- Fixes #21731
- Resolve the skybox example not functioning as intended. Currently, the
skybox example compiles but can't run due to TAA not being supported for
WASM builds.

## Solution

- Skip TAA if in a building for a WASM environment.

## Testing

- I ran the skybox example locally with: `bevy run --example skybox
--features="free_camera" web` and the example now compiles and runs in
the browser.
---
 examples/3d/skybox.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/examples/3d/skybox.rs b/examples/3d/skybox.rs
index fc32289f973fa..0cfe1cec93607 100644
--- a/examples/3d/skybox.rs
+++ b/examples/3d/skybox.rs
@@ -1,7 +1,9 @@
 //! Load a cubemap texture onto a cube like a skybox and cycle through different compressed texture formats
 
+#[cfg(not(target_arch = "wasm32"))]
+use bevy::anti_alias::taa::TemporalAntiAliasing;
+
 use bevy::{
-    anti_alias::taa::TemporalAntiAliasing,
     camera_controller::free_camera::{FreeCamera, FreeCameraPlugin},
     core_pipeline::Skybox,
     image::CompressedImageFormats,
@@ -71,6 +73,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
     commands.spawn((
         Camera3d::default(),
         Msaa::Off,
+        #[cfg(not(target_arch = "wasm32"))]
         TemporalAntiAliasing::default(),
         ScreenSpaceAmbientOcclusion::default(),
         Transform::from_xyz(0.0, 0.0, 8.0).looking_at(Vec3::ZERO, Vec3::Y),

From e26983936560f820d8793c9f1357792c6caa5e50 Mon Sep 17 00:00:00 2001
From: andriyDev <andriydzikh@gmail.com>
Date: Tue, 9 Dec 2025 15:37:22 -0800
Subject: [PATCH 072/133] Avoid reading the entire asset into memory during
 asset processing. (#21925)

# Objective

- When processing assets, we first read the whole asset into memory,
then process the asset from that in-memory representation. This means
that large assets may just not fit into memory causing much bigger
issues (e.g., switching over to slow virtual memory).

## Solution

- Read the asset twice during processing: 1) once to determine the asset
hash, 2) once to actually process the asset.

This means the processing code itself doesn't need to read the whole
asset into memory at any point, meaning we can now process much bigger
assets.

However, there are some risks. Asset sources which can't read chunks of
an asset - which need to read the whole asset into memory anyway - now
have to do so twice (not at the same time though). An example of this
kind of asset source is the default Wasm source, or the HTTP asset
source. In practice, I don't think this is a big issue - processing is
likely to be happening on local assets anyway - it seems unlikely that
users will want to download large assets from an HTTP asset source
multiple times (which needs to happen any time you start the app, even
ignoring this PR).

## Testing

- The processing tests all still pass.

---------

Co-authored-by: Kevin Chen <chen.kevin.f@gmail.com>
---
 crates/bevy_asset/src/meta.rs                 | 26 ++++++---
 crates/bevy_asset/src/processor/mod.rs        | 53 +++++++++++--------
 crates/bevy_asset/src/processor/process.rs    | 24 +++++----
 .../migration-guides/process_trait_changes.md | 30 +++++++++++
 4 files changed, 96 insertions(+), 37 deletions(-)
 create mode 100644 release-content/migration-guides/process_trait_changes.md

diff --git a/crates/bevy_asset/src/meta.rs b/crates/bevy_asset/src/meta.rs
index 0e972261198cc..b6b41d36833cb 100644
--- a/crates/bevy_asset/src/meta.rs
+++ b/crates/bevy_asset/src/meta.rs
@@ -3,10 +3,13 @@ use alloc::{
     string::{String, ToString},
     vec::Vec,
 };
+use futures_lite::AsyncReadExt;
 
 use crate::{
-    loader::AssetLoader, processor::Process, Asset, AssetPath, DeserializeMetaError,
-    VisitAssetDependencies,
+    io::{AssetReaderError, Reader},
+    loader::AssetLoader,
+    processor::Process,
+    Asset, AssetPath, DeserializeMetaError, VisitAssetDependencies,
 };
 use downcast_rs::{impl_downcast, Downcast};
 use ron::ser::PrettyConfig;
@@ -204,7 +207,7 @@ impl AssetLoader for () {
     type Error = std::io::Error;
     async fn load(
         &self,
-        _reader: &mut dyn crate::io::Reader,
+        _reader: &mut dyn Reader,
         _settings: &Self::Settings,
         _load_context: &mut crate::LoadContext<'_>,
     ) -> Result<Self::Asset, Self::Error> {
@@ -241,11 +244,22 @@ pub(crate) fn loader_settings_meta_transform<S: Settings>(
 pub type AssetHash = [u8; 32];
 
 /// NOTE: changing the hashing logic here is a _breaking change_ that requires a [`META_FORMAT_VERSION`] bump.
-pub(crate) fn get_asset_hash(meta_bytes: &[u8], asset_bytes: &[u8]) -> AssetHash {
+pub(crate) async fn get_asset_hash(
+    meta_bytes: &[u8],
+    asset_reader: &mut impl Reader,
+) -> Result<AssetHash, AssetReaderError> {
     let mut hasher = blake3::Hasher::new();
     hasher.update(meta_bytes);
-    hasher.update(asset_bytes);
-    *hasher.finalize().as_bytes()
+    let mut buffer = [0; blake3::CHUNK_LEN];
+    loop {
+        let bytes_read = asset_reader.read(&mut buffer).await?;
+        hasher.update(&buffer[..bytes_read]);
+        if bytes_read < buffer.len() {
+            // This means we've reached EOF, so we're done consuming asset bytes.
+            break;
+        }
+    }
+    Ok(*hasher.finalize().as_bytes())
 }
 
 /// NOTE: changing the hashing logic here is a _breaking change_ that requires a [`META_FORMAT_VERSION`] bump.
diff --git a/crates/bevy_asset/src/processor/mod.rs b/crates/bevy_asset/src/processor/mod.rs
index 8e58b120fb934..b9459f04a47d2 100644
--- a/crates/bevy_asset/src/processor/mod.rs
+++ b/crates/bevy_asset/src/processor/mod.rs
@@ -64,7 +64,7 @@ use bevy_platform::{
 };
 use bevy_tasks::IoTaskPool;
 use futures_io::ErrorKind;
-use futures_lite::{AsyncReadExt, AsyncWriteExt, StreamExt};
+use futures_lite::{AsyncWriteExt, StreamExt};
 use futures_util::{select_biased, FutureExt};
 use std::{
     path::{Path, PathBuf},
@@ -976,9 +976,6 @@ impl AssetProcessor {
             err,
         };
 
-        // Note: we get the asset source reader first because we don't want to create meta files for assets that don't have source files
-        let mut byte_reader = reader.read(path).await.map_err(reader_err)?;
-
         let (mut source_meta, meta_bytes, processor) = match reader.read_meta_bytes(path).await {
             Ok(meta_bytes) => {
                 let minimal: AssetMetaMinimal = ron::de::from_bytes(&meta_bytes).map_err(|e| {
@@ -1033,19 +1030,14 @@ impl AssetProcessor {
 
         let processed_writer = source.processed_writer()?;
 
-        let mut asset_bytes = Vec::new();
-        byte_reader
-            .read_to_end(&mut asset_bytes)
-            .await
-            .map_err(|e| ProcessError::AssetReaderError {
-                path: asset_path.clone(),
-                err: AssetReaderError::Io(e.into()),
-            })?;
-
-        // PERF: in theory these hashes could be streamed if we want to avoid allocating the whole asset.
-        // The downside is that reading assets would need to happen twice (once for the hash and once for the asset loader)
-        // Hard to say which is worse
-        let new_hash = get_asset_hash(&meta_bytes, &asset_bytes);
+        let new_hash = {
+            // Create a reader just for computing the hash. Keep this scoped here so that we drop it
+            // as soon as the hash is computed.
+            let mut reader_for_hash = reader.read(path).await.map_err(reader_err)?;
+            get_asset_hash(&meta_bytes, &mut reader_for_hash)
+                .await
+                .map_err(reader_err)?
+        };
         let mut new_processed_info = ProcessedInfo {
             hash: new_hash,
             full_hash: new_hash,
@@ -1076,6 +1068,16 @@ impl AssetProcessor {
             }
         }
 
+        // Create a reader just for the actual process. Note: this means that we're performing two
+        // reads for the same file (but we avoid having to load the whole file into memory). For
+        // some sources (like local file systems), this is not a big deal, but for other sources
+        // like an HTTP asset sources, this could be an entire additional download (if the asset
+        // source doesn't do any caching). In practice, most sources being processed are likely to
+        // be local, and processing in general is a publish-time operation, so it's not likely to be
+        // too big a deal. If in the future, we decide we want to avoid this repeated read, we could
+        // "ask" the asset source if it prefers avoiding repeated reads or not.
+        let mut reader_for_process = reader.read(path).await.map_err(reader_err)?;
+
         // Note: this lock must remain alive until all processed asset and meta writes have finished (or failed)
         // See ProcessedAssetInfo::file_transaction_lock docs for more info
         let _transaction_lock = {
@@ -1097,8 +1099,12 @@ impl AssetProcessor {
         if let Some(processor) = processor {
             let mut writer = processed_writer.write(path).await.map_err(writer_err)?;
             let mut processed_meta = {
-                let mut context =
-                    ProcessContext::new(self, asset_path, &asset_bytes, &mut new_processed_info);
+                let mut context = ProcessContext::new(
+                    self,
+                    asset_path,
+                    reader_for_process,
+                    &mut new_processed_info,
+                );
                 processor
                     .process(&mut context, source_meta, &mut *writer)
                     .await?
@@ -1128,10 +1134,13 @@ impl AssetProcessor {
                 .await
                 .map_err(writer_err)?;
         } else {
-            processed_writer
-                .write_bytes(path, &asset_bytes)
+            let mut writer = processed_writer.write(path).await.map_err(writer_err)?;
+            futures_lite::io::copy(&mut reader_for_process, &mut writer)
                 .await
-                .map_err(writer_err)?;
+                .map_err(|err| ProcessError::AssetWriterError {
+                    path: asset_path.clone_owned(),
+                    err: err.into(),
+                })?;
             *source_meta.processed_info_mut() = Some(new_processed_info.clone());
             let meta_bytes = source_meta.serialize();
             processed_writer
diff --git a/crates/bevy_asset/src/processor/process.rs b/crates/bevy_asset/src/processor/process.rs
index b37265d0fb660..a29b6abcab1a5 100644
--- a/crates/bevy_asset/src/processor/process.rs
+++ b/crates/bevy_asset/src/processor/process.rs
@@ -1,7 +1,7 @@
 use crate::{
     io::{
         AssetReaderError, AssetWriterError, MissingAssetWriterError,
-        MissingProcessedAssetReaderError, MissingProcessedAssetWriterError, SliceReader, Writer,
+        MissingProcessedAssetReaderError, MissingProcessedAssetWriterError, Reader, Writer,
     },
     meta::{AssetAction, AssetMeta, AssetMetaDyn, ProcessDependencyInfo, ProcessedInfo, Settings},
     processor::AssetProcessor,
@@ -280,20 +280,20 @@ pub struct ProcessContext<'a> {
     /// [`AssetServer`]: crate::server::AssetServer
     processor: &'a AssetProcessor,
     path: &'a AssetPath<'static>,
-    asset_bytes: &'a [u8],
+    reader: Box<dyn Reader + 'a>,
 }
 
 impl<'a> ProcessContext<'a> {
     pub(crate) fn new(
         processor: &'a AssetProcessor,
         path: &'a AssetPath<'static>,
-        asset_bytes: &'a [u8],
+        reader: Box<dyn Reader + 'a>,
         new_processed_info: &'a mut ProcessedInfo,
     ) -> Self {
         Self {
             processor,
             path,
-            asset_bytes,
+            reader,
             new_processed_info,
         }
     }
@@ -309,9 +309,15 @@ impl<'a> ProcessContext<'a> {
         let server = &self.processor.server;
         let loader_name = core::any::type_name::<L>();
         let loader = server.get_asset_loader_with_type_name(loader_name).await?;
-        let mut reader = SliceReader::new(self.asset_bytes);
         let loaded_asset = server
-            .load_with_meta_loader_and_reader(self.path, &meta, &*loader, &mut reader, false, true)
+            .load_with_meta_loader_and_reader(
+                self.path,
+                &meta,
+                &*loader,
+                &mut self.reader,
+                false,
+                true,
+            )
             .await?;
         for (path, full_hash) in &loaded_asset.loader_dependencies {
             self.new_processed_info
@@ -330,9 +336,9 @@ impl<'a> ProcessContext<'a> {
         self.path
     }
 
-    /// The source bytes of the asset being processed.
+    /// The reader for the asset being processed.
     #[inline]
-    pub fn asset_bytes(&self) -> &[u8] {
-        self.asset_bytes
+    pub fn asset_reader(&mut self) -> &mut dyn Reader {
+        &mut self.reader
     }
 }
diff --git a/release-content/migration-guides/process_trait_changes.md b/release-content/migration-guides/process_trait_changes.md
new file mode 100644
index 0000000000000..0b043a60e0845
--- /dev/null
+++ b/release-content/migration-guides/process_trait_changes.md
@@ -0,0 +1,30 @@
+---
+title: Changes to the `Process` trait in `bevy_asset`.
+pull_requests: [21925]
+---
+
+`ProcessContext` no longer includes `asset_bytes`. This has been replaced by `asset_reader`. To
+maintain current behavior in a `Process` implementation, you can read all the bytes into memory.
+If previously, you did:
+
+```rust
+// Inside `impl Process for Type`
+let bytes = context.asset_bytes();
+// Use bytes here!
+```
+
+Then now, it should be:
+
+```rust
+// Inside `impl Process for Type`
+let reader = context.asset_reader();
+let mut bytes = vec![];
+reader
+    .read_to_end(&mut bytes)
+    .await
+    .map_err(|err| ProcessError::AssetReaderError {
+        path: context.path().clone_owned(),
+        err: err.into(),
+    })?;
+// Use bytes here!
+```

From 4618f0cde63bd3e59f251f5056e2f883defd3e83 Mon Sep 17 00:00:00 2001
From: mgi388 <135186256+mgi388@users.noreply.github.com>
Date: Wed, 10 Dec 2025 10:38:02 +1100
Subject: [PATCH 073/133] Add `MeshPipelineKey::LIGHTMAPPED` as applicable
 during the wireframe pass (#21942)

Fixes #21899. See that issue for details but this is the same sort of
fix done by @pcwalton in #11910.
---
 crates/bevy_pbr/src/wireframe.rs | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/crates/bevy_pbr/src/wireframe.rs b/crates/bevy_pbr/src/wireframe.rs
index 0468b7c0681ad..c4b19df63f09f 100644
--- a/crates/bevy_pbr/src/wireframe.rs
+++ b/crates/bevy_pbr/src/wireframe.rs
@@ -1,7 +1,7 @@
 use crate::{
-    DrawMesh, MeshPipeline, MeshPipelineKey, RenderMeshInstanceFlags, RenderMeshInstances,
-    SetMeshBindGroup, SetMeshViewBindGroup, SetMeshViewBindingArrayBindGroup, ViewKeyCache,
-    ViewSpecializationTicks,
+    DrawMesh, MeshPipeline, MeshPipelineKey, RenderLightmaps, RenderMeshInstanceFlags,
+    RenderMeshInstances, SetMeshBindGroup, SetMeshViewBindGroup, SetMeshViewBindingArrayBindGroup,
+    ViewKeyCache, ViewSpecializationTicks,
 };
 use bevy_app::{App, Plugin, PostUpdate, Startup, Update};
 use bevy_asset::{
@@ -757,6 +757,7 @@ pub fn specialize_wireframes(
     mut pipelines: ResMut<SpecializedMeshPipelines<Wireframe3dPipeline>>,
     pipeline: Res<Wireframe3dPipeline>,
     pipeline_cache: Res<PipelineCache>,
+    render_lightmaps: Res<RenderLightmaps>,
     ticks: SystemChangeTick,
 ) {
     // Record the retained IDs of all views so that we can expire old
@@ -827,6 +828,18 @@ pub fn specialize_wireframes(
                 }
             }
 
+            // Even though we don't use the lightmap in the wireframe, the
+            // `SetMeshBindGroup` render command will bind the data for it. So
+            // we need to include the appropriate flag in the mesh pipeline key
+            // to ensure that the necessary bind group layout entries are
+            // present.
+            if render_lightmaps
+                .render_lightmaps
+                .contains_key(visible_entity)
+            {
+                mesh_key |= MeshPipelineKey::LIGHTMAPPED;
+            }
+
             let pipeline_id =
                 pipelines.specialize(&pipeline_cache, &pipeline, mesh_key, &mesh.layout);
             let pipeline_id = match pipeline_id {

From d60a1b816677abecdc2c0a03e7f1daf368197fe7 Mon Sep 17 00:00:00 2001
From: mgi388 <135186256+mgi388@users.noreply.github.com>
Date: Wed, 10 Dec 2025 10:38:23 +1100
Subject: [PATCH 074/133] Add MeshTag to array_texture example to demonstrate
 layer selection in shader (#21989)

## Objective

- When looking at the `array_texture` example, it wasn't clear to me how
I could send the "layer" to the GPU, but it turns out that [MeshTag is
one recommended
way](https://discord.com/channels/691052431525675048/866787577687310356/1444495450999754823)
to pass this.
- The example previously extracted a fake "layer" from the world
position, but IIUC this isn't the most realistic way to demonstrate
layer selection.

## Solution

- Update the `array_texture` example by using `MeshTag`.
- Add a system to the example that periodically changes the `MeshTag` on
entities to show that the mesh tag can also change dynamically at
runtime (and show how easy it is).

## Testing and showcase

Before, you can see each cube's texture is fixed.

<img width="1280" height="747" alt="image"
src="https://github.com/user-attachments/assets/1ffde7db-8110-4431-b4e8-3a5a4ba5c5db"
/>

After, you can see each cube's texture changes as time passes.


https://github.com/user-attachments/assets/b1227659-5886-4d2c-a401-84b80423c798

----

I'm hoping for a rendering dev to validate this approach is correct, and
useful. I think it is, but [I'm only just starting to
understand](https://discord.com/channels/691052431525675048/866787577687310356/1444888786478829668)
how to use this stuff and it's [possibly not the only
way](https://discord.com/channels/691052431525675048/866787577687310356/1444888304020488365)
so I don't want to submit this if it's the wrong approach to teach
future me's.
---
 assets/shaders/array_texture.wgsl |  5 +++-
 examples/shader/array_texture.rs  | 38 +++++++++++++++++++++++++++----
 2 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/assets/shaders/array_texture.wgsl b/assets/shaders/array_texture.wgsl
index 1bc6c46c404bf..73dfadba20c06 100644
--- a/assets/shaders/array_texture.wgsl
+++ b/assets/shaders/array_texture.wgsl
@@ -1,5 +1,6 @@
 #import bevy_pbr::{
     forward_io::VertexOutput,
+    mesh_functions,
     mesh_view_bindings::view,
     pbr_types::{STANDARD_MATERIAL_FLAGS_DOUBLE_SIDED_BIT, PbrInput, pbr_input_new},
     pbr_functions as fns,
@@ -15,7 +16,9 @@ fn fragment(
     @builtin(front_facing) is_front: bool,
     mesh: VertexOutput,
 ) -> @location(0) vec4<f32> {
-    let layer = i32(mesh.world_position.x) & 0x3;
+    // Determine which layer of the array texture to sample from based on the
+    // mesh tag which originates from the MeshTag component on the entity.
+    let layer = mesh_functions::get_tag(mesh.instance_index);
 
     // Prepare a 'processed' StandardMaterial by sampling all textures to resolve
     // the material members
diff --git a/examples/shader/array_texture.rs b/examples/shader/array_texture.rs
index b91872725ab3a..e17763dde132a 100644
--- a/examples/shader/array_texture.rs
+++ b/examples/shader/array_texture.rs
@@ -1,17 +1,23 @@
-//! This example illustrates how to create a texture for use with a `texture_2d_array<f32>` shader
-//! uniform variable.
+//! This example illustrates how to create a texture for use with a
+//! `texture_2d_array<f32>` shader uniform variable and then how to sample from
+//! that texture in the shader by using a `MeshTag` component on the mesh
+//! entity.
 
 use bevy::{
     image::{ImageArrayLayout, ImageLoaderSettings},
+    mesh::MeshTag,
     prelude::*,
     reflect::TypePath,
     render::render_resource::AsBindGroup,
     shader::ShaderRef,
 };
 
-/// This example uses a shader source file from the assets subdirectory
+/// This example uses a shader source file from the assets subdirectory.
 const SHADER_ASSET_PATH: &str = "shaders/array_texture.wgsl";
 
+/// Corresponds to the number of layers in the array texture.
+const TEXTURE_COUNT: u32 = 4;
+
 fn main() {
     App::new()
         .add_plugins((
@@ -19,6 +25,7 @@ fn main() {
             MaterialPlugin::<ArrayTextureMaterial>::default(),
         ))
         .add_systems(Startup, setup)
+        .add_systems(Update, update_mesh_tags)
         .run();
 }
 
@@ -32,7 +39,9 @@ fn setup(
     let array_texture = asset_server.load_with_settings(
         "textures/array_texture.png",
         |settings: &mut ImageLoaderSettings| {
-            settings.array_layout = Some(ImageArrayLayout::RowCount { rows: 4 });
+            settings.array_layout = Some(ImageArrayLayout::RowCount {
+                rows: TEXTURE_COUNT,
+            });
         },
     );
 
@@ -48,18 +57,37 @@ fn setup(
         Transform::from_xyz(5.0, 5.0, 5.0).looking_at(Vec3::new(1.5, 0.0, 0.0), Vec3::Y),
     ));
 
-    // Spawn some cubes using the array texture
+    // Spawn some cubes using the array texture.
     let mesh_handle = meshes.add(Cuboid::default());
     let material_handle = materials.add(ArrayTextureMaterial { array_texture });
     for x in -5..=5 {
         commands.spawn((
             Mesh3d(mesh_handle.clone()),
             MeshMaterial3d(material_handle.clone()),
+            // Pass a different mesh tag to allow selecting different layers of
+            // the array texture in the shader.
+            MeshTag(x as u32 % TEXTURE_COUNT),
             Transform::from_xyz(x as f32 + 0.5, 0.0, 0.0),
         ));
     }
 }
 
+fn update_mesh_tags(time: Res<Time>, mut query: Query<&mut MeshTag>, mut timer: Local<Timer>) {
+    // Initialize the timer on the first run.
+    if timer.duration().is_zero() {
+        *timer = Timer::from_seconds(1.5, TimerMode::Repeating);
+    }
+
+    timer.tick(time.delta());
+    if timer.just_finished() {
+        for mut tag in query.iter_mut() {
+            // Cycle through the texture layers to demonstrate that we can
+            // select different layers of the array texture at runtime.
+            tag.0 = (tag.0 + 1) % TEXTURE_COUNT;
+        }
+    }
+}
+
 #[derive(Asset, TypePath, AsBindGroup, Debug, Clone)]
 struct ArrayTextureMaterial {
     #[texture(0, dimension = "2d_array")]

From 98d4adb830f1e7efaf27ef4d34fff14201113122 Mon Sep 17 00:00:00 2001
From: IQuick 143 <IQuick143cz@gmail.com>
Date: Wed, 10 Dec 2025 00:38:42 +0100
Subject: [PATCH 075/133] Make the ui_surface module public. (#22056)

# Objective

- Fix #17909

## Solution

- Make the `ui_surface` module public (not just pub(crate)), so that
UiSurface can be querried and used with the function.

## Notes
Making this public may break encapsulation (notably it could allow
removing the Resource), but given how lax the guarantees of ECS state
are, I don't think that (a resource existing) is an assumption anyone
can truly rely on.
---
 crates/bevy_ui/src/layout/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/bevy_ui/src/layout/mod.rs b/crates/bevy_ui/src/layout/mod.rs
index f4a814cc257c8..68b8c69dbd9e9 100644
--- a/crates/bevy_ui/src/layout/mod.rs
+++ b/crates/bevy_ui/src/layout/mod.rs
@@ -25,7 +25,7 @@ use bevy_text::CosmicFontSystem;
 
 mod convert;
 pub mod debug;
-pub(crate) mod ui_surface;
+pub mod ui_surface;
 
 pub struct LayoutContext {
     pub scale_factor: f32,

From f6648961939fb45307dcd9ae7fba1ee53157055f Mon Sep 17 00:00:00 2001
From: Greeble <166992735+greeble-dev@users.noreply.github.com>
Date: Tue, 9 Dec 2025 23:46:41 +0000
Subject: [PATCH 076/133] Fix scene viewer animation switching (#21871)

## Objective

The `scene_viewer` example doesn't correctly switch between animations.
It plays the new animation but also keeps playing any previous
animations, so the animation graph mixes them all together.

I suspect this was accidentally broken when animation graphs were added
in #11989, but I haven't confirmed.

## Solution

Stop all animations and then play the new animation.

## Testing

```sh
# Press enter to switch animation, or space to pause.
cargo run --example scene_viewer --features "free_camera" -- "assets/models/animated/Fox.glb"
```

Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
---
 examples/tools/scene_viewer/animation_plugin.rs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/examples/tools/scene_viewer/animation_plugin.rs b/examples/tools/scene_viewer/animation_plugin.rs
index 8a36d372d77d2..8f61a0391a4b2 100644
--- a/examples/tools/scene_viewer/animation_plugin.rs
+++ b/examples/tools/scene_viewer/animation_plugin.rs
@@ -171,15 +171,14 @@ fn handle_inputs(
         if keyboard_input.just_pressed(KeyCode::Enter) {
             info!("switching to new animation for {display_entity_name}");
 
-            let resume = !player.all_paused();
-            // set the current animation to its start and pause it to reset to its starting state
-            player.rewind_all().pause_all();
+            let paused = player.all_paused();
+            player.stop_all();
 
             clips.advance_to_next();
             let current_clip = clips.current();
             player.play(current_clip).repeat();
-            if resume {
-                player.resume_all();
+            if paused {
+                player.pause_all();
             }
         }
     }

From e610c53af32c5736702fd0964136190d5b372366 Mon Sep 17 00:00:00 2001
From: rudderbucky <anandkwork7@gmail.com>
Date: Tue, 9 Dec 2025 17:48:19 -0600
Subject: [PATCH 077/133] Feathers: add override cursor (#21824)

# Objective

Fixes #21801 and tweaks the feathers example to exhibit the new
behavior.

## Solution

What the issue suggested. Added a new resource and adjusted the
`EntityCursor` interaction logic in `cursor.rs`.

## Testing

Tested it via the example tweak where the wide button now toggles the
override logic.
(Note: I wasn't able to get the load cursor to show up on macOS, but I
think this is a `winit` issue: `cursor `busyButClickableCursor` appears
to be invalid`)

---------

Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
---
 crates/bevy_feathers/Cargo.toml    |  1 +
 crates/bevy_feathers/src/cursor.rs | 38 ++++++++++++++++++++----------
 examples/ui/feathers.rs            | 13 +++++++---
 3 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/crates/bevy_feathers/Cargo.toml b/crates/bevy_feathers/Cargo.toml
index ef76d4c8aa6d3..bdcf8868c95da 100644
--- a/crates/bevy_feathers/Cargo.toml
+++ b/crates/bevy_feathers/Cargo.toml
@@ -31,6 +31,7 @@ bevy_ui = { path = "../bevy_ui", version = "0.18.0-dev", features = [
 ] }
 bevy_ui_render = { path = "../bevy_ui_render", version = "0.18.0-dev" }
 bevy_window = { path = "../bevy_window", version = "0.18.0-dev" }
+bevy_derive = { path = "../bevy_derive", version = "0.18.0-dev" }
 smol_str = { version = "0.2", default-features = false }
 
 # other
diff --git a/crates/bevy_feathers/src/cursor.rs b/crates/bevy_feathers/src/cursor.rs
index 4a35e40a7af20..417a622fc41fe 100644
--- a/crates/bevy_feathers/src/cursor.rs
+++ b/crates/bevy_feathers/src/cursor.rs
@@ -1,5 +1,6 @@
 //! Provides a way to automatically set the mouse cursor based on hovered entity.
 use bevy_app::{App, Plugin, PreUpdate};
+use bevy_derive::Deref;
 use bevy_ecs::{
     component::Component,
     entity::Entity,
@@ -18,7 +19,7 @@ use bevy_window::{CursorIcon, SystemCursorIcon, Window};
 
 /// A resource that specifies the cursor icon to be used when the mouse is not hovering over
 /// any other entity. This is used to set the default cursor icon for the window.
-#[derive(Resource, Debug, Clone, Default, Reflect)]
+#[derive(Deref, Resource, Debug, Clone, Default, Reflect)]
 #[reflect(Resource, Debug, Default)]
 pub struct DefaultCursor(pub EntityCursor);
 
@@ -37,6 +38,13 @@ pub enum EntityCursor {
     System(SystemCursorIcon),
 }
 
+/// A component used to override any [`EntityCursor`] cursor changes.
+///
+/// This is meant for cases like loading where you don't want the cursor to imply you
+/// can interact with something.
+#[derive(Deref, Resource, Debug, Clone, Default, Reflect)]
+pub struct OverrideCursor(pub Option<EntityCursor>);
+
 impl EntityCursor {
     /// Convert the [`EntityCursor`] to a [`CursorIcon`] so that it can be inserted into a
     /// window.
@@ -80,19 +88,22 @@ pub(crate) fn update_cursor(
     cursor_query: Query<&EntityCursor, Without<Window>>,
     q_windows: Query<(Entity, Option<&CursorIcon>), With<Window>>,
     r_default_cursor: Res<DefaultCursor>,
+    r_override_cursor: Res<OverrideCursor>,
 ) {
-    let cursor = hover_map
-        .and_then(|hover_map| match hover_map.get(&PointerId::Mouse) {
-            Some(hover_set) => hover_set.keys().find_map(|entity| {
-                cursor_query.get(*entity).ok().or_else(|| {
-                    parent_query
-                        .iter_ancestors(*entity)
-                        .find_map(|e| cursor_query.get(e).ok())
-                })
-            }),
-            None => None,
-        })
-        .unwrap_or(&r_default_cursor.0);
+    let cursor = r_override_cursor.0.as_ref().unwrap_or_else(|| {
+        hover_map
+            .and_then(|hover_map| match hover_map.get(&PointerId::Mouse) {
+                Some(hover_set) => hover_set.keys().find_map(|entity| {
+                    cursor_query.get(*entity).ok().or_else(|| {
+                        parent_query
+                            .iter_ancestors(*entity)
+                            .find_map(|e| cursor_query.get(e).ok())
+                    })
+                }),
+                None => None,
+            })
+            .unwrap_or(&r_default_cursor)
+    });
 
     for (entity, prev_cursor) in q_windows.iter() {
         if let Some(prev_cursor) = prev_cursor
@@ -111,6 +122,7 @@ impl Plugin for CursorIconPlugin {
     fn build(&self, app: &mut App) {
         if app.world().get_resource::<DefaultCursor>().is_none() {
             app.init_resource::<DefaultCursor>();
+            app.init_resource::<OverrideCursor>();
         }
         app.add_systems(PreUpdate, update_cursor.in_set(PickingSystems::Last));
     }
diff --git a/examples/ui/feathers.rs b/examples/ui/feathers.rs
index e6a31a7cad0a7..29f11789ef998 100644
--- a/examples/ui/feathers.rs
+++ b/examples/ui/feathers.rs
@@ -9,6 +9,7 @@ use bevy::{
             ColorSlider, ColorSliderProps, ColorSwatch, ColorSwatchValue, SliderBaseColor,
             SliderProps,
         },
+        cursor::{EntityCursor, OverrideCursor},
         dark_theme::create_dark_theme,
         rounded_corners::RoundedCorners,
         theme::{ThemeBackgroundColor, ThemedText, UiTheme},
@@ -21,6 +22,7 @@ use bevy::{
         checkbox_self_update, observe, slider_self_update, Activate, RadioButton, RadioGroup,
         SliderPrecision, SliderStep, SliderValue, ValueChange,
     },
+    window::SystemCursorIcon,
 };
 
 /// A struct to hold the state of various widgets shown in the demo.
@@ -185,10 +187,15 @@ fn demo_root() -> impl Bundle {
                     button(
                         ButtonProps::default(),
                         (),
-                        Spawn((Text::new("Button"), ThemedText))
+                        Spawn((Text::new("Toggle override"), ThemedText))
                     ),
-                    observe(|_activate: On<Activate>| {
-                        info!("Wide button clicked!");
+                    observe(|_activate: On<Activate>, mut ovr: ResMut<OverrideCursor>| {
+                        ovr.0 = if ovr.0.is_some() {
+                            None
+                        } else {
+                            Some(EntityCursor::System(SystemCursorIcon::Wait))
+                        };
+                        info!("Override cursor button clicked!");
                     })
                 ),
                 (

From 0c815db70ebdfd0a695f7a8b4fb84886987bd465 Mon Sep 17 00:00:00 2001
From: JMS55 <47158642+JMS55@users.noreply.github.com>
Date: Wed, 10 Dec 2025 02:26:40 -0500
Subject: [PATCH 078/133] Upgrade to wgpu 27 and associated crates (#21746)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Supersedes https://github.com/bevyengine/bevy/pull/21725.

---------

Co-authored-by: Jasmine Schweitzer <jasmine.schweitzer@nominal.io>
Co-authored-by: Ben Cochrane <ben.cochrane2112@gmail.com>
Co-authored-by: François Mockers <francois.mockers@vleue.com>
Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
Co-authored-by: François Mockers <mockersf@gmail.com>
---
 crates/bevy_anti_alias/Cargo.toml             |  2 +-
 crates/bevy_camera/Cargo.toml                 |  2 +-
 crates/bevy_color/Cargo.toml                  |  2 +-
 crates/bevy_image/Cargo.toml                  |  2 +-
 crates/bevy_mesh/Cargo.toml                   |  2 +-
 crates/bevy_reflect/Cargo.toml                |  2 +-
 crates/bevy_render/Cargo.toml                 |  4 ++--
 .../src/batching/gpu_preprocessing.rs         |  8 +++----
 .../bevy_render/src/diagnostic/tracy_gpu.rs   |  2 +-
 .../src/render_resource/uniform_buffer.rs     | 16 +++++++-------
 crates/bevy_render/src/renderer/mod.rs        | 21 ++++++++++++++++++-
 .../bevy_render/src/renderer/render_device.rs | 13 ++++++------
 crates/bevy_shader/Cargo.toml                 |  8 +++----
 crates/bevy_solari/src/lib.rs                 |  3 +--
 crates/bevy_sprite/Cargo.toml                 |  2 +-
 crates/bevy_text/Cargo.toml                   |  2 +-
 crates/bevy_winit/Cargo.toml                  |  2 +-
 examples/app/headless_renderer.rs             |  2 +-
 18 files changed, 55 insertions(+), 40 deletions(-)

diff --git a/crates/bevy_anti_alias/Cargo.toml b/crates/bevy_anti_alias/Cargo.toml
index 8fbcf88fdc23e..54d69899e4847 100644
--- a/crates/bevy_anti_alias/Cargo.toml
+++ b/crates/bevy_anti_alias/Cargo.toml
@@ -34,7 +34,7 @@ bevy_diagnostic = { path = "../bevy_diagnostic", version = "0.18.0-dev" }
 
 # other
 tracing = { version = "0.1", default-features = false, features = ["std"] }
-dlss_wgpu = { version = "1", optional = true }
+dlss_wgpu = { version = "2", optional = true }
 uuid = { version = "1", optional = true }
 
 [lints]
diff --git a/crates/bevy_camera/Cargo.toml b/crates/bevy_camera/Cargo.toml
index b8a1332dcd06b..6b310b65d69a0 100644
--- a/crates/bevy_camera/Cargo.toml
+++ b/crates/bevy_camera/Cargo.toml
@@ -28,7 +28,7 @@ bevy_color = { path = "../bevy_color", version = "0.18.0-dev", features = [
 bevy_window = { path = "../bevy_window", version = "0.18.0-dev" }
 
 # other
-wgpu-types = { version = "26", default-features = false }
+wgpu-types = { version = "27", default-features = false }
 serde = { version = "1", default-features = false, features = ["derive"] }
 thiserror = { version = "2", default-features = false }
 downcast-rs = { version = "2", default-features = false, features = ["std"] }
diff --git a/crates/bevy_color/Cargo.toml b/crates/bevy_color/Cargo.toml
index 056cdeb2f57b7..07b4d17292b17 100644
--- a/crates/bevy_color/Cargo.toml
+++ b/crates/bevy_color/Cargo.toml
@@ -20,7 +20,7 @@ serde = { version = "1.0", features = [
 ], default-features = false, optional = true }
 thiserror = { version = "2", default-features = false }
 derive_more = { version = "2", default-features = false, features = ["from"] }
-wgpu-types = { version = "26", default-features = false, optional = true }
+wgpu-types = { version = "27", default-features = false, optional = true }
 encase = { version = "0.12", default-features = false, optional = true }
 
 [features]
diff --git a/crates/bevy_image/Cargo.toml b/crates/bevy_image/Cargo.toml
index f608023fe984b..008772a5179d6 100644
--- a/crates/bevy_image/Cargo.toml
+++ b/crates/bevy_image/Cargo.toml
@@ -70,7 +70,7 @@ image = { version = "0.25.2", default-features = false }
 # misc
 bitflags = { version = "2.3", features = ["serde"] }
 bytemuck = { version = "1.5" }
-wgpu-types = { version = "26", default-features = false }
+wgpu-types = { version = "27", default-features = false }
 serde = { version = "1", features = ["derive"] }
 thiserror = { version = "2", default-features = false }
 futures-lite = "2.0.1"
diff --git a/crates/bevy_mesh/Cargo.toml b/crates/bevy_mesh/Cargo.toml
index eaa0dc2c574f0..c8e48307dc204 100644
--- a/crates/bevy_mesh/Cargo.toml
+++ b/crates/bevy_mesh/Cargo.toml
@@ -27,7 +27,7 @@ bevy_platform = { path = "../bevy_platform", version = "0.18.0-dev", default-fea
 # other
 bitflags = { version = "2.3", features = ["serde"] }
 bytemuck = { version = "1.5" }
-wgpu-types = { version = "26", default-features = false }
+wgpu-types = { version = "27", default-features = false }
 serde = { version = "1", default-features = false, features = [
   "derive",
 ], optional = true }
diff --git a/crates/bevy_reflect/Cargo.toml b/crates/bevy_reflect/Cargo.toml
index 5d5dfe1bc3249..46682e56c0c3e 100644
--- a/crates/bevy_reflect/Cargo.toml
+++ b/crates/bevy_reflect/Cargo.toml
@@ -125,7 +125,7 @@ uuid = { version = "1.13.1", default-features = false, optional = true, features
   "serde",
 ] }
 variadics_please = "1.1"
-wgpu-types = { version = "26", features = [
+wgpu-types = { version = "27", features = [
   "serde",
 ], optional = true, default-features = false }
 
diff --git a/crates/bevy_render/Cargo.toml b/crates/bevy_render/Cargo.toml
index 6edeec51654c0..69cdc5cd93c81 100644
--- a/crates/bevy_render/Cargo.toml
+++ b/crates/bevy_render/Cargo.toml
@@ -85,7 +85,7 @@ image = { version = "0.25.2", default-features = false }
 # It is enabled for now to avoid having to do a significant overhaul of the renderer just for wasm.
 # When the 'atomics' feature is enabled `fragile-send-sync-non-atomic` does nothing
 # and Bevy instead wraps `wgpu` types to verify they are not used off their origin thread.
-wgpu = { version = "26", default-features = false, features = [
+wgpu = { version = "27", default-features = false, features = [
   "wgsl",
   "dx12",
   "metal",
@@ -93,7 +93,7 @@ wgpu = { version = "26", default-features = false, features = [
   "naga-ir",
   "fragile-send-sync-non-atomic-wasm",
 ] }
-naga = { version = "26", features = ["wgsl-in"] }
+naga = { version = "27", features = ["wgsl-in"] }
 bytemuck = { version = "1.5", features = ["derive", "must_cast"] }
 downcast-rs = { version = "2", default-features = false, features = ["std"] }
 thiserror = { version = "2", default-features = false }
diff --git a/crates/bevy_render/src/batching/gpu_preprocessing.rs b/crates/bevy_render/src/batching/gpu_preprocessing.rs
index 02e3292f47a22..21780b222797d 100644
--- a/crates/bevy_render/src/batching/gpu_preprocessing.rs
+++ b/crates/bevy_render/src/batching/gpu_preprocessing.rs
@@ -1109,11 +1109,9 @@ impl FromWorld for GpuPreprocessingSupport {
                 || crate::get_mali_driver_version(adapter_info).is_some_and(|version| version < 48)
         }
 
-        let culling_feature_support = device.features().contains(
-            Features::INDIRECT_FIRST_INSTANCE
-                | Features::MULTI_DRAW_INDIRECT
-                | Features::PUSH_CONSTANTS,
-        );
+        let culling_feature_support = device
+            .features()
+            .contains(Features::INDIRECT_FIRST_INSTANCE | Features::PUSH_CONSTANTS);
         // Depth downsampling for occlusion culling requires 12 textures
         let limit_support = device.limits().max_storage_textures_per_shader_stage >= 12 &&
             // Even if the adapter supports compute, we might be simulating a lack of
diff --git a/crates/bevy_render/src/diagnostic/tracy_gpu.rs b/crates/bevy_render/src/diagnostic/tracy_gpu.rs
index c429c0ee245af..488e41581190a 100644
--- a/crates/bevy_render/src/diagnostic/tracy_gpu.rs
+++ b/crates/bevy_render/src/diagnostic/tracy_gpu.rs
@@ -61,7 +61,7 @@ fn initial_timestamp(device: &RenderDevice, queue: &RenderQueue) -> i64 {
 
     map_buffer.slice(..).map_async(MapMode::Read, |_| ());
     device
-        .poll(PollType::Wait)
+        .poll(PollType::wait_indefinitely())
         .expect("Failed to poll device for map async");
 
     let view = map_buffer.slice(..).get_mapped_range();
diff --git a/crates/bevy_render/src/render_resource/uniform_buffer.rs b/crates/bevy_render/src/render_resource/uniform_buffer.rs
index 03cfb8c644991..0fe93506eaa3f 100644
--- a/crates/bevy_render/src/render_resource/uniform_buffer.rs
+++ b/crates/bevy_render/src/render_resource/uniform_buffer.rs
@@ -277,7 +277,7 @@ impl<T: ShaderType + WriteInto> DynamicUniformBuffer<T> {
         max_count: usize,
         device: &RenderDevice,
         queue: &'a RenderQueue,
-    ) -> Option<DynamicUniformBufferWriter<'a, T>> {
+    ) -> Option<DynamicUniformBufferWriter<T>> {
         let alignment = if cfg!(target_abi = "sim") {
             // On iOS simulator on silicon macs, metal validation check that the host OS alignment
             // is respected, but the device reports the correct value for iOS, which is smaller.
@@ -357,27 +357,27 @@ impl<T: ShaderType + WriteInto> DynamicUniformBuffer<T> {
 /// A writer that can be used to directly write elements into the target buffer.
 ///
 /// For more information, see [`DynamicUniformBuffer::get_writer`].
-pub struct DynamicUniformBufferWriter<'a, T> {
-    buffer: encase::DynamicUniformBuffer<QueueWriteBufferViewWrapper<'a>>,
+pub struct DynamicUniformBufferWriter<T> {
+    buffer: encase::DynamicUniformBuffer<QueueWriteBufferViewWrapper>,
     _marker: PhantomData<fn() -> T>,
 }
 
-impl<'a, T: ShaderType + WriteInto> DynamicUniformBufferWriter<'a, T> {
+impl<T: ShaderType + WriteInto> DynamicUniformBufferWriter<T> {
     pub fn write(&mut self, value: &T) -> u32 {
         self.buffer.write(value).unwrap() as u32
     }
 }
 
-/// A wrapper to work around the orphan rule so that [`wgpu::QueueWriteBufferView`] can  implement
+/// A wrapper to work around the orphan rule so that [`wgpu::QueueWriteBufferView`] can implement
 /// [`BufferMut`].
-struct QueueWriteBufferViewWrapper<'a> {
-    buffer_view: wgpu::QueueWriteBufferView<'a>,
+struct QueueWriteBufferViewWrapper {
+    buffer_view: wgpu::QueueWriteBufferView,
     // Must be kept separately and cannot be retrieved from buffer_view, as the read-only access will
     // invoke a panic.
     capacity: usize,
 }
 
-impl<'a> BufferMut for QueueWriteBufferViewWrapper<'a> {
+impl BufferMut for QueueWriteBufferViewWrapper {
     #[inline]
     fn capacity(&self) -> usize {
         self.capacity
diff --git a/crates/bevy_render/src/renderer/mod.rs b/crates/bevy_render/src/renderer/mod.rs
index af716707fc44e..f4cd4ad07be5d 100644
--- a/crates/bevy_render/src/renderer/mod.rs
+++ b/crates/bevy_render/src/renderer/mod.rs
@@ -195,6 +195,9 @@ pub async fn initialize_renderer(
             },
             dx12: wgpu::Dx12BackendOptions {
                 shader_compiler: options.dx12_shader_compiler.clone(),
+                presentation_system: wgpu::wgt::Dx12SwapchainKind::from_env().unwrap_or_default(),
+                latency_waitable_object: wgpu::wgt::Dx12UseFrameLatencyWaitableObject::from_env()
+                    .unwrap_or_default(),
             },
             noop: wgpu::NoopBackendOptions { enable: false },
         },
@@ -431,7 +434,21 @@ pub async fn initialize_renderer(
             max_subgroup_size: limits
                 .max_subgroup_size
                 .min(constrained_limits.max_subgroup_size),
-            max_acceleration_structures_per_shader_stage: 0,
+            max_acceleration_structures_per_shader_stage: limits
+                .max_acceleration_structures_per_shader_stage
+                .min(constrained_limits.max_acceleration_structures_per_shader_stage),
+            max_task_workgroup_total_count: limits
+                .max_task_workgroup_total_count
+                .min(constrained_limits.max_task_workgroup_total_count),
+            max_task_workgroups_per_dimension: limits
+                .max_task_workgroups_per_dimension
+                .min(constrained_limits.max_task_workgroups_per_dimension),
+            max_mesh_output_layers: limits
+                .max_mesh_output_layers
+                .min(constrained_limits.max_mesh_output_layers),
+            max_mesh_multiview_count: limits
+                .max_mesh_multiview_count
+                .min(constrained_limits.max_mesh_multiview_count),
         };
     }
 
@@ -439,6 +456,8 @@ pub async fn initialize_renderer(
         label: options.device_label.as_ref().map(AsRef::as_ref),
         required_features: features,
         required_limits: limits,
+        // SAFETY: TODO, see https://github.com/bevyengine/bevy/issues/22082
+        experimental_features: unsafe { wgpu::ExperimentalFeatures::enabled() },
         memory_hints: options.memory_hints.clone(),
         // See https://github.com/gfx-rs/wgpu/issues/5974
         trace: Trace::Off,
diff --git a/crates/bevy_render/src/renderer/render_device.rs b/crates/bevy_render/src/renderer/render_device.rs
index 21a778040ebd0..f0334a9c8de71 100644
--- a/crates/bevy_render/src/renderer/render_device.rs
+++ b/crates/bevy_render/src/renderer/render_device.rs
@@ -61,19 +61,18 @@ impl RenderDevice {
             wgpu::ShaderSource::SpirV(source)
                 if self
                     .features()
-                    .contains(wgpu::Features::SPIRV_SHADER_PASSTHROUGH) =>
+                    .contains(wgpu::Features::EXPERIMENTAL_PASSTHROUGH_SHADERS) =>
             {
                 // SAFETY:
                 // This call passes binary data to the backend as-is and can potentially result in a driver crash or bogus behavior.
                 // No attempt is made to ensure that data is valid SPIR-V.
                 unsafe {
                     self.device.create_shader_module_passthrough(
-                        wgpu::ShaderModuleDescriptorPassthrough::SpirV(
-                            wgpu::ShaderModuleDescriptorSpirV {
-                                label: desc.label,
-                                source: source.clone(),
-                            },
-                        ),
+                        wgpu::ShaderModuleDescriptorPassthrough {
+                            label: desc.label,
+                            spirv: Some(source.clone()),
+                            ..Default::default()
+                        },
                     )
                 }
             }
diff --git a/crates/bevy_shader/Cargo.toml b/crates/bevy_shader/Cargo.toml
index 9a14fc0184258..f7f0ef3ba75c0 100644
--- a/crates/bevy_shader/Cargo.toml
+++ b/crates/bevy_shader/Cargo.toml
@@ -15,8 +15,8 @@ bevy_reflect = { path = "../bevy_reflect", version = "0.18.0-dev" }
 bevy_platform = { path = "../bevy_platform", version = "0.18.0-dev" }
 
 # other
-wgpu-types = { version = "26", default-features = false }
-naga = { version = "26", features = ["wgsl-in"] }
+wgpu-types = { version = "27", default-features = false }
+naga = { version = "27", features = ["wgsl-in"] }
 serde = { version = "1", features = ["derive"] }
 thiserror = { version = "2", default-features = false }
 wesl = { version = "0.2.0", optional = true }
@@ -25,12 +25,12 @@ tracing = { version = "0.1", default-features = false, features = ["std"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 # Omit the `glsl` feature in non-WebAssembly by default.
-naga_oil = { version = "0.19", default-features = false, features = [
+naga_oil = { version = "0.20", default-features = false, features = [
   "test_shader",
 ] }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-naga_oil = { version = "0.19" }
+naga_oil = { version = "0.20" }
 
 [features]
 shader_format_glsl = ["naga/glsl-in", "naga/wgsl-out", "naga_oil/glsl"]
diff --git a/crates/bevy_solari/src/lib.rs b/crates/bevy_solari/src/lib.rs
index 6aaea2180fe0b..0b2e731926c54 100644
--- a/crates/bevy_solari/src/lib.rs
+++ b/crates/bevy_solari/src/lib.rs
@@ -49,8 +49,7 @@ impl PluginGroup for SolariPlugins {
 impl SolariPlugins {
     /// [`WgpuFeatures`] required for these plugins to function.
     pub fn required_wgpu_features() -> WgpuFeatures {
-        WgpuFeatures::EXPERIMENTAL_RAY_TRACING_ACCELERATION_STRUCTURE
-            | WgpuFeatures::EXPERIMENTAL_RAY_QUERY
+        WgpuFeatures::EXPERIMENTAL_RAY_QUERY
             | WgpuFeatures::BUFFER_BINDING_ARRAY
             | WgpuFeatures::TEXTURE_BINDING_ARRAY
             | WgpuFeatures::SAMPLED_TEXTURE_AND_STORAGE_BUFFER_ARRAY_NON_UNIFORM_INDEXING
diff --git a/crates/bevy_sprite/Cargo.toml b/crates/bevy_sprite/Cargo.toml
index f980c56fda8c6..823718762c495 100644
--- a/crates/bevy_sprite/Cargo.toml
+++ b/crates/bevy_sprite/Cargo.toml
@@ -32,7 +32,7 @@ bevy_text = { path = "../bevy_text", version = "0.18.0-dev", optional = true }
 # other
 radsort = "0.1"
 tracing = { version = "0.1", default-features = false, features = ["std"] }
-wgpu-types = { version = "26", default-features = false }
+wgpu-types = { version = "27", default-features = false }
 
 [dev-dependencies]
 approx = "0.5.1"
diff --git a/crates/bevy_text/Cargo.toml b/crates/bevy_text/Cargo.toml
index bc9b134f280a2..9e153138b989b 100644
--- a/crates/bevy_text/Cargo.toml
+++ b/crates/bevy_text/Cargo.toml
@@ -29,7 +29,7 @@ bevy_platform = { path = "../bevy_platform", version = "0.18.0-dev", default-fea
 ] }
 
 # other
-wgpu-types = { version = "26", default-features = false }
+wgpu-types = { version = "27", default-features = false }
 cosmic-text = { version = "0.15", features = ["shape-run-cache"] }
 thiserror = { version = "2", default-features = false }
 serde = { version = "1", features = ["derive"] }
diff --git a/crates/bevy_winit/Cargo.toml b/crates/bevy_winit/Cargo.toml
index 29b87ae8c1feb..6855cfce2314f 100644
--- a/crates/bevy_winit/Cargo.toml
+++ b/crates/bevy_winit/Cargo.toml
@@ -57,7 +57,7 @@ bevy_asset = { path = "../bevy_asset", version = "0.18.0-dev", optional = true }
 ## used by custom_cursor
 bevy_image = { path = "../bevy_image", version = "0.18.0-dev", optional = true }
 ## used by custom_cursor
-wgpu-types = { version = "26", optional = true }
+wgpu-types = { version = "27", optional = true }
 ## used by custom_cursor
 bytemuck = { version = "1.5", optional = true }
 
diff --git a/examples/app/headless_renderer.rs b/examples/app/headless_renderer.rs
index b8e11e2aabb13..b6aa5bf674636 100644
--- a/examples/app/headless_renderer.rs
+++ b/examples/app/headless_renderer.rs
@@ -449,7 +449,7 @@ fn receive_image_from_buffer(
 
         // This blocks until the gpu is done executing everything
         render_device
-            .poll(PollType::Wait)
+            .poll(PollType::wait_indefinitely())
             .expect("Failed to poll device for map async");
 
         // This blocks until the buffer is mapped

From a647a47371c58ee1629f49fceb26f1854878e643 Mon Sep 17 00:00:00 2001
From: Rajveer Singh Bharadwaj <rajveer.developer@icloud.com>
Date: Thu, 11 Dec 2025 01:04:47 +0530
Subject: [PATCH 079/133] Add a new `almost_finish` method for `Timer` with
 immediate first `tick` action (#21983)

# Objective

Resolves #21860

This new method would tick the timer by `duration - 1 ns` leaving a very
short waiting time for the first tick initiated by the user allowing
immediate action.

## Solution

The `almost_finish` method updates the timer by ticking it with `1ns`
remaining.

## Testing

Tests have been added in `almost_finished_repeating`.
---
 crates/bevy_time/src/timer.rs | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/crates/bevy_time/src/timer.rs b/crates/bevy_time/src/timer.rs
index bbf76aa1d93a6..a9ce7b3d6ce63 100644
--- a/crates/bevy_time/src/timer.rs
+++ b/crates/bevy_time/src/timer.rs
@@ -206,6 +206,25 @@ impl Timer {
         self.tick(remaining);
     }
 
+    /// Almost finishes the timer leaving 1 ns of remaining time.
+    /// This can be useful when needing an immediate action without having
+    /// to wait for the set duration of the timer in the first tick.
+    ///
+    /// # Examples
+    /// ```
+    /// # use bevy_time::*;
+    /// use std::time::Duration;
+    /// let mut timer = Timer::from_seconds(1.5, TimerMode::Once);
+    /// timer.almost_finish();
+    /// assert!(!timer.is_finished());
+    /// assert_eq!(timer.remaining(), Duration::from_nanos(1));
+    /// ```
+    #[inline]
+    pub fn almost_finish(&mut self) {
+        let remaining = self.remaining() - Duration::from_nanos(1);
+        self.tick(remaining);
+    }
+
     /// Returns the mode of the timer.
     ///
     /// # Examples
@@ -628,6 +647,21 @@ mod tests {
         assert_eq!(t.times_finished_this_tick(), 34);
     }
 
+    #[test]
+    fn almost_finished_repeating() {
+        let mut t = Timer::from_seconds(10.0, TimerMode::Repeating);
+        let duration = Duration::from_nanos(1);
+
+        t.almost_finish();
+        assert!(!t.is_finished());
+        assert_eq!(t.times_finished_this_tick(), 0);
+        assert_eq!(t.remaining(), Duration::from_nanos(1));
+
+        t.tick(duration);
+        assert!(t.is_finished());
+        assert_eq!(t.times_finished_this_tick(), 1);
+    }
+
     #[test]
     fn paused() {
         let mut t = Timer::from_seconds(10.0, TimerMode::Once);

From 3eb3f479bb7e9bc7ec85f94756c902cdaeaff810 Mon Sep 17 00:00:00 2001
From: Eric Kwoka <43540491+ekwoka@users.noreply.github.com>
Date: Wed, 10 Dec 2025 23:40:34 +0400
Subject: [PATCH 080/133] :bug: Fixes Warning regression in Propagate (#22084)

# Objective

Solves #22067

It was just a warning, but no reason to emit warnings for internals.

Seemed safe to just use `try_remove` everywhere in place of `remove`.
---
 crates/bevy_app/src/propagate.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/crates/bevy_app/src/propagate.rs b/crates/bevy_app/src/propagate.rs
index ecdfa74b9dfda..06d445aa75e1e 100644
--- a/crates/bevy_app/src/propagate.rs
+++ b/crates/bevy_app/src/propagate.rs
@@ -176,7 +176,7 @@ pub fn update_source<C: Component + Clone + PartialEq, F: QueryFilter, R: Relati
             {
                 commands.insert(inherited.clone());
             } else {
-                commands.remove::<Inherited<C>>();
+                commands.try_remove::<Inherited<C>>();
             }
         }
     }
@@ -193,12 +193,12 @@ pub fn update_reparented<C: Component + Clone + PartialEq, F: QueryFilter, R: Re
         if let Ok(inherited) = relations.get(relation.get()) {
             commands.entity(entity).try_insert(inherited.clone());
         } else if maybe_inherited.is_some() {
-            commands.entity(entity).remove::<Inherited<C>>();
+            commands.entity(entity).try_remove::<Inherited<C>>();
         }
     }
 
     for orphan in &orphaned {
-        commands.entity(orphan).remove::<Inherited<C>>();
+        commands.entity(orphan).try_remove::<Inherited<C>>();
     }
 }
 
@@ -279,7 +279,7 @@ pub fn propagate_inherited<C: Component + Clone + PartialEq, F: QueryFilter, R:
         if let Some(inherited) = maybe_inherited {
             commands.entity(entity).try_insert(inherited);
         } else {
-            commands.entity(entity).remove::<Inherited<C>>();
+            commands.entity(entity).try_remove::<Inherited<C>>();
         }
     }
 }
@@ -304,7 +304,7 @@ pub fn propagate_output<C: Component + Clone + PartialEq, F: QueryFilter>(
 
     for removed in removed.read() {
         if skip.get(removed).is_err() {
-            commands.entity(removed).remove::<C>();
+            commands.entity(removed).try_remove::<C>();
         }
     }
 }

From 176d5a39b7c146bc6885e095bd105871fba24054 Mon Sep 17 00:00:00 2001
From: ickshonpe <david.curthoys@googlemail.com>
Date: Wed, 10 Dec 2025 19:41:44 +0000
Subject: [PATCH 081/133] Remove queue text (#22051)

# Objective

Remove the `queue_text` function as redundant.

## Solution

* Remove `queue_text` from `TextPipeline`.
* In `update_text2d_layout`, instead of `queue_text`, call
`TextPipeline::update_buffer` and then
`TextPipeline::update_text_layout`.
---
 crates/bevy_sprite/src/text2d.rs  |  97 ++++++++-----
 crates/bevy_text/src/glyph.rs     |   2 +-
 crates/bevy_text/src/lib.rs       |   2 +-
 crates/bevy_text/src/pipeline.rs  | 223 ++----------------------------
 crates/bevy_ui/src/widget/text.rs |   1 +
 5 files changed, 78 insertions(+), 247 deletions(-)

diff --git a/crates/bevy_sprite/src/text2d.rs b/crates/bevy_sprite/src/text2d.rs
index 572a9572218bf..b68bf92a55f66 100644
--- a/crates/bevy_sprite/src/text2d.rs
+++ b/crates/bevy_sprite/src/text2d.rs
@@ -160,8 +160,8 @@ impl Default for Text2dShadow {
 /// It does not modify or observe existing ones.
 pub fn update_text2d_layout(
     mut target_scale_factors: Local<Vec<(f32, RenderLayers)>>,
-    // Text items which should be reprocessed again, generally when the font hasn't loaded yet.
-    mut queue: Local<EntityHashSet>,
+    // Text2d entities from the previous frame which need to be reprocessed, usually because the font hadn't loaded yet.
+    mut reprocess_queue: Local<EntityHashSet>,
     mut textures: ResMut<Assets<Image>>,
     fonts: Res<Assets<Font>>,
     camera_query: Query<(&Camera, &VisibleEntities, Option<&RenderLayers>)>,
@@ -176,6 +176,7 @@ pub fn update_text2d_layout(
         &mut TextLayoutInfo,
         &mut ComputedTextBlock,
     )>,
+    text_font_query: Query<&TextFont>,
     mut text_reader: Text2dReader,
     mut font_system: ResMut<CosmicFontSystem>,
     mut swash_cache: ResMut<SwashCache>,
@@ -197,7 +198,7 @@ pub fn update_text2d_layout(
     let mut previous_scale_factor = 0.;
     let mut previous_mask = &RenderLayers::none();
 
-    for (entity, maybe_entity_mask, block, bounds, text_layout_info, mut computed) in
+    for (entity, maybe_entity_mask, block, bounds, mut text_layout_info, mut computed) in
         &mut text_query
     {
         let entity_mask = maybe_entity_mask.unwrap_or_default();
@@ -219,39 +220,40 @@ pub fn update_text2d_layout(
             *scale_factor
         };
 
-        if scale_factor != text_layout_info.scale_factor
+        let text_changed = scale_factor != text_layout_info.scale_factor
+            || block.is_changed()
             || computed.needs_rerender()
-            || bounds.is_changed()
-            || (!queue.is_empty() && queue.remove(&entity))
-        {
-            let text_bounds = TextBounds {
-                width: if block.linebreak == LineBreak::NoWrap {
-                    None
-                } else {
-                    bounds.width.map(|width| width * scale_factor)
-                },
-                height: bounds.height.map(|height| height * scale_factor),
-            };
+            || (!reprocess_queue.is_empty() && reprocess_queue.remove(&entity));
+
+        if !(text_changed || bounds.is_changed()) {
+            continue;
+        }
 
-            let text_layout_info = text_layout_info.into_inner();
-            match text_pipeline.queue_text(
-                text_layout_info,
+        let text_bounds = TextBounds {
+            width: if block.linebreak == LineBreak::NoWrap {
+                None
+            } else {
+                bounds.width.map(|width| width * scale_factor)
+            },
+            height: bounds.height.map(|height| height * scale_factor),
+        };
+
+        if text_changed {
+            match text_pipeline.update_buffer(
                 &fonts,
                 text_reader.iter(entity),
-                scale_factor as f64,
-                &block,
+                block.linebreak,
+                block.justify,
                 text_bounds,
-                &mut font_atlas_set,
-                &mut texture_atlases,
-                &mut textures,
-                computed.as_mut(),
+                scale_factor as f64,
+                &mut computed,
                 &mut font_system,
-                &mut swash_cache,
             ) {
                 Err(TextError::NoSuchFont) => {
-                    // There was an error processing the text layout, let's add this entity to the
-                    // queue for further processing
-                    queue.insert(entity);
+                    // There was an error processing the text layout.
+                    // Add this entity to the queue and reprocess it in the following frame
+                    reprocess_queue.insert(entity);
+                    continue;
                 }
                 Err(
                     e @ (TextError::FailedToAddGlyph(_)
@@ -262,10 +264,41 @@ pub fn update_text2d_layout(
                 ) => {
                     panic!("Fatal error when processing text: {e}.");
                 }
-                Ok(()) => {
-                    text_layout_info.scale_factor = scale_factor;
-                    text_layout_info.size *= scale_factor.recip();
-                }
+                Ok(()) => {}
+            }
+        }
+
+        match text_pipeline.update_text_layout_info(
+            &mut text_layout_info,
+            text_font_query,
+            scale_factor as f64,
+            &mut font_atlas_set,
+            &mut texture_atlases,
+            &mut textures,
+            &mut computed,
+            &mut font_system,
+            &mut swash_cache,
+            text_bounds,
+            block.justify,
+        ) {
+            Err(TextError::NoSuchFont) => {
+                // There was an error processing the text layout.
+                // Add this entity to the queue and reprocess it in the following frame.
+                reprocess_queue.insert(entity);
+                continue;
+            }
+            Err(
+                e @ (TextError::FailedToAddGlyph(_)
+                | TextError::FailedToGetGlyphImage(_)
+                | TextError::MissingAtlasLayout
+                | TextError::MissingAtlasTexture
+                | TextError::InconsistentAtlasState),
+            ) => {
+                panic!("Fatal error when processing text: {e}.");
+            }
+            Ok(()) => {
+                text_layout_info.scale_factor = scale_factor;
+                text_layout_info.size *= scale_factor.recip();
             }
         }
     }
diff --git a/crates/bevy_text/src/glyph.rs b/crates/bevy_text/src/glyph.rs
index 453fc579a6b56..f9edd7b85bd98 100644
--- a/crates/bevy_text/src/glyph.rs
+++ b/crates/bevy_text/src/glyph.rs
@@ -9,7 +9,7 @@ use bevy_reflect::Reflect;
 ///
 /// Contains information about how and where to render a glyph.
 ///
-/// Used in [`TextPipeline::queue_text`](crate::TextPipeline::queue_text) and [`TextLayoutInfo`](`crate::TextLayoutInfo`) for rendering glyphs.
+/// Used in [`TextPipeline::update_text_layout_info`](crate::TextPipeline::update_text_layout_info) and [`TextLayoutInfo`](`crate::TextLayoutInfo`) for rendering glyphs.
 #[derive(Debug, Clone, Reflect)]
 #[reflect(Clone)]
 pub struct PositionedGlyph {
diff --git a/crates/bevy_text/src/lib.rs b/crates/bevy_text/src/lib.rs
index 2beb5b1897034..8c1bd93ae063d 100644
--- a/crates/bevy_text/src/lib.rs
+++ b/crates/bevy_text/src/lib.rs
@@ -21,7 +21,7 @@
 //!
 //! With the actual text bounds defined, the `bevy_ui::widget::text::text_system` system (in a UI context)
 //! or `bevy_sprite::text2d::update_text2d_layout` system (in a 2d world space context)
-//! passes it into [`TextPipeline::queue_text`], which:
+//! passes it into [`TextPipeline::update_text_layout_info`], which:
 //!
 //! 1. updates a [`Buffer`](cosmic_text::Buffer) from the [`TextSpan`]s, generating new [`FontAtlas`]es if necessary.
 //! 2. iterates over each glyph in the [`Buffer`](cosmic_text::Buffer) to create a [`PositionedGlyph`],
diff --git a/crates/bevy_text/src/pipeline.rs b/crates/bevy_text/src/pipeline.rs
index 40a428510dfa8..d9e95e7e598d0 100644
--- a/crates/bevy_text/src/pipeline.rs
+++ b/crates/bevy_text/src/pipeline.rs
@@ -235,216 +235,6 @@ impl TextPipeline {
         Ok(())
     }
 
-    /// Queues text for rendering
-    ///
-    /// Produces a [`TextLayoutInfo`], containing [`PositionedGlyph`]s
-    /// which contain information for rendering the text.
-    pub fn queue_text<'a>(
-        &mut self,
-        layout_info: &mut TextLayoutInfo,
-        fonts: &Assets<Font>,
-        text_spans: impl Iterator<Item = (Entity, usize, &'a str, &'a TextFont, Color, LineHeight)>,
-        scale_factor: f64,
-        layout: &TextLayout,
-        bounds: TextBounds,
-        font_atlas_set: &mut FontAtlasSet,
-        texture_atlases: &mut Assets<TextureAtlasLayout>,
-        textures: &mut Assets<Image>,
-        computed: &mut ComputedTextBlock,
-        font_system: &mut CosmicFontSystem,
-        swash_cache: &mut SwashCache,
-    ) -> Result<(), TextError> {
-        layout_info.clear();
-
-        // Clear this here at the focal point of text rendering to ensure the field's lifecycle has strong boundaries.
-        computed.needs_rerender = false;
-
-        // Extract font ids from the iterator while traversing it.
-        let mut glyph_info = core::mem::take(&mut self.glyph_info);
-        glyph_info.clear();
-        let text_spans = text_spans.inspect(|(_, _, _, text_font, _, _)| {
-            glyph_info.push((
-                text_font.font.id(),
-                text_font.font_smoothing,
-                text_font.font_size,
-                0.,
-                0.,
-                0.,
-            ));
-        });
-
-        let update_result = self.update_buffer(
-            fonts,
-            text_spans,
-            layout.linebreak,
-            layout.justify,
-            bounds,
-            scale_factor,
-            computed,
-            font_system,
-        );
-
-        self.glyph_info = glyph_info;
-
-        update_result?;
-
-        for (font, _, size, strikethrough_offset, stroke, underline_offset) in
-            self.glyph_info.iter_mut()
-        {
-            let Some((id, _)) = self.map_handle_to_font_id.get(font) else {
-                continue;
-            };
-            let weight = font_system
-                .db()
-                .face(*id)
-                .map(|f| f.weight)
-                .unwrap_or(cosmic_text::Weight::NORMAL);
-            if let Some(font) = font_system.get_font(*id, weight) {
-                let swash = font.as_swash();
-                let metrics = swash.metrics(&[]);
-                let upem = metrics.units_per_em as f32;
-                let scalar = *size * scale_factor as f32 / upem;
-                *strikethrough_offset = (metrics.strikeout_offset * scalar).round();
-                *stroke = (metrics.stroke_size * scalar).round().max(1.);
-                *underline_offset = (metrics.underline_offset * scalar).round();
-            }
-        }
-
-        let buffer = &mut computed.buffer;
-        let mut box_size = Vec2::ZERO;
-
-        let result = buffer.layout_runs().try_for_each(|run| {
-            box_size.x = box_size.x.max(run.line_w);
-            box_size.y += run.line_height;
-            let mut current_section: Option<usize> = None;
-            let mut start = 0.;
-            let mut end = 0.;
-            let result = run
-                .glyphs
-                .iter()
-                .map(move |layout_glyph| (layout_glyph, run.line_y, run.line_i))
-                .try_for_each(|(layout_glyph, line_y, line_i)| {
-                    match current_section {
-                        Some(section) => {
-                            if section != layout_glyph.metadata {
-                                layout_info.run_geometry.push(RunGeometry {
-                                    span_index: section,
-                                    bounds: Rect::new(
-                                        start,
-                                        run.line_top,
-                                        end,
-                                        run.line_top + run.line_height,
-                                    ),
-                                    strikethrough_y: (run.line_y - self.glyph_info[section].3)
-                                        .round(),
-                                    strikethrough_thickness: self.glyph_info[section].4,
-                                    underline_y: (run.line_y - self.glyph_info[section].5).round(),
-                                    underline_thickness: self.glyph_info[section].4,
-                                });
-                                start = end.max(layout_glyph.x);
-                                current_section = Some(layout_glyph.metadata);
-                            }
-                            end = layout_glyph.x + layout_glyph.w;
-                        }
-                        None => {
-                            current_section = Some(layout_glyph.metadata);
-                            start = layout_glyph.x;
-                            end = start + layout_glyph.w;
-                        }
-                    }
-
-                    let mut temp_glyph;
-                    let span_index = layout_glyph.metadata;
-                    let font_id = self.glyph_info[span_index].0;
-                    let font_smoothing = self.glyph_info[span_index].1;
-
-                    let layout_glyph = if font_smoothing == FontSmoothing::None {
-                        // If font smoothing is disabled, round the glyph positions and sizes,
-                        // effectively discarding all subpixel layout.
-                        temp_glyph = layout_glyph.clone();
-                        temp_glyph.x = temp_glyph.x.round();
-                        temp_glyph.y = temp_glyph.y.round();
-                        temp_glyph.w = temp_glyph.w.round();
-                        temp_glyph.x_offset = temp_glyph.x_offset.round();
-                        temp_glyph.y_offset = temp_glyph.y_offset.round();
-                        temp_glyph.line_height_opt = temp_glyph.line_height_opt.map(f32::round);
-
-                        &temp_glyph
-                    } else {
-                        layout_glyph
-                    };
-
-                    let physical_glyph = layout_glyph.physical((0., 0.), 1.);
-
-                    let font_atlases = font_atlas_set
-                        .entry(FontAtlasKey(
-                            font_id,
-                            physical_glyph.cache_key.font_size_bits,
-                            font_smoothing,
-                        ))
-                        .or_default();
-
-                    let atlas_info = get_glyph_atlas_info(font_atlases, physical_glyph.cache_key)
-                        .map(Ok)
-                        .unwrap_or_else(|| {
-                            add_glyph_to_atlas(
-                                font_atlases,
-                                texture_atlases,
-                                textures,
-                                &mut font_system.0,
-                                &mut swash_cache.0,
-                                layout_glyph,
-                                font_smoothing,
-                            )
-                        })?;
-
-                    let texture_atlas = texture_atlases.get(atlas_info.texture_atlas).unwrap();
-                    let location = atlas_info.location;
-                    let glyph_rect = texture_atlas.textures[location.glyph_index];
-                    let left = location.offset.x as f32;
-                    let top = location.offset.y as f32;
-                    let glyph_size = UVec2::new(glyph_rect.width(), glyph_rect.height());
-
-                    // offset by half the size because the origin is center
-                    let x = glyph_size.x as f32 / 2.0 + left + physical_glyph.x as f32;
-                    let y =
-                        line_y.round() + physical_glyph.y as f32 - top + glyph_size.y as f32 / 2.0;
-
-                    let position = Vec2::new(x, y);
-
-                    let pos_glyph = PositionedGlyph {
-                        position,
-                        size: glyph_size.as_vec2(),
-                        atlas_info,
-                        span_index,
-                        byte_index: layout_glyph.start,
-                        byte_length: layout_glyph.end - layout_glyph.start,
-                        line_index: line_i,
-                    };
-                    layout_info.glyphs.push(pos_glyph);
-                    Ok(())
-                });
-            if let Some(section) = current_section {
-                layout_info.run_geometry.push(RunGeometry {
-                    span_index: section,
-                    bounds: Rect::new(start, run.line_top, end, run.line_top + run.line_height),
-                    strikethrough_y: (run.line_y - self.glyph_info[section].3).round(),
-                    strikethrough_thickness: self.glyph_info[section].4,
-                    underline_y: (run.line_y - self.glyph_info[section].5).round(),
-                    underline_thickness: self.glyph_info[section].4,
-                });
-            }
-
-            result
-        });
-
-        // Check result.
-        result?;
-
-        layout_info.size = box_size.ceil();
-        Ok(())
-    }
-
     /// Queues text for measurement
     ///
     /// Produces a [`TextMeasureInfo`] which can be used by a layout system
@@ -513,6 +303,7 @@ impl TextPipeline {
         font_system: &mut CosmicFontSystem,
         swash_cache: &mut SwashCache,
         bounds: TextBounds,
+        justify: Justify,
     ) -> Result<(), TextError> {
         layout_info.glyphs.clear();
         layout_info.run_geometry.clear();
@@ -550,7 +341,13 @@ impl TextPipeline {
         }
 
         let buffer = &mut computed.buffer;
-        buffer.set_size(font_system, bounds.width, bounds.height);
+
+        // Workaround for alignment not working for unbounded text.
+        // See https://github.com/pop-os/cosmic-text/issues/343
+        let width = (bounds.width.is_none() && justify != Justify::Left)
+            .then(|| buffer_dimensions(buffer).x)
+            .or(bounds.width);
+        buffer.set_size(font_system, width, bounds.height);
         let mut box_size = Vec2::ZERO;
 
         let result = buffer.layout_runs().try_for_each(|run| {
@@ -681,14 +478,14 @@ impl TextPipeline {
         // Check result.
         result?;
 
-        layout_info.size = box_size;
+        layout_info.size = box_size.ceil();
         Ok(())
     }
 }
 
 /// Render information for a corresponding text block.
 ///
-/// Contains scaled glyphs and their size. Generated via [`TextPipeline::queue_text`] when an entity has
+/// Contains scaled glyphs and their size. Generated via [`TextPipeline::update_text_layout_info`] when an entity has
 /// [`TextLayout`] and [`ComputedTextBlock`] components.
 #[derive(Component, Clone, Default, Debug, Reflect)]
 #[reflect(Component, Default, Debug, Clone)]
diff --git a/crates/bevy_ui/src/widget/text.rs b/crates/bevy_ui/src/widget/text.rs
index c132bee60165d..f10f485342e59 100644
--- a/crates/bevy_ui/src/widget/text.rs
+++ b/crates/bevy_ui/src/widget/text.rs
@@ -360,6 +360,7 @@ pub fn text_system(
                 &mut font_system,
                 &mut swash_cache,
                 physical_node_size,
+                block.justify,
             ) {
                 Err(TextError::NoSuchFont) => {
                     // There was an error processing the text layout, try again next frame

From f198bd63525de35fad6acde009a6fd9e7d8c6f9c Mon Sep 17 00:00:00 2001
From: robtfm <50659922+robtfm@users.noreply.github.com>
Date: Wed, 10 Dec 2025 21:28:25 +0000
Subject: [PATCH 082/133] increase morph targets to 256 (#21421)

# Objective

our current morph target / blend shape limit is 64 per model, documented
as "to support all hardware". many assets use more than this ("over a
hundred" is common), so i'd like to increase this limit.

the relevant hardware constraint is uniform buffer size (usage in
morph.wgsl). morph targets use 4 bytes per entry, and wgpu's downlevel
uniform buffer size limit is 16k so we have a lot of room from the 256
bytes we are currently limiting to, while still supporting the vast
majority of hardware.

## Solution

increase the limit to 256 targets / 1k.

we also increase the input to the buffer to this 1k size: this was not
done previously but worked as long as the min buffer alignment was 256
(which it probably always is at the moment) as it was sized up to match
alignment previously.

there may be a slight performance impact from using a larger size in all
cases but it should be negligible.
---
 crates/bevy_mesh/src/morph.rs              | 2 +-
 crates/bevy_pbr/src/render/mesh_types.wgsl | 2 +-
 crates/bevy_pbr/src/render/morph.rs        | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/crates/bevy_mesh/src/morph.rs b/crates/bevy_mesh/src/morph.rs
index 4b6d2f574323d..2cb39a31985cb 100644
--- a/crates/bevy_mesh/src/morph.rs
+++ b/crates/bevy_mesh/src/morph.rs
@@ -14,7 +14,7 @@ const MAX_TEXTURE_WIDTH: u32 = 2048;
 const MAX_COMPONENTS: u32 = MAX_TEXTURE_WIDTH * MAX_TEXTURE_WIDTH;
 
 /// Max target count available for [morph targets](MorphWeights).
-pub const MAX_MORPH_WEIGHTS: usize = 64;
+pub const MAX_MORPH_WEIGHTS: usize = 256;
 
 #[derive(Error, Clone, Debug)]
 pub enum MorphBuildError {
diff --git a/crates/bevy_pbr/src/render/mesh_types.wgsl b/crates/bevy_pbr/src/render/mesh_types.wgsl
index 4c85192ddd9a2..476391d6f8415 100644
--- a/crates/bevy_pbr/src/render/mesh_types.wgsl
+++ b/crates/bevy_pbr/src/render/mesh_types.wgsl
@@ -34,7 +34,7 @@ struct SkinnedMesh {
 
 #ifdef MORPH_TARGETS
 struct MorphWeights {
-    weights: array<vec4<f32>, 16u>, // 16 = 64 / 4 (64 = MAX_MORPH_WEIGHTS)
+    weights: array<vec4<f32>, 64u>, // 64 = 256 / 4 (256 = MAX_MORPH_WEIGHTS)
 };
 #endif
 
diff --git a/crates/bevy_pbr/src/render/morph.rs b/crates/bevy_pbr/src/render/morph.rs
index 75ddb03414682..c742c77300cc0 100644
--- a/crates/bevy_pbr/src/render/morph.rs
+++ b/crates/bevy_pbr/src/render/morph.rs
@@ -127,7 +127,11 @@ pub fn extract_morphs(
         }
         let start = uniform.current_buffer.len();
         let weights = morph_weights.weights();
-        let legal_weights = weights.iter().take(MAX_MORPH_WEIGHTS).copied();
+        let legal_weights = weights
+            .iter()
+            .chain(iter::repeat(&0.0))
+            .take(MAX_MORPH_WEIGHTS)
+            .copied();
         uniform.current_buffer.extend(legal_weights);
         add_to_alignment::<f32>(&mut uniform.current_buffer);
 

From e4bf6dc78106da3d7d840992d58f5b685bb88990 Mon Sep 17 00:00:00 2001
From: robtfm <50659922+robtfm@users.noreply.github.com>
Date: Thu, 11 Dec 2025 00:28:46 +0000
Subject: [PATCH 083/133] fix gltf path texture usages (#22086)

# Objective

the asset usages from `GltfLoaderSettings::load_materials` are not
respected when loading path-based / non-embedded textures.

## Solution

use them
---
 crates/bevy_gltf/src/loader/mod.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crates/bevy_gltf/src/loader/mod.rs b/crates/bevy_gltf/src/loader/mod.rs
index 7c6c0eaa56ca9..73df951299f1b 100644
--- a/crates/bevy_gltf/src/loader/mod.rs
+++ b/crates/bevy_gltf/src/loader/mod.rs
@@ -1137,6 +1137,7 @@ async fn load_image<'a, 'b>(
                     path: image_path,
                     is_srgb,
                     sampler_descriptor,
+                    render_asset_usages: settings.load_materials,
                 })
             }
         }
@@ -1811,6 +1812,7 @@ enum ImageOrPath {
         path: AssetPath<'static>,
         is_srgb: bool,
         sampler_descriptor: ImageSamplerDescriptor,
+        render_asset_usages: RenderAssetUsages,
     },
 }
 
@@ -1833,11 +1835,13 @@ impl ImageOrPath {
                 path,
                 is_srgb,
                 sampler_descriptor,
+                render_asset_usages,
             } => load_context
                 .loader()
                 .with_settings(move |settings: &mut ImageLoaderSettings| {
                     settings.is_srgb = is_srgb;
                     settings.sampler = ImageSampler::Descriptor(sampler_descriptor.clone());
+                    settings.asset_usage = render_asset_usages;
                 })
                 .load(path),
         };

From bcdb844d3c852c54f9a20a798595defd9f2714ee Mon Sep 17 00:00:00 2001
From: Emerson Coskey <emerson@coskey.dev>
Date: Wed, 10 Dec 2025 17:20:28 -0800
Subject: [PATCH 084/133] More flexible SystemInput (#21917)

# Objective

Allow functions accepting `StaticSystemInput` as input to be used as
systems accepting the inner type.

## Solution

- Add FromInput trait mirroring IntoResult

## Testing

- Compiles
- Added test to `input.rs`

---

## Showcase

<details>
  <summary>Click to view showcase</summary>

```rust
    #[test]
    fn compatible_input() {
        fn takes_usize(In(a): In<usize>) -> usize {
            a
        }

        fn takes_static_usize(StaticSystemInput(In(b)): StaticSystemInput<In<usize>>) -> usize {
            b
        }

        assert_is_system::<In<usize>, usize, _>(takes_usize);
        // test if StaticSystemInput is compatible with its inner type
        assert_is_system::<In<usize>, usize, _>(takes_static_usize);
    }
```

</details>
---
 crates/bevy_ecs/src/schedule/set.rs           |  11 +-
 crates/bevy_ecs/src/system/function_system.rs | 112 ++++++++++--------
 crates/bevy_ecs/src/system/input.rs           |  41 ++++++-
 .../function_system_generics.md               |  21 ++++
 4 files changed, 131 insertions(+), 54 deletions(-)
 create mode 100644 release-content/migration-guides/function_system_generics.md

diff --git a/crates/bevy_ecs/src/schedule/set.rs b/crates/bevy_ecs/src/schedule/set.rs
index 7c2d718ed6be8..53c6e1565600e 100644
--- a/crates/bevy_ecs/src/schedule/set.rs
+++ b/crates/bevy_ecs/src/schedule/set.rs
@@ -14,8 +14,8 @@ use crate::{
     define_label,
     intern::Interned,
     system::{
-        ExclusiveFunctionSystem, ExclusiveSystemParamFunction, FunctionSystem, IntoResult,
-        IsExclusiveFunctionSystem, IsFunctionSystem, SystemParamFunction,
+        ExclusiveFunctionSystem, ExclusiveSystemParamFunction, FromInput, FunctionSystem,
+        IntoResult, IsExclusiveFunctionSystem, IsFunctionSystem, SystemParamFunction,
     },
 };
 
@@ -291,14 +291,13 @@ impl<S: SystemSet> IntoSystemSet<()> for S {
 impl<Marker, F> IntoSystemSet<(IsFunctionSystem, Marker)> for F
 where
     Marker: 'static,
-    F::Out: IntoResult<()>,
-    F: SystemParamFunction<Marker>,
+    F: SystemParamFunction<Marker, In: FromInput<()>, Out: IntoResult<()>>,
 {
-    type Set = SystemTypeSet<FunctionSystem<Marker, (), F>>;
+    type Set = SystemTypeSet<FunctionSystem<Marker, (), (), F>>;
 
     #[inline]
     fn into_system_set(self) -> Self::Set {
-        SystemTypeSet::<FunctionSystem<Marker, (), F>>::new()
+        SystemTypeSet::<FunctionSystem<Marker, (), (), F>>::new()
     }
 }
 
diff --git a/crates/bevy_ecs/src/system/function_system.rs b/crates/bevy_ecs/src/system/function_system.rs
index 4aeb704ecf9f2..cc7009c1759b8 100644
--- a/crates/bevy_ecs/src/system/function_system.rs
+++ b/crates/bevy_ecs/src/system/function_system.rs
@@ -6,8 +6,8 @@ use crate::{
     query::FilteredAccessSet,
     schedule::{InternedSystemSet, SystemSet},
     system::{
-        check_system_change_tick, ReadOnlySystemParam, System, SystemIn, SystemInput, SystemParam,
-        SystemParamItem,
+        check_system_change_tick, FromInput, ReadOnlySystemParam, System, SystemIn, SystemInput,
+        SystemParam, SystemParamItem,
     },
     world::{unsafe_world_cell::UnsafeWorldCell, DeferredWorld, World, WorldId},
 };
@@ -237,17 +237,18 @@ macro_rules! impl_build_system {
             /// Create a [`FunctionSystem`] from a [`SystemState`].
             /// This method signature allows type inference of closure parameters for a system with no input.
             /// You can use [`SystemState::build_system_with_input()`] if you have input, or [`SystemState::build_any_system()`] if you don't need type inference.
+            #[inline]
             pub fn build_system<
                 InnerOut: IntoResult<Out>,
-                Out: 'static,
+                Out,
                 Marker,
                 F: FnMut($(SystemParamItem<$param>),*) -> InnerOut
-                    + SystemParamFunction<Marker, Param = ($($param,)*), In = (), Out = InnerOut>
+                    + SystemParamFunction<Marker, In = (), Out = InnerOut, Param = ($($param,)*)>
             >
             (
                 self,
                 func: F,
-            ) -> FunctionSystem<Marker, Out, F>
+            ) -> FunctionSystem<Marker, (), Out, F>
             {
                 self.build_any_system(func)
             }
@@ -255,17 +256,20 @@ macro_rules! impl_build_system {
             /// Create a [`FunctionSystem`] from a [`SystemState`].
             /// This method signature allows type inference of closure parameters for a system with input.
             /// You can use [`SystemState::build_system()`] if you have no input, or [`SystemState::build_any_system()`] if you don't need type inference.
+            #[inline]
             pub fn build_system_with_input<
-                Input: SystemInput,
+                InnerIn: SystemInput + FromInput<In>,
+                In: SystemInput,
                 InnerOut: IntoResult<Out>,
-                Out: 'static,
+                Out,
                 Marker,
-                F: FnMut(Input, $(SystemParamItem<$param>),*) -> InnerOut
-                    + SystemParamFunction<Marker, Param = ($($param,)*), In = Input, Out = InnerOut>,
-            >(
+                F: FnMut(InnerIn, $(SystemParamItem<$param>),*) -> InnerOut
+                    + SystemParamFunction<Marker, In = InnerIn, Out = InnerOut, Param = ($($param,)*)>
+            >
+            (
                 self,
                 func: F,
-            ) -> FunctionSystem<Marker, Out, F> {
+            ) -> FunctionSystem<Marker, In, Out, F> {
                 self.build_any_system(func)
             }
         }
@@ -316,22 +320,20 @@ impl<Param: SystemParam> SystemState<Param> {
     /// Create a [`FunctionSystem`] from a [`SystemState`].
     /// This method signature allows any system function, but the compiler will not perform type inference on closure parameters.
     /// You can use [`SystemState::build_system()`] or [`SystemState::build_system_with_input()`] to get type inference on parameters.
-    pub fn build_any_system<Marker, Out, F>(self, func: F) -> FunctionSystem<Marker, Out, F>
+    #[inline]
+    pub fn build_any_system<Marker, In, Out, F>(self, func: F) -> FunctionSystem<Marker, In, Out, F>
     where
-        F: SystemParamFunction<Marker, Param = Param, Out: IntoResult<Out>>,
+        In: SystemInput,
+        F: SystemParamFunction<Marker, In: FromInput<In>, Out: IntoResult<Out>, Param = Param>,
     {
-        FunctionSystem {
+        FunctionSystem::new(
             func,
-            #[cfg(feature = "hotpatching")]
-            current_ptr: subsecond::HotFn::current(<F as SystemParamFunction<Marker>>::run)
-                .ptr_address(),
-            state: Some(FunctionSystemState {
+            self.meta,
+            Some(FunctionSystemState {
                 param: self.param_state,
                 world_id: self.world_id,
             }),
-            system_meta: self.meta,
-            marker: PhantomData,
-        }
+        )
     }
 
     /// Gets the metadata for this instance.
@@ -480,7 +482,7 @@ impl<Param: SystemParam> FromWorld for SystemState<Param> {
 ///
 /// The [`Clone`] implementation for [`FunctionSystem`] returns a new instance which
 /// is NOT initialized. The cloned system must also be `.initialized` before it can be run.
-pub struct FunctionSystem<Marker, Out, F>
+pub struct FunctionSystem<Marker, In, Out, F>
 where
     F: SystemParamFunction<Marker>,
 {
@@ -490,7 +492,7 @@ where
     state: Option<FunctionSystemState<F::Param>>,
     system_meta: SystemMeta,
     // NOTE: PhantomData<fn()-> T> gives this safe Send/Sync impls
-    marker: PhantomData<fn() -> (Marker, Out)>,
+    marker: PhantomData<fn(In) -> (Marker, Out)>,
 }
 
 /// The state of a [`FunctionSystem`], which must be initialized with
@@ -505,10 +507,23 @@ struct FunctionSystemState<P: SystemParam> {
     world_id: WorldId,
 }
 
-impl<Marker, Out, F> FunctionSystem<Marker, Out, F>
+impl<Marker, In, Out, F> FunctionSystem<Marker, In, Out, F>
 where
     F: SystemParamFunction<Marker>,
 {
+    #[inline]
+    fn new(func: F, system_meta: SystemMeta, state: Option<FunctionSystemState<F::Param>>) -> Self {
+        Self {
+            func,
+            #[cfg(feature = "hotpatching")]
+            current_ptr: subsecond::HotFn::current(<F as SystemParamFunction<Marker>>::run)
+                .ptr_address(),
+            state,
+            system_meta,
+            marker: PhantomData,
+        }
+    }
+
     /// Return this system with a new name.
     ///
     /// Useful to give closure systems more readable and unique names for debugging and tracing.
@@ -519,7 +534,7 @@ where
 }
 
 // De-initializes the cloned system.
-impl<Marker, Out, F> Clone for FunctionSystem<Marker, Out, F>
+impl<Marker, In, Out, F> Clone for FunctionSystem<Marker, In, Out, F>
 where
     F: SystemParamFunction<Marker> + Clone,
 {
@@ -540,23 +555,16 @@ where
 #[doc(hidden)]
 pub struct IsFunctionSystem;
 
-impl<Marker, Out, F> IntoSystem<F::In, Out, (IsFunctionSystem, Marker)> for F
+impl<Marker, In, Out, F> IntoSystem<In, Out, (IsFunctionSystem, Marker)> for F
 where
-    Out: 'static,
     Marker: 'static,
-    F: SystemParamFunction<Marker, Out: IntoResult<Out>>,
+    In: SystemInput + 'static,
+    Out: 'static,
+    F: SystemParamFunction<Marker, In: FromInput<In>, Out: IntoResult<Out>>,
 {
-    type System = FunctionSystem<Marker, Out, F>;
+    type System = FunctionSystem<Marker, In, Out, F>;
     fn into_system(func: Self) -> Self::System {
-        FunctionSystem {
-            func,
-            #[cfg(feature = "hotpatching")]
-            current_ptr: subsecond::HotFn::current(<F as SystemParamFunction<Marker>>::run)
-                .ptr_address(),
-            state: None,
-            system_meta: SystemMeta::new::<F>(),
-            marker: PhantomData,
-        }
+        FunctionSystem::new(func, SystemMeta::new::<F>(), None)
     }
 }
 
@@ -601,7 +609,7 @@ impl IntoResult<bool> for Never {
     }
 }
 
-impl<Marker, Out, F> FunctionSystem<Marker, Out, F>
+impl<Marker, In, Out, F> FunctionSystem<Marker, In, Out, F>
 where
     F: SystemParamFunction<Marker>,
 {
@@ -612,13 +620,14 @@ where
         "System's state was not found. Did you forget to initialize this system before running it?";
 }
 
-impl<Marker, Out, F> System for FunctionSystem<Marker, Out, F>
+impl<Marker, In, Out, F> System for FunctionSystem<Marker, In, Out, F>
 where
     Marker: 'static,
+    In: SystemInput + 'static,
     Out: 'static,
-    F: SystemParamFunction<Marker, Out: IntoResult<Out>>,
+    F: SystemParamFunction<Marker, In: FromInput<In>, Out: IntoResult<Out>>,
 {
-    type In = F::In;
+    type In = In;
     type Out = Out;
 
     #[inline]
@@ -642,6 +651,8 @@ where
 
         let change_tick = world.increment_change_tick();
 
+        let input = F::In::from_inner(input);
+
         let state = self.state.as_mut().expect(Self::ERROR_UNINITIALIZED);
         assert_eq!(state.world_id, world.id(), "Encountered a mismatched World. A System cannot be used with Worlds other than the one it was initialized with.");
         // SAFETY:
@@ -753,12 +764,17 @@ where
 }
 
 /// SAFETY: `F`'s param is [`ReadOnlySystemParam`], so this system will only read from the world.
-unsafe impl<Marker, Out, F> ReadOnlySystem for FunctionSystem<Marker, Out, F>
+unsafe impl<Marker, In, Out, F> ReadOnlySystem for FunctionSystem<Marker, In, Out, F>
 where
     Marker: 'static,
+    In: SystemInput + 'static,
     Out: 'static,
-    F: SystemParamFunction<Marker, Out: IntoResult<Out>>,
-    F::Param: ReadOnlySystemParam,
+    F: SystemParamFunction<
+        Marker,
+        In: FromInput<In>,
+        Out: IntoResult<Out>,
+        Param: ReadOnlySystemParam,
+    >,
 {
 }
 
@@ -804,8 +820,10 @@ where
 ///     let mut world = World::default();
 ///     world.insert_resource(Message("42".to_string()));
 ///
-///     // pipe the `parse_message_system`'s output into the `filter_system`s input
-///     let mut piped_system = IntoSystem::into_system(pipe(parse_message, filter));
+///     // pipe the `parse_message_system`'s output into the `filter_system`s input.
+///     // Type annotations should only needed when using `StaticSystemInput` as input
+///     // AND the input type isn't constrained by nearby code.
+///     let mut piped_system = IntoSystem::<(), Option<usize>, _>::into_system(pipe(parse_message, filter));
 ///     piped_system.initialize(&mut world);
 ///     assert_eq!(piped_system.run((), &mut world).unwrap(), Some(42));
 /// }
diff --git a/crates/bevy_ecs/src/system/input.rs b/crates/bevy_ecs/src/system/input.rs
index 429f4df018ed6..c37a08cd65be1 100644
--- a/crates/bevy_ecs/src/system/input.rs
+++ b/crates/bevy_ecs/src/system/input.rs
@@ -55,6 +55,30 @@ pub trait SystemInput: Sized {
 /// Shorthand way to get the [`System::In`] for a [`System`] as a [`SystemInput::Inner`].
 pub type SystemIn<'a, S> = <<S as System>::In as SystemInput>::Inner<'a>;
 
+/// A type that may be constructed from the input of a [`System`].
+/// This is used to allow systems whose first parameter is a `StaticSystemInput<In>`
+/// to take an `In` as input, and can be implemented for user types to allow
+/// similar conversions.
+pub trait FromInput<In: SystemInput>: SystemInput {
+    /// Converts the system input's inner representation into this type's
+    /// inner representation.
+    fn from_inner<'i>(inner: In::Inner<'i>) -> Self::Inner<'i>;
+}
+
+impl<In: SystemInput> FromInput<In> for In {
+    #[inline]
+    fn from_inner<'i>(inner: In::Inner<'i>) -> Self::Inner<'i> {
+        inner
+    }
+}
+
+impl<'a, In: SystemInput> FromInput<In> for StaticSystemInput<'a, In> {
+    #[inline]
+    fn from_inner<'i>(inner: In::Inner<'i>) -> Self::Inner<'i> {
+        inner
+    }
+}
+
 /// A [`SystemInput`] type which denotes that a [`System`] receives
 /// an input value of type `T` from its caller.
 ///
@@ -294,7 +318,7 @@ all_tuples!(
 #[cfg(test)]
 mod tests {
     use crate::{
-        system::{In, InMut, InRef, IntoSystem, System},
+        system::{assert_is_system, In, InMut, InRef, IntoSystem, StaticSystemInput, System},
         world::World,
     };
 
@@ -327,4 +351,19 @@ mod tests {
         by_mut.run((&mut a, b), &mut world).unwrap();
         assert_eq!(a, 36);
     }
+
+    #[test]
+    fn compatible_input() {
+        fn takes_usize(In(a): In<usize>) -> usize {
+            a
+        }
+
+        fn takes_static_usize(StaticSystemInput(b): StaticSystemInput<In<usize>>) -> usize {
+            b
+        }
+
+        assert_is_system::<In<usize>, usize, _>(takes_usize);
+        // test if StaticSystemInput is compatible with its inner type
+        assert_is_system::<In<usize>, usize, _>(takes_static_usize);
+    }
 }
diff --git a/release-content/migration-guides/function_system_generics.md b/release-content/migration-guides/function_system_generics.md
new file mode 100644
index 0000000000000..a302dd72cf329
--- /dev/null
+++ b/release-content/migration-guides/function_system_generics.md
@@ -0,0 +1,21 @@
+---
+title: "FunctionSystem Generics"
+authors: ["@ecoskey"]
+pull_requests: [21917]
+---
+
+`FunctionSystem` now has a new generic parameter: `In`.
+
+Old: `FunctionSystem<Marker, Out, F>`
+New: `FunctionSystem<Marker, In, Out, F>`
+
+Additionally, there's an extra bound on the `System` and `IntoSystem` impls
+related to `FunctionSystem`:
+
+`<F as SystemParamFunction>::In: FromInput<In>`
+
+This enabled systems to take as input any *compatible* type, in addition to the
+exact one specified by the system function. This shouldn't impact users at all
+since it only adds functionality, but users writing heavily generic code may
+want to add a similar bound. See `function_system.rs` to see how it works in
+practice.

From c7b752a1f4312660e8431fc962ce98759d531054 Mon Sep 17 00:00:00 2001
From: Joel Uckelman <uckelman@nomic.net>
Date: Thu, 11 Dec 2025 01:22:06 +0000
Subject: [PATCH 085/133] Make Gizmos::rect_2d and primitive_2d draw the joint
 of the first corner of closed shapes (#22085)

Make `Gizmos::rect_2d` and `primitive_2d` draw the joint of the first
corner of closed shapes

# Objective

- `Gizmos::rect_2d` and `primitive_2d` do not draw the line joint
between the first and last segments. This looks odd when the line joint
is not `GizmoLineJoint::None`. (This affects `Triangle2d`, `Rhombus`,
`Rectangle`, `Polygon`, and `RegularPolygon`.)
- Fixes #22081.

## Solution

- `Gizmos::rect_2d` and `primitive_2d` draw using
`Gizmos::linestrip_2d`, which doesn't draw a closed shape.
- In order to make `linestrip_2d` to draw a joint at a corner, that
corner has to be in the points list with a predecessor and a successor.
- There is no predecessor for the first element in the list, and no
successor when it is repeated as the last.
- Appending the second point to the list is enough to put the first
point between two other points, which causes the joint to be rendered.
- I added a `Gizmos::lineloop_2d` function which handles the final joint
for all closed shapes.
- Draw closed shapes with the `lineloop_2d` function, rather than
manually adding closing vertices in each case.

## Testing

- I tested my change against this demo:

```
use bevy::prelude::*;

fn main() {
    App::new()
        .add_plugins(DefaultPlugins)
        .add_systems(Startup, setup)
        .add_systems(Update, draw_shapes)
        .run();
}

fn setup(
    mut config_store: ResMut<GizmoConfigStore>,
    mut commands: Commands
)
{
    let (config, _) = config_store.config_mut::<DefaultGizmoConfigGroup>();
    config.line.width = 10.0;
    config.line.joints = GizmoLineJoint::Miter;

    commands.spawn(Camera2d);
}

fn draw_shapes(mut gizmos: Gizmos) {
    gizmos.rect_2d(
        Vec2::new(-200.0, 0.0),
        Vec2::new(50.0, 50.0),
        Color::srgb_u8(0xFF, 0, 0)
    );

    gizmos.primitive_2d(
        &Rhombus { half_diagonals: Vec2::new(20.0, 35.0) },
        Vec2::new(-100.0, 0.0),
        Color::srgb_u8(0xFF, 0, 0)
    );

    gizmos.primitive_2d(
        &Triangle2d { vertices: [Vec2::ZERO, Vec2::new(50.0, 0.), Vec2::new(0.0, 60.0) ] },
        Vec2::new(-20.0, -30.0),
        Color::srgb_u8(0xFF, 0, 0)
    );

    gizmos.primitive_2d(
        &Rectangle { half_size: Vec2::new(25.0, 25.0) },
        Vec2::new(100.0, 0.0),
        Color::srgb_u8(0xFF, 0, 0)
    );

     gizmos.primitive_2d(
        &RegularPolygon { sides: 5, circumcircle: Circle::new(40.0) },
        Vec2::new(200.0, 0.0),
        Color::srgb_u8(0xFF, 0, 0)
    );

    gizmos.primitive_2d(
        &Polygon { vertices: vec![Vec2::ZERO, Vec2::new(90.0, 0.), Vec2::new(75.0, 60.0), Vec2::new(15.0, 60.0) ] },
        Vec2::new(275.0, -30.0),
        Color::srgb_u8(0xFF, 0, 0)
    );
}
```

---

## Showcase

Before:

<img width="751" height="191" alt="Image"
src="https://github.com/user-attachments/assets/b57a6fdb-669b-4aa7-b294-412c3871e8ec"
/>

After:

<img width="738" height="247" alt="Image"
src="https://github.com/user-attachments/assets/2dc7f5ba-f446-41e6-8d07-b3b37a8f59ef"
/>
---
 crates/bevy_gizmos/src/gizmos.rs          | 42 ++++++++++++++++++++++-
 crates/bevy_gizmos/src/primitives/dim2.rs | 38 ++++++++------------
 2 files changed, 55 insertions(+), 25 deletions(-)

diff --git a/crates/bevy_gizmos/src/gizmos.rs b/crates/bevy_gizmos/src/gizmos.rs
index 34f9f476dcaf7..3d666cbbf51fe 100644
--- a/crates/bevy_gizmos/src/gizmos.rs
+++ b/crates/bevy_gizmos/src/gizmos.rs
@@ -727,6 +727,46 @@ where
         self.linestrip(positions.into_iter().map(|vec2| vec2.extend(0.)), color);
     }
 
+    /// Draw a line in 2D made of straight segments between the points, with the first and last connected.
+    ///
+    /// # Example
+    /// ```
+    /// # use bevy_gizmos::prelude::*;
+    /// # use bevy_math::prelude::*;
+    /// # use bevy_color::palettes::basic::GREEN;
+    /// fn system(mut gizmos: Gizmos) {
+    ///     gizmos.lineloop_2d([Vec2::ZERO, Vec2::X, Vec2::Y], GREEN);
+    /// }
+    /// # bevy_ecs::system::assert_is_system(system);
+    /// ```
+    #[inline]
+    pub fn lineloop_2d(
+        &mut self,
+        positions: impl IntoIterator<Item = Vec2>,
+        color: impl Into<Color>,
+    ) {
+        if !self.enabled {
+            return;
+        }
+
+        // Loop back to the start; second is needed to ensure that
+        // the joint on the first corner is drawn.
+        let mut positions = positions.into_iter();
+        let first = positions.next();
+        let second = positions.next();
+
+        self.linestrip(
+            first
+                .into_iter()
+                .chain(second)
+                .chain(positions)
+                .chain(first)
+                .chain(second)
+                .map(|vec2| vec2.extend(0.)),
+            color,
+        );
+    }
+
     /// Draw a line in 2D made of straight segments between the points, with a color gradient.
     ///
     /// # Example
@@ -833,7 +873,7 @@ where
         }
         let isometry = isometry.into();
         let [tl, tr, br, bl] = rect_inner(size).map(|vec2| isometry * vec2);
-        self.linestrip_2d([tl, tr, br, bl, tl], color);
+        self.lineloop_2d([tl, tr, br, bl], color);
     }
 
     #[inline]
diff --git a/crates/bevy_gizmos/src/primitives/dim2.rs b/crates/bevy_gizmos/src/primitives/dim2.rs
index 41b5e0a60a056..a8f25dcac78d8 100644
--- a/crates/bevy_gizmos/src/primitives/dim2.rs
+++ b/crates/bevy_gizmos/src/primitives/dim2.rs
@@ -358,8 +358,8 @@ where
                     primitive.half_diagonals.y * sign_y,
                 )
             });
-        let positions = [a, b, c, d, a].map(|vec2| isometry * vec2);
-        self.linestrip_2d(positions, color);
+        let positions = [a, b, c, d].map(|vec2| isometry * vec2);
+        self.lineloop_2d(positions, color);
     }
 }
 
@@ -706,8 +706,8 @@ where
         let isometry = isometry.into();
 
         let [a, b, c] = primitive.vertices;
-        let positions = [a, b, c, a].map(|vec2| isometry * vec2);
-        self.linestrip_2d(positions, color);
+        let positions = [a, b, c].map(|vec2| isometry * vec2);
+        self.lineloop_2d(positions, color);
     }
 }
 
@@ -742,8 +742,8 @@ where
                     primitive.half_size.y * sign_y,
                 )
             });
-        let positions = [a, b, c, d, a].map(|vec2| isometry * vec2);
-        self.linestrip_2d(positions, color);
+        let positions = [a, b, c, d].map(|vec2| isometry * vec2);
+        self.lineloop_2d(positions, color);
     }
 }
 
@@ -771,24 +771,14 @@ where
 
         let isometry = isometry.into();
 
-        // Check if the polygon needs a closing point
-        let closing_point = {
-            let first = primitive.vertices.first();
-            (primitive.vertices.last() != first)
-                .then_some(first)
-                .flatten()
-                .cloned()
+        let vertices = if primitive.vertices.first() == primitive.vertices.last() {
+            // Strip closing point if there is one
+            &primitive.vertices[..primitive.vertices.len() - 1]
+        } else {
+            &primitive.vertices[..]
         };
 
-        self.linestrip_2d(
-            primitive
-                .vertices
-                .iter()
-                .copied()
-                .chain(closing_point)
-                .map(|vec2| isometry * vec2),
-            color,
-        );
+        self.lineloop_2d(vertices.iter().map(|&vec2| isometry * vec2), color);
     }
 }
 
@@ -816,9 +806,9 @@ where
 
         let isometry = isometry.into();
 
-        let points = (0..=primitive.sides)
+        let points = (0..primitive.sides)
             .map(|n| single_circle_coordinate(primitive.circumcircle.radius, primitive.sides, n))
             .map(|vec2| isometry * vec2);
-        self.linestrip_2d(points, color);
+        self.lineloop_2d(points, color);
     }
 }

From 2d4e1406bb0fc01f82ca33aa1565233f538339d0 Mon Sep 17 00:00:00 2001
From: ickshonpe <david.curthoys@googlemail.com>
Date: Thu, 11 Dec 2025 01:53:40 +0000
Subject: [PATCH 086/133] UI per text section picking (#22047)

# Objective

Allow picking text per section.

Fixes #17477

## Solution

In `ui_picking` whenever a node with text components is below a pointer,
don't add the `Text` node's entity to the `hit_nodes` list. Instead,
iterate the list of text section bounding rects in its `TextLayoutInfo`
component to find which text section the pointer is over, and add that
section's entity id to the `hit_nodes` list.

* Add optional text components to `NodeQuery`.
* New helper function, `pick_ui_text`. Finds if a text section is
hovered and returns its id.
* Add the entities of text sections to `hit_nodes` when hovered.
* Add the target camera entity to `hit_nodes`, instead of querying for
it a second time.
* When a picked node is a text node and `require_markers` is enabled,
check if the hit section entity has a `Pickable` component, instead of
the text node.

#

This design might need to be changed later to allow for text selection
and copying. But there doesn't seem any need to overcomplicate things
for now by considering it.

## Testing

I added observers to the `TextBackgroundColors` example's text entities.
The observers turn a text section's text color to white when the pointer
hovers them.

```
cargo run --example text_background_colors
```
---
 crates/bevy_ui/src/picking_backend.rs         | 70 +++++++++++++++----
 examples/ui/text_background_colors.rs         | 33 ++++++---
 ...as_of_text_nodes_are_no_longer_pickable.md |  7 ++
 .../release-notes/per_text_section_picking.md |  7 ++
 4 files changed, 93 insertions(+), 24 deletions(-)
 create mode 100644 release-content/migration-guides/the_non-text_areas_of_text_nodes_are_no_longer_pickable.md
 create mode 100644 release-content/release-notes/per_text_section_picking.md

diff --git a/crates/bevy_ui/src/picking_backend.rs b/crates/bevy_ui/src/picking_backend.rs
index d3ef8abd80d0f..46d29e7f1a4b2 100644
--- a/crates/bevy_ui/src/picking_backend.rs
+++ b/crates/bevy_ui/src/picking_backend.rs
@@ -30,6 +30,7 @@ use bevy_ecs::{prelude::*, query::QueryData};
 use bevy_math::Vec2;
 use bevy_platform::collections::HashMap;
 use bevy_reflect::{std_traits::ReflectDefault, Reflect};
+use bevy_text::{ComputedTextBlock, TextLayoutInfo};
 use bevy_window::PrimaryWindow;
 
 use bevy_picking::backend::prelude::*;
@@ -92,6 +93,7 @@ pub struct NodeQuery {
     pickable: Option<&'static Pickable>,
     inherited_visibility: Option<&'static InheritedVisibility>,
     target_camera: &'static ComputedUiTargetCamera,
+    text_node: Option<(&'static TextLayoutInfo, &'static ComputedTextBlock)>,
 }
 
 /// Computes the UI node entities under each pointer.
@@ -108,6 +110,7 @@ pub fn ui_picking(
     mut output: MessageWriter<PointerHits>,
     clipping_query: Query<(&ComputedNode, &UiGlobalTransform, &Node)>,
     child_of_query: Query<&ChildOf, Without<OverrideClip>>,
+    pickable_query: Query<&Pickable>,
 ) {
     // Map from each camera to its active pointers and their positions in viewport space
     let mut pointer_pos_by_camera = HashMap::<Entity, HashMap<PointerId, Vec2>>::default();
@@ -143,7 +146,7 @@ pub fn ui_picking(
     }
 
     // The list of node entities hovered for each (camera, pointer) combo
-    let mut hit_nodes = HashMap::<(Entity, PointerId), Vec<(Entity, Vec2)>>::default();
+    let mut hit_nodes = HashMap::<(Entity, PointerId), Vec<(Entity, Entity, Vec2)>>::default();
 
     // prepare an iterator that contains all the nodes that have the cursor in their rect,
     // from the top node to the bottom one. this will also reset the interaction to `None`
@@ -175,7 +178,8 @@ pub fn ui_picking(
                 continue;
             };
 
-            if settings.require_markers && node.pickable.is_none() {
+            // Nodes with Display::None have a (0., 0.) logical rect and can be ignored
+            if node.node.size() == Vec2::ZERO {
                 continue;
             }
 
@@ -188,8 +192,8 @@ pub fn ui_picking(
                 continue;
             }
 
-            // Nodes with Display::None have a (0., 0.) logical rect and can be ignored
-            if node.node.size() == Vec2::ZERO {
+            // If this is a text node, need to do this check per section.
+            if node.text_node.is_none() && settings.require_markers && node.pickable.is_none() {
                 continue;
             }
 
@@ -197,7 +201,29 @@ pub fn ui_picking(
             // (±0., 0.) is the center with the corners at points (±0.5, ±0.5).
             // Coordinates are relative to the entire node, not just the visible region.
             for (pointer_id, cursor_position) in pointers_on_this_cam.iter() {
-                if node.node.contains_point(*node.transform, *cursor_position)
+                if let Some((text_layout_info, text_block)) = node.text_node {
+                    if let Some(text_entity) = pick_ui_text_section(
+                        node.node,
+                        node.transform,
+                        *cursor_position,
+                        text_layout_info,
+                        text_block,
+                    ) {
+                        if settings.require_markers && !pickable_query.contains(text_entity) {
+                            continue;
+                        }
+
+                        hit_nodes
+                            .entry((camera_entity, *pointer_id))
+                            .or_default()
+                            .push((
+                                text_entity,
+                                camera_entity,
+                                node.transform.inverse().transform_point2(*cursor_position)
+                                    / node.node.size(),
+                            ));
+                    }
+                } else if node.node.contains_point(*node.transform, *cursor_position)
                     && clip_check_recursive(
                         *cursor_position,
                         node_entity,
@@ -210,6 +236,7 @@ pub fn ui_picking(
                         .or_default()
                         .push((
                             node_entity,
+                            camera_entity,
                             node.transform.inverse().transform_point2(*cursor_position)
                                 / node.node.size(),
                         ));
@@ -224,19 +251,13 @@ pub fn ui_picking(
         let mut picks = Vec::new();
         let mut depth = 0.0;
 
-        for (hovered_node, position) in hovered {
-            let node = node_query.get(*hovered_node).unwrap();
-
-            let Some(camera_entity) = node.target_camera.get() else {
-                continue;
-            };
-
+        for (hovered_node, camera_entity, position) in hovered {
             picks.push((
-                node.entity,
-                HitData::new(camera_entity, depth, Some(position.extend(0.0)), None),
+                *hovered_node,
+                HitData::new(*camera_entity, depth, Some(position.extend(0.0)), None),
             ));
 
-            if let Some(pickable) = node.pickable {
+            if let Ok(pickable) = pickable_query.get(*hovered_node) {
                 // If an entity has a `Pickable` component, we will use that as the source of truth.
                 if pickable.should_block_lower {
                     break;
@@ -258,3 +279,22 @@ pub fn ui_picking(
         output.write(PointerHits::new(*pointer, picks, order));
     }
 }
+
+fn pick_ui_text_section(
+    uinode: &ComputedNode,
+    global_transform: &UiGlobalTransform,
+    point: Vec2,
+    text_layout_info: &TextLayoutInfo,
+    text_block: &ComputedTextBlock,
+) -> Option<Entity> {
+    let local_point = global_transform
+        .try_inverse()
+        .map(|transform| transform.transform_point2(point) + 0.5 * uinode.size())?;
+
+    for run in text_layout_info.run_geometry.iter() {
+        if run.bounds.contains(local_point) {
+            return text_block.entities().get(run.span_index).map(|e| e.entity);
+        }
+    }
+    None
+}
diff --git a/examples/ui/text_background_colors.rs b/examples/ui/text_background_colors.rs
index 8f32c8d29e85b..d81e18565c881 100644
--- a/examples/ui/text_background_colors.rs
+++ b/examples/ui/text_background_colors.rs
@@ -49,15 +49,30 @@ fn setup(mut commands: Commands) {
                 ))
                 .with_children(|commands| {
                     for (i, section_str) in message_text.iter().enumerate() {
-                        commands.spawn((
-                            TextSpan::new(*section_str),
-                            TextColor::BLACK,
-                            TextFont {
-                                font_size: 100.,
-                                ..default()
-                            },
-                            TextBackgroundColor(PALETTE[i % PALETTE.len()]),
-                        ));
+                        commands
+                            .spawn((
+                                TextSpan::new(*section_str),
+                                TextColor::BLACK,
+                                TextFont {
+                                    font_size: 100.,
+                                    ..default()
+                                },
+                                TextBackgroundColor(PALETTE[i % PALETTE.len()]),
+                            ))
+                            .observe(
+                                |event: On<Pointer<Over>>, mut query: Query<&mut TextColor>| {
+                                    if let Ok(mut text_color) = query.get_mut(event.entity) {
+                                        text_color.0 = Color::WHITE;
+                                    }
+                                },
+                            )
+                            .observe(
+                                |event: On<Pointer<Out>>, mut query: Query<&mut TextColor>| {
+                                    if let Ok(mut text_color) = query.get_mut(event.entity) {
+                                        text_color.0 = Color::BLACK;
+                                    }
+                                },
+                            );
                     }
                 });
         });
diff --git a/release-content/migration-guides/the_non-text_areas_of_text_nodes_are_no_longer_pickable.md b/release-content/migration-guides/the_non-text_areas_of_text_nodes_are_no_longer_pickable.md
new file mode 100644
index 0000000000000..360d6ee483bc2
--- /dev/null
+++ b/release-content/migration-guides/the_non-text_areas_of_text_nodes_are_no_longer_pickable.md
@@ -0,0 +1,7 @@
+---
+title: "The non-text areas of UI `Text` nodes are no longer pickable"
+pull_requests: [22047]
+---
+
+Only the sections of `Text` node's containing text are pickable now, the non-text areas of the node do not register pointer hits.
+To replicate Bevy 0.17's picking behavior, use an intermediate parent node to intercept the pointer hits.
diff --git a/release-content/release-notes/per_text_section_picking.md b/release-content/release-notes/per_text_section_picking.md
new file mode 100644
index 0000000000000..7ab2e7ac5df2d
--- /dev/null
+++ b/release-content/release-notes/per_text_section_picking.md
@@ -0,0 +1,7 @@
+---
+title: "UI per text section picking"
+authors: ["@ickshonpe"]
+pull_requests: [22047]
+---
+
+Individual text sections belonging to UI text nodes are now pickable and can be given observers.

From 16409b8a0213e866f6c8179f95b31f0a9338a484 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20S=C3=B8holm?= <k.soeholm@gmail.com>
Date: Fri, 12 Dec 2025 10:10:29 +0100
Subject: [PATCH 087/133] Fix lints after Rust 1.92 (#22092)

# Objective

CI is currently failing

## Solution

Fix the lints (and work around all the rustc lint bugs that are
apparently included)

---------

Co-authored-by: MichiRecRoom <1008889+LikeLakers2@users.noreply.github.com>
---
 benches/benches/bevy_reflect/function.rs      |   4 +
 crates/bevy_asset/src/reflect.rs              |   2 +-
 .../tests/ui/bundle_on_drop_impl.stderr       |  14 ++
 .../component_hook_call_signature_mismatch.rs |   4 +-
 ...ponent_hook_call_signature_mismatch.stderr |  26 +-
 .../ui/component_hook_relationship.stderr     |  56 +++--
 .../tests/ui/deconstruct_moving_ptr.stderr    | 224 ++++++++++++++++++
 .../query_exact_sized_iterator_safety.stderr  |   2 +-
 ...er_combinations_mut_iterator_safety.stderr |   4 +-
 ...query_iter_many_mut_iterator_safety.stderr |   4 +-
 .../tests/ui/query_lifetime_safety.stderr     |  10 +-
 .../tests/ui/query_to_readonly.stderr         |   6 +-
 .../tests/ui/query_transmute_safety.stderr    |   2 +-
 .../ui/system_param_derive_readonly.stderr    |  12 +-
 .../system_query_get_lifetime_safety.stderr   |   6 +-
 ...stem_query_get_many_lifetime_safety.stderr |   6 +-
 ..._query_get_many_mut_lifetime_safety.stderr |   6 +-
 .../system_query_iter_lifetime_safety.stderr  |   2 +-
 ...tem_query_iter_sort_lifetime_safety.stderr |   2 +-
 ...ystem_query_set_get_lifetime_safety.stderr |   2 +-
 ...stem_query_set_iter_lifetime_safety.stderr |   2 +-
 .../tests/ui/world_query_derive.stderr        |  23 +-
 .../src/system/exclusive_system_param.rs      |   3 +-
 crates/bevy_ecs/src/system/system_param.rs    |   3 +-
 crates/bevy_reflect/src/path/parse.rs         |   8 +-
 crates/bevy_remote/src/builtin_methods.rs     |   2 -
 crates/bevy_render/src/diagnostic/internal.rs |   9 +-
 crates/bevy_transform/src/systems.rs          |   4 +-
 tools/export-content/src/app.rs               |   5 +
 29 files changed, 353 insertions(+), 100 deletions(-)
 create mode 100644 crates/bevy_ecs/compile_fail/tests/ui/bundle_on_drop_impl.stderr
 create mode 100644 crates/bevy_ecs/compile_fail/tests/ui/deconstruct_moving_ptr.stderr

diff --git a/benches/benches/bevy_reflect/function.rs b/benches/benches/bevy_reflect/function.rs
index ff4c8dca2ffc0..f155d227c8803 100644
--- a/benches/benches/bevy_reflect/function.rs
+++ b/benches/benches/bevy_reflect/function.rs
@@ -48,6 +48,10 @@ fn into(c: &mut Criterion) {
         .bench_function("closure_mut", |b| {
             let mut _capture = 25;
             // `move` is required here because `into_function_mut()` takes ownership of `self`.
+            #[expect(
+                unused_assignments,
+                reason = "rustc bug https://github.com/rust-lang/rust/issues/149889"
+            )]
             let closure = move |a: i32| _capture += a;
             b.iter(|| closure.into_function_mut());
         });
diff --git a/crates/bevy_asset/src/reflect.rs b/crates/bevy_asset/src/reflect.rs
index 063d3dccc8fb7..08ceea28c486f 100644
--- a/crates/bevy_asset/src/reflect.rs
+++ b/crates/bevy_asset/src/reflect.rs
@@ -59,11 +59,11 @@ impl ReflectAsset {
         world: &'w mut World,
         asset_id: impl Into<UntypedAssetId>,
     ) -> Option<&'w mut dyn Reflect> {
-        // SAFETY: unique world access
         #[expect(
             unsafe_code,
             reason = "Use of unsafe `Self::get_unchecked_mut()` function."
         )]
+        // SAFETY: unique world access
         unsafe {
             (self.get_unchecked_mut)(world.as_unsafe_world_cell(), asset_id.into())
         }
diff --git a/crates/bevy_ecs/compile_fail/tests/ui/bundle_on_drop_impl.stderr b/crates/bevy_ecs/compile_fail/tests/ui/bundle_on_drop_impl.stderr
new file mode 100644
index 0000000000000..6cd6d26422fdd
--- /dev/null
+++ b/crates/bevy_ecs/compile_fail/tests/ui/bundle_on_drop_impl.stderr
@@ -0,0 +1,14 @@
+error[E0509]: cannot move out of type `DropBundle`, which implements the `Drop` trait
+ --> tests/ui/bundle_on_drop_impl.rs:7:10
+  |
+7 | #[derive(Bundle, Debug)]
+  |          ^^^^^^
+  |          |
+  |          cannot move out of here
+  |          move occurs because value has type `A`, which does not implement the `Copy` trait
+  |
+  = note: this error originates in the macro `bevy_ecs::ptr::deconstruct_moving_ptr` which comes from the expansion of the derive macro `Bundle` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0509`.
diff --git a/crates/bevy_ecs/compile_fail/tests/ui/component_hook_call_signature_mismatch.rs b/crates/bevy_ecs/compile_fail/tests/ui/component_hook_call_signature_mismatch.rs
index ef6b98cf09417..ffb9173f232ef 100644
--- a/crates/bevy_ecs/compile_fail/tests/ui/component_hook_call_signature_mismatch.rs
+++ b/crates/bevy_ecs/compile_fail/tests/ui/component_hook_call_signature_mismatch.rs
@@ -9,6 +9,6 @@ use bevy_ecs::prelude::*;
 )]
 pub struct FooWrongCall;
 
-fn wrong_bazzing(path: &str) -> impl Fn(bevy_ecs::world::DeferredWorld) {
-    |world| {}
+fn wrong_bazzing(_path: &str) -> impl Fn(bevy_ecs::world::DeferredWorld) {
+    |_world| {}
 }
diff --git a/crates/bevy_ecs/compile_fail/tests/ui/component_hook_call_signature_mismatch.stderr b/crates/bevy_ecs/compile_fail/tests/ui/component_hook_call_signature_mismatch.stderr
index 967cffe4ff399..c9502a7d58f68 100644
--- a/crates/bevy_ecs/compile_fail/tests/ui/component_hook_call_signature_mismatch.stderr
+++ b/crates/bevy_ecs/compile_fail/tests/ui/component_hook_call_signature_mismatch.stderr
@@ -1,32 +1,18 @@
-warning: unused variable: `path`
-  --> tests/ui/component_hook_call_signature_mismatch.rs:12:18
-   |
-12 | fn wrong_bazzing(path: &str) -> impl Fn(bevy_ecs::world::DeferredWorld) {
-   |                  ^^^^ help: if this is intentional, prefix it with an underscore: `_path`
-   |
-   = note: `#[warn(unused_variables)]` on by default
-
-warning: unused variable: `world`
-  --> tests/ui/component_hook_call_signature_mismatch.rs:13:6
-   |
-13 |     |world| {}
-   |      ^^^^^ help: if this is intentional, prefix it with an underscore: `_world`
-
 error[E0057]: this function takes 1 argument but 2 arguments were supplied
   --> tests/ui/component_hook_call_signature_mismatch.rs:8:14
    |
-5  | #[derive(Component)]
+ 5 | #[derive(Component)]
    |          --------- unexpected argument #2 of type `HookContext`
 ...
-8  |     on_add = wrong_bazzing("foo"),
+ 8 |     on_add = wrong_bazzing("foo"),
    |              ^^^^^^^^^^^^^^^^^^^^
    |
 note: opaque type defined here
-  --> tests/ui/component_hook_call_signature_mismatch.rs:12:33
+  --> tests/ui/component_hook_call_signature_mismatch.rs:12:34
    |
-12 | fn wrong_bazzing(path: &str) -> impl Fn(bevy_ecs::world::DeferredWorld) {
-   |                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+12 | fn wrong_bazzing(_path: &str) -> impl Fn(bevy_ecs::world::DeferredWorld) {
+   |                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: aborting due to 1 previous error; 2 warnings emitted
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0057`.
diff --git a/crates/bevy_ecs/compile_fail/tests/ui/component_hook_relationship.stderr b/crates/bevy_ecs/compile_fail/tests/ui/component_hook_relationship.stderr
index 01e4d57578af4..6ef40f9bf0255 100644
--- a/crates/bevy_ecs/compile_fail/tests/ui/component_hook_relationship.stderr
+++ b/crates/bevy_ecs/compile_fail/tests/ui/component_hook_relationship.stderr
@@ -22,68 +22,88 @@ error: Custom on_despawn hooks are not supported as this RelationshipTarget alre
 52 |     #[component(on_despawn = foo_hook)]
    |     ^
 
-error[E0277]: the trait bound `FooTargetOfFail: Relationship` is not satisfied
+error[E0277]: the trait bound `FooTargetOfFail: bevy_ecs::relationship::Relationship` is not satisfied
    --> tests/ui/component_hook_relationship.rs:13:42
     |
-13  |     #[relationship_target(relationship = FooTargetOfFail)]
-    |                                          ^^^^^^^^^^^^^^^ the trait `Relationship` is not implemented for `FooTargetOfFail`
+ 13 |     #[relationship_target(relationship = FooTargetOfFail)]
+    |                                          ^^^^^^^^^^^^^^^ unsatisfied trait bound
     |
-    = help: the following other types implement trait `Relationship`:
+help: the trait `bevy_ecs::relationship::Relationship` is not implemented for `FooTargetOfFail`
+   --> tests/ui/component_hook_relationship.rs:10:5
+    |
+ 10 |     pub struct FooTargetOfFail(Entity);
+    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^
+    = help: the following other types implement trait `bevy_ecs::relationship::Relationship`:
               BarTargetOf
               ChildOf
               FooTargetOf
 note: required by a bound in `bevy_ecs::relationship::RelationshipTarget::Relationship`
-   --> $BEVY_ROOT/bevy_ecs/src/relationship/mod.rs:167:24
+   --> $BEVY_ROOT/bevy_ecs/src/relationship/mod.rs:234:24
     |
-167 |     type Relationship: Relationship<RelationshipTarget = Self>;
+234 |     type Relationship: Relationship<RelationshipTarget = Self>;
     |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `RelationshipTarget::Relationship`
 
 error[E0277]: the trait bound `FooTargetsFail: bevy_ecs::relationship::RelationshipTarget` is not satisfied
   --> tests/ui/component_hook_relationship.rs:28:42
    |
 28 |     #[relationship(relationship_target = FooTargetsFail)]
-   |                                          ^^^^^^^^^^^^^^ the trait `bevy_ecs::relationship::RelationshipTarget` is not implemented for `FooTargetsFail`
+   |                                          ^^^^^^^^^^^^^^ unsatisfied trait bound
+   |
+help: the trait `bevy_ecs::relationship::RelationshipTarget` is not implemented for `FooTargetsFail`
+  --> tests/ui/component_hook_relationship.rs:25:5
    |
+25 |     pub struct FooTargetsFail(Vec<Entity>);
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^
    = help: the following other types implement trait `bevy_ecs::relationship::RelationshipTarget`:
              BarTargets
              Children
              FooTargets
 note: required by a bound in `bevy_ecs::relationship::Relationship::RelationshipTarget`
-  --> $BEVY_ROOT/bevy_ecs/src/relationship/mod.rs:79:30
+  --> $BEVY_ROOT/bevy_ecs/src/relationship/mod.rs:81:30
    |
-79 |     type RelationshipTarget: RelationshipTarget<Relationship = Self>;
+81 |     type RelationshipTarget: RelationshipTarget<Relationship = Self>;
    |                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `Relationship::RelationshipTarget`
 
-error[E0277]: the trait bound `BarTargetOfFail: Relationship` is not satisfied
+error[E0277]: the trait bound `BarTargetOfFail: bevy_ecs::relationship::Relationship` is not satisfied
    --> tests/ui/component_hook_relationship.rs:43:42
     |
-43  |     #[relationship_target(relationship = BarTargetOfFail)]
-    |                                          ^^^^^^^^^^^^^^^ the trait `Relationship` is not implemented for `BarTargetOfFail`
+ 43 |     #[relationship_target(relationship = BarTargetOfFail)]
+    |                                          ^^^^^^^^^^^^^^^ unsatisfied trait bound
     |
-    = help: the following other types implement trait `Relationship`:
+help: the trait `bevy_ecs::relationship::Relationship` is not implemented for `BarTargetOfFail`
+   --> tests/ui/component_hook_relationship.rs:40:5
+    |
+ 40 |     pub struct BarTargetOfFail(Entity);
+    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^
+    = help: the following other types implement trait `bevy_ecs::relationship::Relationship`:
               BarTargetOf
               ChildOf
               FooTargetOf
 note: required by a bound in `bevy_ecs::relationship::RelationshipTarget::Relationship`
-   --> $BEVY_ROOT/bevy_ecs/src/relationship/mod.rs:167:24
+   --> $BEVY_ROOT/bevy_ecs/src/relationship/mod.rs:234:24
     |
-167 |     type Relationship: Relationship<RelationshipTarget = Self>;
+234 |     type Relationship: Relationship<RelationshipTarget = Self>;
     |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `RelationshipTarget::Relationship`
 
 error[E0277]: the trait bound `BarTargetsFail: bevy_ecs::relationship::RelationshipTarget` is not satisfied
   --> tests/ui/component_hook_relationship.rs:58:42
    |
 58 |     #[relationship(relationship_target = BarTargetsFail)]
-   |                                          ^^^^^^^^^^^^^^ the trait `bevy_ecs::relationship::RelationshipTarget` is not implemented for `BarTargetsFail`
+   |                                          ^^^^^^^^^^^^^^ unsatisfied trait bound
+   |
+help: the trait `bevy_ecs::relationship::RelationshipTarget` is not implemented for `BarTargetsFail`
+  --> tests/ui/component_hook_relationship.rs:55:5
    |
+55 |     pub struct BarTargetsFail(Vec<Entity>);
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^
    = help: the following other types implement trait `bevy_ecs::relationship::RelationshipTarget`:
              BarTargets
              Children
              FooTargets
 note: required by a bound in `bevy_ecs::relationship::Relationship::RelationshipTarget`
-  --> $BEVY_ROOT/bevy_ecs/src/relationship/mod.rs:79:30
+  --> $BEVY_ROOT/bevy_ecs/src/relationship/mod.rs:81:30
    |
-79 |     type RelationshipTarget: RelationshipTarget<Relationship = Self>;
+81 |     type RelationshipTarget: RelationshipTarget<Relationship = Self>;
    |                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `Relationship::RelationshipTarget`
 
 error: aborting due to 8 previous errors
diff --git a/crates/bevy_ecs/compile_fail/tests/ui/deconstruct_moving_ptr.stderr b/crates/bevy_ecs/compile_fail/tests/ui/deconstruct_moving_ptr.stderr
new file mode 100644
index 0000000000000..1534e2e7dac03
--- /dev/null
+++ b/crates/bevy_ecs/compile_fail/tests/ui/deconstruct_moving_ptr.stderr
@@ -0,0 +1,224 @@
+error[E0025]: field `x` bound multiple times in the pattern
+  --> tests/ui/deconstruct_moving_ptr.rs:25:5
+   |
+25 | /     deconstruct_moving_ptr!({
+26 | |         let A { x, x } = a;
+27 | |     });
+   | |      ^
+   | |      |
+   | |______multiple uses of `x` in pattern
+   |        first use of `x`
+   |
+   = note: this error originates in the macro `deconstruct_moving_ptr` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0308]: mismatched types
+  --> tests/ui/deconstruct_moving_ptr.rs:31:5
+   |
+31 | /     deconstruct_moving_ptr!({
+32 | |         let A { x } = box_a;
+33 | |     });
+   | |      ^
+   | |      |
+   | |______expected `Box<A>`, found `A`
+   |        this expression has type `&mut Box<A>`
+   |
+   = note: expected struct `Box<A>`
+              found struct `A`
+   = note: this error originates in the macro `deconstruct_moving_ptr` (in Nightly builds, run with -Z macro-backtrace for more info)
+help: consider dereferencing to access the inner value using the Deref trait
+  --> $BEVY_ROOT/bevy_ptr/src/lib.rs:1461:57
+   |
+146|             let $struct_name { $($field_index: _),* } = &**value;
+   |                                                         +++
+
+error[E0308]: mismatched types
+  --> tests/ui/deconstruct_moving_ptr.rs:31:5
+   |
+31 | /     deconstruct_moving_ptr!({
+32 | |         let A { x } = box_a;
+33 | |     });
+   | |______^ expected `A`, found `Box<A>`
+   |
+   = note: expected struct `A`
+              found struct `Box<A>`
+   = note: this error originates in the macro `deconstruct_moving_ptr` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0308]: mismatched types
+  --> tests/ui/deconstruct_moving_ptr.rs:35:5
+   |
+35 | /     deconstruct_moving_ptr!({
+36 | |         let A { x } = mut_a;
+37 | |     });
+   | |______^ expected `A`, found `&mut A`
+   |
+   = note: this error originates in the macro `deconstruct_moving_ptr` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0308]: mismatched types
+  --> tests/ui/deconstruct_moving_ptr.rs:39:5
+   |
+39 | /     deconstruct_moving_ptr!({
+40 | |         let tuple { 0: _ } = box_t1;
+41 | |     });
+   | |      ^
+   | |      |
+   | |______expected `Box<(usize,)>`, found `(_,)`
+   |        expected due to the type of this binding
+   |
+   = note: expected struct `Box<(usize,)>`
+               found tuple `(_,)`
+   = note: for more on the distinction between the stack and the heap, read https://doc.rust-lang.org/book/ch15-01-box.html, https://doc.rust-lang.org/rust-by-example/std/box.html, and https://doc.rust-lang.org/std/boxed/index.html
+   = note: this error originates in the macro `deconstruct_moving_ptr` (in Nightly builds, run with -Z macro-backtrace for more info)
+help: store this in the heap by calling `Box::new`
+  --> $BEVY_ROOT/bevy_ptr/src/lib.rs:1420:22
+   |
+142|             *value = Box::new(($(unreachable($field_index),)*));
+   |                      +++++++++                                +
+help: consider dereferencing here to assign to the mutably borrowed value
+  --> $BEVY_ROOT/bevy_ptr/src/lib.rs:1420:13
+   |
+142|             **value = ($(unreachable($field_index),)*);
+   |             +
+
+error[E0308]: mismatched types
+  --> tests/ui/deconstruct_moving_ptr.rs:43:5
+   |
+43 | /     deconstruct_moving_ptr!({
+44 | |         let tuple { 0: _ } = mut_t1;
+45 | |     });
+   | |      ^
+   | |      |
+   | |______expected `&mut (usize,)`, found `(_,)`
+   |        expected due to the type of this binding
+   |
+   = note: expected mutable reference `&mut (usize,)`
+                          found tuple `(_,)`
+   = note: this error originates in the macro `deconstruct_moving_ptr` (in Nightly builds, run with -Z macro-backtrace for more info)
+help: consider dereferencing here to assign to the mutably borrowed value
+  --> $BEVY_ROOT/bevy_ptr/src/lib.rs:1420:13
+   |
+142|             **value = ($(unreachable($field_index),)*);
+   |             +
+
+error[E0308]: mismatched types
+  --> tests/ui/deconstruct_moving_ptr.rs:47:5
+   |
+47 | /     deconstruct_moving_ptr!({
+48 | |         let tuple { 0: _, 1: _ } = box_t2;
+49 | |     });
+   | |      ^
+   | |      |
+   | |______expected `Box<(usize, usize)>`, found `(_, _)`
+   |        expected due to the type of this binding
+   |
+   = note: expected struct `Box<(usize, usize)>`
+               found tuple `(_, _)`
+   = note: for more on the distinction between the stack and the heap, read https://doc.rust-lang.org/book/ch15-01-box.html, https://doc.rust-lang.org/rust-by-example/std/box.html, and https://doc.rust-lang.org/std/boxed/index.html
+   = note: this error originates in the macro `deconstruct_moving_ptr` (in Nightly builds, run with -Z macro-backtrace for more info)
+help: store this in the heap by calling `Box::new`
+  --> $BEVY_ROOT/bevy_ptr/src/lib.rs:1420:22
+   |
+142|             *value = Box::new(($(unreachable($field_index),)*));
+   |                      +++++++++                                +
+help: consider dereferencing here to assign to the mutably borrowed value
+  --> $BEVY_ROOT/bevy_ptr/src/lib.rs:1420:13
+   |
+142|             **value = ($(unreachable($field_index),)*);
+   |             +
+
+error[E0308]: mismatched types
+  --> tests/ui/deconstruct_moving_ptr.rs:51:5
+   |
+51 | /     deconstruct_moving_ptr!({
+52 | |         let tuple { 0: _, 1: _ } = mut_t2;
+53 | |     });
+   | |      ^
+   | |      |
+   | |______expected `&mut (usize, usize)`, found `(_, _)`
+   |        expected due to the type of this binding
+   |
+   = note: expected mutable reference `&mut (usize, usize)`
+                          found tuple `(_, _)`
+   = note: this error originates in the macro `deconstruct_moving_ptr` (in Nightly builds, run with -Z macro-backtrace for more info)
+help: consider dereferencing here to assign to the mutably borrowed value
+  --> $BEVY_ROOT/bevy_ptr/src/lib.rs:1420:13
+   |
+142|             **value = ($(unreachable($field_index),)*);
+   |             +
+
+error[E0308]: mismatched types
+  --> tests/ui/deconstruct_moving_ptr.rs:77:23
+   |
+75 | /     deconstruct_moving_ptr!({
+76 | |
+77 | |         let A { x } = a;
+   | |                       ^ expected `MovingPtr<'_, _, _>`, found `&mut MovingPtr<'_, A>`
+78 | |     });
+   | |______- expected due to this
+   |
+   = note:         expected struct `MovingPtr<'_, _, _>`
+           found mutable reference `&mut MovingPtr<'_, A, Aligned>`
+
+error[E0308]: mismatched types
+  --> tests/ui/deconstruct_moving_ptr.rs:81:30
+   |
+79 | /     deconstruct_moving_ptr!({
+80 | |
+81 | |         let tuple { 0: _ } = t1;
+   | |                              ^^ expected `MovingPtr<'_, _, _>`, found `&mut MovingPtr<'_, (usize,)>`
+82 | |     });
+   | |______- expected due to this
+   |
+   = note:         expected struct `MovingPtr<'_, _, _>`
+           found mutable reference `&mut MovingPtr<'_, (usize,), Aligned>`
+
+error[E0308]: mismatched types
+  --> tests/ui/deconstruct_moving_ptr.rs:85:36
+   |
+83 | /     deconstruct_moving_ptr!({
+84 | |
+85 | |         let tuple { 0: _, 1: _ } = t2;
+   | |                                    ^^ expected `MovingPtr<'_, _, _>`, found `&mut MovingPtr<'_, (usize, usize)>`
+86 | |     });
+   | |______- expected due to this
+   |
+   = note:         expected struct `MovingPtr<'_, _, _>`
+           found mutable reference `&mut MovingPtr<'_, (usize, usize), Aligned>`
+
+error[E0499]: cannot borrow value as mutable more than once at a time
+  --> tests/ui/deconstruct_moving_ptr.rs:59:5
+   |
+59 | /     deconstruct_moving_ptr!({
+60 | |         let tuple { 0: _, 0: _ } = t;
+61 | |     });
+   | |      ^
+   | |      |
+   | |______value was mutably borrowed here in the previous iteration of the loop
+   |        first borrow later used here
+   |
+   = note: this error originates in the macro `deconstruct_moving_ptr` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0793]: reference to packed field is unaligned
+  --> tests/ui/deconstruct_moving_ptr.rs:67:5
+   |
+67 | /     deconstruct_moving_ptr!({
+68 | |         let B { x } = b;
+69 | |     });
+   | |______^
+   |
+   = note: packed structs are only aligned by one byte, and many modern architectures penalize unaligned field accesses
+   = note: creating a misaligned reference is undefined behavior (even if that reference is never dereferenced)
+   = help: copy the field contents to a local variable, or replace the reference with a raw pointer and use `read_unaligned`/`write_unaligned` (loads and stores via `*p` must be properly aligned even when using raw pointers)
+   = note: this error originates in the macro `deconstruct_moving_ptr` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+warning: unused variable: `x`
+  --> tests/ui/deconstruct_moving_ptr.rs:68:17
+   |
+68 |         let B { x } = b;
+   |                 ^ help: if this is intentional, prefix it with an underscore: `_x`
+   |
+   = note: `#[warn(unused_variables)]` (part of `#[warn(unused)]`) on by default
+
+error: aborting due to 13 previous errors; 1 warning emitted
+
+Some errors have detailed explanations: E0025, E0308, E0499, E0793.
+For more information about an error, try `rustc --explain E0025`.
diff --git a/crates/bevy_ecs/compile_fail/tests/ui/query_exact_sized_iterator_safety.stderr b/crates/bevy_ecs/compile_fail/tests/ui/query_exact_sized_iterator_safety.stderr
index ba14761f58e8f..65c3ed45a91b2 100644
--- a/crates/bevy_ecs/compile_fail/tests/ui/query_exact_sized_iterator_safety.stderr
+++ b/crates/bevy_ecs/compile_fail/tests/ui/query_exact_sized_iterator_safety.stderr
@@ -1,7 +1,7 @@
 error[E0277]: `bevy_ecs::query::Changed<Foo>` is not a valid `Query` filter based on archetype information
   --> tests/ui/query_exact_sized_iterator_safety.rs:7:28
    |
-7  |     is_exact_size_iterator(query.iter());
+ 7 |     is_exact_size_iterator(query.iter());
    |     ---------------------- ^^^^^^^^^^^^ invalid `Query` filter
    |     |
    |     required by a bound introduced by this call
diff --git a/crates/bevy_ecs/compile_fail/tests/ui/query_iter_combinations_mut_iterator_safety.stderr b/crates/bevy_ecs/compile_fail/tests/ui/query_iter_combinations_mut_iterator_safety.stderr
index cb40b8f11ccb5..9c382e6e403f7 100644
--- a/crates/bevy_ecs/compile_fail/tests/ui/query_iter_combinations_mut_iterator_safety.stderr
+++ b/crates/bevy_ecs/compile_fail/tests/ui/query_iter_combinations_mut_iterator_safety.stderr
@@ -1,7 +1,7 @@
 error[E0277]: the trait bound `&mut A: ReadOnlyQueryData` is not satisfied
   --> tests/ui/query_iter_combinations_mut_iterator_safety.rs:9:17
    |
-9  |     is_iterator(iter)
+ 9 |     is_iterator(iter)
    |     ----------- ^^^^ the trait `ReadOnlyQueryData` is not implemented for `&mut A`
    |     |
    |     required by a bound introduced by this call
@@ -15,7 +15,7 @@ error[E0277]: the trait bound `&mut A: ReadOnlyQueryData` is not satisfied
              (F0, F1, F2)
              (F0, F1, F2, F3)
              (F0, F1, F2, F3, F4)
-           and 36 others
+           and 37 others
    = note: `ReadOnlyQueryData` is implemented for `&A`, but not for `&mut A`
    = note: required for `QueryCombinationIter<'_, '_, &mut A, (), _>` to implement `Iterator`
 note: required by a bound in `is_iterator`
diff --git a/crates/bevy_ecs/compile_fail/tests/ui/query_iter_many_mut_iterator_safety.stderr b/crates/bevy_ecs/compile_fail/tests/ui/query_iter_many_mut_iterator_safety.stderr
index 24aafb1df49fc..a00fc7c321c5a 100644
--- a/crates/bevy_ecs/compile_fail/tests/ui/query_iter_many_mut_iterator_safety.stderr
+++ b/crates/bevy_ecs/compile_fail/tests/ui/query_iter_many_mut_iterator_safety.stderr
@@ -1,7 +1,7 @@
 error[E0277]: the trait bound `&mut A: ReadOnlyQueryData` is not satisfied
   --> tests/ui/query_iter_many_mut_iterator_safety.rs:9:17
    |
-9  |     is_iterator(iter)
+ 9 |     is_iterator(iter)
    |     ----------- ^^^^ the trait `ReadOnlyQueryData` is not implemented for `&mut A`
    |     |
    |     required by a bound introduced by this call
@@ -15,7 +15,7 @@ error[E0277]: the trait bound `&mut A: ReadOnlyQueryData` is not satisfied
              (F0, F1, F2)
              (F0, F1, F2, F3)
              (F0, F1, F2, F3, F4)
-           and 36 others
+           and 37 others
    = note: `ReadOnlyQueryData` is implemented for `&A`, but not for `&mut A`
    = note: required for `QueryManyIter<'_, '_, &mut A, (), std::array::IntoIter<bevy_ecs::entity::Entity, 1>>` to implement `Iterator`
 note: required by a bound in `is_iterator`
diff --git a/crates/bevy_ecs/compile_fail/tests/ui/query_lifetime_safety.stderr b/crates/bevy_ecs/compile_fail/tests/ui/query_lifetime_safety.stderr
index c39840127ad45..96ad14019be8c 100644
--- a/crates/bevy_ecs/compile_fail/tests/ui/query_lifetime_safety.stderr
+++ b/crates/bevy_ecs/compile_fail/tests/ui/query_lifetime_safety.stderr
@@ -23,9 +23,9 @@ error[E0502]: cannot borrow `query` as immutable because it is also borrowed as
 error[E0502]: cannot borrow `query` as mutable because it is also borrowed as immutable
   --> tests/ui/query_lifetime_safety.rs:31:39
    |
-30 |             let data: &Foo = query.single();
+30 |             let data: &Foo = query.single().unwrap();
    |                              ----- immutable borrow occurs here
-31 |             let mut data2: Mut<Foo> = query.single_mut();
+31 |             let mut data2: Mut<Foo> = query.single_mut().unwrap();
    |                                       ^^^^^^^^^^^^^^^^^^ mutable borrow occurs here
 32 |
 33 |             assert_eq!(data, &mut *data2); // oops UB
@@ -34,9 +34,9 @@ error[E0502]: cannot borrow `query` as mutable because it is also borrowed as im
 error[E0502]: cannot borrow `query` as immutable because it is also borrowed as mutable
   --> tests/ui/query_lifetime_safety.rs:38:30
    |
-37 |             let mut data2: Mut<Foo> = query.single_mut();
+37 |             let mut data2: Mut<Foo> = query.single_mut().unwrap();
    |                                       ----- mutable borrow occurs here
-38 |             let data: &Foo = query.single();
+38 |             let data: &Foo = query.single().unwrap();
    |                              ^^^^^ immutable borrow occurs here
 39 |
 40 |             assert_eq!(data, &mut *data2); // oops UB
@@ -48,7 +48,7 @@ error[E0502]: cannot borrow `query` as mutable because it is also borrowed as im
 44 |             let data: &Foo = query.single().unwrap();
    |                              ----- immutable borrow occurs here
 45 |             let mut data2: Mut<Foo> = query.single_mut().unwrap();
-   |                                       ^^^^^^^^^^^^^^^^^^^^^^ mutable borrow occurs here
+   |                                       ^^^^^^^^^^^^^^^^^^ mutable borrow occurs here
 46 |
 47 |             assert_eq!(data, &mut *data2); // oops UB
    |             ----------------------------- immutable borrow later used here
diff --git a/crates/bevy_ecs/compile_fail/tests/ui/query_to_readonly.stderr b/crates/bevy_ecs/compile_fail/tests/ui/query_to_readonly.stderr
index 30cbc3c14221b..8ba81f0954499 100644
--- a/crates/bevy_ecs/compile_fail/tests/ui/query_to_readonly.stderr
+++ b/crates/bevy_ecs/compile_fail/tests/ui/query_to_readonly.stderr
@@ -23,7 +23,7 @@ error[E0502]: cannot borrow `query` as mutable because it is also borrowed as im
 error[E0502]: cannot borrow `query` as immutable because it is also borrowed as mutable
   --> tests/ui/query_to_readonly.rs:41:30
    |
-38 |         let mut mut_foo = query.single_mut();
+38 |         let mut mut_foo = query.single_mut().unwrap();
    |                           ----- mutable borrow occurs here
 ...
 41 |         let readonly_query = query.as_readonly();
@@ -38,11 +38,11 @@ error[E0502]: cannot borrow `query` as mutable because it is also borrowed as im
 54 |         let readonly_query = query.as_readonly();
    |                              ----- immutable borrow occurs here
 ...
-58 |         let mut mut_foo = query.single_mut();
+58 |         let mut mut_foo = query.single_mut().unwrap();
    |                           ^^^^^^^^^^^^^^^^^^ mutable borrow occurs here
 ...
 61 |         println!("{ref_foo:?}");
-   |                   ----------- immutable borrow later used here
+   |                    ------- immutable borrow later used here
 
 error: aborting due to 4 previous errors
 
diff --git a/crates/bevy_ecs/compile_fail/tests/ui/query_transmute_safety.stderr b/crates/bevy_ecs/compile_fail/tests/ui/query_transmute_safety.stderr
index d0234b197e595..edd87da242c11 100644
--- a/crates/bevy_ecs/compile_fail/tests/ui/query_transmute_safety.stderr
+++ b/crates/bevy_ecs/compile_fail/tests/ui/query_transmute_safety.stderr
@@ -17,7 +17,7 @@ error[E0499]: cannot borrow `lens` as mutable more than once at a time
 34 |         let mut query_b = lens.query();
    |                           ^^^^ second mutable borrow occurs here
 ...
-37 |         let a = query_a.single_mut();
+37 |         let a = query_a.single_mut().unwrap();
    |                 ------- first borrow later used here
 
 error: aborting due to 2 previous errors
diff --git a/crates/bevy_ecs/compile_fail/tests/ui/system_param_derive_readonly.stderr b/crates/bevy_ecs/compile_fail/tests/ui/system_param_derive_readonly.stderr
index 2f767d960cb2f..8d0ad83216136 100644
--- a/crates/bevy_ecs/compile_fail/tests/ui/system_param_derive_readonly.stderr
+++ b/crates/bevy_ecs/compile_fail/tests/ui/system_param_derive_readonly.stderr
@@ -1,7 +1,7 @@
 error[E0277]: the trait bound `&'static mut Foo: ReadOnlyQueryData` is not satisfied
    --> tests/ui/system_param_derive_readonly.rs:16:11
     |
-16  |     state.get(&world);
+ 16 |     state.get(&world);
     |           ^^^ the trait `ReadOnlyQueryData` is not implemented for `&'static mut Foo`
     |
     = help: the following other types implement trait `ReadOnlyQueryData`:
@@ -13,18 +13,18 @@ error[E0277]: the trait bound `&'static mut Foo: ReadOnlyQueryData` is not satis
               (F0, F1, F2)
               (F0, F1, F2, F3)
               (F0, F1, F2, F3, F4)
-            and 36 others
+            and 37 others
     = note: `ReadOnlyQueryData` is implemented for `&'static Foo`, but not for `&'static mut Foo`
     = note: required for `bevy_ecs::system::Query<'_, '_, &'static mut Foo>` to implement `ReadOnlySystemParam`
     = note: 1 redundant requirement hidden
     = note: required for `Mutable<'_, '_>` to implement `ReadOnlySystemParam`
 note: required by a bound in `SystemState::<Param>::get`
-   --> $BEVY_ROOT/bevy_ecs/src/system/function_system.rs:487:16
+   --> $BEVY_ROOT/bevy_ecs/src/system/function_system.rs:355:16
     |
-485 |     pub fn get<'w, 's>(&'s mut self, world: &'w World) -> SystemParamItem<'w, 's, Param>
+353 |     pub fn get<'w, 's>(&'s mut self, world: &'w World) -> SystemParamItem<'w, 's, Param>
     |            --- required by a bound in this associated function
-486 |     where
-487 |         Param: ReadOnlySystemParam,
+354 |     where
+355 |         Param: ReadOnlySystemParam,
     |                ^^^^^^^^^^^^^^^^^^^ required by this bound in `SystemState::<Param>::get`
 
 error: aborting due to 1 previous error
diff --git a/crates/bevy_ecs/compile_fail/tests/ui/system_query_get_lifetime_safety.stderr b/crates/bevy_ecs/compile_fail/tests/ui/system_query_get_lifetime_safety.stderr
index cd003db5125fe..be8418424288a 100644
--- a/crates/bevy_ecs/compile_fail/tests/ui/system_query_get_lifetime_safety.stderr
+++ b/crates/bevy_ecs/compile_fail/tests/ui/system_query_get_lifetime_safety.stderr
@@ -1,11 +1,11 @@
 error[E0499]: cannot borrow `query` as mutable more than once at a time
   --> tests/ui/system_query_get_lifetime_safety.rs:8:14
    |
-7  |     let a1 = query.get_mut(e).unwrap();
+ 7 |     let a1 = query.get_mut(e).unwrap();
    |              ----- first mutable borrow occurs here
-8  |     let a2 = query.get_mut(e).unwrap();
+ 8 |     let a2 = query.get_mut(e).unwrap();
    |              ^^^^^ second mutable borrow occurs here
-9  |
+ 9 |
 10 |     println!("{} {}", a1.0, a2.0);
    |                       -- first borrow later used here
 
diff --git a/crates/bevy_ecs/compile_fail/tests/ui/system_query_get_many_lifetime_safety.stderr b/crates/bevy_ecs/compile_fail/tests/ui/system_query_get_many_lifetime_safety.stderr
index 91e8b81509e05..310a88f0da935 100644
--- a/crates/bevy_ecs/compile_fail/tests/ui/system_query_get_many_lifetime_safety.stderr
+++ b/crates/bevy_ecs/compile_fail/tests/ui/system_query_get_many_lifetime_safety.stderr
@@ -1,11 +1,11 @@
 error[E0502]: cannot borrow `query` as mutable because it is also borrowed as immutable
   --> tests/ui/system_query_get_many_lifetime_safety.rs:8:14
    |
-7  |     let a1 = query.get_many([e, e]).unwrap();
+ 7 |     let a1 = query.get_many([e, e]).unwrap();
    |              ----- immutable borrow occurs here
-8  |     let a2 = query.get_mut(e).unwrap();
+ 8 |     let a2 = query.get_mut(e).unwrap();
    |              ^^^^^^^^^^^^^^^^ mutable borrow occurs here
-9  |
+ 9 |
 10 |     println!("{} {}", a1[0].0, a2.0);
    |                       ----- immutable borrow later used here
 
diff --git a/crates/bevy_ecs/compile_fail/tests/ui/system_query_get_many_mut_lifetime_safety.stderr b/crates/bevy_ecs/compile_fail/tests/ui/system_query_get_many_mut_lifetime_safety.stderr
index 567a1da1a683e..fb770e42b2a9c 100644
--- a/crates/bevy_ecs/compile_fail/tests/ui/system_query_get_many_mut_lifetime_safety.stderr
+++ b/crates/bevy_ecs/compile_fail/tests/ui/system_query_get_many_mut_lifetime_safety.stderr
@@ -1,11 +1,11 @@
 error[E0499]: cannot borrow `query` as mutable more than once at a time
   --> tests/ui/system_query_get_many_mut_lifetime_safety.rs:8:14
    |
-7  |     let a1 = query.get_many_mut([e, e]).unwrap();
+ 7 |     let a1 = query.get_many_mut([e, e]).unwrap();
    |              ----- first mutable borrow occurs here
-8  |     let a2 = query.get_mut(e).unwrap();
+ 8 |     let a2 = query.get_mut(e).unwrap();
    |              ^^^^^ second mutable borrow occurs here
-9  |
+ 9 |
 10 |     println!("{} {}", a1[0].0, a2.0);
    |                       ----- first borrow later used here
 
diff --git a/crates/bevy_ecs/compile_fail/tests/ui/system_query_iter_lifetime_safety.stderr b/crates/bevy_ecs/compile_fail/tests/ui/system_query_iter_lifetime_safety.stderr
index bcae3940a4811..309bd73fd7c79 100644
--- a/crates/bevy_ecs/compile_fail/tests/ui/system_query_iter_lifetime_safety.stderr
+++ b/crates/bevy_ecs/compile_fail/tests/ui/system_query_iter_lifetime_safety.stderr
@@ -1,7 +1,7 @@
 error[E0499]: cannot borrow `query` as mutable more than once at a time
   --> tests/ui/system_query_iter_lifetime_safety.rs:10:21
    |
-7  |     let mut iter = query.iter_mut();
+ 7 |     let mut iter = query.iter_mut();
    |                    ----- first mutable borrow occurs here
 ...
 10 |     let mut iter2 = query.iter_mut();
diff --git a/crates/bevy_ecs/compile_fail/tests/ui/system_query_iter_sort_lifetime_safety.stderr b/crates/bevy_ecs/compile_fail/tests/ui/system_query_iter_sort_lifetime_safety.stderr
index 4565ece326b29..d3966c0fd158f 100644
--- a/crates/bevy_ecs/compile_fail/tests/ui/system_query_iter_sort_lifetime_safety.stderr
+++ b/crates/bevy_ecs/compile_fail/tests/ui/system_query_iter_sort_lifetime_safety.stderr
@@ -1,7 +1,7 @@
 error[E0521]: borrowed data escapes outside of closure
   --> tests/ui/system_query_iter_sort_lifetime_safety.rs:12:9
    |
-9  |     let mut stored: Option<&A> = None;
+ 9 |     let mut stored: Option<&A> = None;
    |         ---------- `stored` declared here, outside of the closure body
 10 |     let mut sorted = iter.sort_by::<&A>(|left, _right| {
    |                                          ---- `left` is a reference that is only valid in the closure body
diff --git a/crates/bevy_ecs/compile_fail/tests/ui/system_query_set_get_lifetime_safety.stderr b/crates/bevy_ecs/compile_fail/tests/ui/system_query_set_get_lifetime_safety.stderr
index be0598f1eb767..1aaceb1721ad8 100644
--- a/crates/bevy_ecs/compile_fail/tests/ui/system_query_set_get_lifetime_safety.stderr
+++ b/crates/bevy_ecs/compile_fail/tests/ui/system_query_set_get_lifetime_safety.stderr
@@ -1,7 +1,7 @@
 error[E0499]: cannot borrow `queries` as mutable more than once at a time
   --> tests/ui/system_query_set_get_lifetime_safety.rs:10:14
    |
-7  |     let mut q2 = queries.p0();
+ 7 |     let mut q2 = queries.p0();
    |                  ------- first mutable borrow occurs here
 ...
 10 |     let q1 = queries.p1();
diff --git a/crates/bevy_ecs/compile_fail/tests/ui/system_query_set_iter_lifetime_safety.stderr b/crates/bevy_ecs/compile_fail/tests/ui/system_query_set_iter_lifetime_safety.stderr
index 8d1a50bd3f8cc..8aebf6c7b6c4d 100644
--- a/crates/bevy_ecs/compile_fail/tests/ui/system_query_set_iter_lifetime_safety.stderr
+++ b/crates/bevy_ecs/compile_fail/tests/ui/system_query_set_iter_lifetime_safety.stderr
@@ -1,7 +1,7 @@
 error[E0499]: cannot borrow `queries` as mutable more than once at a time
   --> tests/ui/system_query_set_iter_lifetime_safety.rs:11:14
    |
-7  |     let mut q2 = queries.p0();
+ 7 |     let mut q2 = queries.p0();
    |                  ------- first mutable borrow occurs here
 ...
 11 |     let q1 = queries.p1();
diff --git a/crates/bevy_ecs/compile_fail/tests/ui/world_query_derive.stderr b/crates/bevy_ecs/compile_fail/tests/ui/world_query_derive.stderr
index ec71c112a6a05..2ece1b014ebd1 100644
--- a/crates/bevy_ecs/compile_fail/tests/ui/world_query_derive.stderr
+++ b/crates/bevy_ecs/compile_fail/tests/ui/world_query_derive.stderr
@@ -19,20 +19,25 @@ error[E0277]: the trait bound `&'static mut Foo: ReadOnlyQueryData` is not satis
              (F0, F1, F2)
              (F0, F1, F2, F3)
              (F0, F1, F2, F3, F4)
-           and 39 others
+           and 40 others
 note: required by a bound in `_::assert_readonly`
   --> tests/ui/world_query_derive.rs:7:10
    |
-7  | #[derive(QueryData)]
+ 7 | #[derive(QueryData)]
    |          ^^^^^^^^^ required by this bound in `assert_readonly`
    = note: this error originates in the derive macro `QueryData` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `MutableMarked: ReadOnlyQueryData` is not satisfied
-  --> tests/ui/world_query_derive.rs:43:8
+  --> tests/ui/world_query_derive.rs:29:8
    |
-43 |     a: MutableMarked,
-   |        ^^^^^^^^^^^^^ the trait `ReadOnlyQueryData` is not implemented for `MutableMarked`
+29 |     a: MutableMarked,
+   |        ^^^^^^^^^^^^^ unsatisfied trait bound
    |
+help: the trait `ReadOnlyQueryData` is not implemented for `MutableMarked`
+  --> tests/ui/world_query_derive.rs:22:1
+   |
+22 | struct MutableMarked {
+   | ^^^^^^^^^^^^^^^^^^^^
    = help: the following other types implement trait `ReadOnlyQueryData`:
              &Archetype
              &T
@@ -42,14 +47,14 @@ error[E0277]: the trait bound `MutableMarked: ReadOnlyQueryData` is not satisfie
              (F0, F1, F2)
              (F0, F1, F2, F3)
              (F0, F1, F2, F3, F4)
-           and 39 others
+           and 40 others
 note: required by a bound in `_::assert_readonly`
-  --> tests/ui/world_query_derive.rs:40:10
+  --> tests/ui/world_query_derive.rs:26:10
    |
-40 | #[derive(QueryData)]
+26 | #[derive(QueryData)]
    |          ^^^^^^^^^ required by this bound in `assert_readonly`
    = note: this error originates in the derive macro `QueryData` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: aborting due to 5 previous errors
+error: aborting due to 3 previous errors
 
 For more information about this error, try `rustc --explain E0277`.
diff --git a/crates/bevy_ecs/src/system/exclusive_system_param.rs b/crates/bevy_ecs/src/system/exclusive_system_param.rs
index f87182ab1f13c..89bd1b0d8bcfe 100644
--- a/crates/bevy_ecs/src/system/exclusive_system_param.rs
+++ b/crates/bevy_ecs/src/system/exclusive_system_param.rs
@@ -100,6 +100,7 @@ macro_rules! impl_exclusive_system_param_tuple {
             unused_variables,
             reason = "Zero-length tuples won't use any of the parameters."
         )]
+        #[allow(clippy::unused_unit, reason = "Zero length tuple is unit.")]
         $(#[$meta])*
         impl<$($param: ExclusiveSystemParam),*> ExclusiveSystemParam for ($($param,)*) {
             type State = ($($param::State,)*);
@@ -107,7 +108,7 @@ macro_rules! impl_exclusive_system_param_tuple {
 
             #[inline]
             fn init(world: &mut World, system_meta: &mut SystemMeta) -> Self::State {
-                (($($param::init(world, system_meta),)*))
+                ($($param::init(world, system_meta),)*)
             }
 
             #[inline]
diff --git a/crates/bevy_ecs/src/system/system_param.rs b/crates/bevy_ecs/src/system/system_param.rs
index 32b4044e6f25b..de15c850ccdb9 100644
--- a/crates/bevy_ecs/src/system/system_param.rs
+++ b/crates/bevy_ecs/src/system/system_param.rs
@@ -2145,6 +2145,7 @@ macro_rules! impl_system_param_tuple {
             unused_variables,
             reason = "Zero-length tuples won't use some of the parameters."
         )]
+        #[allow(clippy::unused_unit, reason = "Zero length tuple is unit.")]
         $(#[$meta])*
         // SAFETY: implementers of each `SystemParam` in the tuple have validated their impls
         unsafe impl<$($param: SystemParam),*> SystemParam for ($($param,)*) {
@@ -2153,7 +2154,7 @@ macro_rules! impl_system_param_tuple {
 
             #[inline]
             fn init_state(world: &mut World) -> Self::State {
-                (($($param::init_state(world),)*))
+                ($($param::init_state(world),)*)
             }
 
             fn init_access(state: &Self::State, _system_meta: &mut SystemMeta, _component_access_set: &mut FilteredAccessSet, _world: &mut World) {
diff --git a/crates/bevy_reflect/src/path/parse.rs b/crates/bevy_reflect/src/path/parse.rs
index be5856834a9c3..1a8a0c55f8654 100644
--- a/crates/bevy_reflect/src/path/parse.rs
+++ b/crates/bevy_reflect/src/path/parse.rs
@@ -59,16 +59,16 @@ impl<'a> PathParser<'a> {
         // If we do not find a subsequent token, we are at the end of the parse string.
         let ident_len = to_parse.iter().position(|t| Token::SYMBOLS.contains(t));
         let (ident, remaining) = to_parse.split_at(ident_len.unwrap_or(to_parse.len()));
+        #[expect(
+            unsafe_code,
+            reason = "We have fulfilled the Safety requirements for `from_utf8_unchecked`."
+        )]
         // SAFETY: This relies on `self.remaining` always remaining valid UTF8:
         // - self.remaining is a slice derived from self.path (valid &str)
         // - The slice's end is either the same as the valid &str or
         //   the last byte before an ASCII utf-8 character (ie: it is a char
         //   boundary).
         // - The slice always starts after a symbol ie: an ASCII character's boundary.
-        #[expect(
-            unsafe_code,
-            reason = "We have fulfilled the Safety requirements for `from_utf8_unchecked`."
-        )]
         let ident = unsafe { from_utf8_unchecked(ident) };
 
         self.remaining = remaining;
diff --git a/crates/bevy_remote/src/builtin_methods.rs b/crates/bevy_remote/src/builtin_methods.rs
index 5c359dab5b2e1..4ee7f336aefc2 100644
--- a/crates/bevy_remote/src/builtin_methods.rs
+++ b/crates/bevy_remote/src/builtin_methods.rs
@@ -1690,8 +1690,6 @@ mod tests {
 
     #[test]
     fn insert_reflect_only_component() {
-        use bevy_ecs::prelude::Component;
-        use bevy_reflect::Reflect;
         #[derive(Reflect, Component)]
         #[reflect(Component)]
         struct Player {
diff --git a/crates/bevy_render/src/diagnostic/internal.rs b/crates/bevy_render/src/diagnostic/internal.rs
index ec226c760b96b..2bd360c51bee6 100644
--- a/crates/bevy_render/src/diagnostic/internal.rs
+++ b/crates/bevy_render/src/diagnostic/internal.rs
@@ -323,11 +323,7 @@ impl FrameData {
     ) -> &mut SpanRecord {
         let thread_id = thread::current().id();
 
-        let parent = self
-            .open_spans
-            .iter()
-            .filter(|v| v.thread_id == thread_id)
-            .next_back();
+        let parent = self.open_spans.iter().rfind(|v| v.thread_id == thread_id);
 
         let path_range = match &parent {
             Some(parent) if parent.path_range.end == self.path_components.len() => {
@@ -363,8 +359,7 @@ impl FrameData {
         let iter = self.open_spans.iter();
         let (index, _) = iter
             .enumerate()
-            .filter(|(_, v)| v.thread_id == thread_id)
-            .next_back()
+            .rfind(|(_, v)| v.thread_id == thread_id)
             .unwrap();
 
         let span = self.open_spans.swap_remove(index);
diff --git a/crates/bevy_transform/src/systems.rs b/crates/bevy_transform/src/systems.rs
index 62038b37ed90f..34366b1b3ce25 100644
--- a/crates/bevy_transform/src/systems.rs
+++ b/crates/bevy_transform/src/systems.rs
@@ -881,12 +881,12 @@ mod test {
         // cannot happen
         let mut a = unsafe { child_entity.get_mut_assume_mutable::<ChildOf>().unwrap() };
 
-        // SAFETY: ChildOf is not mutable but this is for a test to produce a scenario that
-        // cannot happen
         #[expect(
             unsafe_code,
             reason = "ChildOf is not mutable but this is for a test to produce a scenario that cannot happen"
         )]
+        // SAFETY: ChildOf is not mutable but this is for a test to produce a scenario that
+        // cannot happen
         let mut b = unsafe {
             grandchild_entity
                 .get_mut_assume_mutable::<ChildOf>()
diff --git a/tools/export-content/src/app.rs b/tools/export-content/src/app.rs
index 7fa2be0d1a494..f734375ccb45a 100644
--- a/tools/export-content/src/app.rs
+++ b/tools/export-content/src/app.rs
@@ -1,3 +1,8 @@
+#![expect(
+    unused_assignments,
+    reason = "Warnings from inside miette due to a rustc bug: https://github.com/rust-lang/rust/issues/147648"
+)]
+
 use std::{env, fs, io::Write, path::PathBuf};
 
 use miette::{diagnostic, Context, Diagnostic, IntoDiagnostic, NamedSource, Result};

From 94914053ebf0dc7119f01e3ecc3477d0bd996f6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20S=C3=B8holm?= <k.soeholm@gmail.com>
Date: Fri, 12 Dec 2025 19:47:13 +0100
Subject: [PATCH 088/133] Fix incorrect blake3 version bound (#22091)

# Objective

The PR #21925 introduced some code using the constant
`blake3::CHUNK_LEN`, but that wasn't public before version 1.8, and
bevy_asset currently depends on version 1.5. This breaks users with an
older version in their lock file.

## Solution

Bump blake3 to 1.8
---
 crates/bevy_asset/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/bevy_asset/Cargo.toml b/crates/bevy_asset/Cargo.toml
index d20e9c0974ee7..fb19e7e841d5a 100644
--- a/crates/bevy_asset/Cargo.toml
+++ b/crates/bevy_asset/Cargo.toml
@@ -58,7 +58,7 @@ futures-util = { version = "0.3", default-features = false, features = [
 ] }
 futures-io = { version = "0.3", default-features = false }
 futures-lite = { version = "2.0.1", default-features = false }
-blake3 = { version = "1.5", default-features = false }
+blake3 = { version = "1.8", default-features = false }
 ron = { version = "0.12", default-features = false }
 serde = { version = "1", default-features = false, features = ["derive"] }
 thiserror = { version = "2", default-features = false }

From 53aea52328bf79b5becf95a2ab66883b1d7c8b69 Mon Sep 17 00:00:00 2001
From: ickshonpe <david.curthoys@googlemail.com>
Date: Fri, 12 Dec 2025 20:16:33 +0000
Subject: [PATCH 089/133] text2d change detection fix (#22098)

# Objective

Fix performance regression caused by #22051 breaking text2d's change
detection.

Fixes #22099.

## Solution

Set the text entity's `ComputedTextBlock::needs_rerender` flag to false
at the start of `update_text_buffer` and `update_text_layout_info`.

## Testing

```
cargo run --example many_text2d --release
```

should run about 400x main's FPS
---
 crates/bevy_text/src/pipeline.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crates/bevy_text/src/pipeline.rs b/crates/bevy_text/src/pipeline.rs
index d9e95e7e598d0..88cbd8ba32cef 100644
--- a/crates/bevy_text/src/pipeline.rs
+++ b/crates/bevy_text/src/pipeline.rs
@@ -104,6 +104,8 @@ impl TextPipeline {
         computed: &mut ComputedTextBlock,
         font_system: &mut CosmicFontSystem,
     ) -> Result<(), TextError> {
+        computed.needs_rerender = false;
+
         let font_system = &mut font_system.0;
 
         // Collect span information into a vec. This is necessary because font loading requires mut access
@@ -305,6 +307,8 @@ impl TextPipeline {
         bounds: TextBounds,
         justify: Justify,
     ) -> Result<(), TextError> {
+        computed.needs_rerender = false;
+
         layout_info.glyphs.clear();
         layout_info.run_geometry.clear();
         layout_info.size = Default::default();

From 5eba4eb98c9f3bc0f7634ac169ae7cea23803847 Mon Sep 17 00:00:00 2001
From: andriyDev <andriydzikh@gmail.com>
Date: Fri, 12 Dec 2025 15:49:38 -0800
Subject: [PATCH 090/133] Fix wrong termination for asset hash reads. (#22100)

# Objective

- #21925 changed the hash computation to read the file piece by piece.
Unfortunately, the termination condition is wrong for this loop. We
should only exit once the reader has no more bytes (`bytes_read == 0`),
otherwise, the reader might partially fill the buffer, and that may be
interpretted as an EOF.
- I originally did this check, but something was failing due to never
terminating the read. Unclear what happened, maybe I got mixed up!

## Solution

- Check if there are no bytes left rather than if the buffer is
partially filled.

## Testing

- Ran the asset tests with --all-features
- Ran the `asset_processor` example and it seems to work!
---
 crates/bevy_asset/src/meta.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/bevy_asset/src/meta.rs b/crates/bevy_asset/src/meta.rs
index b6b41d36833cb..f78273d5bd672 100644
--- a/crates/bevy_asset/src/meta.rs
+++ b/crates/bevy_asset/src/meta.rs
@@ -254,7 +254,7 @@ pub(crate) async fn get_asset_hash(
     loop {
         let bytes_read = asset_reader.read(&mut buffer).await?;
         hasher.update(&buffer[..bytes_read]);
-        if bytes_read < buffer.len() {
+        if bytes_read == 0 {
             // This means we've reached EOF, so we're done consuming asset bytes.
             break;
         }

From 9c589768c7c25167e011937b3d018a0f53db3724 Mon Sep 17 00:00:00 2001
From: Luo Zhihao <luo_zhihao@outlook.com>
Date: Sat, 13 Dec 2025 07:53:59 +0800
Subject: [PATCH 091/133] Revert "Support non-sRGB image formats for
 `RenderTarget::Image`" (#22101)

Reverts bevyengine/bevy#22031

Rationale see https://github.com/bevyengine/bevy/pull/22090
---
 crates/bevy_render/src/camera.rs                    |  6 +++---
 .../bevy_render/src/texture/manual_texture_view.rs  | 13 ++++++++++---
 .../bevy_render/src/texture/texture_attachment.rs   |  6 ++++--
 crates/bevy_render/src/view/mod.rs                  | 13 ++++++++++---
 crates/bevy_render/src/view/window/screenshot.rs    | 10 +++++-----
 5 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/crates/bevy_render/src/camera.rs b/crates/bevy_render/src/camera.rs
index 5c9cf002c2c07..84988a2fc6534 100644
--- a/crates/bevy_render/src/camera.rs
+++ b/crates/bevy_render/src/camera.rs
@@ -213,9 +213,9 @@ impl NormalizedRenderTargetExt for NormalizedRenderTarget {
             NormalizedRenderTarget::Image(image_target) => images
                 .get(&image_target.handle)
                 .map(|image| image.texture_format),
-            NormalizedRenderTarget::TextureView(id) => manual_texture_views
-                .get(id)
-                .map(|view| view.texture_view.texture().format()),
+            NormalizedRenderTarget::TextureView(id) => {
+                manual_texture_views.get(id).map(|tex| tex.format)
+            }
             NormalizedRenderTarget::None { .. } => None,
         }
     }
diff --git a/crates/bevy_render/src/texture/manual_texture_view.rs b/crates/bevy_render/src/texture/manual_texture_view.rs
index b03943d3c2750..b9faa84ab78f6 100644
--- a/crates/bevy_render/src/texture/manual_texture_view.rs
+++ b/crates/bevy_render/src/texture/manual_texture_view.rs
@@ -1,8 +1,10 @@
 use bevy_camera::ManualTextureViewHandle;
 use bevy_ecs::{prelude::Component, resource::Resource};
+use bevy_image::BevyDefault;
 use bevy_math::UVec2;
 use bevy_platform::collections::HashMap;
 use bevy_render_macros::ExtractResource;
+use wgpu::TextureFormat;
 
 use crate::render_resource::TextureView;
 
@@ -11,11 +13,16 @@ use crate::render_resource::TextureView;
 pub struct ManualTextureView {
     pub texture_view: TextureView,
     pub size: UVec2,
+    pub format: TextureFormat,
 }
 
 impl ManualTextureView {
-    pub fn new(texture_view: TextureView, size: UVec2) -> Self {
-        Self { texture_view, size }
+    pub fn with_default_format(texture_view: TextureView, size: UVec2) -> Self {
+        Self {
+            texture_view,
+            size,
+            format: TextureFormat::bevy_default(),
+        }
     }
 }
 
@@ -29,7 +36,7 @@ impl ManualTextureView {
 /// # world.insert_resource(ManualTextureViews::default());
 /// # let texture_view = todo!();
 /// let manual_views = world.resource_mut::<ManualTextureViews>();
-/// let manual_view = ManualTextureView::new(texture_view, UVec2::new(1024, 1024));
+/// let manual_view = ManualTextureView::with_default_format(texture_view, UVec2::new(1024, 1024));
 ///
 /// // Choose an unused handle value; it's likely only you are inserting manual views.
 /// const MANUAL_VIEW_HANDLE: ManualTextureViewHandle = ManualTextureViewHandle::new(42);
diff --git a/crates/bevy_render/src/texture/texture_attachment.rs b/crates/bevy_render/src/texture/texture_attachment.rs
index 26588212683c1..269c2f1422820 100644
--- a/crates/bevy_render/src/texture/texture_attachment.rs
+++ b/crates/bevy_render/src/texture/texture_attachment.rs
@@ -1,5 +1,5 @@
 use super::CachedTexture;
-use crate::render_resource::TextureView;
+use crate::render_resource::{TextureFormat, TextureView};
 use alloc::sync::Arc;
 use bevy_color::LinearRgba;
 use core::sync::atomic::{AtomicBool, Ordering};
@@ -127,13 +127,15 @@ impl DepthAttachment {
 #[derive(Clone)]
 pub struct OutputColorAttachment {
     pub view: TextureView,
+    pub format: TextureFormat,
     is_first_call: Arc<AtomicBool>,
 }
 
 impl OutputColorAttachment {
-    pub fn new(view: TextureView) -> Self {
+    pub fn new(view: TextureView, format: TextureFormat) -> Self {
         Self {
             view,
+            format,
             is_first_call: Arc::new(AtomicBool::new(true)),
         }
     }
diff --git a/crates/bevy_render/src/view/mod.rs b/crates/bevy_render/src/view/mod.rs
index cc39266a6ddec..e9898c9deaddf 100644
--- a/crates/bevy_render/src/view/mod.rs
+++ b/crates/bevy_render/src/view/mod.rs
@@ -848,7 +848,7 @@ impl ViewTarget {
     /// The format of the final texture this view will render to
     #[inline]
     pub fn out_texture_format(&self) -> TextureFormat {
-        self.out_texture.view.texture().format()
+        self.out_texture.format
     }
 
     /// This will start a new "post process write", which assumes that the caller
@@ -1024,7 +1024,10 @@ pub fn prepare_view_attachments(
                 let Some(attachment) = target
                     .get_texture_view(&windows, &images, &manual_texture_views)
                     .cloned()
-                    .map(OutputColorAttachment::new)
+                    .zip(target.get_texture_format(&windows, &images, &manual_texture_views))
+                    .map(|(view, format)| {
+                        OutputColorAttachment::new(view.clone(), format.add_srgb_suffix())
+                    })
                 else {
                     continue;
                 };
@@ -1093,7 +1096,11 @@ pub fn prepare_view_targets(
                     dimension: TextureDimension::D2,
                     format: main_texture_format,
                     usage: texture_usage.0,
-                    view_formats: &[],
+                    view_formats: match main_texture_format {
+                        TextureFormat::Bgra8Unorm => &[TextureFormat::Bgra8UnormSrgb],
+                        TextureFormat::Rgba8Unorm => &[TextureFormat::Rgba8UnormSrgb],
+                        _ => &[],
+                    },
                 };
                 let a = texture_cache.get(
                     &render_device,
diff --git a/crates/bevy_render/src/view/window/screenshot.rs b/crates/bevy_render/src/view/window/screenshot.rs
index 4c5f60ac34c1c..4aba6c6cee791 100644
--- a/crates/bevy_render/src/view/window/screenshot.rs
+++ b/crates/bevy_render/src/view/window/screenshot.rs
@@ -295,7 +295,7 @@ fn prepare_screenshots(
                 prepared.insert(*entity, state);
                 view_target_attachments.insert(
                     target.clone(),
-                    OutputColorAttachment::new(texture_view.clone()),
+                    OutputColorAttachment::new(texture_view.clone(), format.add_srgb_suffix()),
                 );
             }
             NormalizedRenderTarget::Image(image) => {
@@ -315,7 +315,7 @@ fn prepare_screenshots(
                 prepared.insert(*entity, state);
                 view_target_attachments.insert(
                     target.clone(),
-                    OutputColorAttachment::new(texture_view.clone()),
+                    OutputColorAttachment::new(texture_view.clone(), format.add_srgb_suffix()),
                 );
             }
             NormalizedRenderTarget::TextureView(texture_view) => {
@@ -326,7 +326,7 @@ fn prepare_screenshots(
                     );
                     continue;
                 };
-                let format = manual_texture_view.texture_view.texture().format();
+                let format = manual_texture_view.format;
                 let size = manual_texture_view.size.to_extents();
                 let (texture_view, state) = prepare_screenshot_state(
                     size,
@@ -339,7 +339,7 @@ fn prepare_screenshots(
                 prepared.insert(*entity, state);
                 view_target_attachments.insert(
                     target.clone(),
-                    OutputColorAttachment::new(texture_view.clone()),
+                    OutputColorAttachment::new(texture_view.clone(), format.add_srgb_suffix()),
                 );
             }
             NormalizedRenderTarget::None { .. } => {
@@ -550,7 +550,7 @@ pub(crate) fn submit_screenshot_commands(world: &World, encoder: &mut CommandEnc
                 };
                 let width = texture_view.size.x;
                 let height = texture_view.size.y;
-                let texture_format = texture_view.texture_view.texture().format();
+                let texture_format = texture_view.format;
                 let texture_view = texture_view.texture_view.deref();
                 render_screenshot(
                     encoder,

From f2592b0a72ed238161208a7ce01587aff2ec30e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Mockers?= <francois.mockers@vleue.com>
Date: Sun, 14 Dec 2025 01:15:41 +0100
Subject: [PATCH 092/133] make example clustered_decal_maps deterministic
 (#22109)

# Objective

- don't use random random

## Solution

- use seeded random
---
 examples/3d/clustered_decal_maps.rs | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/examples/3d/clustered_decal_maps.rs b/examples/3d/clustered_decal_maps.rs
index f72aa1df40b99..0f88747fd1fd9 100644
--- a/examples/3d/clustered_decal_maps.rs
+++ b/examples/3d/clustered_decal_maps.rs
@@ -11,7 +11,8 @@ use bevy::{
     prelude::*,
     render::view::Hdr,
 };
-use rand::Rng;
+use rand::{Rng, SeedableRng};
+use rand_chacha::ChaCha8Rng;
 
 use crate::widgets::{RadioButton, RadioButtonText, WidgetClickEvent, WidgetClickSender};
 
@@ -159,9 +160,13 @@ fn main() {
             Update,
             handle_emission_type_change.after(widgets::handle_ui_interactions::<AppSetting>),
         )
+        .insert_resource(SeededRng(ChaCha8Rng::seed_from_u64(19878367467712)))
         .run();
 }
 
+#[derive(Resource)]
+struct SeededRng(ChaCha8Rng);
+
 /// Spawns all the objects in the scene.
 fn setup(
     mut commands: Commands,
@@ -279,6 +284,7 @@ fn spawn_decal(
     app_textures: Res<AppTextures>,
     time: Res<Time>,
     mut decal_spawn_timer: Local<Option<Timer>>,
+    mut seeded_rng: ResMut<SeededRng>,
 ) {
     // Tick the decal spawn timer. Check to see if we should spawn a new decal,
     // and bail out if it's not yet time to.
@@ -290,18 +296,17 @@ fn spawn_decal(
     }
 
     // Generate a random position along the plane.
-    let mut rng = rand::rng();
     let decal_position = vec3(
-        rng.random_range(-PLANE_HALF_SIZE..PLANE_HALF_SIZE),
-        rng.random_range(-PLANE_HALF_SIZE..PLANE_HALF_SIZE),
+        seeded_rng.0.random_range(-PLANE_HALF_SIZE..PLANE_HALF_SIZE),
+        seeded_rng.0.random_range(-PLANE_HALF_SIZE..PLANE_HALF_SIZE),
         0.0,
     );
 
     // Generate a random size for the decal.
-    let decal_size = rng.random_range(DECAL_MIN_SIZE..DECAL_MAX_SIZE);
+    let decal_size = seeded_rng.0.random_range(DECAL_MIN_SIZE..DECAL_MAX_SIZE);
 
     // Generate a random rotation for the decal.
-    let theta = rng.random_range(0.0f32..PI);
+    let theta = seeded_rng.0.random_range(0.0f32..PI);
 
     // Now spawn the decal.
     commands.spawn((

From bd2a6dd60c026f28c1589cf93feb0115e3a9de39 Mon Sep 17 00:00:00 2001
From: Erik W <22211983+Lampan-git@users.noreply.github.com>
Date: Sun, 14 Dec 2025 22:16:36 +0100
Subject: [PATCH 093/133] Bump tracy-client version (#22110)

# Objective

- Latest tracy version 0.13 doesn't work with tracy-client 0.18.0

## Solution

- Bump tracy-client to 0.18.3 per
https://github.com/nagisa/rust_tracy_client?tab=readme-ov-file#version-support-table

## Testing

- Tested with tracy version 13.1
- I have not tested with tracy version 12

---

<details>
  <summary>Click to view showcase</summary>

```rust
println!("My super cool code.");
```

</details>
---
 crates/bevy_log/Cargo.toml    | 2 +-
 crates/bevy_render/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/bevy_log/Cargo.toml b/crates/bevy_log/Cargo.toml
index f8dbdf683c3f5..eccc424242ec4 100644
--- a/crates/bevy_log/Cargo.toml
+++ b/crates/bevy_log/Cargo.toml
@@ -32,7 +32,7 @@ tracing = { version = "0.1", default-features = false, features = ["std"] }
 # Tracy dependency compatibility table:
 # https://github.com/nagisa/rust_tracy_client
 tracing-tracy = { version = "0.11.4", optional = true }
-tracy-client = { version = "0.18.0", optional = true }
+tracy-client = { version = "0.18.3", optional = true }
 
 [target.'cfg(target_os = "android")'.dependencies]
 android_log-sys = "0.3.0"
diff --git a/crates/bevy_render/Cargo.toml b/crates/bevy_render/Cargo.toml
index 69cdc5cd93c81..278ae95b8fef7 100644
--- a/crates/bevy_render/Cargo.toml
+++ b/crates/bevy_render/Cargo.toml
@@ -113,7 +113,7 @@ smallvec = { version = "1", default-features = false, features = ["const_new"] }
 offset-allocator = "0.2"
 variadics_please = "1.1"
 tracing = { version = "0.1", default-features = false, features = ["std"] }
-tracy-client = { version = "0.18.0", optional = true }
+tracy-client = { version = "0.18.3", optional = true }
 indexmap = { version = "2" }
 fixedbitset = { version = "0.5" }
 bitflags = "2"

From c342e254a246e8184a3e4f83d33717fbc8c58951 Mon Sep 17 00:00:00 2001
From: atlv <rodol@rivalrebels.com>
Date: Sun, 14 Dec 2025 16:19:02 -0500
Subject: [PATCH 094/133] Add PresentMode fallbacks (#22108)

# Objective

- Selecting an unsupported PresentMode crashes. Lets not do that.

## Solution

- Filter by capabilities and assume reasonable fallbacks.

## Testing

-
---
 crates/bevy_render/src/view/window/mod.rs | 68 +++++++++++++++++------
 1 file changed, 51 insertions(+), 17 deletions(-)

diff --git a/crates/bevy_render/src/view/window/mod.rs b/crates/bevy_render/src/view/window/mod.rs
index ae5389e906820..48686af01db01 100644
--- a/crates/bevy_render/src/view/window/mod.rs
+++ b/crates/bevy_render/src/view/window/mod.rs
@@ -15,7 +15,7 @@ use core::{
     num::NonZero,
     ops::{Deref, DerefMut},
 };
-use tracing::{debug, warn};
+use tracing::{debug, info, warn};
 use wgpu::{
     SurfaceConfiguration, SurfaceTargetUnsafe, TextureFormat, TextureUsages, TextureViewDescriptor,
 };
@@ -348,6 +348,7 @@ pub fn create_surfaces(
                         .expect("Failed to create wgpu surface")
                 };
                 let caps = surface.get_capabilities(&render_adapter);
+                let present_mode = present_mode(window, &caps);
                 let formats = caps.formats;
                 // For future HDR output support, we'll need to request a format that supports HDR,
                 // but as of wgpu 0.15 that is not yet supported.
@@ -368,14 +369,7 @@ pub fn create_surfaces(
                     width: window.physical_width,
                     height: window.physical_height,
                     usage: TextureUsages::RENDER_ATTACHMENT,
-                    present_mode: match window.present_mode {
-                        PresentMode::Fifo => wgpu::PresentMode::Fifo,
-                        PresentMode::FifoRelaxed => wgpu::PresentMode::FifoRelaxed,
-                        PresentMode::Mailbox => wgpu::PresentMode::Mailbox,
-                        PresentMode::Immediate => wgpu::PresentMode::Immediate,
-                        PresentMode::AutoVsync => wgpu::PresentMode::AutoVsync,
-                        PresentMode::AutoNoVsync => wgpu::PresentMode::AutoNoVsync,
-                    },
+                    present_mode,
                     desired_maximum_frame_latency: window
                         .desired_maximum_frame_latency
                         .map(NonZero::<u32>::get)
@@ -413,17 +407,57 @@ pub fn create_surfaces(
 
             data.configuration.width = window.physical_width;
             data.configuration.height = window.physical_height;
-            data.configuration.present_mode = match window.present_mode {
-                PresentMode::Fifo => wgpu::PresentMode::Fifo,
-                PresentMode::FifoRelaxed => wgpu::PresentMode::FifoRelaxed,
-                PresentMode::Mailbox => wgpu::PresentMode::Mailbox,
-                PresentMode::Immediate => wgpu::PresentMode::Immediate,
-                PresentMode::AutoVsync => wgpu::PresentMode::AutoVsync,
-                PresentMode::AutoNoVsync => wgpu::PresentMode::AutoNoVsync,
-            };
+            let caps = data.surface.get_capabilities(&render_adapter);
+            data.configuration.present_mode = present_mode(window, &caps);
             render_device.configure_surface(&data.surface, &data.configuration);
         }
 
         window_surfaces.configured_windows.insert(window.entity);
     }
 }
+
+fn present_mode(
+    window: &mut ExtractedWindow,
+    caps: &wgpu::SurfaceCapabilities,
+) -> wgpu::PresentMode {
+    let present_mode = match window.present_mode {
+        PresentMode::Fifo => wgpu::PresentMode::Fifo,
+        PresentMode::FifoRelaxed => wgpu::PresentMode::FifoRelaxed,
+        PresentMode::Mailbox => wgpu::PresentMode::Mailbox,
+        PresentMode::Immediate => wgpu::PresentMode::Immediate,
+        PresentMode::AutoVsync => wgpu::PresentMode::AutoVsync,
+        PresentMode::AutoNoVsync => wgpu::PresentMode::AutoNoVsync,
+    };
+    let fallbacks = match present_mode {
+        wgpu::PresentMode::AutoVsync => {
+            &[wgpu::PresentMode::FifoRelaxed, wgpu::PresentMode::Fifo][..]
+        }
+        wgpu::PresentMode::AutoNoVsync => &[
+            wgpu::PresentMode::Immediate,
+            wgpu::PresentMode::Mailbox,
+            wgpu::PresentMode::Fifo,
+        ][..],
+        wgpu::PresentMode::Mailbox => &[
+            wgpu::PresentMode::Mailbox,
+            wgpu::PresentMode::Immediate,
+            wgpu::PresentMode::Fifo,
+        ][..],
+        // Always end in FIFO to make sure it's always supported
+        x => &[x, wgpu::PresentMode::Fifo][..],
+    };
+    let new_present_mode = fallbacks
+        .iter()
+        .copied()
+        .find(|fallback| caps.present_modes.contains(fallback))
+        .unwrap_or_else(|| {
+            unreachable!(
+                "Fallback system failed to choose present mode. \
+                            This is a bug. Mode: {:?}, Options: {:?}",
+                window.present_mode, &caps.present_modes
+            );
+        });
+    if new_present_mode != present_mode && fallbacks.contains(&present_mode) {
+        info!("PresentMode {present_mode:?} requested but not available. Falling back to {new_present_mode:?}");
+    }
+    new_present_mode
+}

From d042f8d6bd9dc10b3004f0f8e1007b05d1c6a239 Mon Sep 17 00:00:00 2001
From: atlv <rodol@rivalrebels.com>
Date: Sun, 14 Dec 2025 16:23:03 -0500
Subject: [PATCH 095/133] Make it possible to statically construct gizmo
 buffers (#22105)

# Objective

- statically construct gizmo buffers for some shenanigans

## Solution

- expose a const constructor

## Testing

-
---
 crates/bevy_gizmos/src/gizmos.rs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/crates/bevy_gizmos/src/gizmos.rs b/crates/bevy_gizmos/src/gizmos.rs
index 3d666cbbf51fe..074a9232e6b79 100644
--- a/crates/bevy_gizmos/src/gizmos.rs
+++ b/crates/bevy_gizmos/src/gizmos.rs
@@ -308,6 +308,17 @@ where
     Clear: 'static + Send + Sync,
 {
     fn default() -> Self {
+        GizmoBuffer::new()
+    }
+}
+
+impl<Config, Clear> GizmoBuffer<Config, Clear>
+where
+    Config: GizmoConfigGroup,
+    Clear: 'static + Send + Sync,
+{
+    /// Constructs an empty `GizmoBuffer`.
+    pub const fn new() -> Self {
         GizmoBuffer {
             enabled: true,
             list_positions: Vec::new(),

From e7b64b6b04ea11a0bdbc44c94733ac545665baed Mon Sep 17 00:00:00 2001
From: Chris Biscardi <chris@christopherbiscardi.com>
Date: Sun, 14 Dec 2025 13:25:07 -0800
Subject: [PATCH 096/133] Add support for arbitrary/third party glTF Extension
 processing via GltfExtensionHandler (#22106)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Currently Bevy doesn't support arbitrary glTF extensions. The ones it
does support are hardcoded.

We should support glTF extensions, as this is a primary mechanism for
sharing behavior via data exported from applications like Blender.

I personally have found usecases in exporting component data, lightmap
textures/information, and processing other kinds of data
(AnimationGraph, 3d meshes into 2d, etc).

## Solution

This PR introduces a new `GltfExtensionHandler` trait that users can
implement and add to the glTF loader processing via inserting into a
Resource.

There are two example processors currently added, with a third that I'd
like to add after this PR.

- `examples/gltf/gltf_extension_animation_graph.rs` duplicates the
functionality of `animation_mesh`, constructing AnimationGraphs via
extension processing and applying them to be played on the relevant
nodes.
- `examples/gltf/gltf_extension_mesh_2d.rs` duplicates the functionality
of the `custom_gltf_vertex_attribute` example, showing how the extension
processing could be used to convert 3d meshes to 2d meshes alongside
custom materials.

Both of these examples re-use existing assets and thus don't *actually
use* extension data, but show how one could access the relevant data to
say, only convert specifically labelled Mesh3ds to 2d, or process many
animations into multiple graphs based on extension-data based labelling
introduced in Blender.

A third example I want to introduce after this PR is the same core
functionality Skein requires: an example that uses reflected component
data stored in glTF extensions and inserts that data onto the relevant
entities, resulting in scenes that are "ready to go".

## Comparison to Extras

In comparison to extensions: data placed in glTF extras is well
supported through the `GltfExtras` category of components.

Extras only support adding an additional `extras` field to any object.

Data stored in extras is application-specific. It should be usable by
Bevy developers to implement their own, application-specific, data
transfer. This is supported by applications like Blender through the
application of Custom Properties.

Once data is used by more than one application, it belongs in a glTF
extension.

## What is a glTF Extension?

Extensions are named with a prefix like `KHR` or `EXT`. Bevy has already
reserved the `BEVY` namespace for this, which is listed in the official
[prefix
list](https://github.com/KhronosGroup/glTF/blob/7bbd90978cad06389eee3a36882c5ef2f2039faf/extensions/Prefixes.md).

For a glTF file, an extension must be listed in `extensionsUsed` and
optionally `extensionsRequired`.

```
{
    "extensionsRequired": [
        "KHR_texture_transform"
    ],
    "extensionsUsed": [
        "KHR_texture_transform"
    ]
}
```

Extension data is allowed in any place extras are also allowed, but also
allow much more flexibility.

Extensions are also allowed to define global data, add additional binary
chunks, and more.

For meshes, extensions can add additional attribute names, accessor
types, and/or component types

`KHR_lights_punctual` is a contained and understandable example of an
extension:
https://github.com/KhronosGroup/glTF/blob/7bbd90978cad06389eee3a36882c5ef2f2039faf/extensions/2.0/Khronos/KHR_lights_punctual/README.md
. This one happens to be already hardcoded into Bevy's handling, so it
doesn't benefit from arbitrary extension processing, but there are
additional
[ratified](https://github.com/KhronosGroup/glTF/tree/7bbd90978cad06389eee3a36882c5ef2f2039faf/extensions#ratified-khronos-extensions)
and
[in-progress](https://github.com/KhronosGroup/glTF/tree/7bbd90978cad06389eee3a36882c5ef2f2039faf/extensions#in-progress-khronos-and-multi-vendor-extensions-and-projects)
extensions, as well as
[vendor](https://github.com/KhronosGroup/glTF/tree/7bbd90978cad06389eee3a36882c5ef2f2039faf/extensions#vendor-extensions)
and other arbitrary extensions that would benefit from userland support.

## Implementation

This initial implementation is reasonably minimal: enabling extension
processing for objects/etc as they're loaded which may also define
extension data, including the scene world. This may leave out useful
functionality; as detailed in the next section: "What's not
implemented".

Extension handlers are defined by implementing a trait which can
optionally define hooks and data.
Extension handler data is cloned to start with a fresh slate for each
glTF load, which limits scope to "one glTF load".
So while state can be maintained across hooks during a single load,
users who want to combine or handle multiple glTF assets should do so in
the main app, not in an extension handler.
Following this, because the extensions are stored as `dyn GltfExtension`
*and* we want to clone them to isolate state to a single load,
`dyn_clone` must be included as a workaround to enable this cloning.

An extension handler has to be added to the list of handler by accessing
a `Resource` and pushing an instantiated handler into it.
This Resource keeps the list of extension handlers so that a new glTF
loader can bootstrap them.

The design of the hooks is such that:

- If no extensions handlers are registered, none are called for
processing
- If an extension handler is defined, it receives all "events"
- handlers are defined by a trait, and default implementations are
called if an override is not specified.
    - default implementations are no-ops

It is important that extensions receive all events because certain
information is not embedded in extension data.
For example, processing animation data into an animation graph could
require both processing animations with extension data, tracking the
animation roots through hooks like `on_node`, *and* applying those
graphs in the `on_scene_completed` hook.

- Extension data is passed to hooks as `Option<&serde_json::Value>`
which is only passing references around as the data has already been
converted to `Value` by the `gltf` crate.
- `LoadContext` is required for creating any new additional assets, like
`AnimationGraph`s.
- *scene* World access is provided in hooks like `on_scene_completed`,
which allows calculating data over the course of a glTF load and
applying it to a Scene.

### What's not implemented

This PR chooses to *not* implement some features that it could. Instead
the approach in this PR is to offer up the data that Bevy has already
processed to extensions to do more with that data.

- Overriding `load_image`/`process_loaded_texture`
- This could allow projects like bevy_web_codecs, [which currently forks
the entire gltf
loader](https://github.com/jf908/bevy_web_codecs/tree/373bbf29be6555c7603fd6867a01159ab0f20fed/bevy_web_codecs_gltf).
Associated [issue](https://github.com/bevyengine/bevy/issues/21185).
However I believe this needs some design work dedicated to what exactly
happens here to support that use case.
- This PR doesn't include any refactoring of the glTF loader, which I
feel is important for a first merge.
- ~~There is some benefit to passing in the relevant `gltf::*` object to
every hook. For example, I believe this is the only way to access
extension data for `KHR_lights_punctual`, and
[`KHR_materials_variants`](https://docs.rs/gltf/1.4.1/gltf/struct.Document.html#method.variants)
or other extensions with "built-in" support. I haven't done this in all
places.~~ (edit: after external implementation I decided this was a good
idea and added it to more places)

## Testing

```
cargo run --example gltf_extension_animation_graph
cargo run --example gltf_extension_mesh_2d
```

---

## Showcase

Both examples running:


https://github.com/user-attachments/assets/f9e7c3c9-cdad-4d33-ace7-7c2ca5469d5e



https://github.com/user-attachments/assets/baa9bc92-ca3b-46ad-a3f0-2f74bbc29b68


<details>
<summary>An example that showcases converting Mesh3d to Mesh2d</summary>

```rust
#[derive(Default, Clone)]
struct GltfExtensionProcessorToMesh2d;

impl GltfExtensionProcessor for GltfExtensionProcessorToMesh2d {
    fn extension_ids(&self) -> &'static [&'static str] {
        &[""]
    }

    fn dyn_clone(&self) -> Box<dyn GltfExtensionHandler> {
        Box::new((*self).clone())
    }

    fn on_spawn_mesh_and_material(
        &mut self,
        load_context: &mut LoadContext<'_>,
        _gltf_node: &gltf::Node,
        entity: &mut EntityWorldMut,
    ) {
        if let Some(mesh3d) = entity.get::<Mesh3d>()
            && let Some(_) = entity.get::<MeshMaterial3d<StandardMaterial>>()
        {
            let material_handle =
                load_context.add_loaded_labeled_asset("AColorMaterial", (CustomMaterial {}).into());
            let mesh_handle = mesh3d.0.clone();
            entity
                .remove::<(Mesh3d, MeshMaterial3d<StandardMaterial>)>()
                .insert((Mesh2d(mesh_handle), MeshMaterial2d(material_handle.clone())));
        }
    }
}
```

</details>

---------

Co-authored-by: Kristoffer Søholm <k.soeholm@gmail.com>
---
 Cargo.toml                                    |  23 ++
 assets/models/barycentric/barycentric.gltf    |  14 +
 crates/bevy_gltf/Cargo.toml                   |   1 +
 crates/bevy_gltf/src/lib.rs                   |   8 +-
 crates/bevy_gltf/src/loader/extensions/mod.rs | 263 ++++++++++++++++++
 crates/bevy_gltf/src/loader/mod.rs            | 188 ++++++++++++-
 examples/README.md                            |   2 +
 .../gltf/gltf_extension_animation_graph.rs    | 202 ++++++++++++++
 examples/gltf/gltf_extension_mesh_2d.rs       | 129 +++++++++
 9 files changed, 821 insertions(+), 9 deletions(-)
 create mode 100644 examples/gltf/gltf_extension_animation_graph.rs
 create mode 100644 examples/gltf/gltf_extension_mesh_2d.rs

diff --git a/Cargo.toml b/Cargo.toml
index ce3b87468e628..c3d1dfb93f35f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -732,6 +732,7 @@ event-listener = "5.3.0"
 anyhow = "1"
 accesskit = "0.21"
 nonmax = "0.5"
+gltf = "1.4"
 
 [target.'cfg(not(target_family = "wasm"))'.dev-dependencies]
 ureq = { version = "3.0.8", features = ["json"] }
@@ -4201,6 +4202,28 @@ description = "Loads and renders a glTF file as a scene, including the gltf extr
 category = "glTF"
 wasm = true
 
+[[example]]
+name = "gltf_extension_animation_graph"
+path = "examples/gltf/gltf_extension_animation_graph.rs"
+doc-scrape-examples = true
+
+[package.metadata.example.gltf_extension_animation_graph]
+name = "glTF extension AnimationGraph"
+description = "Uses glTF data to build an AnimationGraph via extension processing"
+category = "glTF"
+wasm = true
+
+[[example]]
+name = "gltf_extension_mesh_2d"
+path = "examples/gltf/gltf_extension_mesh_2d.rs"
+doc-scrape-examples = true
+
+[package.metadata.example.gltf_extension_mesh_2d]
+name = "glTF extension processing to build Mesh2ds from glTF data"
+description = "Uses glTF extension data to convert incoming Mesh3d/MeshMaterial3d assets to 2d"
+category = "glTF"
+wasm = true
+
 [[example]]
 name = "query_gltf_primitives"
 path = "examples/gltf/query_gltf_primitives.rs"
diff --git a/assets/models/barycentric/barycentric.gltf b/assets/models/barycentric/barycentric.gltf
index eecb2bb52cf95..092c28eb7bdf9 100644
--- a/assets/models/barycentric/barycentric.gltf
+++ b/assets/models/barycentric/barycentric.gltf
@@ -1,4 +1,18 @@
 {
+  "scene": 0,
+  "scenes": [
+    {
+      "nodes": [
+        0
+      ]
+    }
+  ],
+  "nodes": [
+    {
+      "name": "box",
+      "mesh": 0
+    }
+  ],
   "accessors": [
     {
       "bufferView": 0,
diff --git a/crates/bevy_gltf/Cargo.toml b/crates/bevy_gltf/Cargo.toml
index bd906090b96da..34e1c56b73d98 100644
--- a/crates/bevy_gltf/Cargo.toml
+++ b/crates/bevy_gltf/Cargo.toml
@@ -55,6 +55,7 @@ gltf = { version = "1.4.0", default-features = false, features = [
   "names",
   "utils",
 ] }
+async-lock = { version = "3.0", default-features = false }
 thiserror = { version = "2", default-features = false }
 base64 = "0.22.0"
 fixedbitset = "0.5"
diff --git a/crates/bevy_gltf/src/lib.rs b/crates/bevy_gltf/src/lib.rs
index bb01fb034fc30..ea9ec7659405e 100644
--- a/crates/bevy_gltf/src/lib.rs
+++ b/crates/bevy_gltf/src/lib.rs
@@ -155,6 +155,8 @@ pub mod prelude {
     pub use crate::{assets::Gltf, assets::GltfExtras, label::GltfAssetLabel};
 }
 
+use crate::extensions::GltfExtensionHandlers;
+
 pub use {assets::*, label::GltfAssetLabel, loader::*};
 
 // Has to store an Arc<Mutex<...>> as there is no other way to mutate fields of asset loaders.
@@ -249,7 +251,8 @@ impl Plugin for GltfPlugin {
             .init_asset::<GltfPrimitive>()
             .init_asset::<GltfMesh>()
             .init_asset::<GltfSkin>()
-            .preregister_asset_loader::<GltfLoader>(&["gltf", "glb"]);
+            .preregister_asset_loader::<GltfLoader>(&["gltf", "glb"])
+            .init_resource::<GltfExtensionHandlers>();
     }
 
     fn finish(&self, app: &mut App) {
@@ -267,11 +270,14 @@ impl Plugin for GltfPlugin {
         let default_sampler = default_sampler_resource.get_internal();
         app.insert_resource(default_sampler_resource);
 
+        let extensions = app.world().resource::<GltfExtensionHandlers>();
+
         app.register_asset_loader(GltfLoader {
             supported_compressed_formats,
             custom_vertex_attributes: self.custom_vertex_attributes.clone(),
             default_sampler,
             default_use_model_forward_direction: self.use_model_forward_direction,
+            extensions: extensions.0.clone(),
         });
     }
 }
diff --git a/crates/bevy_gltf/src/loader/extensions/mod.rs b/crates/bevy_gltf/src/loader/extensions/mod.rs
index 14863fa4538c5..32ec5ce6a7fb5 100644
--- a/crates/bevy_gltf/src/loader/extensions/mod.rs
+++ b/crates/bevy_gltf/src/loader/extensions/mod.rs
@@ -4,7 +4,270 @@ mod khr_materials_anisotropy;
 mod khr_materials_clearcoat;
 mod khr_materials_specular;
 
+use alloc::sync::Arc;
+use async_lock::RwLock;
+
+use bevy_animation::AnimationClip;
+use bevy_asset::{Handle, LoadContext};
+use bevy_ecs::{
+    entity::Entity,
+    resource::Resource,
+    world::{EntityWorldMut, World},
+};
+use bevy_pbr::StandardMaterial;
+use bevy_platform::collections::{HashMap, HashSet};
+use gltf::Node;
+
+use crate::GltfMesh;
+
 pub(crate) use self::{
     khr_materials_anisotropy::AnisotropyExtension, khr_materials_clearcoat::ClearcoatExtension,
     khr_materials_specular::SpecularExtension,
 };
+
+/// Stores the `GltfExtensionHandler` implementations so that they
+/// can be added by users and also passed to the glTF loader
+#[derive(Resource, Default)]
+pub struct GltfExtensionHandlers(pub Arc<RwLock<Vec<Box<dyn GltfExtensionHandler>>>>);
+
+/// glTF Extensions can attach data to any objects in a glTF file.
+/// This is done by inserting data in the `extensions` sub-object, and
+/// data in the extensions sub-object is keyed by the id of the extension.
+/// For example: `KHR_materials_variants`, `EXT_meshopt_compression`, or `BEVY_my_tool`
+///
+/// A list of publicly known extensions and their ids can be found
+/// in the [KhronosGroup/glTF](https://github.com/KhronosGroup/glTF/blob/main/extensions/README.md)
+/// git repo. Vendors reserve prefixes, such as the `BEVY` prefix,
+/// which is also listed in the [KhronosGroup repo](https://github.com/KhronosGroup/glTF/blob/main/extensions/Prefixes.md).
+///
+/// The `GltfExtensionHandler` trait should be implemented to participate in
+/// processing glTF files as they load, and exposes glTF extension data via
+/// a series of hook callbacks.
+///
+/// The type a `GltfExtensionHandler` is implemented for can define data
+/// which will be cloned for each new glTF load. This enables stateful
+/// handling of glTF extension data during a single load.
+pub trait GltfExtensionHandler: Send + Sync {
+    /// Required for dyn cloning
+    fn dyn_clone(&self) -> Box<dyn GltfExtensionHandler>;
+
+    /// When loading a glTF file, a glTF object that could contain extension
+    /// data will cause the relevant hook to execute once for each id in this list.
+    /// Each invocation will receive the extension data for one of the extension ids,
+    /// along with the `extension_id` itself so implementors can differentiate
+    /// between different calls and parse data correctly.
+    ///
+    /// The hooks are always called, even if there is no extension data
+    /// for a specified id. This is useful for scenarios where additional
+    /// extension data isn't required, but processing should still happen.
+    ///
+    /// Most implementors will pick one extension for this list, causing the
+    /// relevant hooks to fire once per object. An implementor that does not
+    /// wish to receive any data but still wants hooks to be called can use
+    /// an empty string `""` as the extension id, which is also the default
+    /// value if the function is not implemented by an implementor. If the
+    /// empty string is used, all extension data in hooks will be `None`.
+    ///
+    /// Some implementors will choose to list multiple extensions here.
+    /// This is an advanced use case and the alternative of having multiple
+    /// independent handlers should be considered as an option first.
+    /// If multiple extension ids are listed here, the hooks will fire once
+    /// for each extension id, and each successive call will receive the data for
+    /// a separate extension. The extension id is also included in hook arguments
+    /// for this reason, so multiple extension id implementors can differentiate
+    /// between the data received.
+    fn extension_ids(&self) -> &'static [&'static str] {
+        &[""]
+    }
+
+    /// Called when the "global" data for an extension
+    /// at the root of a glTF file is encountered.
+    #[expect(
+        unused,
+        reason = "default trait implementations do not use the arguments because they are no-ops"
+    )]
+    fn on_root_data(&mut self, extension_id: &str, value: Option<&serde_json::Value>) {}
+
+    #[cfg(feature = "bevy_animation")]
+    #[expect(
+        unused,
+        reason = "default trait implementations do not use the arguments because they are no-ops"
+    )]
+    /// Called when an individual animation is processed
+    fn on_animation(
+        &mut self,
+        extension_id: &str,
+        extension_data: Option<&serde_json::Value>,
+        gltf_animation: &gltf::Animation,
+        name: Option<&str>,
+        handle: Handle<AnimationClip>,
+    ) {
+    }
+
+    #[cfg(feature = "bevy_animation")]
+    #[expect(
+        unused,
+        reason = "default trait implementations do not use the arguments because they are no-ops"
+    )]
+    /// Called when all animations have been collected.
+    /// `animations` is the glTF ordered list of `Handle<AnimationClip>`s
+    /// `named_animations` is a `HashMap` from animation name to `Handle<AnimationClip>`
+    /// `animation_roots` is the glTF index of the animation root object
+    fn on_animations_collected(
+        &mut self,
+        load_context: &mut LoadContext<'_>,
+        animations: &[Handle<AnimationClip>],
+        named_animations: &HashMap<Box<str>, Handle<AnimationClip>>,
+        animation_roots: &HashSet<usize>,
+    ) {
+    }
+
+    /// Called when an individual texture is processed
+    #[expect(
+        unused,
+        reason = "default trait implementations do not use the arguments because they are no-ops"
+    )]
+    fn on_texture(
+        &mut self,
+        extension_id: &str,
+        extension_data: Option<&serde_json::Value>,
+        texture: Handle<bevy_image::Image>,
+    ) {
+    }
+
+    /// Called when an individual material is processed
+    #[expect(
+        unused,
+        reason = "default trait implementations do not use the arguments because they are no-ops"
+    )]
+    fn on_material(
+        &mut self,
+        extension_id: &str,
+        extension_data: Option<&serde_json::Value>,
+        load_context: &mut LoadContext<'_>,
+        gltf_material: &gltf::Material,
+        name: Option<&str>,
+        material: Handle<StandardMaterial>,
+    ) {
+    }
+
+    /// Called when an individual glTF Mesh is processed
+    #[expect(
+        unused,
+        reason = "default trait implementations do not use the arguments because they are no-ops"
+    )]
+    fn on_gltf_mesh(
+        &mut self,
+        extension_id: &str,
+        extension_data: Option<&serde_json::Value>,
+        load_context: &mut LoadContext<'_>,
+        gltf_mesh: &gltf::Mesh,
+        name: Option<&str>,
+        mesh: Handle<GltfMesh>,
+    ) {
+    }
+
+    /// mesh and material are spawned as a single Entity,
+    /// which means an extension would have to decide for
+    /// itself how to merge the extension data.
+    #[expect(
+        unused,
+        reason = "default trait implementations do not use the arguments because they are no-ops"
+    )]
+    fn on_spawn_mesh_and_material(
+        &mut self,
+        load_context: &mut LoadContext<'_>,
+        primitive: &gltf::Primitive,
+        mesh: &gltf::Mesh,
+        material: &gltf::Material,
+        entity: &mut EntityWorldMut,
+    ) {
+    }
+
+    /// Called when an individual Scene is done processing
+    #[expect(
+        unused,
+        reason = "default trait implementations do not use the arguments because they are no-ops"
+    )]
+    fn on_scene_completed(
+        &mut self,
+        extension_id: &str,
+        extension_data: Option<&serde_json::Value>,
+        scene: &gltf::Scene,
+        name: Option<&str>,
+        world_root_id: Entity,
+        scene_world: &mut World,
+        load_context: &mut LoadContext<'_>,
+    ) {
+    }
+
+    /// Called when a node is processed
+    #[expect(
+        unused,
+        reason = "default trait implementations do not use the arguments because they are no-ops"
+    )]
+    fn on_gltf_node(
+        &mut self,
+        extension_id: &str,
+        extension_data: Option<&serde_json::Value>,
+        load_context: &mut LoadContext<'_>,
+        gltf_node: &Node,
+        entity: &mut EntityWorldMut,
+    ) {
+    }
+
+    /// Called with a `DirectionalLight` node is spawned
+    /// which is typically created as a result of
+    /// `KHR_lights_punctual`
+    #[expect(
+        unused,
+        reason = "default trait implementations do not use the arguments because they are no-ops"
+    )]
+    fn on_spawn_light_directional(
+        &mut self,
+        extension_id: &str,
+        extension_data: Option<&serde_json::Value>,
+        load_context: &mut LoadContext<'_>,
+        gltf_node: &Node,
+        entity: &mut EntityWorldMut,
+    ) {
+    }
+    /// Called with a `PointLight` node is spawned
+    /// which is typically created as a result of
+    /// `KHR_lights_punctual`
+    #[expect(
+        unused,
+        reason = "default trait implementations do not use the arguments because they are no-ops"
+    )]
+    fn on_spawn_light_point(
+        &mut self,
+        extension_id: &str,
+        extension_data: Option<&serde_json::Value>,
+        load_context: &mut LoadContext<'_>,
+        gltf_node: &Node,
+        entity: &mut EntityWorldMut,
+    ) {
+    }
+    /// Called with a `SpotLight` node is spawned
+    /// which is typically created as a result of
+    /// `KHR_lights_punctual`
+    #[expect(
+        unused,
+        reason = "default trait implementations do not use the arguments because they are no-ops"
+    )]
+    fn on_spawn_light_spot(
+        &mut self,
+        extension_id: &str,
+        extension_data: Option<&serde_json::Value>,
+        load_context: &mut LoadContext<'_>,
+        gltf_node: &Node,
+        entity: &mut EntityWorldMut,
+    ) {
+    }
+}
+
+impl Clone for Box<dyn GltfExtensionHandler> {
+    fn clone(&self) -> Self {
+        self.dyn_clone()
+    }
+}
diff --git a/crates/bevy_gltf/src/loader/mod.rs b/crates/bevy_gltf/src/loader/mod.rs
index 73df951299f1b..1c5bbd94e74c1 100644
--- a/crates/bevy_gltf/src/loader/mod.rs
+++ b/crates/bevy_gltf/src/loader/mod.rs
@@ -1,7 +1,8 @@
-mod extensions;
+pub mod extensions;
 mod gltf_ext;
 
 use alloc::sync::Arc;
+use async_lock::RwLock;
 use std::{io::Error, sync::Mutex};
 
 #[cfg(feature = "bevy_animation")]
@@ -160,6 +161,10 @@ pub struct GltfLoader {
     ///
     /// The default is `false`.
     pub default_use_model_forward_direction: bool,
+    /// glTF extension data processors.
+    /// These are Bevy-side processors designed to access glTF
+    /// extension data during the loading process.
+    pub extensions: Arc<RwLock<Vec<Box<dyn extensions::GltfExtensionHandler>>>>,
 }
 
 /// Specifies optional settings for processing gltfs at load time. By default, all recognized contents of
@@ -246,6 +251,18 @@ impl GltfLoader {
     ) -> Result<Gltf, GltfError> {
         let gltf = gltf::Gltf::from_slice(bytes)?;
 
+        // clone extensions to start with a fresh processing state
+        let mut extensions = loader.extensions.read().await.clone();
+
+        // Extensions can have data on the "root" of the glTF data.
+        // Let extensions process the root data for the extension ids
+        // they've subscribed to.
+        for extension in extensions.iter_mut() {
+            for id in extension.extension_ids() {
+                extension.on_root_data(id, gltf.extension_value(id));
+            }
+        }
+
         let file_name = load_context
             .path()
             .path()
@@ -577,8 +594,35 @@ impl GltfLoader {
                 if let Some(name) = animation.name() {
                     named_animations.insert(name.into(), handle.clone());
                 }
+
+                // let extensions handle extension data placed on animations
+                for extension in extensions.iter_mut() {
+                    for id in extension.extension_ids() {
+                        extension.on_animation(
+                            id,
+                            animation.extension_value(id),
+                            &animation,
+                            animation.name(),
+                            handle.clone(),
+                        );
+                    }
+                }
+
                 animations.push(handle);
             }
+
+            // let extensions process the collection of animation data
+            // this only happens once for each GltfExtensionHandler because
+            // it is a hook for Bevy's finalized representation of the animations
+            for extension in extensions.iter_mut() {
+                extension.on_animations_collected(
+                    load_context,
+                    &animations,
+                    &named_animations,
+                    &animation_roots,
+                );
+            }
+
             (animations, named_animations, animation_roots)
         } else {
             Default::default()
@@ -594,11 +638,11 @@ impl GltfLoader {
         // In theory we could store a mapping between texture.index() and handle to use
         // later in the loader when looking up handles for materials. However this would mean
         // that the material's load context would no longer track those images as dependencies.
-        let mut _texture_handles = Vec::new();
+        let mut texture_handles = Vec::new();
         if gltf.textures().len() == 1 || cfg!(target_arch = "wasm32") {
             for texture in gltf.textures() {
                 let image = load_image(
-                    texture,
+                    texture.clone(),
                     &buffer_data,
                     &linear_textures,
                     load_context.path(),
@@ -607,7 +651,17 @@ impl GltfLoader {
                     settings,
                 )
                 .await?;
-                image.process_loaded_texture(load_context, &mut _texture_handles);
+                image.process_loaded_texture(load_context, &mut texture_handles);
+                // let extensions handle texture data
+                for extension in extensions.iter_mut() {
+                    for id in extension.extension_ids() {
+                        extension.on_texture(
+                            id,
+                            texture.extension_value(id),
+                            texture_handles.iter().last().unwrap().clone(),
+                        );
+                    }
+                }
             }
         } else {
             #[cfg(not(target_arch = "wasm32"))]
@@ -617,8 +671,9 @@ impl GltfLoader {
                         let asset_path = load_context.path().clone();
                         let linear_textures = &linear_textures;
                         let buffer_data = &buffer_data;
+                        let extension_data = gltf_texture.extensions().map(ToOwned::to_owned);
                         scope.spawn(async move {
-                            load_image(
+                            let result = load_image(
                                 gltf_texture,
                                 buffer_data,
                                 linear_textures,
@@ -627,14 +682,27 @@ impl GltfLoader {
                                 default_sampler,
                                 settings,
                             )
-                            .await
+                            .await;
+                            (extension_data, result)
                         });
                     });
                 })
                 .into_iter()
-                .for_each(|result| match result {
+                .for_each(|(extension_data, result)| match result {
                     Ok(image) => {
-                        image.process_loaded_texture(load_context, &mut _texture_handles);
+                        image.process_loaded_texture(load_context, &mut texture_handles);
+                        // let extensions handle texture data
+                        // We do this differently here because of the IoTaskPool vs
+                        // gltf::Texture lifetimes
+                        for extension in extensions.iter_mut() {
+                            for id in extension.extension_ids() {
+                                extension.on_texture(
+                                    id,
+                                    extension_data.as_ref().and_then(|map| map.get(*id)),
+                                    texture_handles.iter().last().unwrap().clone(),
+                                );
+                            }
+                        }
                     }
                     Err(err) => {
                         warn!("Error loading glTF texture: {}", err);
@@ -652,6 +720,21 @@ impl GltfLoader {
                 if let Some(name) = material.name() {
                     named_materials.insert(name.into(), handle.clone());
                 }
+
+                // let extensions handle material data
+                for extension in extensions.iter_mut() {
+                    for id in extension.extension_ids() {
+                        extension.on_material(
+                            id,
+                            material.extension_value(id),
+                            load_context,
+                            &material,
+                            material.name(),
+                            handle.clone(),
+                        );
+                    }
+                }
+
                 materials.push(handle);
             }
         }
@@ -815,6 +898,19 @@ impl GltfLoader {
             if let Some(name) = gltf_mesh.name() {
                 named_meshes.insert(name.into(), handle.clone());
             }
+            for extension in extensions.iter_mut() {
+                for id in extension.extension_ids() {
+                    extension.on_gltf_mesh(
+                        id,
+                        gltf_mesh.extension_value(id),
+                        load_context,
+                        &gltf_mesh,
+                        gltf_mesh.name(),
+                        handle.clone(),
+                    );
+                }
+            }
+
             meshes.push(handle);
         }
 
@@ -969,6 +1065,7 @@ impl GltfLoader {
                             None,
                             &gltf.document,
                             convert_coordinates,
+                            &mut extensions,
                         );
                         if result.is_err() {
                             err = Some(result);
@@ -1014,6 +1111,22 @@ impl GltfLoader {
                     joints: joint_entities,
                 });
             }
+
+            // let extensions handle scene extension data
+            for extension in extensions.iter_mut() {
+                for id in extension.extension_ids() {
+                    extension.on_scene_completed(
+                        id,
+                        scene.extension_value(id),
+                        &scene,
+                        scene.name(),
+                        world_root_id,
+                        &mut world,
+                        &mut scene_load_context,
+                    );
+                }
+            }
+
             let loaded_scene = scene_load_context.finish(Scene::new(world));
             let scene_handle = load_context.add_loaded_labeled_asset(
                 GltfAssetLabel::Scene(scene.index()).to_string(),
@@ -1414,6 +1527,7 @@ fn load_node(
     #[cfg(feature = "bevy_animation")] mut animation_context: Option<AnimationContext>,
     document: &Document,
     convert_coordinates: bool,
+    extensions: &mut [Box<dyn extensions::GltfExtensionHandler>],
 ) -> Result<(), GltfError> {
     let mut gltf_error = None;
     let transform = node_transform(gltf_node, convert_coordinates);
@@ -1605,6 +1719,18 @@ fn load_node(
                 if let Some(skin) = gltf_node.skin() {
                     entity_to_skin_index_map.insert(mesh_entity.id(), skin.index());
                 }
+
+                // enable extension processing for a Bevy-created construct
+                // that is the Mesh and Material merged on a single entity
+                for extension in extensions.iter_mut() {
+                    extension.on_spawn_mesh_and_material(
+                        load_context,
+                        &primitive,
+                        &mesh,
+                        &material,
+                        &mut mesh_entity,
+                    );
+                }
             }
         }
 
@@ -1628,6 +1754,17 @@ fn load_node(
                             value: extras.get().to_string(),
                         });
                     }
+                    for extension in extensions.iter_mut() {
+                        for id in extension.extension_ids() {
+                            extension.on_spawn_light_directional(
+                                id,
+                                gltf_node.extension_value(id),
+                                load_context,
+                                gltf_node,
+                                &mut entity,
+                            );
+                        }
+                    }
                 }
                 gltf::khr_lights_punctual::Kind::Point => {
                     let mut entity = parent.spawn(PointLight {
@@ -1648,6 +1785,17 @@ fn load_node(
                             value: extras.get().to_string(),
                         });
                     }
+                    for extension in extensions.iter_mut() {
+                        for id in extension.extension_ids() {
+                            extension.on_spawn_light_point(
+                                id,
+                                gltf_node.extension_value(id),
+                                load_context,
+                                gltf_node,
+                                &mut entity,
+                            );
+                        }
+                    }
                 }
                 gltf::khr_lights_punctual::Kind::Spot {
                     inner_cone_angle,
@@ -1673,6 +1821,17 @@ fn load_node(
                             value: extras.get().to_string(),
                         });
                     }
+                    for extension in extensions.iter_mut() {
+                        for id in extension.extension_ids() {
+                            extension.on_spawn_light_spot(
+                                id,
+                                gltf_node.extension_value(id),
+                                load_context,
+                                gltf_node,
+                                &mut entity,
+                            );
+                        }
+                    }
                 }
             }
         }
@@ -1695,6 +1854,7 @@ fn load_node(
                 animation_context.clone(),
                 document,
                 convert_coordinates,
+                extensions,
             ) {
                 gltf_error = Some(err);
                 return;
@@ -1715,6 +1875,18 @@ fn load_node(
         node.insert(MorphWeights::new(weights, first_mesh)?);
     }
 
+    // let extensions process node data
+    // This can be *many* kinds of object, so we also
+    // give access to the gltf_node, which is needed for
+    // accessing Mesh and Material extension data, which
+    // are merged onto the same entity in Bevy
+    for extension in extensions.iter_mut() {
+        for id in extension.extension_ids() {
+            let data = gltf_node.extension_value(id);
+            extension.on_gltf_node(id, data, load_context, gltf_node, &mut node);
+        }
+    }
+
     if let Some(err) = gltf_error {
         Err(err)
     } else {
diff --git a/examples/README.md b/examples/README.md
index 324fac7163be3..52f0379ea915f 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -638,6 +638,8 @@ Example | Description
 [Query glTF primitives](../examples/gltf/query_gltf_primitives.rs) | Query primitives in a glTF scene
 [Update glTF Scene](../examples/gltf/update_gltf_scene.rs) | Update a scene from a glTF file, either by spawning the scene as a child of another entity, or by accessing the entities of the scene
 [glTF Skinned Mesh](../examples/gltf/gltf_skinned_mesh.rs) | Skinned mesh example with mesh and joints data loaded from a glTF file
+[glTF extension AnimationGraph](../examples/gltf/gltf_extension_animation_graph.rs) | Uses glTF data to build an AnimationGraph via extension processing
+[glTF extension processing to build Mesh2ds from glTF data](../examples/gltf/gltf_extension_mesh_2d.rs) | Uses glTF extension data to convert incoming Mesh3d/MeshMaterial3d assets to 2d
 
 ## Tests
 
diff --git a/examples/gltf/gltf_extension_animation_graph.rs b/examples/gltf/gltf_extension_animation_graph.rs
new file mode 100644
index 0000000000000..dea4112a980b9
--- /dev/null
+++ b/examples/gltf/gltf_extension_animation_graph.rs
@@ -0,0 +1,202 @@
+//! Uses glTF extension processing to play an animation on a skinned glTF model of a fox.
+
+use std::f32::consts::PI;
+
+use bevy::{
+    asset::LoadContext,
+    ecs::entity::EntityHashSet,
+    gltf::extensions::{GltfExtensionHandler, GltfExtensionHandlers},
+    light::CascadeShadowConfigBuilder,
+    platform::collections::{HashMap, HashSet},
+    prelude::*,
+    scene::SceneInstanceReady,
+};
+
+/// An example asset that contains a mesh and animation.
+const GLTF_PATH: &str = "models/animated/Fox.glb";
+
+fn main() {
+    App::new()
+        .insert_resource(GlobalAmbientLight {
+            color: Color::WHITE,
+            brightness: 2000.,
+            ..default()
+        })
+        .add_plugins((DefaultPlugins, GltfExtensionHandlerAnimationPlugin))
+        .add_systems(
+            Startup,
+            (setup_mesh_and_animation, setup_camera_and_environment),
+        )
+        .run();
+}
+
+/// A component that stores a reference to an animation we want to play. This is
+/// created when we start loading the mesh (see `setup_mesh_and_animation`) and
+/// read when the mesh has spawned (see `play_animation_once_loaded`).
+#[derive(Component, Reflect)]
+#[reflect(Component)]
+struct AnimationToPlay {
+    graph_handle: Handle<AnimationGraph>,
+    index: AnimationNodeIndex,
+}
+
+fn setup_mesh_and_animation(mut commands: Commands, asset_server: Res<AssetServer>) {
+    // Spawn an entity with our components, and connect it to an observer that
+    // will trigger when the scene is loaded and spawned.
+    commands
+        .spawn(SceneRoot(
+            asset_server.load(GltfAssetLabel::Scene(0).from_asset(GLTF_PATH)),
+        ))
+        .observe(play_animation_when_ready);
+}
+
+fn play_animation_when_ready(
+    scene_ready: On<SceneInstanceReady>,
+    mut commands: Commands,
+    children: Query<&Children>,
+    mut players: Query<(&mut AnimationPlayer, &AnimationToPlay)>,
+) {
+    for child in children.iter_descendants(scene_ready.entity) {
+        let Ok((mut player, animation_to_play)) = players.get_mut(child) else {
+            continue;
+        };
+
+        // Tell the animation player to start the animation and keep
+        // repeating it.
+        //
+        // If you want to try stopping and switching animations, see the
+        // `animated_mesh_control.rs` example.
+        player.play(animation_to_play.index).repeat();
+
+        // Add the animation graph. This only needs to be done once to
+        // connect the animation player to the mesh.
+        commands
+            .entity(child)
+            .insert(AnimationGraphHandle(animation_to_play.graph_handle.clone()));
+    }
+}
+
+/// Spawn a camera and a simple environment with a ground plane and light.
+fn setup_camera_and_environment(
+    mut commands: Commands,
+    mut meshes: ResMut<Assets<Mesh>>,
+    mut materials: ResMut<Assets<StandardMaterial>>,
+) {
+    // Camera
+    commands.spawn((
+        Camera3d::default(),
+        Transform::from_xyz(100.0, 100.0, 150.0).looking_at(Vec3::new(0.0, 20.0, 0.0), Vec3::Y),
+    ));
+
+    // Plane
+    commands.spawn((
+        Mesh3d(meshes.add(Plane3d::default().mesh().size(500000.0, 500000.0))),
+        MeshMaterial3d(materials.add(Color::srgb(0.3, 0.5, 0.3))),
+    ));
+
+    // Light
+    commands.spawn((
+        Transform::from_rotation(Quat::from_euler(EulerRot::ZYX, 0.0, 1.0, -PI / 4.)),
+        DirectionalLight {
+            shadows_enabled: true,
+            ..default()
+        },
+        CascadeShadowConfigBuilder {
+            first_cascade_far_bound: 200.0,
+            maximum_distance: 400.0,
+            ..default()
+        }
+        .build(),
+    ));
+}
+
+struct GltfExtensionHandlerAnimationPlugin;
+
+impl Plugin for GltfExtensionHandlerAnimationPlugin {
+    fn build(&self, app: &mut App) {
+        app.world_mut()
+            .resource_mut::<GltfExtensionHandlers>()
+            .0
+            .write_blocking()
+            .push(Box::new(GltfExtensionHandlerAnimation::default()));
+    }
+}
+
+#[derive(Default, Clone)]
+struct GltfExtensionHandlerAnimation {
+    animation_root_indices: HashSet<usize>,
+    animation_root_entities: EntityHashSet,
+    clip: Option<Handle<AnimationClip>>,
+}
+
+impl GltfExtensionHandler for GltfExtensionHandlerAnimation {
+    fn dyn_clone(&self) -> Box<dyn GltfExtensionHandler> {
+        Box::new((*self).clone())
+    }
+
+    #[cfg(feature = "bevy_animation")]
+    fn on_animation(
+        &mut self,
+        _extension_id: &str,
+        _value: Option<&serde_json::Value>,
+        _gltf_animation: &gltf::Animation,
+        name: Option<&str>,
+        handle: Handle<AnimationClip>,
+    ) {
+        if name.is_some_and(|v| v == "Walk") {
+            self.clip = Some(handle.clone());
+        }
+    }
+    #[cfg(feature = "bevy_animation")]
+    fn on_animations_collected(
+        &mut self,
+        _load_context: &mut LoadContext<'_>,
+        _animations: &[Handle<AnimationClip>],
+        _named_animations: &HashMap<Box<str>, Handle<AnimationClip>>,
+        animation_roots: &HashSet<usize>,
+    ) {
+        self.animation_root_indices = animation_roots.clone();
+    }
+
+    fn on_gltf_node(
+        &mut self,
+        _extension_id: &str,
+        _value: Option<&serde_json::Value>,
+        _load_context: &mut LoadContext<'_>,
+        gltf_node: &gltf::Node,
+        entity: &mut EntityWorldMut,
+    ) {
+        if self.animation_root_indices.contains(&gltf_node.index()) {
+            self.animation_root_entities.insert(entity.id());
+        }
+    }
+
+    /// Called when an individual Scene is done processing
+    fn on_scene_completed(
+        &mut self,
+        _extension_id: &str,
+        _value: Option<&serde_json::Value>,
+        _scene: &gltf::Scene,
+        _name: Option<&str>,
+        _world_root_id: Entity,
+        world: &mut World,
+        load_context: &mut LoadContext<'_>,
+    ) {
+        // Create an AnimationGraph from the desired clip
+        let (graph, index) = AnimationGraph::from_clip(self.clip.clone().unwrap());
+        // Store the animation graph as an asset with an arbitrary label
+        // We only have one graph, so this label will be unique
+        let graph_handle =
+            load_context.add_labeled_asset("MyAnimationGraphLabel".to_string(), graph);
+
+        // Create a component that stores a reference to our animation
+        let animation_to_play = AnimationToPlay {
+            graph_handle,
+            index,
+        };
+
+        // Insert the `AnimationToPlay` component on the first animation root
+        let mut entity = world.entity_mut(*self.animation_root_entities.iter().next().unwrap());
+        entity.insert(animation_to_play);
+    }
+}
diff --git a/examples/gltf/gltf_extension_mesh_2d.rs b/examples/gltf/gltf_extension_mesh_2d.rs
new file mode 100644
index 0000000000000..552c544deab20
--- /dev/null
+++ b/examples/gltf/gltf_extension_mesh_2d.rs
@@ -0,0 +1,129 @@
+//! Uses glTF extension processing to convert incoming 3d Meshes to 2d Meshes
+
+use bevy::{
+    asset::LoadContext,
+    gltf::extensions::{GltfExtensionHandler, GltfExtensionHandlers},
+    gltf::GltfPlugin,
+    mesh::{MeshVertexAttribute, MeshVertexBufferLayoutRef},
+    prelude::*,
+    reflect::TypePath,
+    render::render_resource::*,
+    shader::ShaderRef,
+    sprite_render::{Material2d, Material2dKey, Material2dPlugin},
+};
+
+/// This example uses a shader source file from the assets subdirectory
+const SHADER_ASSET_PATH: &str = "shaders/custom_gltf_2d.wgsl";
+
+/// This vertex attribute supplies barycentric coordinates for each triangle.
+///
+/// Each component of the vector corresponds to one corner of a triangle. It's
+/// equal to 1.0 in that corner and 0.0 in the other two. Hence, its value in
+/// the fragment shader indicates proximity to a corner or the opposite edge.
+const ATTRIBUTE_BARYCENTRIC: MeshVertexAttribute =
+    MeshVertexAttribute::new("Barycentric", 2137464976, VertexFormat::Float32x3);
+
+fn main() {
+    App::new()
+        .insert_resource(GlobalAmbientLight {
+            color: Color::WHITE,
+            brightness: 2000.,
+            ..default()
+        })
+        .add_plugins((
+            DefaultPlugins.set(
+                GltfPlugin::default()
+                    // Map a custom glTF attribute name to a `MeshVertexAttribute`.
+                    // The glTF file used here has an attribute name with *two*
+                    // underscores: __BARYCENTRIC
+                    // One is stripped to do the comparison here.
+                    .add_custom_vertex_attribute("_BARYCENTRIC", ATTRIBUTE_BARYCENTRIC),
+            ),
+            GltfToMesh2dPlugin,
+        ))
+        .add_systems(Startup, setup)
+        .run();
+}
+
+fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
+    commands.spawn((
+        SceneRoot(
+            asset_server
+                .load(GltfAssetLabel::Scene(0).from_asset("models/barycentric/barycentric.gltf")),
+        ),
+        Transform::from_scale(150. * Vec3::ONE),
+    ));
+    commands.spawn(Camera2d);
+}
+
+struct GltfToMesh2dPlugin;
+
+impl Plugin for GltfToMesh2dPlugin {
+    fn build(&self, app: &mut App) {
+        app.world_mut()
+            .resource_mut::<GltfExtensionHandlers>()
+            .0
+            .write_blocking()
+            .push(Box::new(GltfExtensionHandlerToMesh2d));
+
+        app.add_plugins(Material2dPlugin::<CustomMaterial>::default());
+    }
+}
+
+#[derive(Default, Clone)]
+struct GltfExtensionHandlerToMesh2d;
+
+impl GltfExtensionHandler for GltfExtensionHandlerToMesh2d {
+    fn dyn_clone(&self) -> Box<dyn GltfExtensionHandler> {
+        Box::new((*self).clone())
+    }
+
+    fn on_spawn_mesh_and_material(
+        &mut self,
+        load_context: &mut LoadContext<'_>,
+        _primitive: &gltf::Primitive,
+        _mesh: &gltf::Mesh,
+        _material: &gltf::Material,
+        entity: &mut EntityWorldMut,
+    ) {
+        if let Some(mesh3d) = entity.get::<Mesh3d>()
+            && let Some(_) = entity.get::<MeshMaterial3d<StandardMaterial>>()
+        {
+            let material_handle =
+                load_context.add_labeled_asset("AColorMaterial".to_string(), CustomMaterial {});
+            let mesh_handle = mesh3d.0.clone();
+            entity
+                .remove::<(Mesh3d, MeshMaterial3d<StandardMaterial>)>()
+                .insert((Mesh2d(mesh_handle), MeshMaterial2d(material_handle.clone())));
+        }
+    }
+}
+
+/// This custom material uses barycentric coordinates from
+/// `ATTRIBUTE_BARYCENTRIC` to shade a white border around each triangle. The
+/// thickness of the border is animated using the global time shader uniform.
+#[derive(Asset, TypePath, AsBindGroup, Debug, Clone)]
+struct CustomMaterial {}
+
+impl Material2d for CustomMaterial {
+    fn vertex_shader() -> ShaderRef {
+        SHADER_ASSET_PATH.into()
+    }
+    fn fragment_shader() -> ShaderRef {
+        SHADER_ASSET_PATH.into()
+    }
+
+    fn specialize(
+        descriptor: &mut RenderPipelineDescriptor,
+        layout: &MeshVertexBufferLayoutRef,
+        _key: Material2dKey<Self>,
+    ) -> Result<(), SpecializedMeshPipelineError> {
+        let vertex_layout = layout.0.get_layout(&[
+            Mesh::ATTRIBUTE_POSITION.at_shader_location(0),
+            Mesh::ATTRIBUTE_COLOR.at_shader_location(1),
+            ATTRIBUTE_BARYCENTRIC.at_shader_location(2),
+        ])?;
+        descriptor.vertex.buffers = vec![vertex_layout];
+        Ok(())
+    }
+}

From 3ed80d3c6fd623a698d8565e16a441b7422632e4 Mon Sep 17 00:00:00 2001
From: JMS55 <47158642+JMS55@users.noreply.github.com>
Date: Sun, 14 Dec 2025 16:26:07 -0500
Subject: [PATCH 097/133] Solari: Double buffer prepass textures (#22102)

Fixes Solari crashing with `Partial copy of 0..1600 on X dimension with
size 3200 is not supported for the Source texture format Depth32Float
with 1 samples` after #21746.

Also slightly better performance by avoiding the copy.

Code is extremely cludgy though, we're just piling hacks upon hacks for
the prepass texture stuff.
---
 crates/bevy_core_pipeline/Cargo.toml          |   1 +
 crates/bevy_core_pipeline/src/core_3d/mod.rs  | 145 +++++++++++++++---
 crates/bevy_core_pipeline/src/prepass/mod.rs  |  24 +++
 .../src/texture/texture_attachment.rs         |   3 +
 crates/bevy_render/src/view/mod.rs            |   4 +-
 crates/bevy_solari/src/realtime/mod.rs        |  14 +-
 crates/bevy_solari/src/realtime/node.rs       |  34 +---
 crates/bevy_solari/src/realtime/prepare.rs    |  29 ----
 8 files changed, 171 insertions(+), 83 deletions(-)

diff --git a/crates/bevy_core_pipeline/Cargo.toml b/crates/bevy_core_pipeline/Cargo.toml
index 68dccf17d2080..7dfe8f0ab5791 100644
--- a/crates/bevy_core_pipeline/Cargo.toml
+++ b/crates/bevy_core_pipeline/Cargo.toml
@@ -20,6 +20,7 @@ bevy_app = { path = "../bevy_app", version = "0.18.0-dev" }
 bevy_asset = { path = "../bevy_asset", version = "0.18.0-dev" }
 bevy_color = { path = "../bevy_color", version = "0.18.0-dev" }
 bevy_derive = { path = "../bevy_derive", version = "0.18.0-dev" }
+bevy_diagnostic = { path = "../bevy_diagnostic", version = "0.18.0-dev" }
 bevy_ecs = { path = "../bevy_ecs", version = "0.18.0-dev" }
 bevy_image = { path = "../bevy_image", version = "0.18.0-dev" }
 bevy_camera = { path = "../bevy_camera", version = "0.18.0-dev" }
diff --git a/crates/bevy_core_pipeline/src/core_3d/mod.rs b/crates/bevy_core_pipeline/src/core_3d/mod.rs
index 0e5a07b870e83..5a090b5da610a 100644
--- a/crates/bevy_core_pipeline/src/core_3d/mod.rs
+++ b/crates/bevy_core_pipeline/src/core_3d/mod.rs
@@ -73,12 +73,14 @@ pub const DEPTH_TEXTURE_SAMPLING_SUPPORTED: bool = true;
 use core::ops::Range;
 
 use bevy_camera::{Camera, Camera3d, Camera3dDepthLoadOp};
+use bevy_diagnostic::FrameCount;
 use bevy_render::{
     batching::gpu_preprocessing::{GpuPreprocessingMode, GpuPreprocessingSupport},
     camera::CameraRenderGraph,
     experimental::occlusion_culling::OcclusionCulling,
     mesh::allocator::SlabId,
     render_phase::PhaseItemBatchSetKey,
+    texture::CachedTexture,
     view::{prepare_view_targets, NoIndirectDrawing, RetainedViewEntity},
 };
 pub use main_opaque_pass_3d_node::*;
@@ -124,9 +126,10 @@ use crate::{
     },
     prepass::{
         node::{EarlyPrepassNode, LatePrepassNode},
-        AlphaMask3dPrepass, DeferredPrepass, DepthPrepass, MotionVectorPrepass, NormalPrepass,
-        Opaque3dPrepass, OpaqueNoLightmap3dBatchSetKey, OpaqueNoLightmap3dBinKey,
-        ViewPrepassTextures, MOTION_VECTOR_PREPASS_FORMAT, NORMAL_PREPASS_FORMAT,
+        AlphaMask3dPrepass, DeferredPrepass, DeferredPrepassDoubleBuffer, DepthPrepass,
+        DepthPrepassDoubleBuffer, MotionVectorPrepass, NormalPrepass, Opaque3dPrepass,
+        OpaqueNoLightmap3dBatchSetKey, OpaqueNoLightmap3dBinKey, ViewPrepassTextures,
+        MOTION_VECTOR_PREPASS_FORMAT, NORMAL_PREPASS_FORMAT,
     },
     skybox::SkyboxPlugin,
     tonemapping::{DebandDither, Tonemapping, TonemappingNode},
@@ -676,6 +679,8 @@ pub fn extract_camera_prepass_phase(
                 Has<NormalPrepass>,
                 Has<MotionVectorPrepass>,
                 Has<DeferredPrepass>,
+                Has<DepthPrepassDoubleBuffer>,
+                Has<DeferredPrepassDoubleBuffer>,
             ),
             With<Camera3d>,
         >,
@@ -694,6 +699,8 @@ pub fn extract_camera_prepass_phase(
         normal_prepass,
         motion_vector_prepass,
         deferred_prepass,
+        depth_prepass_double_buffer,
+        deferred_prepass_double_buffer,
     ) in cameras_3d.iter()
     {
         if !camera.is_active {
@@ -761,6 +768,18 @@ pub fn extract_camera_prepass_phase(
         } else {
             camera_commands.remove::<DeferredPrepass>();
         }
+
+        if depth_prepass_double_buffer {
+            camera_commands.insert(DepthPrepassDoubleBuffer);
+        } else {
+            camera_commands.remove::<DepthPrepassDoubleBuffer>();
+        }
+
+        if deferred_prepass_double_buffer {
+            camera_commands.insert(DeferredPrepassDoubleBuffer);
+        } else {
+            camera_commands.remove::<DeferredPrepassDoubleBuffer>();
+        }
     }
 
     opaque_3d_prepass_phases.retain(|view_entity, _| live_entities.contains(view_entity));
@@ -973,6 +992,7 @@ pub fn prepare_prepass_textures(
     mut commands: Commands,
     mut texture_cache: ResMut<TextureCache>,
     render_device: Res<RenderDevice>,
+    frame_count: Res<FrameCount>,
     opaque_3d_prepass_phases: Res<ViewBinnedRenderPhases<Opaque3dPrepass>>,
     alpha_mask_3d_prepass_phases: Res<ViewBinnedRenderPhases<AlphaMask3dPrepass>>,
     opaque_3d_deferred_phases: Res<ViewBinnedRenderPhases<Opaque3dDeferred>>,
@@ -986,11 +1006,15 @@ pub fn prepare_prepass_textures(
         Has<NormalPrepass>,
         Has<MotionVectorPrepass>,
         Has<DeferredPrepass>,
+        Has<DepthPrepassDoubleBuffer>,
+        Has<DeferredPrepassDoubleBuffer>,
     )>,
 ) {
-    let mut depth_textures = <HashMap<_, _>>::default();
+    let mut depth_textures1 = <HashMap<_, _>>::default();
+    let mut depth_textures2 = <HashMap<_, _>>::default();
     let mut normal_textures = <HashMap<_, _>>::default();
-    let mut deferred_textures = <HashMap<_, _>>::default();
+    let mut deferred_textures1: HashMap<_, _> = <HashMap<_, _>>::default();
+    let mut deferred_textures2: HashMap<_, _> = <HashMap<_, _>>::default();
     let mut deferred_lighting_id_textures = <HashMap<_, _>>::default();
     let mut motion_vectors_textures = <HashMap<_, _>>::default();
     for (
@@ -1002,6 +1026,8 @@ pub fn prepare_prepass_textures(
         normal_prepass,
         motion_vector_prepass,
         deferred_prepass,
+        depth_prepass_double_buffer,
+        deferred_prepass_double_buffer,
     ) in &views_3d
     {
         if !opaque_3d_prepass_phases.contains_key(&view.retained_view_entity)
@@ -1019,12 +1045,33 @@ pub fn prepare_prepass_textures(
 
         let size = physical_target_size.to_extents();
 
-        let cached_depth_texture = depth_prepass.then(|| {
-            depth_textures
+        let cached_depth_texture1 = depth_prepass.then(|| {
+            depth_textures1
+                .entry(camera.target.clone())
+                .or_insert_with(|| {
+                    let descriptor = TextureDescriptor {
+                        label: Some("prepass_depth_texture_1"),
+                        size,
+                        mip_level_count: 1,
+                        sample_count: msaa.samples(),
+                        dimension: TextureDimension::D2,
+                        format: CORE_3D_DEPTH_FORMAT,
+                        usage: TextureUsages::COPY_DST
+                            | TextureUsages::RENDER_ATTACHMENT
+                            | TextureUsages::TEXTURE_BINDING,
+                        view_formats: &[],
+                    };
+                    texture_cache.get(&render_device, descriptor)
+                })
+                .clone()
+        });
+
+        let cached_depth_texture2 = depth_prepass_double_buffer.then(|| {
+            depth_textures2
                 .entry(camera.target.clone())
                 .or_insert_with(|| {
                     let descriptor = TextureDescriptor {
-                        label: Some("prepass_depth_texture"),
+                        label: Some("prepass_depth_texture_2"),
                         size,
                         mip_level_count: 1,
                         sample_count: msaa.samples(),
@@ -1032,8 +1079,7 @@ pub fn prepare_prepass_textures(
                         format: CORE_3D_DEPTH_FORMAT,
                         usage: TextureUsages::COPY_DST
                             | TextureUsages::RENDER_ATTACHMENT
-                            | TextureUsages::TEXTURE_BINDING
-                            | TextureUsages::COPY_SRC, // TODO: Remove COPY_SRC, double buffer instead (for bevy_solari)
+                            | TextureUsages::TEXTURE_BINDING,
                         view_formats: &[],
                     };
                     texture_cache.get(&render_device, descriptor)
@@ -1085,22 +1131,43 @@ pub fn prepare_prepass_textures(
                 .clone()
         });
 
-        let cached_deferred_texture = deferred_prepass.then(|| {
-            deferred_textures
+        let cached_deferred_texture1 = deferred_prepass.then(|| {
+            deferred_textures1
+                .entry(camera.target.clone())
+                .or_insert_with(|| {
+                    texture_cache.get(
+                        &render_device,
+                        TextureDescriptor {
+                            label: Some("prepass_deferred_texture_1"),
+                            size,
+                            mip_level_count: 1,
+                            sample_count: 1,
+                            dimension: TextureDimension::D2,
+                            format: DEFERRED_PREPASS_FORMAT,
+                            usage: TextureUsages::RENDER_ATTACHMENT
+                                | TextureUsages::TEXTURE_BINDING,
+                            view_formats: &[],
+                        },
+                    )
+                })
+                .clone()
+        });
+
+        let cached_deferred_texture2 = deferred_prepass_double_buffer.then(|| {
+            deferred_textures2
                 .entry(camera.target.clone())
                 .or_insert_with(|| {
                     texture_cache.get(
                         &render_device,
                         TextureDescriptor {
-                            label: Some("prepass_deferred_texture"),
+                            label: Some("prepass_deferred_texture_2"),
                             size,
                             mip_level_count: 1,
                             sample_count: 1,
                             dimension: TextureDimension::D2,
                             format: DEFERRED_PREPASS_FORMAT,
                             usage: TextureUsages::RENDER_ATTACHMENT
-                                | TextureUsages::TEXTURE_BINDING
-                                | TextureUsages::COPY_SRC, // TODO: Remove COPY_SRC, double buffer instead (for bevy_solari)
+                                | TextureUsages::TEXTURE_BINDING,
                             view_formats: &[],
                         },
                     )
@@ -1131,20 +1198,54 @@ pub fn prepare_prepass_textures(
         });
 
         commands.entity(entity).insert(ViewPrepassTextures {
-            depth: cached_depth_texture
-                .map(|t| ColorAttachment::new(t, None, Some(LinearRgba::BLACK))),
+            depth: package_double_buffered_texture(
+                cached_depth_texture1,
+                cached_depth_texture2,
+                frame_count.0,
+            ),
             normal: cached_normals_texture
-                .map(|t| ColorAttachment::new(t, None, Some(LinearRgba::BLACK))),
+                .map(|t| ColorAttachment::new(t, None, None, Some(LinearRgba::BLACK))),
             // Red and Green channels are X and Y components of the motion vectors
             // Blue channel doesn't matter, but set to 0.0 for possible faster clear
             // https://gpuopen.com/performance/#clears
             motion_vectors: cached_motion_vectors_texture
-                .map(|t| ColorAttachment::new(t, None, Some(LinearRgba::BLACK))),
-            deferred: cached_deferred_texture
-                .map(|t| ColorAttachment::new(t, None, Some(LinearRgba::BLACK))),
+                .map(|t| ColorAttachment::new(t, None, None, Some(LinearRgba::BLACK))),
+            deferred: package_double_buffered_texture(
+                cached_deferred_texture1,
+                cached_deferred_texture2,
+                frame_count.0,
+            ),
             deferred_lighting_pass_id: cached_deferred_lighting_pass_id_texture
-                .map(|t| ColorAttachment::new(t, None, Some(LinearRgba::BLACK))),
+                .map(|t| ColorAttachment::new(t, None, None, Some(LinearRgba::BLACK))),
             size,
         });
     }
 }
+
+fn package_double_buffered_texture(
+    texture1: Option<CachedTexture>,
+    texture2: Option<CachedTexture>,
+    frame_count: u32,
+) -> Option<ColorAttachment> {
+    match (texture1, texture2) {
+        (Some(t1), None) => Some(ColorAttachment::new(
+            t1,
+            None,
+            None,
+            Some(LinearRgba::BLACK),
+        )),
+        (Some(t1), Some(t2)) if frame_count.is_multiple_of(2) => Some(ColorAttachment::new(
+            t1,
+            None,
+            Some(t2),
+            Some(LinearRgba::BLACK),
+        )),
+        (Some(t1), Some(t2)) => Some(ColorAttachment::new(
+            t2,
+            None,
+            Some(t1),
+            Some(LinearRgba::BLACK),
+        )),
+        _ => None,
+    }
+}
diff --git a/crates/bevy_core_pipeline/src/prepass/mod.rs b/crates/bevy_core_pipeline/src/prepass/mod.rs
index 7b3cc05a66aa1..c4ad850b348b7 100644
--- a/crates/bevy_core_pipeline/src/prepass/mod.rs
+++ b/crates/bevy_core_pipeline/src/prepass/mod.rs
@@ -77,6 +77,18 @@ pub struct MotionVectorPrepass;
 #[reflect(Component, Default)]
 pub struct DeferredPrepass;
 
+/// Allows querying the previous frame's [`DepthPrepass`].
+#[derive(Component, Default, Reflect, Clone)]
+#[reflect(Component, Default, Clone)]
+#[require(DepthPrepass)]
+pub struct DepthPrepassDoubleBuffer;
+
+/// Allows querying the previous frame's [`DeferredPrepass`].
+#[derive(Component, Default, Reflect, Clone)]
+#[reflect(Component, Default, Clone)]
+#[require(DeferredPrepass)]
+pub struct DeferredPrepassDoubleBuffer;
+
 /// View matrices from the previous frame.
 ///
 /// Useful for temporal rendering techniques that need access to last frame's camera data.
@@ -128,6 +140,12 @@ impl ViewPrepassTextures {
         self.depth.as_ref().map(|t| &t.texture.default_view)
     }
 
+    pub fn previous_depth_view(&self) -> Option<&TextureView> {
+        self.depth
+            .as_ref()
+            .and_then(|t| t.previous_frame_texture.as_ref().map(|t| &t.default_view))
+    }
+
     pub fn normal_view(&self) -> Option<&TextureView> {
         self.normal.as_ref().map(|t| &t.texture.default_view)
     }
@@ -141,6 +159,12 @@ impl ViewPrepassTextures {
     pub fn deferred_view(&self) -> Option<&TextureView> {
         self.deferred.as_ref().map(|t| &t.texture.default_view)
     }
+
+    pub fn previous_deferred_view(&self) -> Option<&TextureView> {
+        self.deferred
+            .as_ref()
+            .and_then(|t| t.previous_frame_texture.as_ref().map(|t| &t.default_view))
+    }
 }
 
 /// Opaque phase of the 3D prepass.
diff --git a/crates/bevy_render/src/texture/texture_attachment.rs b/crates/bevy_render/src/texture/texture_attachment.rs
index 269c2f1422820..cc1f0efd12c10 100644
--- a/crates/bevy_render/src/texture/texture_attachment.rs
+++ b/crates/bevy_render/src/texture/texture_attachment.rs
@@ -12,6 +12,7 @@ use wgpu::{
 pub struct ColorAttachment {
     pub texture: CachedTexture,
     pub resolve_target: Option<CachedTexture>,
+    pub previous_frame_texture: Option<CachedTexture>,
     clear_color: Option<LinearRgba>,
     is_first_call: Arc<AtomicBool>,
 }
@@ -20,11 +21,13 @@ impl ColorAttachment {
     pub fn new(
         texture: CachedTexture,
         resolve_target: Option<CachedTexture>,
+        previous_frame_texture: Option<CachedTexture>,
         clear_color: Option<LinearRgba>,
     ) -> Self {
         Self {
             texture,
             resolve_target,
+            previous_frame_texture,
             clear_color,
             is_first_call: Arc::new(AtomicBool::new(true)),
         }
diff --git a/crates/bevy_render/src/view/mod.rs b/crates/bevy_render/src/view/mod.rs
index e9898c9deaddf..6871fc0bb8596 100644
--- a/crates/bevy_render/src/view/mod.rs
+++ b/crates/bevy_render/src/view/mod.rs
@@ -1141,8 +1141,8 @@ pub fn prepare_view_targets(
         let converted_clear_color = clear_color.map(Into::into);
 
         let main_textures = MainTargetTextures {
-            a: ColorAttachment::new(a.clone(), sampled.clone(), converted_clear_color),
-            b: ColorAttachment::new(b.clone(), sampled.clone(), converted_clear_color),
+            a: ColorAttachment::new(a.clone(), sampled.clone(), None, converted_clear_color),
+            b: ColorAttachment::new(b.clone(), sampled.clone(), None, converted_clear_color),
             main_texture: main_texture.clone(),
         };
 
diff --git a/crates/bevy_solari/src/realtime/mod.rs b/crates/bevy_solari/src/realtime/mod.rs
index 2c85e73083936..0ab1e13fe6029 100644
--- a/crates/bevy_solari/src/realtime/mod.rs
+++ b/crates/bevy_solari/src/realtime/mod.rs
@@ -7,7 +7,10 @@ use bevy_app::{App, Plugin};
 use bevy_asset::embedded_asset;
 use bevy_core_pipeline::{
     core_3d::graph::{Core3d, Node3d},
-    prepass::{DeferredPrepass, DepthPrepass, MotionVectorPrepass},
+    prepass::{
+        DeferredPrepass, DeferredPrepassDoubleBuffer, DepthPrepass, DepthPrepassDoubleBuffer,
+        MotionVectorPrepass,
+    },
 };
 use bevy_ecs::{component::Component, reflect::ReflectComponent, schedule::IntoScheduleConfigs};
 use bevy_pbr::DefaultOpaqueRendererMethod;
@@ -87,7 +90,14 @@ impl Plugin for SolariLightingPlugin {
 /// `Msaa::Off`.
 #[derive(Component, Reflect, Clone)]
 #[reflect(Component, Default, Clone)]
-#[require(Hdr, DeferredPrepass, DepthPrepass, MotionVectorPrepass)]
+#[require(
+    Hdr,
+    DeferredPrepass,
+    DepthPrepass,
+    MotionVectorPrepass,
+    DeferredPrepassDoubleBuffer,
+    DepthPrepassDoubleBuffer
+)]
 pub struct SolariLighting {
     /// Set to true to delete the saved temporal history (past frames).
     ///
diff --git a/crates/bevy_solari/src/realtime/node.rs b/crates/bevy_solari/src/realtime/node.rs
index 68e36beb92ffe..9e280cd0e1416 100644
--- a/crates/bevy_solari/src/realtime/node.rs
+++ b/crates/bevy_solari/src/realtime/node.rs
@@ -14,7 +14,6 @@ use bevy_ecs::{
     query::QueryItem,
     world::{FromWorld, World},
 };
-use bevy_image::ToExtents;
 use bevy_render::{
     diagnostic::RecordDiagnostics,
     render_graph::{NodeRunError, RenderGraphContext, ViewNode},
@@ -127,6 +126,8 @@ impl ViewNode for SolariLightingNode {
             Some(gbuffer),
             Some(depth_buffer),
             Some(motion_vectors),
+            Some(previous_gbuffer),
+            Some(previous_depth_buffer),
             Some(view_uniforms),
             Some(previous_view_uniforms),
         ) = (
@@ -147,6 +148,8 @@ impl ViewNode for SolariLightingNode {
             view_prepass_textures.deferred_view(),
             view_prepass_textures.depth_view(),
             view_prepass_textures.motion_vectors_view(),
+            view_prepass_textures.previous_deferred_view(),
+            view_prepass_textures.previous_depth_view(),
             view_uniforms.uniforms.binding(),
             previous_view_uniforms.uniforms.binding(),
         )
@@ -177,8 +180,8 @@ impl ViewNode for SolariLightingNode {
                 gbuffer,
                 depth_buffer,
                 motion_vectors,
-                &s.previous_gbuffer.1,
-                &s.previous_depth.1,
+                previous_gbuffer,
+                previous_depth_buffer,
                 view_uniforms,
                 previous_view_uniforms,
                 s.world_cache_checksums.as_entire_binding(),
@@ -334,31 +337,6 @@ impl ViewNode for SolariLightingNode {
         pass.dispatch_workgroups(dx, dy, 1);
 
         pass_span.end(&mut pass);
-        drop(pass);
-
-        // TODO: Remove these copies, and double buffer instead
-        command_encoder.copy_texture_to_texture(
-            view_prepass_textures
-                .deferred
-                .clone()
-                .unwrap()
-                .texture
-                .texture
-                .as_image_copy(),
-            solari_lighting_resources.previous_gbuffer.0.as_image_copy(),
-            solari_lighting_resources.view_size.to_extents(),
-        );
-        command_encoder.copy_texture_to_texture(
-            view_prepass_textures
-                .depth
-                .clone()
-                .unwrap()
-                .texture
-                .texture
-                .as_image_copy(),
-            solari_lighting_resources.previous_depth.0.as_image_copy(),
-            solari_lighting_resources.view_size.to_extents(),
-        );
 
         Ok(())
     }
diff --git a/crates/bevy_solari/src/realtime/prepare.rs b/crates/bevy_solari/src/realtime/prepare.rs
index 266ce6d071939..b166c93b1754a 100644
--- a/crates/bevy_solari/src/realtime/prepare.rs
+++ b/crates/bevy_solari/src/realtime/prepare.rs
@@ -4,7 +4,6 @@ use bevy_anti_alias::dlss::{
     Dlss, DlssRayReconstructionFeature, ViewDlssRayReconstructionTextures,
 };
 use bevy_camera::MainPassResolutionOverride;
-use bevy_core_pipeline::{core_3d::CORE_3D_DEPTH_FORMAT, deferred::DEFERRED_PREPASS_FORMAT};
 #[cfg(all(feature = "dlss", not(feature = "force_disable_dlss")))]
 use bevy_ecs::query::Has;
 use bevy_ecs::{
@@ -50,8 +49,6 @@ pub struct SolariLightingResources {
     pub di_reservoirs_b: (Texture, TextureView),
     pub gi_reservoirs_a: Buffer,
     pub gi_reservoirs_b: Buffer,
-    pub previous_gbuffer: (Texture, TextureView),
-    pub previous_depth: (Texture, TextureView),
     pub world_cache_checksums: Buffer,
     pub world_cache_life: Buffer,
     pub world_cache_radiance: Buffer,
@@ -151,30 +148,6 @@ pub fn prepare_solari_lighting_resources(
         let gi_reservoirs_a = gi_reservoirs("solari_lighting_gi_reservoirs_a");
         let gi_reservoirs_b = gi_reservoirs("solari_lighting_gi_reservoirs_b");
 
-        let previous_gbuffer = render_device.create_texture(&TextureDescriptor {
-            label: Some("solari_lighting_previous_gbuffer"),
-            size: view_size.to_extents(),
-            mip_level_count: 1,
-            sample_count: 1,
-            dimension: TextureDimension::D2,
-            format: DEFERRED_PREPASS_FORMAT,
-            usage: TextureUsages::TEXTURE_BINDING | TextureUsages::COPY_DST,
-            view_formats: &[],
-        });
-        let previous_gbuffer_view = previous_gbuffer.create_view(&TextureViewDescriptor::default());
-
-        let previous_depth = render_device.create_texture(&TextureDescriptor {
-            label: Some("solari_lighting_previous_depth"),
-            size: view_size.to_extents(),
-            mip_level_count: 1,
-            sample_count: 1,
-            dimension: TextureDimension::D2,
-            format: CORE_3D_DEPTH_FORMAT,
-            usage: TextureUsages::TEXTURE_BINDING | TextureUsages::COPY_DST,
-            view_formats: &[],
-        });
-        let previous_depth_view = previous_depth.create_view(&TextureViewDescriptor::default());
-
         let world_cache_checksums = render_device.create_buffer(&BufferDescriptor {
             label: Some("solari_lighting_world_cache_checksums"),
             size: WORLD_CACHE_SIZE * size_of::<u32>() as u64,
@@ -259,8 +232,6 @@ pub fn prepare_solari_lighting_resources(
             di_reservoirs_b,
             gi_reservoirs_a,
             gi_reservoirs_b,
-            previous_gbuffer: (previous_gbuffer, previous_gbuffer_view),
-            previous_depth: (previous_depth, previous_depth_view),
             world_cache_checksums,
             world_cache_life,
             world_cache_radiance,

From b58ecf2ac37ae1052060164ff3e564a1d2d7c61d Mon Sep 17 00:00:00 2001
From: shivanandu <shivanandu.dev@gmail.com>
Date: Mon, 15 Dec 2025 02:56:13 +0530
Subject: [PATCH 098/133] Add sprite slicing scene to testbed_2d example
 (#22089)

# Objective

- Sprite slicing doesn't have any example with the screenshot CI.
- Fixes #22083

## Solution

- Added a new `sprite_slicing` module to `examples/testbed/2d.rs`

## Testing
- Ran the testbed with `cargo run --example testbed_2d`
- Cycled through all scenes using spacebar
- Verified the sprite slicing scene displays correctly with both
original and sliced sprites
- Confirmed labels and positioning are correct

---

## Showcase

<img width="1372" height="755" alt="Screenshot From 2025-12-11 15-41-23"
src="https://github.com/user-attachments/assets/8f5a6223-78bb-4670-b23e-280e003df324"
/>
---
 examples/testbed/2d.rs | 63 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 62 insertions(+), 1 deletion(-)

diff --git a/examples/testbed/2d.rs b/examples/testbed/2d.rs
index 0a10ee04e408d..1751e0f152a2f 100644
--- a/examples/testbed/2d.rs
+++ b/examples/testbed/2d.rs
@@ -15,6 +15,7 @@ fn main() {
         .add_systems(OnEnter(Scene::Bloom), bloom::setup)
         .add_systems(OnEnter(Scene::Text), text::setup)
         .add_systems(OnEnter(Scene::Sprite), sprite::setup)
+        .add_systems(OnEnter(Scene::SpriteSlicing), sprite_slicing::setup)
         .add_systems(OnEnter(Scene::Gizmos), gizmos::setup)
         .add_systems(Update, switch_scene)
         .add_systems(Update, gizmos::draw_gizmos.run_if(in_state(Scene::Gizmos)));
@@ -32,6 +33,7 @@ enum Scene {
     Bloom,
     Text,
     Sprite,
+    SpriteSlicing,
     Gizmos,
 }
 
@@ -41,7 +43,8 @@ impl Next for Scene {
             Scene::Shapes => Scene::Bloom,
             Scene::Bloom => Scene::Text,
             Scene::Text => Scene::Sprite,
-            Scene::Sprite => Scene::Gizmos,
+            Scene::Sprite => Scene::SpriteSlicing,
+            Scene::SpriteSlicing => Scene::Gizmos,
             Scene::Gizmos => Scene::Shapes,
         }
     }
@@ -280,6 +283,64 @@ mod sprite {
     }
 }
 
+mod sprite_slicing {
+    use bevy::prelude::*;
+    use bevy::sprite::{BorderRect, SliceScaleMode, SpriteImageMode, TextureSlicer};
+
+    pub fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
+        commands.spawn((Camera2d, DespawnOnExit(super::Scene::SpriteSlicing)));
+
+        let texture = asset_server.load("textures/slice_square_2.png");
+        let font = asset_server.load("fonts/FiraSans-Bold.ttf");
+
+        commands.spawn((
+            Sprite {
+                image: texture.clone(),
+                ..default()
+            },
+            Transform::from_translation(Vec3::new(-150.0, 50.0, 0.0)).with_scale(Vec3::splat(2.0)),
+            DespawnOnExit(super::Scene::SpriteSlicing),
+        ));
+
+        commands.spawn((
+            Sprite {
+                image: texture,
+                image_mode: SpriteImageMode::Sliced(TextureSlicer {
+                    border: BorderRect::all(20.0),
+                    center_scale_mode: SliceScaleMode::Stretch,
+                    ..default()
+                }),
+                custom_size: Some(Vec2::new(200.0, 200.0)),
+                ..default()
+            },
+            Transform::from_translation(Vec3::new(150.0, 50.0, 0.0)),
+            DespawnOnExit(super::Scene::SpriteSlicing),
+        ));
+
+        commands.spawn((
+            Text2d::new("Original"),
+            TextFont {
+                font: font.clone(),
+                font_size: 20.0,
+                ..default()
+            },
+            Transform::from_translation(Vec3::new(-150.0, -80.0, 0.0)),
+            DespawnOnExit(super::Scene::SpriteSlicing),
+        ));
+
+        commands.spawn((
+            Text2d::new("Sliced"),
+            TextFont {
+                font,
+                font_size: 20.0,
+                ..default()
+            },
+            Transform::from_translation(Vec3::new(150.0, -80.0, 0.0)),
+            DespawnOnExit(super::Scene::SpriteSlicing),
+        ));
+    }
+}
+
 mod gizmos {
     use bevy::{color::palettes::css::*, prelude::*};
 

From 1e916e0d755316381aa7f8041b6c020ff0dd4485 Mon Sep 17 00:00:00 2001
From: Emerson Coskey <emerson@coskey.dev>
Date: Sun, 14 Dec 2025 13:27:02 -0800
Subject: [PATCH 099/133] `spec_v2`: migrate line gizmos (#22072)

# Objective

- Migrate line gizmos to `spec_v2`

## Testing

- Ran example
---
 crates/bevy_gizmos_render/src/pipeline_3d.rs | 141 ++++++++++---------
 1 file changed, 78 insertions(+), 63 deletions(-)

diff --git a/crates/bevy_gizmos_render/src/pipeline_3d.rs b/crates/bevy_gizmos_render/src/pipeline_3d.rs
index 854c3c7b47ae8..00fda49ee587b 100644
--- a/crates/bevy_gizmos_render/src/pipeline_3d.rs
+++ b/crates/bevy_gizmos_render/src/pipeline_3d.rs
@@ -14,6 +14,7 @@ use bevy_core_pipeline::{
 use bevy_gizmos::config::{GizmoLineJoint, GizmoLineStyle, GizmoMeshConfig};
 
 use bevy_ecs::{
+    error::BevyError,
     prelude::Entity,
     query::Has,
     resource::Resource,
@@ -48,7 +49,6 @@ impl Plugin for LineGizmo3dPlugin {
             .add_render_command::<Transparent3d, DrawLineGizmo3d>()
             .add_render_command::<Transparent3d, DrawLineGizmo3dStrip>()
             .add_render_command::<Transparent3d, DrawLineJointGizmo3d>()
-            .init_resource::<SpecializedRenderPipelines<LineGizmoPipeline>>()
             .init_resource::<SpecializedRenderPipelines<LineJointGizmoPipeline>>()
             .configure_sets(
                 Render,
@@ -67,11 +67,9 @@ impl Plugin for LineGizmo3dPlugin {
     }
 }
 
-#[derive(Clone, Resource)]
+#[derive(Resource)]
 struct LineGizmoPipeline {
-    mesh_pipeline: MeshPipeline,
-    uniform_layout: BindGroupLayoutDescriptor,
-    shader: Handle<Shader>,
+    variants: Variants<RenderPipeline, LineGizmoPipelineSpecializer>,
 }
 
 fn init_line_gizmo_pipelines(
@@ -80,10 +78,38 @@ fn init_line_gizmo_pipelines(
     uniform_bind_group_layout: Res<LineGizmoUniformBindgroupLayout>,
     asset_server: Res<AssetServer>,
 ) {
+    let line_shader = load_embedded_asset!(asset_server.as_ref(), "lines.wgsl");
+    let variants_line = Variants::new(
+        LineGizmoPipelineSpecializer {
+            mesh_pipeline: mesh_pipeline.clone(),
+        },
+        RenderPipelineDescriptor {
+            label: Some("LineGizmo 3d Pipeline".into()),
+            vertex: VertexState {
+                shader: line_shader.clone(),
+                ..default()
+            },
+            fragment: Some(FragmentState {
+                shader: line_shader,
+                ..default()
+            }),
+            layout: vec![
+                Default::default(), // placeholder
+                uniform_bind_group_layout.layout.clone(),
+            ],
+            depth_stencil: Some(DepthStencilState {
+                format: CORE_3D_DEPTH_FORMAT,
+                depth_write_enabled: true,
+                depth_compare: CompareFunction::Greater,
+                stencil: StencilState::default(),
+                bias: DepthBiasState::default(),
+            }),
+            ..default()
+        },
+    );
+
     commands.insert_resource(LineGizmoPipeline {
-        mesh_pipeline: mesh_pipeline.clone(),
-        uniform_layout: uniform_bind_group_layout.layout.clone(),
-        shader: load_embedded_asset!(asset_server.as_ref(), "lines.wgsl"),
+        variants: variants_line,
     });
     commands.insert_resource(LineJointGizmoPipeline {
         mesh_pipeline: mesh_pipeline.clone(),
@@ -92,7 +118,11 @@ fn init_line_gizmo_pipelines(
     });
 }
 
-#[derive(PartialEq, Eq, Hash, Clone)]
+struct LineGizmoPipelineSpecializer {
+    mesh_pipeline: MeshPipeline,
+}
+
+#[derive(PartialEq, Eq, Hash, Clone, SpecializerKey)]
 struct LineGizmoPipelineKey {
     view_key: MeshPipelineKey,
     strip: bool,
@@ -100,17 +130,30 @@ struct LineGizmoPipelineKey {
     line_style: GizmoLineStyle,
 }
 
-impl SpecializedRenderPipeline for LineGizmoPipeline {
+impl Specializer<RenderPipeline> for LineGizmoPipelineSpecializer {
     type Key = LineGizmoPipelineKey;
 
-    fn specialize(&self, key: Self::Key) -> RenderPipelineDescriptor {
-        let mut shader_defs = vec![
-            #[cfg(feature = "webgl")]
-            "SIXTEEN_BYTE_ALIGNMENT".into(),
-        ];
+    fn specialize(
+        &self,
+        key: Self::Key,
+        descriptor: &mut RenderPipelineDescriptor,
+    ) -> Result<Canonical<Self::Key>, BevyError> {
+        let view_layout = self
+            .mesh_pipeline
+            .get_view_layout(key.view_key.into())
+            .clone();
+
+        descriptor.set_layout(0, view_layout.main_layout.clone());
+        descriptor.vertex.buffers = line_gizmo_vertex_buffer_layouts(key.strip);
+        descriptor.multisample.count = key.view_key.msaa_samples();
+
+        let fragment = descriptor.fragment_mut()?;
+
+        #[cfg(feature = "webgl")]
+        fragment.shader_defs.push("SIXTEEN_BYTE_ALIGNMENT".into());
 
         if key.perspective {
-            shader_defs.push("PERSPECTIVE".into());
+            fragment.shader_defs.push("PERSPECTIVE".into());
         }
 
         let format = if key.view_key.contains(MeshPipelineKey::HDR) {
@@ -119,12 +162,6 @@ impl SpecializedRenderPipeline for LineGizmoPipeline {
             TextureFormat::bevy_default()
         };
 
-        let view_layout = self
-            .mesh_pipeline
-            .get_view_layout(key.view_key.into())
-            .clone();
-        let layout = vec![view_layout.main_layout.clone(), self.uniform_layout.clone()];
-
         let fragment_entry_point = match key.line_style {
             GizmoLineStyle::Solid => "fragment_solid",
             GizmoLineStyle::Dotted => "fragment_dotted",
@@ -132,39 +169,18 @@ impl SpecializedRenderPipeline for LineGizmoPipeline {
             _ => unimplemented!(),
         };
 
-        RenderPipelineDescriptor {
-            vertex: VertexState {
-                shader: self.shader.clone(),
-                shader_defs: shader_defs.clone(),
-                buffers: line_gizmo_vertex_buffer_layouts(key.strip),
-                ..default()
-            },
-            fragment: Some(FragmentState {
-                shader: self.shader.clone(),
-                shader_defs,
-                entry_point: Some(fragment_entry_point.into()),
-                targets: vec![Some(ColorTargetState {
-                    format,
-                    blend: Some(BlendState::ALPHA_BLENDING),
-                    write_mask: ColorWrites::ALL,
-                })],
-            }),
-            layout,
-            depth_stencil: Some(DepthStencilState {
-                format: CORE_3D_DEPTH_FORMAT,
-                depth_write_enabled: true,
-                depth_compare: CompareFunction::Greater,
-                stencil: StencilState::default(),
-                bias: DepthBiasState::default(),
-            }),
-            multisample: MultisampleState {
-                count: key.view_key.msaa_samples(),
-                mask: !0,
-                alpha_to_coverage_enabled: false,
+        fragment.entry_point = Some(fragment_entry_point.into());
+
+        fragment.set_target(
+            0,
+            ColorTargetState {
+                format,
+                blend: Some(BlendState::ALPHA_BLENDING),
+                write_mask: ColorWrites::ALL,
             },
-            label: Some("LineGizmo 3d Pipeline".into()),
-            ..default()
-        }
+        );
+
+        Ok(key)
     }
 }
 
@@ -274,8 +290,7 @@ type DrawLineJointGizmo3d = (
 
 fn queue_line_gizmos_3d(
     draw_functions: Res<DrawFunctions<Transparent3d>>,
-    pipeline: Res<LineGizmoPipeline>,
-    mut pipelines: ResMut<SpecializedRenderPipelines<LineGizmoPipeline>>,
+    mut pipeline: ResMut<LineGizmoPipeline>,
     pipeline_cache: Res<PipelineCache>,
     line_gizmos: Query<(Entity, &MainEntity, &GizmoMeshConfig)>,
     line_gizmo_assets: Res<RenderAssets<GpuLineGizmo>>,
@@ -292,7 +307,7 @@ fn queue_line_gizmos_3d(
             Has<OrderIndependentTransparencySettings>,
         ),
     )>,
-) {
+) -> Result<(), BevyError> {
     let draw_function = draw_functions.read().get_id::<DrawLineGizmo3d>().unwrap();
     let draw_function_strip = draw_functions
         .read()
@@ -346,16 +361,15 @@ fn queue_line_gizmos_3d(
             };
 
             if line_gizmo.list_vertex_count > 0 {
-                let pipeline = pipelines.specialize(
+                let pipeline = pipeline.variants.specialize(
                     &pipeline_cache,
-                    &pipeline,
                     LineGizmoPipelineKey {
                         view_key,
                         strip: false,
                         perspective: config.line_perspective,
                         line_style: config.line_style,
                     },
-                );
+                )?;
                 transparent_phase.add(Transparent3d {
                     entity: (entity, *main_entity),
                     draw_function,
@@ -368,16 +382,15 @@ fn queue_line_gizmos_3d(
             }
 
             if line_gizmo.strip_vertex_count >= 2 {
-                let pipeline = pipelines.specialize(
+                let pipeline = pipeline.variants.specialize(
                     &pipeline_cache,
-                    &pipeline,
                     LineGizmoPipelineKey {
                         view_key,
                         strip: true,
                         perspective: config.line_perspective,
                         line_style: config.line_style,
                     },
-                );
+                )?;
                 transparent_phase.add(Transparent3d {
                     entity: (entity, *main_entity),
                     draw_function: draw_function_strip,
@@ -390,6 +403,8 @@ fn queue_line_gizmos_3d(
             }
         }
     }
+
+    Ok(())
 }
 
 fn queue_line_joint_gizmos_3d(

From 160b3e5428a131eca828b2771577aad2f1708f8d Mon Sep 17 00:00:00 2001
From: Volodymyr Enhelhardt <148731093+venhelhardt@users.noreply.github.com>
Date: Sun, 14 Dec 2025 13:28:02 -0800
Subject: [PATCH 100/133] Use mesh bounds center for transparent/transmissive
 sorting (#22041)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Transparent and transmissive phases previously used the instance
translation from GlobalTransform as the sort position. This breaks down
when mesh geometry is authored in "world-like" coordinates and the
instance transform is identity or near-identity (common in
building/CAD-style content). In such cases multiple transparent
instances end up with the same translation and produce incorrect draw
order.

This change introduces sorting based on the world-space center of the
mesh bounds instead of the raw translation. The local bounds center is
stored per mesh/instance and transformed by the instance’s world
transform when building sort keys. This adds a small amount of
per-mesh/instance data but produces much more correct transparent and
transmissive rendering in real-world scenes.

# Objective

Currently, transparent and transmissive render phases in Bevy sort
instances using the translation from GlobalTransform. This works only if
the mesh origin is a good proxy for the geometry position. In many
real-world cases (especially CAD/architecture-like content), the mesh
data is authored in "world-like" coordinates and the instance
`Transform` is identity. In such setups, sorting by translation produces
incorrect draw order for transparent/transmissive objects.

I propose switching the sorting key from `GlobalTransform.translation`
to the world-space center of the mesh bounds for each instance.

## Solution

Instead of using `GlobalTransform.translation` as the sort position for
transparent/transmissive phases, use the world-space center of the mesh
bounds:

1. Store the local-space bounds center for each render mesh (e.g. in
something like `RenderMeshInstanceShared` as `center: Vec3` derived from
the mesh `Aabb`).
2. For each instance, compute the world-space center by applying the
instance transform.
3. Use this world-space center as the position for distance / depth
computation in view space when building sort keys for transparent and
transmissive phases.

This way:
- Sorting respects the actual spatial position of the geometry
- Instances with baked-in “world-like” coordinates inside the mesh are
handled correctly
- Draw order for transparent objects becomes much more stable and
visually correct in real scenes

The main trade-offs:
- Adding a Vec3 center in `RenderMeshInstanceShared` (typically +12 or
+16 bytes depending on alignment),
- For each instance, we need to transform the local bounds center into
world space to compute the sort key.

### Alternative approach and its drawbacks

In theory, this could be fixed by **baking** meshes so that:

- The mesh is recentered around its local bounding box center, and
- The instance `Transform` is adjusted to move it back into place.

However, this has several drawbacks:

- Requires modifying vertex data for each mesh (expensive and
error-prone)
- Requires either duplicating meshes or introducing one-off edits, which
is bad for instancing and memory
- Complicates asset workflows (tools, exporters, pipelines)
- Still does not address dynamic or procedurally generated content

In practice, this is not a scalable or convenient solution.

### Secondary issue: unstable ordering when depth is equal

There is another related problem with the current sorting: when two
transparent/transmissive instances end up with the same view-space depth
(for example, their centers project onto the same depth plane), the
resulting draw order becomes unstable. This leads to visible flickering,
because the internal order of `RenderEntity` items is not guaranteed to
be
stable between frames.

In practice this happens quite easily, especially when multiple
transparent instances share the same or very similar sort depth, and
their relative order in the extracted render list can change frame to
frame.

To address this, I suggest extending the sort key with a deterministic
tie-breaker, for example the entity's main index. Conceptually, the sort
key would become:

- primary: view-space depth (or distance),
- secondary: stable per-entity index

This ensures that instances with the same depth keep a consistent draw
order across frames, removing flickering while preserving the intended
depth-based sorting behavior.

## Testing

- Did you test these changes? If so, how?
```sh
cargo run -p ci -- test
cargo run -p ci -- doc
cargo run -p ci -- compile
```
- Are there any parts that need more testing? Not sure
- How can other people (reviewers) test your changes? Is there anything
specific they need to know?
Run this "example"
```rust
use bevy::{
    camera_controller::free_camera::{FreeCamera, FreeCameraPlugin},
    prelude::*,
};

fn main() {
    App::new()
        .add_plugins(DefaultPlugins)
        .add_plugins(FreeCameraPlugin)
        .add_systems(Startup, setup)
        .add_systems(Update, view_orient)
        .run();
}

fn setup(
    mut commands: Commands,
    mut meshes: ResMut<Assets<Mesh>>,
    mut materials: ResMut<Assets<StandardMaterial>>,
) {
    let material = materials.add(StandardMaterial {
        base_color: Color::srgb_u8(150, 250, 150).with_alpha(0.7),
        alpha_mode: AlphaMode::Blend,
        ..default()
    });
    let mesh = Cuboid::new(3., 3., 1.)
        .mesh()
        .build()
        .translated_by(Vec3::new(1.5, 1.5, 0.5));

    // Cuboids grids
    for k in -1..=0 {
        let z_offset = k as f32 * 3.;

        for i in 0..3 {
            let x_offset = i as f32 * 3.25;

            for j in 0..3 {
                let y_offset = j as f32 * 3.25;

                commands.spawn((
                    Mesh3d(
                        meshes.add(
                            mesh.clone()
                                .translated_by(Vec3::new(x_offset, y_offset, z_offset)),
                        ),
                    ),
                    MeshMaterial3d(material.clone()),
                ));
            }
        }
    }

    // Cuboids at the center share the same position and are equidistant from the camera
    {
        commands.spawn((
            Mesh3d(meshes.add(mesh.clone().translated_by(Vec3::new(3.25, 3.25, 3.)))),
            MeshMaterial3d(material.clone()),
        ));
        commands.spawn((
            Mesh3d(meshes.add(mesh.clone().translated_by(Vec3::new(3.25, 3.25, 3.)))),
            MeshMaterial3d(materials.add(StandardMaterial {
                base_color: Color::srgb_u8(150, 150, 250).with_alpha(0.6),
                alpha_mode: AlphaMode::Blend,
                ..default()
            })),
        ));
        commands.spawn((
            Mesh3d(meshes.add(mesh.clone().translated_by(Vec3::new(3.25, 3.25, 3.)))),
            MeshMaterial3d(materials.add(StandardMaterial {
                base_color: Color::srgb_u8(250, 150, 150).with_alpha(0.5),
                alpha_mode: AlphaMode::Blend,
                ..default()
            })),
        ));
    }

    commands.spawn((PointLight::default(), Transform::from_xyz(-3., 10., 4.5)));
    commands.spawn((
        Camera3d::default(),
        Transform::from_xyz(-3., 12., 15.).looking_at(Vec3::new(4.75, 4.75, 0.), Vec3::Y),
        FreeCamera::default(),
    ));
    commands.spawn((
        Node {
            position_type: PositionType::Absolute,
            padding: UiRect::all(px(10)),
            ..default()
        },
        GlobalZIndex(i32::MAX),
        children![(
            Text::default(),
            children![
                (TextSpan::new("1 - 3D view\n")),
                (TextSpan::new("2 - Front view\n")),
                (TextSpan::new("3 - Top view\n")),
                (TextSpan::new("4 - Right view\n")),
            ]
        )],
    ));
}

fn view_orient(
    input: Res<ButtonInput<KeyCode>>,
    mut camera_xform: Single<&mut Transform, With<Camera>>,
) {
    let xform = if input.just_pressed(KeyCode::Digit1) {
        Some(Transform::from_xyz(-3., 12., 15.).looking_at(Vec3::new(4.75, 4.75, 0.), Vec3::Y))
    } else if input.just_pressed(KeyCode::Digit2) {
        Some(Transform::from_xyz(4.75, 4.75, 15.).looking_at(Vec3::new(4.75, 4.75, 0.), Vec3::Y))
    } else if input.just_pressed(KeyCode::Digit3) {
        Some(Transform::from_xyz(4.75, 18., -1.).looking_at(Vec3::new(4.75, 0., -1.), Vec3::NEG_Z))
    } else if input.just_pressed(KeyCode::Digit4) {
        Some(Transform::from_xyz(-15., 4.75, -1.).looking_at(Vec3::new(0., 4.75, -1.), Vec3::Y))
    } else {
        None
    };

    if let Some(xform) = xform {
        camera_xform.set_if_neq(xform);
    }
}
```
- If relevant, what platforms did you test these changes on, and are
there any important ones you can't test? MacOS

---

## Showcase

In my tests with building models (windows, glass, etc.), switching from
translation-based sorting to bounds-center-based sorting noticeably
improves the visual result. Transparent surfaces that were previously
fighting or blending incorrectly now render in a much more expected
order.

### Current:
https://youtu.be/WjDjPAoKK6w

### Sort by aabb center:
https://youtu.be/-Sl4GOXp_vQ

### Sort by aabb center + tie breaker:
https://youtu.be/0aQhkSKxECo

---------

Co-authored-by: Volodymyr Enhelhardt <volodymyr.enhelhardt@ambr.net>
---
 crates/bevy_pbr/src/material.rs               |  4 +-
 crates/bevy_pbr/src/render/mesh.rs            | 54 ++++++++++++++-----
 .../src/render_phase/rangefinder.rs           | 27 +++-------
 .../shader_advanced/custom_render_phase.rs    |  2 +-
 .../custom_shader_instancing.rs               |  2 +-
 5 files changed, 53 insertions(+), 36 deletions(-)

diff --git a/crates/bevy_pbr/src/material.rs b/crates/bevy_pbr/src/material.rs
index c49619c5179ee..42717b57c40fe 100644
--- a/crates/bevy_pbr/src/material.rs
+++ b/crates/bevy_pbr/src/material.rs
@@ -1217,7 +1217,7 @@ pub fn queue_material_meshes(
 
             match material.properties.render_phase_type {
                 RenderPhaseType::Transmissive => {
-                    let distance = rangefinder.distance_translation(&mesh_instance.translation)
+                    let distance = rangefinder.distance(&mesh_instance.center)
                         + material.properties.depth_bias;
                     let Some(draw_function) = material
                         .properties
@@ -1304,7 +1304,7 @@ pub fn queue_material_meshes(
                     );
                 }
                 RenderPhaseType::Transparent => {
-                    let distance = rangefinder.distance_translation(&mesh_instance.translation)
+                    let distance = rangefinder.distance(&mesh_instance.center)
                         + material.properties.depth_bias;
                     let Some(draw_function) = material
                         .properties
diff --git a/crates/bevy_pbr/src/render/mesh.rs b/crates/bevy_pbr/src/render/mesh.rs
index 013849e8ee8d2..f7f0227f2f797 100644
--- a/crates/bevy_pbr/src/render/mesh.rs
+++ b/crates/bevy_pbr/src/render/mesh.rs
@@ -719,11 +719,11 @@ pub struct RenderMeshInstanceGpu {
     /// uniform building paths.
     #[deref]
     pub shared: RenderMeshInstanceShared,
-    /// The translation of the mesh.
+    /// The representative position of the mesh instance in world-space.
     ///
-    /// This is the only part of the transform that we have to keep on CPU (for
-    /// distance sorting).
-    pub translation: Vec3,
+    /// This world-space center is used as a spatial proxy for view-dependent
+    /// operations such as distance computation and render-order sorting.
+    pub center: Vec3,
     /// The index of the [`MeshInputUniform`] in the buffer.
     pub current_uniform_index: NonMaxU32,
 }
@@ -744,6 +744,12 @@ pub struct RenderMeshInstanceShared {
     pub tag: u32,
     /// Render layers that this mesh instance belongs to.
     pub render_layers: Option<RenderLayers>,
+    /// A representative position of the mesh instance in local space,
+    /// derived from its axis-aligned bounding box.
+    ///
+    /// This value is typically used as a spatial proxy for operations such as
+    /// view-dependent sorting (e.g., transparent object ordering).
+    pub center: Vec3,
 }
 
 /// Information that is gathered during the parallel portion of mesh extraction
@@ -836,6 +842,7 @@ impl RenderMeshInstanceShared {
         not_shadow_caster: bool,
         no_automatic_batching: bool,
         render_layers: Option<&RenderLayers>,
+        aabb: Option<&Aabb>,
     ) -> Self {
         Self::for_cpu_building(
             previous_transform,
@@ -845,6 +852,7 @@ impl RenderMeshInstanceShared {
             not_shadow_caster,
             no_automatic_batching,
             render_layers,
+            aabb,
         )
     }
 
@@ -857,6 +865,7 @@ impl RenderMeshInstanceShared {
         not_shadow_caster: bool,
         no_automatic_batching: bool,
         render_layers: Option<&RenderLayers>,
+        aabb: Option<&Aabb>,
     ) -> Self {
         let mut mesh_instance_flags = RenderMeshInstanceFlags::empty();
         mesh_instance_flags.set(RenderMeshInstanceFlags::SHADOW_CASTER, !not_shadow_caster);
@@ -876,6 +885,7 @@ impl RenderMeshInstanceShared {
             lightmap_slab_index: None,
             tag: tag.map_or(0, |i| **i),
             render_layers: render_layers.cloned(),
+            center: aabb.map_or(Vec3::ZERO, |aabb| aabb.center.into()),
         }
     }
 
@@ -963,12 +973,19 @@ impl RenderMeshInstancesCpu {
     }
 
     fn render_mesh_queue_data(&self, entity: MainEntity) -> Option<RenderMeshQueueData<'_>> {
-        self.get(&entity)
-            .map(|render_mesh_instance| RenderMeshQueueData {
+        self.get(&entity).map(|render_mesh_instance| {
+            let world_from_local = &render_mesh_instance.transforms.world_from_local;
+            let center = world_from_local
+                .matrix3
+                .mul_vec3(render_mesh_instance.shared.center)
+                + world_from_local.translation;
+
+            RenderMeshQueueData {
                 shared: &render_mesh_instance.shared,
-                translation: render_mesh_instance.transforms.world_from_local.translation,
+                center,
                 current_uniform_index: InputUniformIndex::default(),
-            })
+            }
+        })
     }
 
     /// Inserts the given flags into the render mesh instance data for the given
@@ -990,7 +1007,7 @@ impl RenderMeshInstancesGpu {
         self.get(&entity)
             .map(|render_mesh_instance| RenderMeshQueueData {
                 shared: &render_mesh_instance.shared,
-                translation: render_mesh_instance.translation,
+                center: render_mesh_instance.center,
                 current_uniform_index: InputUniformIndex(
                     render_mesh_instance.current_uniform_index.into(),
                 ),
@@ -1195,6 +1212,10 @@ impl RenderMeshInstanceGpuBuilder {
 
         // Did the last frame contain this entity as well?
         let current_uniform_index;
+        let world_from_local = &self.world_from_local;
+        let center =
+            world_from_local.matrix3.mul_vec3(self.shared.center) + world_from_local.translation;
+
         match render_mesh_instances.entry(entity) {
             Entry::Occupied(mut occupied_entry) => {
                 // Yes, it did. Replace its entry with the new one.
@@ -1214,8 +1235,8 @@ impl RenderMeshInstanceGpuBuilder {
 
                 occupied_entry.replace_entry_with(|_, _| {
                     Some(RenderMeshInstanceGpu {
-                        translation: self.world_from_local.translation,
                         shared: self.shared,
+                        center,
                         current_uniform_index: NonMaxU32::new(current_uniform_index)
                             .unwrap_or_default(),
                     })
@@ -1227,8 +1248,8 @@ impl RenderMeshInstanceGpuBuilder {
                 current_uniform_index = current_input_buffer.add(mesh_input_uniform);
 
                 vacant_entry.insert(RenderMeshInstanceGpu {
-                    translation: self.world_from_local.translation,
                     shared: self.shared,
+                    center,
                     current_uniform_index: NonMaxU32::new(current_uniform_index)
                         .unwrap_or_default(),
                 });
@@ -1300,8 +1321,11 @@ pub struct RenderMeshQueueData<'a> {
     /// General information about the mesh instance.
     #[deref]
     pub shared: &'a RenderMeshInstanceShared,
-    /// The translation of the mesh instance.
-    pub translation: Vec3,
+    /// The representative position of the mesh instance in world-space.
+    ///
+    /// This world-space center is used as a spatial proxy for view-dependent
+    /// operations such as distance computation and render-order sorting.
+    pub center: Vec3,
     /// The index of the [`MeshInputUniform`] in the GPU buffer for this mesh
     /// instance.
     pub current_uniform_index: InputUniformIndex,
@@ -1338,6 +1362,7 @@ pub fn extract_meshes_for_cpu_building(
             Has<NoAutomaticBatching>,
             Has<VisibilityRange>,
             Option<&RenderLayers>,
+            Option<&Aabb>,
         )>,
     >,
 ) {
@@ -1358,6 +1383,7 @@ pub fn extract_meshes_for_cpu_building(
             no_automatic_batching,
             visibility_range,
             render_layers,
+            aabb,
         )| {
             if !view_visibility.get() {
                 return;
@@ -1391,6 +1417,7 @@ pub fn extract_meshes_for_cpu_building(
                 not_shadow_caster,
                 no_automatic_batching,
                 render_layers,
+                aabb,
             );
 
             let world_from_local = transform.affine();
@@ -1597,6 +1624,7 @@ fn extract_mesh_for_gpu_building(
         not_shadow_caster,
         no_automatic_batching,
         render_layers,
+        aabb,
     );
 
     let lightmap_uv_rect = pack_lightmap_uv_rect(lightmap.map(|lightmap| lightmap.uv_rect));
diff --git a/crates/bevy_render/src/render_phase/rangefinder.rs b/crates/bevy_render/src/render_phase/rangefinder.rs
index 0a93651a41671..bc4fa303df865 100644
--- a/crates/bevy_render/src/render_phase/rangefinder.rs
+++ b/crates/bevy_render/src/render_phase/rangefinder.rs
@@ -15,36 +15,25 @@ impl ViewRangefinder3d {
         }
     }
 
-    /// Calculates the distance, or view-space `Z` value, for the given `translation`.
+    /// Calculates the distance, or view-space `Z` value, for the given world-space `position`.
     #[inline]
-    pub fn distance_translation(&self, translation: &Vec3) -> f32 {
-        // NOTE: row 2 of the inverse view matrix dotted with the translation from the model matrix
-        // gives the z component of translation of the mesh in view-space
-        self.view_from_world_row_2.dot(translation.extend(1.0))
-    }
-
-    /// Calculates the distance, or view-space `Z` value, for the given `transform`.
-    #[inline]
-    pub fn distance(&self, transform: &Mat4) -> f32 {
-        // NOTE: row 2 of the inverse view matrix dotted with column 3 of the model matrix
-        // gives the z component of translation of the mesh in view-space
-        self.view_from_world_row_2.dot(transform.col(3))
+    pub fn distance(&self, position: &Vec3) -> f32 {
+        // NOTE: row 2 of the inverse view matrix dotted with the world-space position
+        // gives the z component of the point in view-space
+        self.view_from_world_row_2.dot(position.extend(1.0))
     }
 }
 
 #[cfg(test)]
 mod tests {
     use super::ViewRangefinder3d;
-    use bevy_math::{Affine3A, Mat4, Vec3};
+    use bevy_math::{Affine3A, Vec3};
 
     #[test]
     fn distance() {
         let view_matrix = Affine3A::from_translation(Vec3::new(0.0, 0.0, -1.0));
         let rangefinder = ViewRangefinder3d::from_world_from_view(&view_matrix);
-        assert_eq!(rangefinder.distance(&Mat4::IDENTITY), 1.0);
-        assert_eq!(
-            rangefinder.distance(&Mat4::from_translation(Vec3::new(0.0, 0.0, 1.0))),
-            2.0
-        );
+        assert_eq!(rangefinder.distance(&Vec3::new(0., 0., 0.)), 1.0);
+        assert_eq!(rangefinder.distance(&Vec3::new(0., 0., 1.)), 2.0);
     }
 }
diff --git a/examples/shader_advanced/custom_render_phase.rs b/examples/shader_advanced/custom_render_phase.rs
index 866e96adca9da..8fd1cdc837539 100644
--- a/examples/shader_advanced/custom_render_phase.rs
+++ b/examples/shader_advanced/custom_render_phase.rs
@@ -549,7 +549,7 @@ fn queue_custom_meshes(
                     continue;
                 }
             };
-            let distance = rangefinder.distance_translation(&mesh_instance.translation);
+            let distance = rangefinder.distance(&mesh_instance.center);
             // At this point we have all the data we need to create a phase item and add it to our
             // phase
             custom_phase.add(Stencil3d {
diff --git a/examples/shader_advanced/custom_shader_instancing.rs b/examples/shader_advanced/custom_shader_instancing.rs
index 4be7a37c2bda4..b9d01fdf481e7 100644
--- a/examples/shader_advanced/custom_shader_instancing.rs
+++ b/examples/shader_advanced/custom_shader_instancing.rs
@@ -161,7 +161,7 @@ fn queue_custom(
                 entity: (entity, *main_entity),
                 pipeline,
                 draw_function: draw_custom,
-                distance: rangefinder.distance_translation(&mesh_instance.translation),
+                distance: rangefinder.distance(&mesh_instance.center),
                 batch_range: 0..1,
                 extra_index: PhaseItemExtraIndex::None,
                 indexed: true,

From 920e77bc3cc5f2e63a01e8e0772f3936d20e2eda Mon Sep 17 00:00:00 2001
From: andriyDev <andriydzikh@gmail.com>
Date: Sun, 14 Dec 2025 13:29:59 -0800
Subject: [PATCH 101/133] Replace path canonicalize with our own version.
 (#22026)

# Objective

- Renaming a file does not send a rename event to the asset system,
meaning that renamed files are not detected!
- In #18023 we canonicalized the file path to work with asset folder
paths that were relative. However `canonicalize` only works if the path
actually exists! During a rename the old path no longer exists, so
`canonicalize` fails and so we just silently `continue`.

## Solution

- Instead of using `canonicalize`, we write our own implementation using
the `std::path::absolute` which uses the environment's current directory
to create an absolute path (but doesn't collapse `..`), and then use our
`normalize_path` to collapse `..` into a "canonical path".
- The advantage is that this doesn't interact with the filesystem at
all, so **any** path will be able to be resolved - including the file
that was renamed (even thought that file path no longer exists).
- The disadvantage is that this no longer resolves symbolic links - I
don't see this as a big problem since I doubt our behavior makes sense
in that case (a sym link will probably just send us out of the assets
dir and give us a file path we won't know how to deal with).

## Testing

- I ran the `asset_processing` example. I made sure that renaming an
asset or directory resulted in a rename event.
- I also tried changing the `asset_processing` example to use a relative
path like #18022. Changes were correctly detected!
- I also checked that the embedded_watcher feature still works by making
sure that one of our embedded shaders were hot-reloaded.
---
 crates/bevy_asset/src/io/file/file_watcher.rs | 107 +++++++++---------
 1 file changed, 52 insertions(+), 55 deletions(-)

diff --git a/crates/bevy_asset/src/io/file/file_watcher.rs b/crates/bevy_asset/src/io/file/file_watcher.rs
index ebe508f5ca02c..e28320e1c1406 100644
--- a/crates/bevy_asset/src/io/file/file_watcher.rs
+++ b/crates/bevy_asset/src/io/file/file_watcher.rs
@@ -2,7 +2,7 @@ use crate::{
     io::{AssetSourceEvent, AssetWatcher},
     path::normalize_path,
 };
-use alloc::borrow::ToOwned;
+use alloc::{borrow::ToOwned, vec::Vec};
 use async_channel::Sender;
 use core::time::Duration;
 use notify_debouncer_full::{
@@ -35,7 +35,7 @@ impl FileWatcher {
         sender: Sender<AssetSourceEvent>,
         debounce_wait_time: Duration,
     ) -> Result<Self, notify::Error> {
-        let root = normalize_path(&path).canonicalize()?;
+        let root = make_absolute_path(&path)?;
         let watcher = new_asset_event_debouncer(
             path.clone(),
             debounce_wait_time,
@@ -51,6 +51,14 @@ impl FileWatcher {
 
 impl AssetWatcher for FileWatcher {}
 
+/// Converts the provided path into an absolute one.
+fn make_absolute_path(path: &Path) -> Result<PathBuf, std::io::Error> {
+    // We use `normalize` + `absolute` instead of `canonicalize` to avoid reading the filesystem to
+    // resolve the path. This also means that paths that no longer exist can still become absolute
+    // (e.g., a file that was renamed will have the "old" path no longer exist).
+    Ok(normalize_path(&std::path::absolute(path)?))
+}
+
 pub(crate) fn get_asset_path(root: &Path, absolute_path: &Path) -> (PathBuf, bool) {
     let relative_path = absolute_path.strip_prefix(root).unwrap_or_else(|_| {
         panic!(
@@ -85,40 +93,40 @@ pub(crate) fn new_asset_event_debouncer(
                 Ok(events) => {
                     handler.begin();
                     for event in events.iter() {
+                        // Make all the paths absolute here so we don't need to do it in each
+                        // handler.
+                        let paths = event
+                            .paths
+                            .iter()
+                            .map(PathBuf::as_path)
+                            .map(|p| {
+                                make_absolute_path(p).expect("paths from the debouncer are valid")
+                            })
+                            .collect::<Vec<_>>();
+
                         match event.kind {
                             notify::EventKind::Create(CreateKind::File) => {
-                                if let Some((path, is_meta)) = handler.get_path(&event.paths[0]) {
+                                if let Some((path, is_meta)) = handler.get_path(&paths[0]) {
                                     if is_meta {
-                                        handler.handle(
-                                            &event.paths,
-                                            AssetSourceEvent::AddedMeta(path),
-                                        );
+                                        handler.handle(&paths, AssetSourceEvent::AddedMeta(path));
                                     } else {
-                                        handler.handle(
-                                            &event.paths,
-                                            AssetSourceEvent::AddedAsset(path),
-                                        );
+                                        handler.handle(&paths, AssetSourceEvent::AddedAsset(path));
                                     }
                                 }
                             }
                             notify::EventKind::Create(CreateKind::Folder) => {
-                                if let Some((path, _)) = handler.get_path(&event.paths[0]) {
-                                    handler
-                                        .handle(&event.paths, AssetSourceEvent::AddedFolder(path));
+                                if let Some((path, _)) = handler.get_path(&paths[0]) {
+                                    handler.handle(&paths, AssetSourceEvent::AddedFolder(path));
                                 }
                             }
                             notify::EventKind::Access(AccessKind::Close(AccessMode::Write)) => {
-                                if let Some((path, is_meta)) = handler.get_path(&event.paths[0]) {
+                                if let Some((path, is_meta)) = handler.get_path(&paths[0]) {
                                     if is_meta {
-                                        handler.handle(
-                                            &event.paths,
-                                            AssetSourceEvent::ModifiedMeta(path),
-                                        );
+                                        handler
+                                            .handle(&paths, AssetSourceEvent::ModifiedMeta(path));
                                     } else {
-                                        handler.handle(
-                                            &event.paths,
-                                            AssetSourceEvent::ModifiedAsset(path),
-                                        );
+                                        handler
+                                            .handle(&paths, AssetSourceEvent::ModifiedAsset(path));
                                     }
                                 }
                             }
@@ -128,41 +136,39 @@ pub(crate) fn new_asset_event_debouncer(
                             // system.
                             notify::EventKind::Remove(RemoveKind::Any)
                             | notify::EventKind::Modify(ModifyKind::Name(RenameMode::From)) => {
-                                if let Some((path, is_meta)) = handler.get_path(&event.paths[0]) {
+                                if let Some((path, is_meta)) = handler.get_path(&paths[0]) {
                                     handler.handle(
-                                        &event.paths,
+                                        &paths,
                                         AssetSourceEvent::RemovedUnknown { path, is_meta },
                                     );
                                 }
                             }
                             notify::EventKind::Create(CreateKind::Any)
                             | notify::EventKind::Modify(ModifyKind::Name(RenameMode::To)) => {
-                                if let Some((path, is_meta)) = handler.get_path(&event.paths[0]) {
-                                    let asset_event = if event.paths[0].is_dir() {
+                                if let Some((path, is_meta)) = handler.get_path(&paths[0]) {
+                                    let asset_event = if paths[0].is_dir() {
                                         AssetSourceEvent::AddedFolder(path)
                                     } else if is_meta {
                                         AssetSourceEvent::AddedMeta(path)
                                     } else {
                                         AssetSourceEvent::AddedAsset(path)
                                     };
-                                    handler.handle(&event.paths, asset_event);
+                                    handler.handle(&paths, asset_event);
                                 }
                             }
                             notify::EventKind::Modify(ModifyKind::Name(RenameMode::Both)) => {
-                                let Some((old_path, old_is_meta)) =
-                                    handler.get_path(&event.paths[0])
+                                let Some((old_path, old_is_meta)) = handler.get_path(&paths[0])
                                 else {
                                     continue;
                                 };
-                                let Some((new_path, new_is_meta)) =
-                                    handler.get_path(&event.paths[1])
+                                let Some((new_path, new_is_meta)) = handler.get_path(&paths[1])
                                 else {
                                     continue;
                                 };
                                 // only the new "real" path is considered a directory
-                                if event.paths[1].is_dir() {
+                                if paths[1].is_dir() {
                                     handler.handle(
-                                        &event.paths,
+                                        &paths,
                                         AssetSourceEvent::RenamedFolder {
                                             old: old_path,
                                             new: new_path,
@@ -172,7 +178,7 @@ pub(crate) fn new_asset_event_debouncer(
                                     match (old_is_meta, new_is_meta) {
                                         (true, true) => {
                                             handler.handle(
-                                                &event.paths,
+                                                &paths,
                                                 AssetSourceEvent::RenamedMeta {
                                                     old: old_path,
                                                     new: new_path,
@@ -181,7 +187,7 @@ pub(crate) fn new_asset_event_debouncer(
                                         }
                                         (false, false) => {
                                             handler.handle(
-                                                &event.paths,
+                                                &paths,
                                                 AssetSourceEvent::RenamedAsset {
                                                     old: old_path,
                                                     new: new_path,
@@ -202,40 +208,32 @@ pub(crate) fn new_asset_event_debouncer(
                                 }
                             }
                             notify::EventKind::Modify(_) => {
-                                let Some((path, is_meta)) = handler.get_path(&event.paths[0])
-                                else {
+                                let Some((path, is_meta)) = handler.get_path(&paths[0]) else {
                                     continue;
                                 };
-                                if event.paths[0].is_dir() {
+                                if paths[0].is_dir() {
                                     // modified folder means nothing in this case
                                 } else if is_meta {
-                                    handler
-                                        .handle(&event.paths, AssetSourceEvent::ModifiedMeta(path));
+                                    handler.handle(&paths, AssetSourceEvent::ModifiedMeta(path));
                                 } else {
-                                    handler.handle(
-                                        &event.paths,
-                                        AssetSourceEvent::ModifiedAsset(path),
-                                    );
+                                    handler.handle(&paths, AssetSourceEvent::ModifiedAsset(path));
                                 };
                             }
                             notify::EventKind::Remove(RemoveKind::File) => {
-                                let Some((path, is_meta)) = handler.get_path(&event.paths[0])
-                                else {
+                                let Some((path, is_meta)) = handler.get_path(&paths[0]) else {
                                     continue;
                                 };
                                 if is_meta {
-                                    handler
-                                        .handle(&event.paths, AssetSourceEvent::RemovedMeta(path));
+                                    handler.handle(&paths, AssetSourceEvent::RemovedMeta(path));
                                 } else {
-                                    handler
-                                        .handle(&event.paths, AssetSourceEvent::RemovedAsset(path));
+                                    handler.handle(&paths, AssetSourceEvent::RemovedAsset(path));
                                 }
                             }
                             notify::EventKind::Remove(RemoveKind::Folder) => {
-                                let Some((path, _)) = handler.get_path(&event.paths[0]) else {
+                                let Some((path, _)) = handler.get_path(&paths[0]) else {
                                     continue;
                                 };
-                                handler.handle(&event.paths, AssetSourceEvent::RemovedFolder(path));
+                                handler.handle(&paths, AssetSourceEvent::RemovedFolder(path));
                             }
                             _ => {}
                         }
@@ -262,8 +260,7 @@ impl FilesystemEventHandler for FileEventHandler {
         self.last_event = None;
     }
     fn get_path(&self, absolute_path: &Path) -> Option<(PathBuf, bool)> {
-        let absolute_path = absolute_path.canonicalize().ok()?;
-        Some(get_asset_path(&self.root, &absolute_path))
+        Some(get_asset_path(&self.root, absolute_path))
     }
 
     fn handle(&mut self, _absolute_paths: &[PathBuf], event: AssetSourceEvent) {

From ae486872d80b58860fbb6fd1d6d9409509d2d5b0 Mon Sep 17 00:00:00 2001
From: Jannik Obermann <50554200+jannik4@users.noreply.github.com>
Date: Sun, 14 Dec 2025 22:30:20 +0100
Subject: [PATCH 102/133] Support MainPassResolutionOverride for Atmosphere
 (#22013)

# Objective

Fixes #21973

## Solution

Use `MainPassResolutionOverride` in `RenderSkyNode`.

## Testing

Tested with DLSS upscaling.
---
 crates/bevy_pbr/src/atmosphere/node.rs | 31 +++++++++++++++++---------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/crates/bevy_pbr/src/atmosphere/node.rs b/crates/bevy_pbr/src/atmosphere/node.rs
index c49debdba30f4..9f640b524b886 100644
--- a/crates/bevy_pbr/src/atmosphere/node.rs
+++ b/crates/bevy_pbr/src/atmosphere/node.rs
@@ -1,6 +1,8 @@
+use bevy_camera::{MainPassResolutionOverride, Viewport};
 use bevy_ecs::{query::QueryItem, system::lifetimeless::Read, world::World};
 use bevy_math::{UVec2, Vec3Swizzles};
 use bevy_render::{
+    camera::ExtractedCamera,
     diagnostic::RecordDiagnostics,
     extract_component::DynamicUniformIndex,
     render_graph::{NodeRunError, RenderGraphContext, RenderLabel, ViewNode},
@@ -165,6 +167,7 @@ pub(super) struct RenderSkyNode;
 
 impl ViewNode for RenderSkyNode {
     type ViewQuery = (
+        Read<ExtractedCamera>,
         Read<AtmosphereBindGroups>,
         Read<ViewTarget>,
         Read<DynamicUniformIndex<GpuAtmosphere>>,
@@ -173,6 +176,7 @@ impl ViewNode for RenderSkyNode {
         Read<ViewUniformOffset>,
         Read<ViewLightsUniformOffset>,
         Read<RenderSkyPipelineId>,
+        Option<Read<MainPassResolutionOverride>>,
     );
 
     fn run<'w>(
@@ -180,6 +184,7 @@ impl ViewNode for RenderSkyNode {
         _graph: &mut RenderGraphContext,
         render_context: &mut RenderContext<'w>,
         (
+            camera,
             atmosphere_bind_groups,
             view_target,
             atmosphere_uniforms_offset,
@@ -188,6 +193,7 @@ impl ViewNode for RenderSkyNode {
             view_uniforms_offset,
             lights_uniforms_offset,
             render_sky_pipeline_id,
+            resolution_override,
         ): QueryItem<'w, '_, Self::ViewQuery>,
         world: &'w World,
     ) -> Result<(), NodeRunError> {
@@ -200,19 +206,22 @@ impl ViewNode for RenderSkyNode {
 
         let diagnostics = render_context.diagnostic_recorder();
 
-        let mut render_sky_pass =
-            render_context
-                .command_encoder()
-                .begin_render_pass(&RenderPassDescriptor {
-                    label: Some("render_sky"),
-                    color_attachments: &[Some(view_target.get_color_attachment())],
-                    depth_stencil_attachment: None,
-                    timestamp_writes: None,
-                    occlusion_query_set: None,
-                });
+        let mut render_sky_pass = render_context.begin_tracked_render_pass(RenderPassDescriptor {
+            label: Some("render_sky"),
+            color_attachments: &[Some(view_target.get_color_attachment())],
+            depth_stencil_attachment: None,
+            timestamp_writes: None,
+            occlusion_query_set: None,
+        });
         let pass_span = diagnostics.pass_span(&mut render_sky_pass, "render_sky");
 
-        render_sky_pass.set_pipeline(render_sky_pipeline);
+        if let Some(viewport) =
+            Viewport::from_viewport_and_override(camera.viewport.as_ref(), resolution_override)
+        {
+            render_sky_pass.set_camera_viewport(&viewport);
+        }
+
+        render_sky_pass.set_render_pipeline(render_sky_pipeline);
         render_sky_pass.set_bind_group(
             0,
             &atmosphere_bind_groups.render_sky,

From 63af390571e959cf17cbcad01f4c7a57c03ada39 Mon Sep 17 00:00:00 2001
From: ickshonpe <david.curthoys@googlemail.com>
Date: Sun, 14 Dec 2025 21:30:53 +0000
Subject: [PATCH 103/133] scrollbar helper functions (#21937)

# Objective

Add helper functions to `ComputedNode` to compute the scrollbar areas of
a UI node.

## Solution

Add `horizontal_scrollbar` and `vertical_scrollbar` functions to
`ComputedNode`. If a scrollbar is present, these return an option
wrapping a tuple of the node-centered bounding `Rect` for the scrollbar,
and the start and end points of the thumb.

## Testing

Includes a couple of tests in the `uinode` module.

---------

Co-authored-by: Kevin Chen <chen.kevin.f@gmail.com>
---
 crates/bevy_ui/src/ui_node.rs | 170 ++++++++++++++++++++++++++++++++++
 1 file changed, 170 insertions(+)

diff --git a/crates/bevy_ui/src/ui_node.rs b/crates/bevy_ui/src/ui_node.rs
index ac086d02a5556..95a4391ee6ab2 100644
--- a/crates/bevy_ui/src/ui_node.rs
+++ b/crates/bevy_ui/src/ui_node.rs
@@ -298,6 +298,74 @@ impl ComputedNode {
 
         clip_rect
     }
+
+    const fn compute_thumb(
+        gutter_min: f32,
+        content_length: f32,
+        gutter_length: f32,
+        scroll_position: f32,
+    ) -> [f32; 2] {
+        if content_length <= gutter_length {
+            return [gutter_min, gutter_min + gutter_length];
+        }
+        let thumb_len = gutter_length * gutter_length / content_length;
+        let thumb_min = gutter_min + scroll_position * gutter_length / content_length;
+        [thumb_min, thumb_min + thumb_len]
+    }
+
+    /// Compute the bounds of the horizontal scrollbar and the thumb
+    /// in object-centered coordinates.
+    pub fn horizontal_scrollbar(&self) -> Option<(Rect, [f32; 2])> {
+        if self.scrollbar_size.y <= 0. {
+            return None;
+        }
+        let content_inset = self.content_inset();
+        let half_size = 0.5 * self.size;
+        let min_x = -half_size.x + content_inset.left;
+        let max_x = half_size.x - content_inset.right - self.scrollbar_size.x;
+        let max_y = half_size.y - content_inset.bottom;
+        let min_y = max_y - self.scrollbar_size.y;
+        let gutter = Rect {
+            min: Vec2::new(min_x, min_y),
+            max: Vec2::new(max_x, max_y),
+        };
+        Some((
+            gutter,
+            Self::compute_thumb(
+                gutter.min.x,
+                self.content_size.x,
+                gutter.size().x,
+                self.scroll_position.x,
+            ),
+        ))
+    }
+
+    /// Compute the bounds of the vertical scrollbar and the thumb
+    /// in object-centered coordinates.
+    pub fn vertical_scrollbar(&self) -> Option<(Rect, [f32; 2])> {
+        if self.scrollbar_size.x <= 0. {
+            return None;
+        }
+        let content_inset = self.content_inset();
+        let half_size = 0.5 * self.size;
+        let max_x = half_size.x - content_inset.right;
+        let min_x = max_x - self.scrollbar_size.x;
+        let min_y = -half_size.y + content_inset.top;
+        let max_y = half_size.y - content_inset.bottom - self.scrollbar_size.y;
+        let gutter = Rect {
+            min: Vec2::new(min_x, min_y),
+            max: Vec2::new(max_x, max_y),
+        };
+        Some((
+            gutter,
+            Self::compute_thumb(
+                gutter.min.y,
+                self.content_size.y,
+                gutter.size().y,
+                self.scroll_position.y,
+            ),
+        ))
+    }
 }
 
 impl ComputedNode {
@@ -2916,6 +2984,10 @@ impl ComputedUiRenderTargetInfo {
 
 #[cfg(test)]
 mod tests {
+    use bevy_math::Rect;
+    use bevy_math::Vec2;
+
+    use crate::ComputedNode;
     use crate::GridPlacement;
 
     #[test]
@@ -2943,4 +3015,102 @@ mod tests {
         assert_eq!(GridPlacement::start_span(3, 5).get_end(), None);
         assert_eq!(GridPlacement::end_span(-4, 12).get_start(), None);
     }
+
+    #[test]
+    fn computed_node_both_scrollbars() {
+        let node = ComputedNode {
+            size: Vec2::splat(100.),
+            scrollbar_size: Vec2::splat(10.),
+            content_size: Vec2::splat(100.),
+            ..Default::default()
+        };
+
+        let (gutter, thumb) = node.horizontal_scrollbar().unwrap();
+        assert_eq!(
+            gutter,
+            Rect {
+                min: Vec2::new(-50., 40.),
+                max: Vec2::new(40., 50.)
+            }
+        );
+        assert_eq!(thumb, [-50., 31.]);
+
+        let (gutter, thumb) = node.vertical_scrollbar().unwrap();
+        assert_eq!(
+            gutter,
+            Rect {
+                min: Vec2::new(40., -50.),
+                max: Vec2::new(50., 40.)
+            }
+        );
+        assert_eq!(thumb, [-50., 31.]);
+    }
+
+    #[test]
+    fn computed_node_single_horizontal_scrollbar() {
+        let mut node = ComputedNode {
+            size: Vec2::splat(100.),
+            scrollbar_size: Vec2::new(0., 10.),
+            content_size: Vec2::new(200., 100.),
+            scroll_position: Vec2::new(0., 0.),
+            ..Default::default()
+        };
+
+        assert_eq!(None, node.vertical_scrollbar());
+
+        let (gutter, thumb) = node.horizontal_scrollbar().unwrap();
+        assert_eq!(
+            gutter,
+            Rect {
+                min: Vec2::new(-50., 40.),
+                max: Vec2::new(50., 50.)
+            }
+        );
+        assert_eq!(thumb, [-50., 0.]);
+
+        node.scroll_position.x += 100.;
+        let (gutter, thumb) = node.horizontal_scrollbar().unwrap();
+        assert_eq!(
+            gutter,
+            Rect {
+                min: Vec2::new(-50., 40.),
+                max: Vec2::new(50., 50.)
+            }
+        );
+        assert_eq!(thumb, [0., 50.]);
+    }
+
+    #[test]
+    fn computed_node_single_vertical_scrollbar() {
+        let mut node = ComputedNode {
+            size: Vec2::splat(100.),
+            scrollbar_size: Vec2::new(10., 0.),
+            content_size: Vec2::new(100., 200.),
+            scroll_position: Vec2::new(0., 0.),
+            ..Default::default()
+        };
+
+        assert_eq!(None, node.horizontal_scrollbar());
+
+        let (gutter, thumb) = node.vertical_scrollbar().unwrap();
+        assert_eq!(
+            gutter,
+            Rect {
+                min: Vec2::new(40., -50.),
+                max: Vec2::new(50., 50.)
+            }
+        );
+        assert_eq!(thumb, [-50., 0.]);
+
+        node.scroll_position.y += 100.;
+        let (gutter, thumb) = node.vertical_scrollbar().unwrap();
+        assert_eq!(
+            gutter,
+            Rect {
+                min: Vec2::new(40., -50.),
+                max: Vec2::new(50., 50.)
+            }
+        );
+        assert_eq!(thumb, [0., 50.]);
+    }
 }

From 67633b34da677a825ea3c6900b884d012d56999b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?charlotte=20=F0=9F=8C=B8?= <charlotte.c.mcelwain@gmail.com>
Date: Sun, 14 Dec 2025 13:33:48 -0800
Subject: [PATCH 104/133] Convert RenderTarget to `Component` (#20917)

# Objective

#20830 created the possibility that we may want to have render targets
that produce a number of outputs, e.g. depth and normals. This is a
first step towards something like that (e.g. a `RendersTo` relation) by
converting `RenderTarget` to be a component. This is also useful for
out-of-tree render targets that may want to do something like
`#[require(RenderTarget::Image)]` once BSN lands.

## Solution

Make it a component.
---
 crates/bevy_camera/src/camera.rs              |  9 ++--
 crates/bevy_core_pipeline/src/oit/mod.rs      | 14 +++---
 crates/bevy_dev_tools/src/picking_debug.rs    | 11 ++---
 crates/bevy_picking/src/backend.rs            | 19 +++++---
 crates/bevy_picking/src/pointer.rs            |  6 +--
 crates/bevy_render/src/camera.rs              | 48 +++++++++++--------
 crates/bevy_sprite/src/picking_backend.rs     |  7 +--
 crates/bevy_ui/src/focus.rs                   |  8 ++--
 crates/bevy_ui/src/picking_backend.rs         | 23 +++++----
 crates/bevy_ui/src/ui_node.rs                 | 12 ++---
 crates/bevy_ui/src/update.rs                  | 32 +++----------
 crates/bevy_ui/src/widget/viewport.rs         | 16 +++----
 crates/bevy_ui_render/src/lib.rs              |  6 +--
 examples/2d/pixel_grid_snap.rs                |  2 +-
 examples/3d/mirror.rs                         | 12 ++---
 examples/3d/render_to_texture.rs              |  3 +-
 examples/app/headless_renderer.rs             |  6 +--
 .../render_depth_to_texture.rs                | 14 +++---
 examples/ui/render_ui_to_texture.rs           |  5 +-
 examples/ui/viewport_node.rs                  |  2 +-
 examples/window/monitor_info.rs               |  8 +---
 examples/window/multi_window_text.rs          |  7 +--
 examples/window/multiple_windows.rs           |  5 +-
 .../render_target_component.md                | 25 ++++++++++
 24 files changed, 151 insertions(+), 149 deletions(-)
 create mode 100644 release-content/migration-guides/render_target_component.md

diff --git a/crates/bevy_camera/src/camera.rs b/crates/bevy_camera/src/camera.rs
index dd5f1019abe6e..073e6a06b2f35 100644
--- a/crates/bevy_camera/src/camera.rs
+++ b/crates/bevy_camera/src/camera.rs
@@ -343,7 +343,8 @@ pub enum ViewportConversionError {
     CameraMainTextureUsages,
     VisibleEntities,
     Transform,
-    Visibility
+    Visibility,
+    RenderTarget
 )]
 pub struct Camera {
     /// If set, this camera will render to the given [`Viewport`] rectangle within the configured [`RenderTarget`].
@@ -356,8 +357,7 @@ pub struct Camera {
     /// Computed values for this camera, such as the projection matrix and the render target size.
     #[reflect(ignore, clone)]
     pub computed: ComputedCameraValues,
-    /// The "target" that this camera will render to.
-    pub target: RenderTarget,
+    // todo: reflect this when #6042 lands
     /// The [`CameraOutputMode`] for this camera.
     pub output_mode: CameraOutputMode,
     /// Controls when MSAA writeback occurs for this camera.
@@ -385,7 +385,6 @@ impl Default for Camera {
             order: 0,
             viewport: None,
             computed: Default::default(),
-            target: Default::default(),
             output_mode: Default::default(),
             msaa_writeback: MsaaWriteback::default(),
             clear_color: Default::default(),
@@ -811,7 +810,7 @@ impl Default for CameraOutputMode {
 
 /// The "target" that a [`Camera`] will render to. For example, this could be a `Window`
 /// swapchain or an [`Image`].
-#[derive(Debug, Clone, Reflect, From)]
+#[derive(Component, Debug, Clone, Reflect, From)]
 #[reflect(Clone)]
 pub enum RenderTarget {
     /// Window to which the camera's view is rendered.
diff --git a/crates/bevy_core_pipeline/src/oit/mod.rs b/crates/bevy_core_pipeline/src/oit/mod.rs
index 80763ee37bf3f..51c07dff717c6 100644
--- a/crates/bevy_core_pipeline/src/oit/mod.rs
+++ b/crates/bevy_core_pipeline/src/oit/mod.rs
@@ -1,7 +1,7 @@
 //! Order Independent Transparency (OIT) for 3d rendering. See [`OrderIndependentTransparencyPlugin`] for more details.
 
 use bevy_app::prelude::*;
-use bevy_camera::{Camera, Camera3d};
+use bevy_camera::{Camera3d, RenderTarget};
 use bevy_ecs::{component::*, lifecycle::ComponentHook, prelude::*};
 use bevy_math::UVec2;
 use bevy_platform::collections::HashSet;
@@ -135,8 +135,8 @@ impl Plugin for OrderIndependentTransparencyPlugin {
 // bevy reuses the same depth texture so we need to set this on all cameras with the same render target.
 fn configure_depth_texture_usages(
     p: Query<Entity, With<PrimaryWindow>>,
-    cameras: Query<(&Camera, Has<OrderIndependentTransparencySettings>)>,
-    mut new_cameras: Query<(&mut Camera3d, &Camera), Added<Camera3d>>,
+    cameras: Query<(&RenderTarget, Has<OrderIndependentTransparencySettings>)>,
+    mut new_cameras: Query<(&mut Camera3d, &RenderTarget), Added<Camera3d>>,
 ) {
     if new_cameras.is_empty() {
         return;
@@ -145,15 +145,15 @@ fn configure_depth_texture_usages(
     // Find all the render target that potentially uses OIT
     let primary_window = p.single().ok();
     let mut render_target_has_oit = <HashSet<_>>::default();
-    for (camera, has_oit) in &cameras {
+    for (render_target, has_oit) in &cameras {
         if has_oit {
-            render_target_has_oit.insert(camera.target.normalize(primary_window));
+            render_target_has_oit.insert(render_target.normalize(primary_window));
         }
     }
 
     // Update the depth texture usage for cameras with a render target that has OIT
-    for (mut camera_3d, camera) in &mut new_cameras {
-        if render_target_has_oit.contains(&camera.target.normalize(primary_window)) {
+    for (mut camera_3d, render_target) in &mut new_cameras {
+        if render_target_has_oit.contains(&render_target.normalize(primary_window)) {
             let mut usages = TextureUsages::from(camera_3d.depth_texture_usages);
             usages |= TextureUsages::RENDER_ATTACHMENT | TextureUsages::TEXTURE_BINDING;
             camera_3d.depth_texture_usages = usages.into();
diff --git a/crates/bevy_dev_tools/src/picking_debug.rs b/crates/bevy_dev_tools/src/picking_debug.rs
index 40c98d2537e35..515dbfc222946 100644
--- a/crates/bevy_dev_tools/src/picking_debug.rs
+++ b/crates/bevy_dev_tools/src/picking_debug.rs
@@ -2,7 +2,7 @@
 
 use bevy_app::prelude::*;
 use bevy_camera::visibility::Visibility;
-use bevy_camera::Camera;
+use bevy_camera::{Camera, RenderTarget};
 use bevy_color::prelude::*;
 use bevy_ecs::prelude::*;
 use bevy_picking::backend::HitData;
@@ -243,7 +243,7 @@ pub fn update_debug_data(
 /// Draw text on each cursor with debug info
 pub fn debug_draw(
     mut commands: Commands,
-    camera_query: Query<(Entity, &Camera)>,
+    camera_query: Query<(Entity, &Camera, &RenderTarget)>,
     primary_window: Query<Entity, With<bevy_window::PrimaryWindow>>,
     pointers: Query<(Entity, &PointerId, &PointerDebug)>,
     scale: Res<UiScale>,
@@ -254,9 +254,8 @@ pub fn debug_draw(
         };
         let text = format!("{id:?}\n{debug}");
 
-        for (camera, _) in camera_query.iter().filter(|(_, camera)| {
-            camera
-                .target
+        for (camera, _, _) in camera_query.iter().filter(|(_, _, render_target)| {
+            render_target
                 .normalize(primary_window.single().ok())
                 .is_some_and(|target| target == pointer_location.target)
         }) {
@@ -264,7 +263,7 @@ pub fn debug_draw(
             if let Some(viewport) = camera_query
                 .get(camera)
                 .ok()
-                .and_then(|(_, camera)| camera.logical_viewport_rect())
+                .and_then(|(_, camera, _)| camera.logical_viewport_rect())
             {
                 pointer_pos -= viewport.min;
             }
diff --git a/crates/bevy_picking/src/backend.rs b/crates/bevy_picking/src/backend.rs
index 1e5fe64b2f97f..83ba7fc010e96 100644
--- a/crates/bevy_picking/src/backend.rs
+++ b/crates/bevy_picking/src/backend.rs
@@ -129,7 +129,7 @@ pub mod ray {
     //! Types and systems for constructing rays from cameras and pointers.
 
     use crate::backend::prelude::{PointerId, PointerLocation};
-    use bevy_camera::Camera;
+    use bevy_camera::{Camera, RenderTarget};
     use bevy_ecs::prelude::*;
     use bevy_math::Ray3d;
     use bevy_platform::collections::{hash_map::Iter, HashMap};
@@ -196,20 +196,24 @@ pub mod ray {
         pub fn repopulate(
             mut ray_map: ResMut<Self>,
             primary_window_entity: Query<Entity, With<PrimaryWindow>>,
-            cameras: Query<(Entity, &Camera, &GlobalTransform)>,
+            cameras: Query<(Entity, &Camera, &RenderTarget, &GlobalTransform)>,
             pointers: Query<(&PointerId, &PointerLocation)>,
         ) {
             ray_map.map.clear();
 
-            for (camera_entity, camera, camera_tfm) in &cameras {
+            for (camera_entity, camera, render_target, camera_tfm) in &cameras {
                 if !camera.is_active {
                     continue;
                 }
 
                 for (&pointer_id, pointer_loc) in &pointers {
-                    if let Some(ray) =
-                        make_ray(&primary_window_entity, camera, camera_tfm, pointer_loc)
-                    {
+                    if let Some(ray) = make_ray(
+                        &primary_window_entity,
+                        camera,
+                        render_target,
+                        camera_tfm,
+                        pointer_loc,
+                    ) {
                         ray_map
                             .map
                             .insert(RayId::new(camera_entity, pointer_id), ray);
@@ -222,11 +226,12 @@ pub mod ray {
     fn make_ray(
         primary_window_entity: &Query<Entity, With<PrimaryWindow>>,
         camera: &Camera,
+        render_target: &RenderTarget,
         camera_tfm: &GlobalTransform,
         pointer_loc: &PointerLocation,
     ) -> Option<Ray3d> {
         let pointer_loc = pointer_loc.location()?;
-        if !pointer_loc.is_in_viewport(camera, primary_window_entity) {
+        if !pointer_loc.is_in_viewport(camera, render_target, primary_window_entity) {
             return None;
         }
         camera
diff --git a/crates/bevy_picking/src/pointer.rs b/crates/bevy_picking/src/pointer.rs
index 3320817c4249a..1ef36a323346c 100644
--- a/crates/bevy_picking/src/pointer.rs
+++ b/crates/bevy_picking/src/pointer.rs
@@ -8,8 +8,8 @@
 //! The purpose of this module is primarily to provide a common interface that can be
 //! driven by lower-level input devices and consumed by higher-level interaction systems.
 
-use bevy_camera::Camera;
 use bevy_camera::NormalizedRenderTarget;
+use bevy_camera::{Camera, RenderTarget};
 use bevy_ecs::prelude::*;
 use bevy_input::mouse::MouseScrollUnit;
 use bevy_math::Vec2;
@@ -223,10 +223,10 @@ impl Location {
     pub fn is_in_viewport(
         &self,
         camera: &Camera,
+        render_target: &RenderTarget,
         primary_window: &Query<Entity, With<PrimaryWindow>>,
     ) -> bool {
-        if camera
-            .target
+        if render_target
             .normalize(Some(match primary_window.single() {
                 Ok(w) => w,
                 Err(_) => return false,
diff --git a/crates/bevy_render/src/camera.rs b/crates/bevy_render/src/camera.rs
index 84988a2fc6534..4ff8e6d456021 100644
--- a/crates/bevy_render/src/camera.rs
+++ b/crates/bevy_render/src/camera.rs
@@ -21,7 +21,7 @@ use bevy_camera::{
     visibility::{self, RenderLayers, VisibleEntities},
     Camera, Camera2d, Camera3d, CameraMainTextureUsages, CameraOutputMode, CameraUpdateSystems,
     ClearColor, ClearColorConfig, Exposure, ManualTextureViewHandle, MsaaWriteback,
-    NormalizedRenderTarget, Projection, RenderTargetInfo, Viewport,
+    NormalizedRenderTarget, Projection, RenderTarget, RenderTargetInfo, Viewport,
 };
 use bevy_derive::{Deref, DerefMut};
 use bevy_ecs::{
@@ -312,7 +312,7 @@ pub fn camera_system(
     windows: Query<(Entity, &Window)>,
     images: Res<Assets<Image>>,
     manual_texture_views: Res<ManualTextureViews>,
-    mut cameras: Query<(&mut Camera, &mut Projection)>,
+    mut cameras: Query<(&mut Camera, &RenderTarget, &mut Projection)>,
 ) -> Result<(), BevyError> {
     let primary_window = primary_window.iter().next();
 
@@ -333,13 +333,13 @@ pub fn camera_system(
         })
         .collect();
 
-    for (mut camera, mut camera_projection) in &mut cameras {
+    for (mut camera, render_target, mut camera_projection) in &mut cameras {
         let mut viewport_size = camera
             .viewport
             .as_ref()
             .map(|viewport| viewport.physical_size);
 
-        if let Some(normalized_target) = &camera.target.normalize(primary_window)
+        if let Some(normalized_target) = render_target.normalize(primary_window)
             && (normalized_target.is_changed(&changed_window_ids, &changed_image_handles)
                 || camera.is_added()
                 || camera_projection.is_changed()
@@ -423,18 +423,21 @@ pub fn extract_cameras(
             Entity,
             RenderEntity,
             &Camera,
+            &RenderTarget,
             &CameraRenderGraph,
             &GlobalTransform,
             &VisibleEntities,
             &Frustum,
-            Has<Hdr>,
-            Option<&ColorGrading>,
-            Option<&Exposure>,
-            Option<&TemporalJitter>,
-            Option<&MipBias>,
-            Option<&RenderLayers>,
-            Option<&Projection>,
-            Has<NoIndirectDrawing>,
+            (
+                Has<Hdr>,
+                Option<&ColorGrading>,
+                Option<&Exposure>,
+                Option<&TemporalJitter>,
+                Option<&MipBias>,
+                Option<&RenderLayers>,
+                Option<&Projection>,
+                Has<NoIndirectDrawing>,
+            ),
         )>,
     >,
     primary_window: Extract<Query<Entity, With<PrimaryWindow>>>,
@@ -457,18 +460,21 @@ pub fn extract_cameras(
         main_entity,
         render_entity,
         camera,
+        render_target,
         camera_render_graph,
         transform,
         visible_entities,
         frustum,
-        hdr,
-        color_grading,
-        exposure,
-        temporal_jitter,
-        mip_bias,
-        render_layers,
-        projection,
-        no_indirect_drawing,
+        (
+            hdr,
+            color_grading,
+            exposure,
+            temporal_jitter,
+            mip_bias,
+            render_layers,
+            projection,
+            no_indirect_drawing,
+        ),
     ) in query.iter()
     {
         if !camera.is_active {
@@ -523,7 +529,7 @@ pub fn extract_cameras(
             let mut commands = commands.entity(render_entity);
             commands.insert((
                 ExtractedCamera {
-                    target: camera.target.normalize(primary_window),
+                    target: render_target.normalize(primary_window),
                     viewport: camera.viewport.clone(),
                     physical_viewport_size: Some(viewport_size),
                     physical_target_size: Some(target_size),
diff --git a/crates/bevy_sprite/src/picking_backend.rs b/crates/bevy_sprite/src/picking_backend.rs
index 9dbd3ac2d413a..1ad650c1a1fdd 100644
--- a/crates/bevy_sprite/src/picking_backend.rs
+++ b/crates/bevy_sprite/src/picking_backend.rs
@@ -15,7 +15,7 @@ use bevy_app::prelude::*;
 use bevy_asset::prelude::*;
 use bevy_camera::{
     visibility::{RenderLayers, ViewVisibility},
-    Camera, Projection,
+    Camera, Projection, RenderTarget,
 };
 use bevy_color::Alpha;
 use bevy_ecs::prelude::*;
@@ -88,6 +88,7 @@ fn sprite_picking(
     cameras: Query<(
         Entity,
         &Camera,
+        &RenderTarget,
         &GlobalTransform,
         &Projection,
         Has<SpritePickingCamera>,
@@ -135,6 +136,7 @@ fn sprite_picking(
         let Ok((
             cam_entity,
             camera,
+            render_target,
             cam_transform,
             Projection::Orthographic(cam_ortho),
             cam_can_pick,
@@ -156,8 +158,7 @@ fn sprite_picking(
             None
         })?;
 
-        if camera
-            .target
+        if render_target
             .normalize(primary_window)
             .is_none_or(|x| x != location.target)
         {
diff --git a/crates/bevy_ui/src/focus.rs b/crates/bevy_ui/src/focus.rs
index 41c133697f590..0f3f0e029a887 100644
--- a/crates/bevy_ui/src/focus.rs
+++ b/crates/bevy_ui/src/focus.rs
@@ -2,7 +2,7 @@ use crate::{
     ui_transform::UiGlobalTransform, ComputedNode, ComputedUiTargetCamera, Node, OverrideClip,
     UiStack,
 };
-use bevy_camera::{visibility::InheritedVisibility, Camera, NormalizedRenderTarget};
+use bevy_camera::{visibility::InheritedVisibility, Camera, NormalizedRenderTarget, RenderTarget};
 use bevy_ecs::{
     change_detection::DetectChangesMut,
     entity::{ContainsEntity, Entity},
@@ -149,7 +149,7 @@ pub struct NodeQuery {
 pub fn ui_focus_system(
     mut hovered_nodes: Local<Vec<Entity>>,
     mut state: Local<State>,
-    camera_query: Query<(Entity, &Camera)>,
+    camera_query: Query<(Entity, &Camera, &RenderTarget)>,
     primary_window: Query<Entity, With<PrimaryWindow>>,
     windows: Query<&Window>,
     mouse_button_input: Res<ButtonInput<MouseButton>>,
@@ -189,10 +189,10 @@ pub fn ui_focus_system(
 
     let camera_cursor_positions: HashMap<Entity, Vec2> = camera_query
         .iter()
-        .filter_map(|(entity, camera)| {
+        .filter_map(|(entity, camera, render_target)| {
             // Interactions are only supported for cameras rendering to a window.
             let Some(NormalizedRenderTarget::Window(window_ref)) =
-                camera.target.normalize(primary_window)
+                render_target.normalize(primary_window)
             else {
                 return None;
             };
diff --git a/crates/bevy_ui/src/picking_backend.rs b/crates/bevy_ui/src/picking_backend.rs
index 46d29e7f1a4b2..1028cfb6b0e5a 100644
--- a/crates/bevy_ui/src/picking_backend.rs
+++ b/crates/bevy_ui/src/picking_backend.rs
@@ -25,7 +25,7 @@
 
 use crate::{clip_check_recursive, prelude::*, ui_transform::UiGlobalTransform, UiStack};
 use bevy_app::prelude::*;
-use bevy_camera::{visibility::InheritedVisibility, Camera};
+use bevy_camera::{visibility::InheritedVisibility, Camera, RenderTarget};
 use bevy_ecs::{prelude::*, query::QueryData};
 use bevy_math::Vec2;
 use bevy_platform::collections::HashMap;
@@ -102,7 +102,7 @@ pub struct NodeQuery {
 /// we need for determining picking.
 pub fn ui_picking(
     pointers: Query<(&PointerId, &PointerLocation)>,
-    camera_query: Query<(Entity, &Camera, Has<UiPickingCamera>)>,
+    camera_query: Query<(Entity, &Camera, &RenderTarget, Has<UiPickingCamera>)>,
     primary_window: Query<Entity, With<PrimaryWindow>>,
     settings: Res<UiPickingSettings>,
     ui_stack: Res<UiStack>,
@@ -122,13 +122,16 @@ pub fn ui_picking(
     {
         // This pointer is associated with a render target, which could be used by multiple
         // cameras. We want to ensure we return all cameras with a matching target.
-        for (entity, camera, _) in camera_query.iter().filter(|(_, camera, cam_can_pick)| {
-            (!settings.require_markers || *cam_can_pick)
-                && camera
-                    .target
-                    .normalize(primary_window.single().ok())
-                    .is_some_and(|target| target == pointer_location.target)
-        }) {
+        for (entity, camera, _, _) in
+            camera_query
+                .iter()
+                .filter(|(_, _, render_target, cam_can_pick)| {
+                    (!settings.require_markers || *cam_can_pick)
+                        && render_target
+                            .normalize(primary_window.single().ok())
+                            .is_some_and(|target| target == pointer_location.target)
+                })
+        {
             let mut pointer_pos =
                 pointer_location.position * camera.target_scaling_factor().unwrap_or(1.);
             if let Some(viewport) = camera.physical_viewport_rect() {
@@ -272,7 +275,7 @@ pub fn ui_picking(
 
         let order = camera_query
             .get(*camera)
-            .map(|(_, cam, _)| cam.order)
+            .map(|(_, cam, _, _)| cam.order)
             .unwrap_or_default() as f32
             + 0.5; // bevy ui can run on any camera, it's a special case
 
diff --git a/crates/bevy_ui/src/ui_node.rs b/crates/bevy_ui/src/ui_node.rs
index 95a4391ee6ab2..e4b18e6f53c22 100644
--- a/crates/bevy_ui/src/ui_node.rs
+++ b/crates/bevy_ui/src/ui_node.rs
@@ -2882,9 +2882,9 @@ impl UiTargetCamera {
 ///     commands.spawn((
 ///         Camera2d,
 ///         Camera {
-///             target: RenderTarget::Window(WindowRef::Entity(another_window)),
 ///             ..Default::default()
 ///         },
+///         RenderTarget::Window(WindowRef::Entity(another_window)),
 ///         // We add the Marker here so all Ui will spawn in
 ///         // another window if no UiTargetCamera is specified
 ///         IsDefaultUiCamera
@@ -2896,7 +2896,7 @@ pub struct IsDefaultUiCamera;
 
 #[derive(SystemParam)]
 pub struct DefaultUiCamera<'w, 's> {
-    cameras: Query<'w, 's, (Entity, &'static Camera)>,
+    cameras: Query<'w, 's, (Entity, &'static Camera, &'static RenderTarget)>,
     default_cameras: Query<'w, 's, Entity, (With<Camera>, With<IsDefaultUiCamera>)>,
     primary_window: Query<'w, 's, Entity, With<PrimaryWindow>>,
 }
@@ -2910,15 +2910,15 @@ impl<'w, 's> DefaultUiCamera<'w, 's> {
             }
             self.cameras
                 .iter()
-                .filter(|(_, c)| match c.target {
+                .filter(|(_, _, render_target)| match render_target {
                     RenderTarget::Window(WindowRef::Primary) => true,
                     RenderTarget::Window(WindowRef::Entity(w)) => {
-                        self.primary_window.get(w).is_ok()
+                        self.primary_window.get(*w).is_ok()
                     }
                     _ => false,
                 })
-                .max_by_key(|(e, c)| (c.order, *e))
-                .map(|(e, _)| e)
+                .max_by_key(|(e, c, _)| (c.order, *e))
+                .map(|(e, _, _)| e)
         })
     }
 }
diff --git a/crates/bevy_ui/src/update.rs b/crates/bevy_ui/src/update.rs
index 77659effabcf1..e1e789577c53f 100644
--- a/crates/bevy_ui/src/update.rs
+++ b/crates/bevy_ui/src/update.rs
@@ -181,11 +181,11 @@ pub fn propagate_ui_target_cameras(
 pub(crate) fn update_cameras_test_system(
     primary_window: Query<Entity, bevy_ecs::query::With<bevy_window::PrimaryWindow>>,
     window_query: Query<&bevy_window::Window>,
-    mut camera_query: Query<&mut Camera>,
+    mut camera_query: Query<(&mut Camera, &bevy_camera::RenderTarget)>,
 ) {
     let primary_window = primary_window.single().ok();
-    for mut camera in camera_query.iter_mut() {
-        let Some(camera_target) = camera.target.normalize(primary_window) else {
+    for (mut camera, render_target) in camera_query.iter_mut() {
+        let Some(camera_target) = render_target.normalize(primary_window) else {
             continue;
         };
         let bevy_camera::NormalizedRenderTarget::Window(window_ref) = camera_target else {
@@ -217,13 +217,11 @@ mod tests {
     use bevy_app::HierarchyPropagatePlugin;
     use bevy_app::PostUpdate;
     use bevy_app::PropagateSet;
-    use bevy_camera::Camera;
     use bevy_camera::Camera2d;
     use bevy_camera::RenderTarget;
     use bevy_ecs::hierarchy::ChildOf;
     use bevy_ecs::schedule::IntoScheduleConfigs;
     use bevy_math::UVec2;
-    use bevy_utils::default;
     use bevy_window::PrimaryWindow;
     use bevy_window::Window;
     use bevy_window::WindowRef;
@@ -326,13 +324,7 @@ mod tests {
 
         let camera1 = world.spawn((Camera2d, IsDefaultUiCamera)).id();
         let camera2 = world
-            .spawn((
-                Camera2d,
-                Camera {
-                    target: RenderTarget::Window(WindowRef::Entity(window_2)),
-                    ..default()
-                },
-            ))
+            .spawn((Camera2d, RenderTarget::Window(WindowRef::Entity(window_2))))
             .id();
 
         let uinode1a = world.spawn(Node::default()).id();
@@ -393,13 +385,7 @@ mod tests {
 
         let camera1 = world.spawn((Camera2d, IsDefaultUiCamera)).id();
         let camera2 = world
-            .spawn((
-                Camera2d,
-                Camera {
-                    target: RenderTarget::Window(WindowRef::Entity(window_2)),
-                    ..default()
-                },
-            ))
+            .spawn((Camera2d, RenderTarget::Window(WindowRef::Entity(window_2))))
             .id();
 
         let uinode = world.spawn(Node::default()).id();
@@ -490,13 +476,7 @@ mod tests {
 
         let camera1 = world.spawn((Camera2d, IsDefaultUiCamera)).id();
         let camera2 = world
-            .spawn((
-                Camera2d,
-                Camera {
-                    target: RenderTarget::Window(WindowRef::Entity(window_2)),
-                    ..default()
-                },
-            ))
+            .spawn((Camera2d, RenderTarget::Window(WindowRef::Entity(window_2))))
             .id();
 
         // `UiTargetCamera` is ignored on non-root UI nodes
diff --git a/crates/bevy_ui/src/widget/viewport.rs b/crates/bevy_ui/src/widget/viewport.rs
index 5f4efb3f4f33d..3b02e1748d84a 100644
--- a/crates/bevy_ui/src/widget/viewport.rs
+++ b/crates/bevy_ui/src/widget/viewport.rs
@@ -1,5 +1,5 @@
 use bevy_asset::Assets;
-use bevy_camera::Camera;
+use bevy_camera::{Camera, RenderTarget};
 use bevy_ecs::{
     component::Component,
     entity::Entity,
@@ -26,7 +26,7 @@ use bevy_reflect::Reflect;
 use crate::UiGlobalTransform;
 use crate::{ComputedNode, Node};
 
-/// Component used to render a [`Camera::target`]  to a node.
+/// Component used to render a [`RenderTarget`]  to a node.
 ///
 /// # See Also
 ///
@@ -67,7 +67,7 @@ pub fn viewport_picking(
         &ComputedNode,
         &UiGlobalTransform,
     )>,
-    camera_query: Query<&Camera>,
+    camera_query: Query<(&Camera, &RenderTarget)>,
     hover_map: Res<HoverMap>,
     pointer_state: Res<PointerState>,
     mut pointer_inputs: MessageReader<PointerInput>,
@@ -110,7 +110,7 @@ pub fn viewport_picking(
             viewport_pointer_location.location = None;
             continue;
         };
-        let Ok(camera) = camera_query.get(viewport.camera) else {
+        let Ok((camera, render_target)) = camera_query.get(viewport.camera) else {
             continue;
         };
         let Some(cam_viewport_size) = camera.logical_viewport_size() else {
@@ -124,7 +124,7 @@ pub fn viewport_picking(
         let top_left = node_rect.min * computed_node.inverse_scale_factor();
         let logical_size = computed_node.size() * computed_node.inverse_scale_factor();
 
-        let Some(target) = camera.target.as_image() else {
+        let Some(target) = render_target.as_image() else {
             continue;
         };
 
@@ -156,14 +156,14 @@ pub fn update_viewport_render_target_size(
         (&ViewportNode, &ComputedNode),
         Or<(Changed<ComputedNode>, Changed<ViewportNode>)>,
     >,
-    camera_query: Query<&Camera>,
+    camera_query: Query<&RenderTarget>,
     mut images: ResMut<Assets<Image>>,
 ) {
     for (viewport, computed_node) in &viewport_query {
-        let camera = camera_query.get(viewport.camera).unwrap();
+        let render_target = camera_query.get(viewport.camera).unwrap();
         let size = computed_node.size();
 
-        let Some(image_handle) = camera.target.as_image() else {
+        let Some(image_handle) = render_target.as_image() else {
             continue;
         };
         let size = size.as_uvec2().max(UVec2::ONE).to_extents();
diff --git a/crates/bevy_ui_render/src/lib.rs b/crates/bevy_ui_render/src/lib.rs
index c79c8c43e405d..fb8b5c9b51af5 100644
--- a/crates/bevy_ui_render/src/lib.rs
+++ b/crates/bevy_ui_render/src/lib.rs
@@ -20,7 +20,7 @@ pub mod ui_texture_slice_pipeline;
 mod debug_overlay;
 
 use bevy_camera::visibility::InheritedVisibility;
-use bevy_camera::{Camera, Camera2d, Camera3d};
+use bevy_camera::{Camera, Camera2d, Camera3d, RenderTarget};
 use bevy_reflect::prelude::ReflectDefault;
 use bevy_reflect::Reflect;
 use bevy_shader::load_shader_library;
@@ -839,7 +839,7 @@ pub fn extract_ui_camera_view(
 pub fn extract_viewport_nodes(
     mut commands: Commands,
     mut extracted_uinodes: ResMut<ExtractedUiNodes>,
-    camera_query: Extract<Query<&Camera>>,
+    camera_query: Extract<Query<(&Camera, &RenderTarget)>>,
     uinode_query: Extract<
         Query<(
             Entity,
@@ -869,7 +869,7 @@ pub fn extract_viewport_nodes(
         let Some(image) = camera_query
             .get(viewport_node.camera)
             .ok()
-            .and_then(|camera| camera.target.as_image())
+            .and_then(|(_, render_target)| render_target.as_image())
         else {
             continue;
         };
diff --git a/examples/2d/pixel_grid_snap.rs b/examples/2d/pixel_grid_snap.rs
index 08d1436ecb359..607dcdf568877 100644
--- a/examples/2d/pixel_grid_snap.rs
+++ b/examples/2d/pixel_grid_snap.rs
@@ -116,10 +116,10 @@ fn setup_camera(mut commands: Commands, mut images: ResMut<Assets<Image>>) {
         Camera {
             // Render before the "main pass" camera
             order: -1,
-            target: RenderTarget::Image(image_handle.clone().into()),
             clear_color: ClearColorConfig::Custom(GRAY.into()),
             ..default()
         },
+        RenderTarget::Image(image_handle.clone().into()),
         Msaa::Off,
         InGameCamera,
         PIXEL_PERFECT_LAYERS,
diff --git a/examples/3d/mirror.rs b/examples/3d/mirror.rs
index b6d0cf8cebadf..6b5b9d71cc9ba 100644
--- a/examples/3d/mirror.rs
+++ b/examples/3d/mirror.rs
@@ -2,6 +2,8 @@
 
 use std::f32::consts::FRAC_PI_2;
 
+use crate::widgets::{RadioButton, WidgetClickEvent, WidgetClickSender};
+use bevy::camera::RenderTarget;
 use bevy::{
     asset::RenderAssetUsages,
     color::palettes::css::GREEN,
@@ -16,8 +18,6 @@ use bevy::{
     window::{PrimaryWindow, WindowResized},
 };
 
-use crate::widgets::{RadioButton, WidgetClickEvent, WidgetClickSender};
-
 #[path = "../helpers/widgets.rs"]
 mod widgets;
 
@@ -263,13 +263,13 @@ fn spawn_mirror_camera(
         Camera3d::default(),
         Camera {
             order: -1,
-            target: mirror_render_target.clone().into(),
             // Reflecting the model across the mirror will flip the winding of
             // all the polygons. Therefore, in order to properly backface cull,
             // we need to turn on `invert_culling`.
             invert_culling: true,
             ..default()
         },
+        RenderTarget::Image(mirror_render_target.clone().into()),
         mirror_camera_transform,
         Projection::Perspective(mirror_camera_projection),
         MirrorCamera,
@@ -387,7 +387,7 @@ fn calculate_mirror_camera_transform_and_projection(
 /// material whenever the window size changes.
 fn handle_window_resize_messages(
     windows_query: Query<&Window>,
-    mut mirror_cameras_query: Query<&mut Camera, With<MirrorCamera>>,
+    mut mirror_cameras_query: Query<&mut RenderTarget, With<MirrorCamera>>,
     mut images: ResMut<Assets<Image>>,
     mut mirror_image: ResMut<MirrorImage>,
     mut screen_space_texture_materials: ResMut<
@@ -410,8 +410,8 @@ fn handle_window_resize_messages(
 
     mirror_image.0 = image.clone();
 
-    for mut mirror_camera in mirror_cameras_query.iter_mut() {
-        mirror_camera.target = image.clone().into();
+    for mut target in mirror_cameras_query.iter_mut() {
+        *target = image.clone().into();
     }
 
     for (_, material) in screen_space_texture_materials.iter_mut() {
diff --git a/examples/3d/render_to_texture.rs b/examples/3d/render_to_texture.rs
index f6b02ff98300d..26cae98f38c25 100644
--- a/examples/3d/render_to_texture.rs
+++ b/examples/3d/render_to_texture.rs
@@ -2,6 +2,7 @@
 
 use std::f32::consts::PI;
 
+use bevy::camera::RenderTarget;
 use bevy::{camera::visibility::RenderLayers, prelude::*, render::render_resource::TextureFormat};
 
 fn main() {
@@ -66,10 +67,10 @@ fn setup(
         Camera {
             // render before the "main pass" camera
             order: -1,
-            target: image_handle.clone().into(),
             clear_color: Color::WHITE.into(),
             ..default()
         },
+        RenderTarget::Image(image_handle.clone().into()),
         Transform::from_translation(Vec3::new(0.0, 0.0, 15.0)).looking_at(Vec3::ZERO, Vec3::Y),
         first_pass_layer,
     ));
diff --git a/examples/app/headless_renderer.rs b/examples/app/headless_renderer.rs
index b6aa5bf674636..7dc9639ed9539 100644
--- a/examples/app/headless_renderer.rs
+++ b/examples/app/headless_renderer.rs
@@ -194,11 +194,7 @@ fn setup(
 
     commands.spawn((
         Camera3d::default(),
-        Camera {
-            // render to image
-            target: render_target,
-            ..default()
-        },
+        render_target,
         Tonemapping::None,
         Transform::from_xyz(-2.5, 4.5, 9.0).looking_at(Vec3::ZERO, Vec3::Y),
     ));
diff --git a/examples/shader_advanced/render_depth_to_texture.rs b/examples/shader_advanced/render_depth_to_texture.rs
index babeebb28c5a0..6cb1d82aa4d8f 100644
--- a/examples/shader_advanced/render_depth_to_texture.rs
+++ b/examples/shader_advanced/render_depth_to_texture.rs
@@ -221,18 +221,18 @@ fn spawn_depth_only_camera(commands: &mut Commands) {
         Camera3d::default(),
         Transform::from_xyz(-4.0, -5.0, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
         Camera {
-            // We specify no color render target, for maximum efficiency.
-            target: RenderTarget::None {
-                // When specifying no render target, we must manually specify
-                // the viewport size. Otherwise, Bevy won't know how big to make
-                // the depth buffer.
-                size: UVec2::splat(DEPTH_TEXTURE_SIZE),
-            },
             // Make sure that we render from this depth-only camera *before*
             // rendering from the main camera.
             order: -1,
             ..Camera::default()
         },
+        // We specify no color render target, for maximum efficiency.
+        RenderTarget::None {
+            // When specifying no render target, we must manually specify
+            // the viewport size. Otherwise, Bevy won't know how big to make
+            // the depth buffer.
+            size: UVec2::splat(DEPTH_TEXTURE_SIZE),
+        },
         // We need to disable multisampling or the depth texture will be
         // multisampled, which adds complexity we don't care about for this
         // demo.
diff --git a/examples/ui/render_ui_to_texture.rs b/examples/ui/render_ui_to_texture.rs
index cc702dbf39a57..d2ff76bad34b4 100644
--- a/examples/ui/render_ui_to_texture.rs
+++ b/examples/ui/render_ui_to_texture.rs
@@ -67,9 +67,9 @@ fn setup(
             Camera {
                 // render before the "main pass" camera
                 order: -1,
-                target: RenderTarget::Image(image_handle.clone().into()),
                 ..default()
             },
+            RenderTarget::Image(image_handle.clone().into()),
         ))
         .id();
 
@@ -176,7 +176,7 @@ fn drive_diegetic_pointer(
     mut raycast: MeshRayCast,
     rays: Res<RayMap>,
     cubes: Query<&Mesh3d, With<Cube>>,
-    ui_camera: Query<&Camera, With<Camera2d>>,
+    ui_camera: Query<&RenderTarget, With<Camera2d>>,
     primary_window: Query<Entity, With<PrimaryWindow>>,
     windows: Query<(Entity, &Window)>,
     images: Res<Assets<Image>>,
@@ -188,7 +188,6 @@ fn drive_diegetic_pointer(
     // from 0 to 1, to pixel coordinates.
     let target = ui_camera
         .single()?
-        .target
         .normalize(primary_window.single().ok())
         .unwrap();
     let target_info = target
diff --git a/examples/ui/viewport_node.rs b/examples/ui/viewport_node.rs
index 913ba765f4c5e..3a8d2f4679db9 100644
--- a/examples/ui/viewport_node.rs
+++ b/examples/ui/viewport_node.rs
@@ -50,9 +50,9 @@ fn test(
             Camera {
                 // Render this camera before our UI camera
                 order: -1,
-                target: RenderTarget::Image(image_handle.clone().into()),
                 ..default()
             },
+            RenderTarget::Image(image_handle.clone().into()),
         ))
         .id();
 
diff --git a/examples/window/monitor_info.rs b/examples/window/monitor_info.rs
index 18500c10a1a66..c5965c3b83161 100644
--- a/examples/window/monitor_info.rs
+++ b/examples/window/monitor_info.rs
@@ -56,13 +56,7 @@ fn update(
             .id();
 
         let camera = commands
-            .spawn((
-                Camera2d,
-                Camera {
-                    target: RenderTarget::Window(WindowRef::Entity(window)),
-                    ..default()
-                },
-            ))
+            .spawn((Camera2d, RenderTarget::Window(WindowRef::Entity(window))))
             .id();
 
         let info_text = format!(
diff --git a/examples/window/multi_window_text.rs b/examples/window/multi_window_text.rs
index 448b67fd12b0a..bd7af84625511 100644
--- a/examples/window/multi_window_text.rs
+++ b/examples/window/multi_window_text.rs
@@ -47,11 +47,8 @@ fn setup_scene(mut commands: Commands) {
             Camera2d,
             // This camera will only render entities belonging to render layer `1`.
             RenderLayers::layer(1),
-            Camera {
-                // Without an explicit render target, this camera would also target the primary window.
-                target: RenderTarget::Window(WindowRef::Entity(secondary_window)),
-                ..default()
-            },
+            // Without an explicit render target, this camera would also target the primary window.
+            RenderTarget::Window(WindowRef::Entity(secondary_window)),
         ))
         .id();
 
diff --git a/examples/window/multiple_windows.rs b/examples/window/multiple_windows.rs
index 46d4a708a5a04..b920b29eada06 100644
--- a/examples/window/multiple_windows.rs
+++ b/examples/window/multiple_windows.rs
@@ -40,10 +40,7 @@ fn setup_scene(mut commands: Commands, asset_server: Res<AssetServer>) {
         .spawn((
             Camera3d::default(),
             Transform::from_xyz(6.0, 0.0, 0.0).looking_at(Vec3::ZERO, Vec3::Y),
-            Camera {
-                target: RenderTarget::Window(WindowRef::Entity(second_window)),
-                ..default()
-            },
+            RenderTarget::Window(WindowRef::Entity(second_window)),
         ))
         .id();
 
diff --git a/release-content/migration-guides/render_target_component.md b/release-content/migration-guides/render_target_component.md
new file mode 100644
index 0000000000000..9896cebbb5e4c
--- /dev/null
+++ b/release-content/migration-guides/render_target_component.md
@@ -0,0 +1,25 @@
+---
+title: "`RenderTarget` is now a component"
+pull_requests: [20917]
+---
+
+`RenderTarget` has been moved from a field on `Camera` to a separate required component.
+
+When spawning a camera, specify `RenderTarget` as a component instead of setting `camera.target`:
+
+```rust
+// before
+commands.spawn((
+    Camera3d::default(),
+    Camera {
+        target: RenderTarget::Image(image_handle.into()),
+        ..default()
+    },
+));
+
+// after
+commands.spawn((
+    Camera3d::default(),
+    RenderTarget::Image(image_handle.into()),
+));
+```

From e3ebf3a8a9a3d10088a7c303a6b9840d56a1dda7 Mon Sep 17 00:00:00 2001
From: Aevyrie <aevyrie@gmail.com>
Date: Sun, 14 Dec 2025 13:35:27 -0800
Subject: [PATCH 105/133] Recompute AABBs (#18742)

# Objective

- Recompute AABBs when meshes change.
- Optimize sprite AABB re-computation to avoid component insertion where
mutation is possible.
- Fixes #4294 and closes #7971

## Solution

- Implement the things.

## Testing

- CI
---
 crates/bevy_camera/src/visibility/mod.rs | 54 ++++++++++++---
 crates/bevy_sprite/src/lib.rs            | 86 ++++++++++++++++++++----
 2 files changed, 117 insertions(+), 23 deletions(-)

diff --git a/crates/bevy_camera/src/visibility/mod.rs b/crates/bevy_camera/src/visibility/mod.rs
index 76d3f3db02122..9a4d496693823 100644
--- a/crates/bevy_camera/src/visibility/mod.rs
+++ b/crates/bevy_camera/src/visibility/mod.rs
@@ -11,7 +11,8 @@ pub use range::*;
 pub use render_layers::*;
 
 use bevy_app::{Plugin, PostUpdate};
-use bevy_asset::Assets;
+use bevy_asset::prelude::AssetChanged;
+use bevy_asset::{AssetEventSystems, Assets};
 use bevy_ecs::{hierarchy::validate_parent_has_component, prelude::*};
 use bevy_reflect::{std_traits::ReflectDefault, Reflect};
 use bevy_transform::{components::GlobalTransform, TransformSystems};
@@ -351,12 +352,7 @@ impl Plugin for VisibilityPlugin {
             .register_required_components::<Mesh2d, VisibilityClass>()
             .configure_sets(
                 PostUpdate,
-                (
-                    CalculateBounds
-                        .ambiguous_with(mark_3d_meshes_as_changed_if_their_assets_changed),
-                    UpdateFrusta,
-                    VisibilityPropagate,
-                )
+                (UpdateFrusta, VisibilityPropagate)
                     .before(CheckVisibility)
                     .after(TransformSystems::Propagate),
             )
@@ -364,6 +360,15 @@ impl Plugin for VisibilityPlugin {
                 PostUpdate,
                 MarkNewlyHiddenEntitiesInvisible.after(CheckVisibility),
             )
+            .configure_sets(
+                PostUpdate,
+                (CalculateBounds)
+                    .before(CheckVisibility)
+                    .after(TransformSystems::Propagate)
+                    .after(AssetEventSystems)
+                    .ambiguous_with(CalculateBounds)
+                    .ambiguous_with(mark_3d_meshes_as_changed_if_their_assets_changed),
+            )
             .init_resource::<PreviousVisibleEntities>()
             .add_systems(
                 PostUpdate,
@@ -384,6 +389,14 @@ impl Plugin for VisibilityPlugin {
     }
 }
 
+/// Add this component to an entity to prevent its `AABB` from being automatically recomputed.
+///
+/// This is useful if entities are already spawned with a correct `Aabb` component, or you have
+/// many entities and want to avoid the cost of table scans searching for entities that need to have
+/// their AABB recomputed.
+#[derive(Component, Clone, Debug, Default, Reflect)]
+pub struct NoAutoAabb;
+
 /// Computes and adds an [`Aabb`] component to entities with a
 /// [`Mesh3d`] component and without a [`NoFrustumCulling`] component.
 ///
@@ -391,15 +404,38 @@ impl Plugin for VisibilityPlugin {
 pub fn calculate_bounds(
     mut commands: Commands,
     meshes: Res<Assets<Mesh>>,
-    without_aabb: Query<(Entity, &Mesh3d), (Without<Aabb>, Without<NoFrustumCulling>)>,
+    new_aabb: Query<
+        (Entity, &Mesh3d),
+        (
+            Without<Aabb>,
+            Without<NoFrustumCulling>,
+            Without<NoAutoAabb>,
+        ),
+    >,
+    mut update_aabb: Query<
+        (&Mesh3d, &mut Aabb),
+        (
+            Or<(AssetChanged<Mesh3d>, Changed<Mesh3d>)>,
+            Without<NoFrustumCulling>,
+            Without<NoAutoAabb>,
+        ),
+    >,
 ) {
-    for (entity, mesh_handle) in &without_aabb {
+    for (entity, mesh_handle) in &new_aabb {
         if let Some(mesh) = meshes.get(mesh_handle)
             && let Some(aabb) = mesh.compute_aabb()
         {
             commands.entity(entity).try_insert(aabb);
         }
     }
+
+    update_aabb
+        .par_iter_mut()
+        .for_each(|(mesh_handle, mut old_aabb)| {
+            if let Some(aabb) = meshes.get(mesh_handle).and_then(MeshAabb::compute_aabb) {
+                *old_aabb = aabb;
+            }
+        });
 }
 
 /// Updates [`Frustum`].
diff --git a/crates/bevy_sprite/src/lib.rs b/crates/bevy_sprite/src/lib.rs
index a2a5d594d0b79..5c6e9fa755021 100644
--- a/crates/bevy_sprite/src/lib.rs
+++ b/crates/bevy_sprite/src/lib.rs
@@ -52,8 +52,11 @@ pub use text2d::*;
 pub use texture_slice::*;
 
 use bevy_app::prelude::*;
+use bevy_asset::prelude::AssetChanged;
+use bevy_camera::visibility::NoAutoAabb;
 use bevy_ecs::prelude::*;
 use bevy_image::{Image, TextureAtlasLayout, TextureAtlasPlugin};
+use bevy_math::Vec2;
 
 /// Adds support for 2D sprites.
 #[derive(Default)]
@@ -107,24 +110,62 @@ pub fn calculate_bounds_2d(
     meshes: Res<Assets<Mesh>>,
     images: Res<Assets<Image>>,
     atlases: Res<Assets<TextureAtlasLayout>>,
-    meshes_without_aabb: Query<(Entity, &Mesh2d), (Without<Aabb>, Without<NoFrustumCulling>)>,
-    sprites_to_recalculate_aabb: Query<
+    new_mesh_aabb: Query<
+        (Entity, &Mesh2d),
+        (
+            Without<Aabb>,
+            Without<NoFrustumCulling>,
+            Without<NoAutoAabb>,
+        ),
+    >,
+    mut update_mesh_aabb: Query<
+        (&Mesh2d, &mut Aabb),
+        (
+            Or<(AssetChanged<Mesh2d>, Changed<Mesh2d>)>,
+            Without<NoFrustumCulling>,
+            Without<NoAutoAabb>,
+            Without<Sprite>, // disjoint mutable query
+        ),
+    >,
+    new_sprite_aabb: Query<
         (Entity, &Sprite, &Anchor),
         (
-            Or<(Without<Aabb>, Changed<Sprite>, Changed<Anchor>)>,
+            Without<Aabb>,
             Without<NoFrustumCulling>,
+            Without<NoAutoAabb>,
+        ),
+    >,
+    mut update_sprite_aabb: Query<
+        (&Sprite, &mut Aabb, &Anchor),
+        (
+            Or<(Changed<Sprite>, Changed<Anchor>)>,
+            Without<NoFrustumCulling>,
+            Without<NoAutoAabb>,
+            Without<Mesh2d>, // disjoint mutable query
         ),
     >,
 ) {
-    for (entity, mesh_handle) in &meshes_without_aabb {
-        if let Some(mesh) = meshes.get(&mesh_handle.0)
+    // New meshes require inserting a component
+    for (entity, mesh_handle) in &new_mesh_aabb {
+        if let Some(mesh) = meshes.get(mesh_handle)
             && let Some(aabb) = mesh.compute_aabb()
         {
             commands.entity(entity).try_insert(aabb);
         }
     }
-    for (entity, sprite, anchor) in &sprites_to_recalculate_aabb {
-        if let Some(size) = sprite
+
+    // Updated meshes can take the fast path with parallel component mutation
+    update_mesh_aabb
+        .par_iter_mut()
+        .for_each(|(mesh_handle, mut aabb)| {
+            if let Some(new_aabb) = meshes.get(mesh_handle).and_then(MeshAabb::compute_aabb) {
+                aabb.set_if_neq(new_aabb);
+            }
+        });
+
+    // Sprite helper
+    let sprite_size = |sprite: &Sprite| -> Option<Vec2> {
+        sprite
             .custom_size
             .or_else(|| sprite.rect.map(|rect| rect.size()))
             .or_else(|| match &sprite.texture_atlas {
@@ -135,14 +176,31 @@ pub fn calculate_bounds_2d(
                     .texture_rect(&atlases)
                     .map(|rect| rect.size().as_vec2()),
             })
-        {
-            let aabb = Aabb {
-                center: (-anchor.as_vec() * size).extend(0.0).into(),
-                half_extents: (0.5 * size).extend(0.0).into(),
-            };
-            commands.entity(entity).try_insert(aabb);
-        }
+    };
+
+    // New sprites require inserting a component
+    for (size, (entity, anchor)) in new_sprite_aabb
+        .iter()
+        .filter_map(|(entity, sprite, anchor)| sprite_size(sprite).zip(Some((entity, anchor))))
+    {
+        let aabb = Aabb {
+            center: (-anchor.as_vec() * size).extend(0.0).into(),
+            half_extents: (0.5 * size).extend(0.0).into(),
+        };
+        commands.entity(entity).try_insert(aabb);
     }
+
+    // Updated sprites can take the fast path with parallel component mutation
+    update_sprite_aabb
+        .par_iter_mut()
+        .for_each(|(sprite, mut aabb, anchor)| {
+            if let Some(size) = sprite_size(sprite) {
+                aabb.set_if_neq(Aabb {
+                    center: (-anchor.as_vec() * size).extend(0.0).into(),
+                    half_extents: (0.5 * size).extend(0.0).into(),
+                });
+            }
+        });
 }
 
 #[cfg(test)]

From 2e9ef6988ce8d332fc704f0313d089900ffcf270 Mon Sep 17 00:00:00 2001
From: Luo Zhihao <luo_zhihao@outlook.com>
Date: Mon, 15 Dec 2025 05:39:02 +0800
Subject: [PATCH 106/133] Fix non-srgb `RenderTarget::Image` (#22090)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Fixes
https://github.com/bevyengine/bevy/pull/22031#issuecomment-3640036590.
Fixes #15201.
#22031 makes `ViewTarget::out_texture_format` to return the underlying
texture’s format, which causes some issues:
1. `ExtractedWindow::swap_chain_texture_view` always uses srgb view. But
the underlying swap chain texture in WebGPU can be Bgra8unorm, leading
to format mismatch between the render pipeline and the render pass.
2. We can no longer use srgb view for non-srgb target texture, it will
panic due to incompatible pipeline:
```rs
    let mut image = Image::new_target_texture(512, 512, TextureFormat::Rgba8Unorm);
    image.texture_view_descriptor = Some(bevy_render::render_resource::TextureViewDescriptor {
        format: Some(TextureFormat::Rgba8UnormSrgb),
        ..Default::default()
    });
    image.texture_descriptor.view_formats = &[TextureFormat::Rgba8UnormSrgb];
```

## Solution

Reverts #22031.
Renames some `format` to `view_format` explicitly.
Adds `view_format` to `GpuImage` and `Image::new_target_texture` so we
can make render pipeline match render pass texture view.

## Testing
Tested `render_to_texture` and `screenshot` examples on linux and
webgpu.
<details>
<summary>The rendered Rgba8Unorm texture with or without srgb view in
MeshMaterial3d looks the same, but the underlaying data is
different:</summary>

With srgb view:
<img width="912" height="640" alt="屏幕截图_20251212_223355"
src="https://github.com/user-attachments/assets/d320bad9-d11a-4d3d-93a9-879af6413658"
/>

Without srgb view:
<img width="912" height="640" alt="屏幕截图_20251212_223313"
src="https://github.com/user-attachments/assets/522abf23-9c85-468d-8d17-a94495ee4452"
/>

</details>
---
 .../bevy_core_pipeline/src/upscaling/mod.rs   |   2 +-
 crates/bevy_image/src/image.rs                | 141 +++++++++++++++++-
 crates/bevy_pbr/src/render/mesh.rs            |   1 +
 crates/bevy_render/src/camera.rs              |  12 +-
 .../bevy_render/src/texture/fallback_image.rs |   1 +
 crates/bevy_render/src/texture/gpu_image.rs   |   5 +-
 .../src/texture/manual_texture_view.rs        |   4 +-
 .../src/texture/texture_attachment.rs         |   6 +-
 crates/bevy_render/src/view/mod.rs            |  10 +-
 crates/bevy_render/src/view/window/mod.rs     |  19 ++-
 .../bevy_render/src/view/window/screenshot.rs |  31 ++--
 examples/3d/render_to_texture.rs              |   7 +-
 examples/app/headless_renderer.rs             |   4 +-
 .../shader/compute_shader_game_of_life.rs     |   2 +-
 14 files changed, 199 insertions(+), 46 deletions(-)

diff --git a/crates/bevy_core_pipeline/src/upscaling/mod.rs b/crates/bevy_core_pipeline/src/upscaling/mod.rs
index 3c46f22a56a08..053ce5007a8a7 100644
--- a/crates/bevy_core_pipeline/src/upscaling/mod.rs
+++ b/crates/bevy_core_pipeline/src/upscaling/mod.rs
@@ -72,7 +72,7 @@ fn prepare_view_upscaling_pipelines(
         };
 
         let key = BlitPipelineKey {
-            texture_format: view_target.out_texture_format(),
+            texture_format: view_target.out_texture_view_format(),
             blend_state,
             samples: 1,
         };
diff --git a/crates/bevy_image/src/image.rs b/crates/bevy_image/src/image.rs
index aeeb58b1a7d98..ad2db13e2b182 100644
--- a/crates/bevy_image/src/image.rs
+++ b/crates/bevy_image/src/image.rs
@@ -38,6 +38,130 @@ impl BevyDefault for TextureFormat {
     }
 }
 
+/// Trait used to provide texture srgb view formats with static lifetime for `TextureDescriptor.view_formats`.
+pub trait TextureSrgbViewFormats {
+    /// Returns the srgb view formats for a type.
+    fn srgb_view_formats(&self) -> &'static [TextureFormat];
+}
+
+impl TextureSrgbViewFormats for TextureFormat {
+    /// Returns the srgb view formats if the format has an srgb variant, otherwise returns an empty slice.
+    ///
+    /// The return result covers all the results of [`TextureFormat::add_srgb_suffix`](wgpu_types::TextureFormat::add_srgb_suffix).
+    fn srgb_view_formats(&self) -> &'static [TextureFormat] {
+        match self {
+            TextureFormat::Rgba8Unorm => &[TextureFormat::Rgba8UnormSrgb],
+            TextureFormat::Bgra8Unorm => &[TextureFormat::Bgra8UnormSrgb],
+            TextureFormat::Bc1RgbaUnorm => &[TextureFormat::Bc1RgbaUnormSrgb],
+            TextureFormat::Bc2RgbaUnorm => &[TextureFormat::Bc2RgbaUnormSrgb],
+            TextureFormat::Bc3RgbaUnorm => &[TextureFormat::Bc3RgbaUnormSrgb],
+            TextureFormat::Bc7RgbaUnorm => &[TextureFormat::Bc7RgbaUnormSrgb],
+            TextureFormat::Etc2Rgb8Unorm => &[TextureFormat::Etc2Rgb8UnormSrgb],
+            TextureFormat::Etc2Rgb8A1Unorm => &[TextureFormat::Etc2Rgb8A1UnormSrgb],
+            TextureFormat::Etc2Rgba8Unorm => &[TextureFormat::Etc2Rgba8UnormSrgb],
+            TextureFormat::Astc {
+                block: wgpu_types::AstcBlock::B4x4,
+                channel: wgpu_types::AstcChannel::Unorm,
+            } => &[TextureFormat::Astc {
+                block: wgpu_types::AstcBlock::B4x4,
+                channel: wgpu_types::AstcChannel::UnormSrgb,
+            }],
+            TextureFormat::Astc {
+                block: wgpu_types::AstcBlock::B5x4,
+                channel: wgpu_types::AstcChannel::Unorm,
+            } => &[TextureFormat::Astc {
+                block: wgpu_types::AstcBlock::B5x4,
+                channel: wgpu_types::AstcChannel::UnormSrgb,
+            }],
+            TextureFormat::Astc {
+                block: wgpu_types::AstcBlock::B5x5,
+                channel: wgpu_types::AstcChannel::Unorm,
+            } => &[TextureFormat::Astc {
+                block: wgpu_types::AstcBlock::B5x5,
+                channel: wgpu_types::AstcChannel::UnormSrgb,
+            }],
+            TextureFormat::Astc {
+                block: wgpu_types::AstcBlock::B6x5,
+                channel: wgpu_types::AstcChannel::Unorm,
+            } => &[TextureFormat::Astc {
+                block: wgpu_types::AstcBlock::B6x5,
+                channel: wgpu_types::AstcChannel::UnormSrgb,
+            }],
+            TextureFormat::Astc {
+                block: wgpu_types::AstcBlock::B6x6,
+                channel: wgpu_types::AstcChannel::Unorm,
+            } => &[TextureFormat::Astc {
+                block: wgpu_types::AstcBlock::B6x6,
+                channel: wgpu_types::AstcChannel::UnormSrgb,
+            }],
+            TextureFormat::Astc {
+                block: wgpu_types::AstcBlock::B8x5,
+                channel: wgpu_types::AstcChannel::Unorm,
+            } => &[TextureFormat::Astc {
+                block: wgpu_types::AstcBlock::B8x5,
+                channel: wgpu_types::AstcChannel::UnormSrgb,
+            }],
+            TextureFormat::Astc {
+                block: wgpu_types::AstcBlock::B8x6,
+                channel: wgpu_types::AstcChannel::Unorm,
+            } => &[TextureFormat::Astc {
+                block: wgpu_types::AstcBlock::B8x6,
+                channel: wgpu_types::AstcChannel::UnormSrgb,
+            }],
+            TextureFormat::Astc {
+                block: wgpu_types::AstcBlock::B8x8,
+                channel: wgpu_types::AstcChannel::Unorm,
+            } => &[TextureFormat::Astc {
+                block: wgpu_types::AstcBlock::B8x8,
+                channel: wgpu_types::AstcChannel::UnormSrgb,
+            }],
+            TextureFormat::Astc {
+                block: wgpu_types::AstcBlock::B10x5,
+                channel: wgpu_types::AstcChannel::Unorm,
+            } => &[TextureFormat::Astc {
+                block: wgpu_types::AstcBlock::B10x5,
+                channel: wgpu_types::AstcChannel::UnormSrgb,
+            }],
+            TextureFormat::Astc {
+                block: wgpu_types::AstcBlock::B10x6,
+                channel: wgpu_types::AstcChannel::Unorm,
+            } => &[TextureFormat::Astc {
+                block: wgpu_types::AstcBlock::B10x6,
+                channel: wgpu_types::AstcChannel::UnormSrgb,
+            }],
+            TextureFormat::Astc {
+                block: wgpu_types::AstcBlock::B10x8,
+                channel: wgpu_types::AstcChannel::Unorm,
+            } => &[TextureFormat::Astc {
+                block: wgpu_types::AstcBlock::B10x8,
+                channel: wgpu_types::AstcChannel::UnormSrgb,
+            }],
+            TextureFormat::Astc {
+                block: wgpu_types::AstcBlock::B10x10,
+                channel: wgpu_types::AstcChannel::Unorm,
+            } => &[TextureFormat::Astc {
+                block: wgpu_types::AstcBlock::B10x10,
+                channel: wgpu_types::AstcChannel::UnormSrgb,
+            }],
+            TextureFormat::Astc {
+                block: wgpu_types::AstcBlock::B12x10,
+                channel: wgpu_types::AstcChannel::Unorm,
+            } => &[TextureFormat::Astc {
+                block: wgpu_types::AstcBlock::B12x10,
+                channel: wgpu_types::AstcChannel::UnormSrgb,
+            }],
+            TextureFormat::Astc {
+                block: wgpu_types::AstcBlock::B12x12,
+                channel: wgpu_types::AstcChannel::Unorm,
+            } => &[TextureFormat::Astc {
+                block: wgpu_types::AstcBlock::B12x12,
+                channel: wgpu_types::AstcChannel::UnormSrgb,
+            }],
+            _ => &[],
+        }
+    }
+}
+
 /// A handle to a 1 x 1 transparent white image.
 ///
 /// Like [`Handle<Image>::default`], this is a handle to a fallback image asset.
@@ -1010,7 +1134,12 @@ impl Image {
     ///
     /// [`Camera`]: https://docs.rs/bevy/latest/bevy/render/camera/struct.Camera.html
     /// [`RenderTarget::Image`]: https://docs.rs/bevy/latest/bevy/render/camera/enum.RenderTarget.html#variant.Image
-    pub fn new_target_texture(width: u32, height: u32, format: TextureFormat) -> Self {
+    pub fn new_target_texture(
+        width: u32,
+        height: u32,
+        format: TextureFormat,
+        view_format: Option<TextureFormat>,
+    ) -> Self {
         let size = Extent3d {
             width,
             height,
@@ -1039,10 +1168,16 @@ impl Image {
                 mip_level_count: 1,
                 sample_count: 1,
                 usage,
-                view_formats: &[],
+                view_formats: match view_format {
+                    Some(_) => format.srgb_view_formats(),
+                    None => &[],
+                },
             },
             sampler: ImageSampler::Default,
-            texture_view_descriptor: None,
+            texture_view_descriptor: view_format.map(|f| TextureViewDescriptor {
+                format: Some(f),
+                ..Default::default()
+            }),
             asset_usage: RenderAssetUsages::default(),
             copy_on_resize: true,
         }
diff --git a/crates/bevy_pbr/src/render/mesh.rs b/crates/bevy_pbr/src/render/mesh.rs
index f7f0227f2f797..c55bbe94d2066 100644
--- a/crates/bevy_pbr/src/render/mesh.rs
+++ b/crates/bevy_pbr/src/render/mesh.rs
@@ -1906,6 +1906,7 @@ pub fn build_dummy_white_gpu_image(
         texture,
         texture_view,
         texture_format: image.texture_descriptor.format,
+        texture_view_format: image.texture_view_descriptor.and_then(|v| v.format),
         sampler,
         size: image.texture_descriptor.size,
         mip_level_count: image.texture_descriptor.mip_level_count,
diff --git a/crates/bevy_render/src/camera.rs b/crates/bevy_render/src/camera.rs
index 4ff8e6d456021..27dac44807dd7 100644
--- a/crates/bevy_render/src/camera.rs
+++ b/crates/bevy_render/src/camera.rs
@@ -156,7 +156,7 @@ pub trait NormalizedRenderTargetExt {
     ) -> Option<&'a TextureView>;
 
     /// Retrieves the [`TextureFormat`] of this render target, if it exists.
-    fn get_texture_format<'a>(
+    fn get_texture_view_format<'a>(
         &self,
         windows: &'a ExtractedWindows,
         images: &'a RenderAssets<GpuImage>,
@@ -199,8 +199,8 @@ impl NormalizedRenderTargetExt for NormalizedRenderTarget {
         }
     }
 
-    /// Retrieves the [`TextureFormat`] of this render target, if it exists.
-    fn get_texture_format<'a>(
+    /// Retrieves the texture view's [`TextureFormat`] of this render target, if it exists.
+    fn get_texture_view_format<'a>(
         &self,
         windows: &'a ExtractedWindows,
         images: &'a RenderAssets<GpuImage>,
@@ -209,12 +209,12 @@ impl NormalizedRenderTargetExt for NormalizedRenderTarget {
         match self {
             NormalizedRenderTarget::Window(window_ref) => windows
                 .get(&window_ref.entity())
-                .and_then(|window| window.swap_chain_texture_format),
+                .and_then(|window| window.swap_chain_texture_view_format),
             NormalizedRenderTarget::Image(image_target) => images
                 .get(&image_target.handle)
-                .map(|image| image.texture_format),
+                .map(|image| image.texture_view_format.unwrap_or(image.texture_format)),
             NormalizedRenderTarget::TextureView(id) => {
-                manual_texture_views.get(id).map(|tex| tex.format)
+                manual_texture_views.get(id).map(|tex| tex.view_format)
             }
             NormalizedRenderTarget::None { .. } => None,
         }
diff --git a/crates/bevy_render/src/texture/fallback_image.rs b/crates/bevy_render/src/texture/fallback_image.rs
index 095f27eecec69..c6d4c271f958c 100644
--- a/crates/bevy_render/src/texture/fallback_image.rs
+++ b/crates/bevy_render/src/texture/fallback_image.rs
@@ -135,6 +135,7 @@ fn fallback_image_new(
         texture,
         texture_view,
         texture_format: image.texture_descriptor.format,
+        texture_view_format: image.texture_view_descriptor.and_then(|v| v.format),
         sampler,
         size: image.texture_descriptor.size,
         mip_level_count: image.texture_descriptor.mip_level_count,
diff --git a/crates/bevy_render/src/texture/gpu_image.rs b/crates/bevy_render/src/texture/gpu_image.rs
index 622ffd16fb156..92e9d5b2be9b3 100644
--- a/crates/bevy_render/src/texture/gpu_image.rs
+++ b/crates/bevy_render/src/texture/gpu_image.rs
@@ -17,6 +17,7 @@ pub struct GpuImage {
     pub texture: Texture,
     pub texture_view: TextureView,
     pub texture_format: TextureFormat,
+    pub texture_view_format: Option<TextureFormat>,
     pub sampler: Sampler,
     pub size: Extent3d,
     pub mip_level_count: u32,
@@ -92,9 +93,8 @@ impl RenderAsset for GpuImage {
         let texture_view = texture.create_view(
             image
                 .texture_view_descriptor
-                .or_else(|| Some(TextureViewDescriptor::default()))
                 .as_ref()
-                .unwrap(),
+                .unwrap_or(&TextureViewDescriptor::default()),
         );
         let sampler = match image.sampler {
             ImageSampler::Default => (***default_sampler).clone(),
@@ -107,6 +107,7 @@ impl RenderAsset for GpuImage {
             texture,
             texture_view,
             texture_format: image.texture_descriptor.format,
+            texture_view_format: image.texture_view_descriptor.and_then(|v| v.format),
             sampler,
             size: image.texture_descriptor.size,
             mip_level_count: image.texture_descriptor.mip_level_count,
diff --git a/crates/bevy_render/src/texture/manual_texture_view.rs b/crates/bevy_render/src/texture/manual_texture_view.rs
index b9faa84ab78f6..a9f3a3ab9add0 100644
--- a/crates/bevy_render/src/texture/manual_texture_view.rs
+++ b/crates/bevy_render/src/texture/manual_texture_view.rs
@@ -13,7 +13,7 @@ use crate::render_resource::TextureView;
 pub struct ManualTextureView {
     pub texture_view: TextureView,
     pub size: UVec2,
-    pub format: TextureFormat,
+    pub view_format: TextureFormat,
 }
 
 impl ManualTextureView {
@@ -21,7 +21,7 @@ impl ManualTextureView {
         Self {
             texture_view,
             size,
-            format: TextureFormat::bevy_default(),
+            view_format: TextureFormat::bevy_default(),
         }
     }
 }
diff --git a/crates/bevy_render/src/texture/texture_attachment.rs b/crates/bevy_render/src/texture/texture_attachment.rs
index cc1f0efd12c10..3e4fbb83327d9 100644
--- a/crates/bevy_render/src/texture/texture_attachment.rs
+++ b/crates/bevy_render/src/texture/texture_attachment.rs
@@ -130,15 +130,15 @@ impl DepthAttachment {
 #[derive(Clone)]
 pub struct OutputColorAttachment {
     pub view: TextureView,
-    pub format: TextureFormat,
+    pub view_format: TextureFormat,
     is_first_call: Arc<AtomicBool>,
 }
 
 impl OutputColorAttachment {
-    pub fn new(view: TextureView, format: TextureFormat) -> Self {
+    pub fn new(view: TextureView, view_format: TextureFormat) -> Self {
         Self {
             view,
-            format,
+            view_format,
             is_first_call: Arc::new(AtomicBool::new(true)),
         }
     }
diff --git a/crates/bevy_render/src/view/mod.rs b/crates/bevy_render/src/view/mod.rs
index 6871fc0bb8596..b1375b9a1975d 100644
--- a/crates/bevy_render/src/view/mod.rs
+++ b/crates/bevy_render/src/view/mod.rs
@@ -847,8 +847,8 @@ impl ViewTarget {
 
     /// The format of the final texture this view will render to
     #[inline]
-    pub fn out_texture_format(&self) -> TextureFormat {
-        self.out_texture.format
+    pub fn out_texture_view_format(&self) -> TextureFormat {
+        self.out_texture.view_format
     }
 
     /// This will start a new "post process write", which assumes that the caller
@@ -1024,10 +1024,8 @@ pub fn prepare_view_attachments(
                 let Some(attachment) = target
                     .get_texture_view(&windows, &images, &manual_texture_views)
                     .cloned()
-                    .zip(target.get_texture_format(&windows, &images, &manual_texture_views))
-                    .map(|(view, format)| {
-                        OutputColorAttachment::new(view.clone(), format.add_srgb_suffix())
-                    })
+                    .zip(target.get_texture_view_format(&windows, &images, &manual_texture_views))
+                    .map(|(view, format)| OutputColorAttachment::new(view.clone(), format))
                 else {
                     continue;
                 };
diff --git a/crates/bevy_render/src/view/window/mod.rs b/crates/bevy_render/src/view/window/mod.rs
index 48686af01db01..708e873ba3519 100644
--- a/crates/bevy_render/src/view/window/mod.rs
+++ b/crates/bevy_render/src/view/window/mod.rs
@@ -60,6 +60,7 @@ pub struct ExtractedWindow {
     pub swap_chain_texture_view: Option<TextureView>,
     pub swap_chain_texture: Option<SurfaceTexture>,
     pub swap_chain_texture_format: Option<TextureFormat>,
+    pub swap_chain_texture_view_format: Option<TextureFormat>,
     pub size_changed: bool,
     pub present_mode_changed: bool,
     pub alpha_mode: CompositeAlphaMode,
@@ -67,8 +68,9 @@ pub struct ExtractedWindow {
 
 impl ExtractedWindow {
     fn set_swapchain_texture(&mut self, frame: wgpu::SurfaceTexture) {
+        self.swap_chain_texture_view_format = Some(frame.texture.format().add_srgb_suffix());
         let texture_view_descriptor = TextureViewDescriptor {
-            format: Some(frame.texture.format().add_srgb_suffix()),
+            format: self.swap_chain_texture_view_format,
             ..default()
         };
         self.swap_chain_texture_view = Some(TextureView::from(
@@ -140,6 +142,7 @@ fn extract_windows(
             swap_chain_texture_view: None,
             size_changed: false,
             swap_chain_texture_format: None,
+            swap_chain_texture_view_format: None,
             present_mode_changed: false,
             alpha_mode: window.composite_alpha_mode,
         });
@@ -191,6 +194,7 @@ struct SurfaceData {
     // TODO: what lifetime should this be?
     surface: WgpuWrapper<wgpu::Surface<'static>>,
     configuration: SurfaceConfiguration,
+    texture_view_format: Option<TextureFormat>,
 }
 
 #[derive(Resource, Default)]
@@ -364,6 +368,11 @@ pub fn create_surfaces(
                     }
                 }
 
+                let texture_view_format = if !format.is_srgb() {
+                    Some(format.add_srgb_suffix())
+                } else {
+                    None
+                };
                 let configuration = SurfaceConfiguration {
                     format,
                     width: window.physical_width,
@@ -385,10 +394,9 @@ pub fn create_surfaces(
                         }
                         CompositeAlphaMode::Inherit => wgpu::CompositeAlphaMode::Inherit,
                     },
-                    view_formats: if !format.is_srgb() {
-                        vec![format.add_srgb_suffix()]
-                    } else {
-                        vec![]
+                    view_formats: match texture_view_format {
+                        Some(format) => vec![format],
+                        None => vec![],
                     },
                 };
 
@@ -397,6 +405,7 @@ pub fn create_surfaces(
                 SurfaceData {
                     surface: WgpuWrapper::new(surface),
                     configuration,
+                    texture_view_format,
                 }
             });
 
diff --git a/crates/bevy_render/src/view/window/screenshot.rs b/crates/bevy_render/src/view/window/screenshot.rs
index 4aba6c6cee791..655b9b30bbe4e 100644
--- a/crates/bevy_render/src/view/window/screenshot.rs
+++ b/crates/bevy_render/src/view/window/screenshot.rs
@@ -278,7 +278,9 @@ fn prepare_screenshots(
                     warn!("Unknown window for screenshot, skipping: {}", window);
                     continue;
                 };
-                let format = surface_data.configuration.format.add_srgb_suffix();
+                let view_format = surface_data
+                    .texture_view_format
+                    .unwrap_or(surface_data.configuration.format);
                 let size = Extent3d {
                     width: surface_data.configuration.width,
                     height: surface_data.configuration.height,
@@ -286,7 +288,7 @@ fn prepare_screenshots(
                 };
                 let (texture_view, state) = prepare_screenshot_state(
                     size,
-                    format,
+                    view_format,
                     &render_device,
                     &screenshot_pipeline,
                     &pipeline_cache,
@@ -295,7 +297,7 @@ fn prepare_screenshots(
                 prepared.insert(*entity, state);
                 view_target_attachments.insert(
                     target.clone(),
-                    OutputColorAttachment::new(texture_view.clone(), format.add_srgb_suffix()),
+                    OutputColorAttachment::new(texture_view.clone(), view_format),
                 );
             }
             NormalizedRenderTarget::Image(image) => {
@@ -303,10 +305,12 @@ fn prepare_screenshots(
                     warn!("Unknown image for screenshot, skipping: {:?}", image);
                     continue;
                 };
-                let format = gpu_image.texture_format;
+                let view_format = gpu_image
+                    .texture_view_format
+                    .unwrap_or(gpu_image.texture_format);
                 let (texture_view, state) = prepare_screenshot_state(
                     gpu_image.size,
-                    format,
+                    view_format,
                     &render_device,
                     &screenshot_pipeline,
                     &pipeline_cache,
@@ -315,7 +319,7 @@ fn prepare_screenshots(
                 prepared.insert(*entity, state);
                 view_target_attachments.insert(
                     target.clone(),
-                    OutputColorAttachment::new(texture_view.clone(), format.add_srgb_suffix()),
+                    OutputColorAttachment::new(texture_view.clone(), view_format),
                 );
             }
             NormalizedRenderTarget::TextureView(texture_view) => {
@@ -326,11 +330,11 @@ fn prepare_screenshots(
                     );
                     continue;
                 };
-                let format = manual_texture_view.format;
+                let view_format = manual_texture_view.view_format;
                 let size = manual_texture_view.size.to_extents();
                 let (texture_view, state) = prepare_screenshot_state(
                     size,
-                    format,
+                    view_format,
                     &render_device,
                     &screenshot_pipeline,
                     &pipeline_cache,
@@ -339,7 +343,7 @@ fn prepare_screenshots(
                 prepared.insert(*entity, state);
                 view_target_attachments.insert(
                     target.clone(),
-                    OutputColorAttachment::new(texture_view.clone(), format.add_srgb_suffix()),
+                    OutputColorAttachment::new(texture_view.clone(), view_format),
                 );
             }
             NormalizedRenderTarget::None { .. } => {
@@ -502,13 +506,12 @@ pub(crate) fn submit_screenshot_commands(world: &World, encoder: &mut CommandEnc
                 };
                 let width = window.physical_width;
                 let height = window.physical_height;
-                let Some(texture_format) = window.swap_chain_texture_format else {
+                let Some(texture_format) = window.swap_chain_texture_view_format else {
                     continue;
                 };
-                let Some(swap_chain_texture) = window.swap_chain_texture.as_ref() else {
+                let Some(swap_chain_texture_view) = window.swap_chain_texture_view.as_ref() else {
                     continue;
                 };
-                let texture_view = swap_chain_texture.texture.create_view(&Default::default());
                 render_screenshot(
                     encoder,
                     prepared,
@@ -517,7 +520,7 @@ pub(crate) fn submit_screenshot_commands(world: &World, encoder: &mut CommandEnc
                     width,
                     height,
                     texture_format,
-                    &texture_view,
+                    swap_chain_texture_view,
                 );
             }
             NormalizedRenderTarget::Image(image) => {
@@ -550,7 +553,7 @@ pub(crate) fn submit_screenshot_commands(world: &World, encoder: &mut CommandEnc
                 };
                 let width = texture_view.size.x;
                 let height = texture_view.size.y;
-                let texture_format = texture_view.format;
+                let texture_format = texture_view.view_format;
                 let texture_view = texture_view.texture_view.deref();
                 render_screenshot(
                     encoder,
diff --git a/examples/3d/render_to_texture.rs b/examples/3d/render_to_texture.rs
index 26cae98f38c25..2c3339cdf4265 100644
--- a/examples/3d/render_to_texture.rs
+++ b/examples/3d/render_to_texture.rs
@@ -28,7 +28,12 @@ fn setup(
     mut images: ResMut<Assets<Image>>,
 ) {
     // This is the texture that will be rendered to.
-    let image = Image::new_target_texture(512, 512, TextureFormat::bevy_default());
+    let image = Image::new_target_texture(
+        512,
+        512,
+        TextureFormat::Rgba8Unorm,
+        Some(TextureFormat::Rgba8UnormSrgb),
+    );
 
     let image_handle = images.add(image);
 
diff --git a/examples/app/headless_renderer.rs b/examples/app/headless_renderer.rs
index 7dc9639ed9539..2ab79e7660a98 100644
--- a/examples/app/headless_renderer.rs
+++ b/examples/app/headless_renderer.rs
@@ -244,13 +244,13 @@ fn setup_render_target(
 
     // This is the texture that will be rendered to.
     let mut render_target_image =
-        Image::new_target_texture(size.width, size.height, TextureFormat::bevy_default());
+        Image::new_target_texture(size.width, size.height, TextureFormat::bevy_default(), None);
     render_target_image.texture_descriptor.usage |= TextureUsages::COPY_SRC;
     let render_target_image_handle = images.add(render_target_image);
 
     // This is the texture that will be copied to.
     let cpu_image =
-        Image::new_target_texture(size.width, size.height, TextureFormat::bevy_default());
+        Image::new_target_texture(size.width, size.height, TextureFormat::bevy_default(), None);
     let cpu_image_handle = images.add(cpu_image);
 
     commands.spawn(ImageCopier::new(
diff --git a/examples/shader/compute_shader_game_of_life.rs b/examples/shader/compute_shader_game_of_life.rs
index b79d1f7a201d7..e9c3af5481eab 100644
--- a/examples/shader/compute_shader_game_of_life.rs
+++ b/examples/shader/compute_shader_game_of_life.rs
@@ -52,7 +52,7 @@ fn main() {
 }
 
 fn setup(mut commands: Commands, mut images: ResMut<Assets<Image>>) {
-    let mut image = Image::new_target_texture(SIZE.x, SIZE.y, TextureFormat::Rgba32Float);
+    let mut image = Image::new_target_texture(SIZE.x, SIZE.y, TextureFormat::Rgba32Float, None);
     image.asset_usage = RenderAssetUsages::RENDER_WORLD;
     image.texture_descriptor.usage =
         TextureUsages::COPY_DST | TextureUsages::STORAGE_BINDING | TextureUsages::TEXTURE_BINDING;

From 5f7e43c951d246683f06664e804a8622ed3d9abd Mon Sep 17 00:00:00 2001
From: robtfm <50659922+robtfm@users.noreply.github.com>
Date: Sun, 14 Dec 2025 22:03:54 +0000
Subject: [PATCH 107/133] Retain asset without data for RENDER_WORLD-only
 assets (#21732)

# Objective

when `RenderAssets` with `RenderAssetUsages::RENDER_WORLD` and without
`RenderAssetUsages::MAIN_WORLD` are extracted, the asset is removed from
the assets collection. this causes some issues:
- systems which rely on the asset, like picking with meshes, fail with
"asset not found" errors which are unintuitive.
- loading the asset by path a second time results in the asset being
reloaded from storage, re-extracted and re-transferred to gpu, replacing
the existing asset
- knowledge about the asset state is lost, we cannot tell if an asset is
already loaded with `AssetServer::get_handle`
- metadata (image size, e.g.) is no longer available for the asset

## Solution

### extraction:
- add `take_gpu_data` to the `RenderAsset` trait. use it to pull the
data out of the asset for transfer, and leave the empty asset in the
collection. default implementation just `clone`s the asset.
- if the data has already been taken, ~~panic. this follows from
modifying an asset after extraction, which is always a code error, so i
think panic here makes sense~~ _log an error_

### Mesh/RenderMesh:
- make `Mesh::attributes` and `Mesh::indices` options
- take them on extraction
- `expect` operations which access or modify the vertex data or indices
if it has been extracted. accessing the vertex data after extraction is
always a code error. fixes #19737 by resulting in the error `Mesh has
been extracted to RenderWorld. To access vertex attributes, the mesh
must have RenderAssetUsages::MAIN_WORLD`
- provide `try_xxx` operations which allow users to handle the access
error gracefully if required (no usages as part of this pr, but provided
for future)
- compute the mesh `Aabb` when gpu data is taken and store the result.
this allows extracted meshes to still use frustum culling (otherwise
using multiple copies of an extracted mesh now panics as `compute_aabb`
relied on vertex positions). there's a bit of a tradeoff here: users may
not need the Aabb and we needlessly compute it. but i think users almost
always do want them, and computing once (for extracted meshes) is
cheaper than the alternative, keeping position data and computing a
fresh `Aabb` every time the mesh is used on a new entity.

### Image/GpuImage:
images are a little more complex because the data can be deliberately
`None` for render-targets / GPU-written textures where we only want an
uninitialized gpu-side texture.
- take `Image::data` on extraction
- record on the resulting `GpuImage` whether any data was found
initially
- on subsequent modifications with no data, panic if there was data
previously

corner case / issue: when used with `RenderAssetBytesPerFrameLimiter`
there may be no previous gpu asset if it is still queued pending upload
due to the bandwidth limit. this can result in a modified image with
initial data skipping the `had_data` check, resulting in a blank
texture. i think this is sufficiently rare that it's not a real problem,
users would still hit the panic if the asset is transferred in time and
the problem/solution should be clear when they do hit it.

### ShaderStorageBuffer/GpuShaderStorageBuffer
follows the same pattern as Image/GpuImage:
- take `ShaderStorageBuffer::data` on extraction
- record on the resulting `GpuShaderStorageBuffer` whether any data was
found initially
- on modifications with no data, panic if there was data previously

we don't have the queue issue here because `GpuShaderStorageBuffer`
doesn't implement `byte_len` so we can't end up queueing them.

#### other RenderAssets
i didn't modify the other `RenderAsset` types
(`GpuAutoExposureCompensationCurve`, `GpuLineGizmo`,
`RenderWireframeMaterial`, `PreparedMaterial`, `PreparedMaterial2d`,
`PreparedUiMaterial`) on the assumption that ~~cloning these is cheap
enough anyway~~ _the asset usages are not exposed so we should never
call `take_gpu_data`. the default implementation panics with a message
directing users to implement the method if required_

## Testing

only really tested within my work project. i can add some explicit tests
if required.

---------

Co-authored-by: Jasmine S <jasmine.schweitzer@nominal.io>
Co-authored-by: Greeble <166992735+greeble-dev@users.noreply.github.com>
---
 crates/bevy_asset/src/render_asset.rs         |   11 +-
 crates/bevy_camera/src/primitives.rs          |    9 +-
 crates/bevy_mesh/src/index.rs                 |   12 +-
 crates/bevy_mesh/src/mesh.rs                  | 1134 +++++++++++++++--
 crates/bevy_mesh/src/mikktspace.rs            |   12 +-
 crates/bevy_pbr/src/render/mesh.rs            |    1 +
 crates/bevy_render/src/mesh/mod.rs            |   13 +-
 crates/bevy_render/src/render_asset.rs        |   38 +-
 crates/bevy_render/src/storage.rs             |   29 +-
 .../bevy_render/src/texture/fallback_image.rs |    1 +
 crates/bevy_render/src/texture/gpu_image.rs   |   23 +-
 11 files changed, 1155 insertions(+), 128 deletions(-)

diff --git a/crates/bevy_asset/src/render_asset.rs b/crates/bevy_asset/src/render_asset.rs
index 583ee45457895..90855e86e3389 100644
--- a/crates/bevy_asset/src/render_asset.rs
+++ b/crates/bevy_asset/src/render_asset.rs
@@ -4,12 +4,13 @@ use serde::{Deserialize, Serialize};
 bitflags::bitflags! {
     /// Defines where the asset will be used.
     ///
-    /// If an asset is set to the `RENDER_WORLD` but not the `MAIN_WORLD`, the asset will be
-    /// unloaded from the asset server once it's been extracted and prepared in the render world.
+    /// If an asset is set to the `RENDER_WORLD` but not the `MAIN_WORLD`, the asset data (pixel data,
+    /// mesh vertex data, etc) will be removed from the cpu-side asset once it's been extracted and prepared
+    /// in the render world. The asset will remain in the assets collection, but with only metadata.
     ///
-    /// Unloading the asset saves on memory, as for most cases it is no longer necessary to keep
-    /// it in RAM once it's been uploaded to the GPU's VRAM. However, this means you can no longer
-    /// access the asset from the CPU (via the `Assets<T>` resource) once unloaded (without re-loading it).
+    /// Unloading the asset data saves on memory, as for most cases it is no longer necessary to keep
+    /// it in RAM once it's been uploaded to the GPU's VRAM. However, this means you cannot access the
+    /// asset data from the CPU (via the `Assets<T>` resource) once unloaded (without re-loading it).
     ///
     /// If you never need access to the asset from the CPU past the first frame it's loaded on,
     /// or only need very infrequent access, then set this to `RENDER_WORLD`. Otherwise, set this to
diff --git a/crates/bevy_camera/src/primitives.rs b/crates/bevy_camera/src/primitives.rs
index 628371d9bdb55..9d2a5203c6669 100644
--- a/crates/bevy_camera/src/primitives.rs
+++ b/crates/bevy_camera/src/primitives.rs
@@ -18,8 +18,13 @@ pub trait MeshAabb {
 
 impl MeshAabb for Mesh {
     fn compute_aabb(&self) -> Option<Aabb> {
-        let Some(VertexAttributeValues::Float32x3(values)) =
-            self.attribute(Mesh::ATTRIBUTE_POSITION)
+        if let Some(aabb) = self.final_aabb {
+            // use precomputed extents
+            return Some(aabb.into());
+        }
+
+        let Ok(VertexAttributeValues::Float32x3(values)) =
+            self.try_attribute(Mesh::ATTRIBUTE_POSITION)
         else {
             return None;
         };
diff --git a/crates/bevy_mesh/src/index.rs b/crates/bevy_mesh/src/index.rs
index 6f89f2dfd59a1..0f64d21ee3c43 100644
--- a/crates/bevy_mesh/src/index.rs
+++ b/crates/bevy_mesh/src/index.rs
@@ -6,6 +6,8 @@ use serde::{Deserialize, Serialize};
 use thiserror::Error;
 use wgpu_types::IndexFormat;
 
+use crate::MeshAccessError;
+
 /// A disjunction of four iterators. This is necessary to have a well-formed type for the output
 /// of [`Mesh::triangles`](super::Mesh::triangles), which produces iterators of four different types depending on the
 /// branch taken.
@@ -56,6 +58,8 @@ pub enum MeshWindingInvertError {
     /// * [`PrimitiveTopology::LineList`](super::PrimitiveTopology::LineList), but the indices are not in chunks of 2.
     #[error("Indices weren't in chunks according to topology")]
     AbruptIndicesEnd,
+    #[error("Mesh access error: {0}")]
+    MeshAccessError(#[from] MeshAccessError),
 }
 
 /// An error that occurred while trying to extract a collection of triangles from a [`Mesh`](super::Mesh).
@@ -64,17 +68,13 @@ pub enum MeshTrianglesError {
     #[error("Source mesh does not have primitive topology TriangleList or TriangleStrip")]
     WrongTopology,
 
-    #[error("Source mesh lacks position data")]
-    MissingPositions,
-
     #[error("Source mesh position data is not Float32x3")]
     PositionsFormat,
 
-    #[error("Source mesh lacks face index data")]
-    MissingIndices,
-
     #[error("Face index data references vertices that do not exist")]
     BadIndices,
+    #[error("mesh access error: {0}")]
+    MeshAccessError(#[from] MeshAccessError),
 }
 
 /// An array of indices into the [`VertexAttributeValues`](super::VertexAttributeValues) for a mesh.
diff --git a/crates/bevy_mesh/src/mesh.rs b/crates/bevy_mesh/src/mesh.rs
index 3ff416f89221d..ca224d6e286eb 100644
--- a/crates/bevy_mesh/src/mesh.rs
+++ b/crates/bevy_mesh/src/mesh.rs
@@ -15,7 +15,7 @@ use bevy_asset::Handle;
 use bevy_asset::{Asset, RenderAssetUsages};
 #[cfg(feature = "morph")]
 use bevy_image::Image;
-use bevy_math::{primitives::Triangle3d, *};
+use bevy_math::{bounding::Aabb3d, primitives::Triangle3d, *};
 #[cfg(feature = "serialize")]
 use bevy_platform::collections::HashMap;
 use bevy_reflect::Reflect;
@@ -29,6 +29,110 @@ use wgpu_types::{VertexAttribute, VertexFormat, VertexStepMode};
 pub const INDEX_BUFFER_ASSET_INDEX: u64 = 0;
 pub const VERTEX_ATTRIBUTE_BUFFER_ID: u64 = 10;
 
+/// Error from accessing mesh vertex attributes or indices
+#[derive(Error, Debug, Clone)]
+pub enum MeshAccessError {
+    #[error("The mesh vertex/index data has been extracted to the RenderWorld (via `Mesh::asset_usage`)")]
+    ExtractedToRenderWorld,
+    #[error("The requested mesh data wasn't found in this mesh")]
+    NotFound,
+}
+
+const MESH_EXTRACTED_ERROR: &str = "Mesh has been extracted to RenderWorld. To access vertex attributes, the mesh `asset_usage` must include `MAIN_WORLD`";
+
+// storage for extractable data with access methods which return errors if the
+// contents have already been extracted
+#[derive(Debug, Clone, PartialEq, Reflect, Default)]
+enum MeshExtractableData<T> {
+    Data(T),
+    #[default]
+    NoData,
+    ExtractedToRenderWorld,
+}
+
+impl<T> MeshExtractableData<T> {
+    // get a reference to internal data. returns error if data has been extracted, or if no
+    // data exists
+    fn as_ref(&self) -> Result<&T, MeshAccessError> {
+        match self {
+            MeshExtractableData::Data(data) => Ok(data),
+            MeshExtractableData::NoData => Err(MeshAccessError::NotFound),
+            MeshExtractableData::ExtractedToRenderWorld => {
+                Err(MeshAccessError::ExtractedToRenderWorld)
+            }
+        }
+    }
+
+    // get an optional reference to internal data. returns error if data has been extracted
+    fn as_ref_option(&self) -> Result<Option<&T>, MeshAccessError> {
+        match self {
+            MeshExtractableData::Data(data) => Ok(Some(data)),
+            MeshExtractableData::NoData => Ok(None),
+            MeshExtractableData::ExtractedToRenderWorld => {
+                Err(MeshAccessError::ExtractedToRenderWorld)
+            }
+        }
+    }
+
+    // get a mutable reference to internal data. returns error if data has been extracted,
+    // or if no data exists
+    fn as_mut(&mut self) -> Result<&mut T, MeshAccessError> {
+        match self {
+            MeshExtractableData::Data(data) => Ok(data),
+            MeshExtractableData::NoData => Err(MeshAccessError::NotFound),
+            MeshExtractableData::ExtractedToRenderWorld => {
+                Err(MeshAccessError::ExtractedToRenderWorld)
+            }
+        }
+    }
+
+    // get an optional mutable reference to internal data. returns error if data has been extracted
+    fn as_mut_option(&mut self) -> Result<Option<&mut T>, MeshAccessError> {
+        match self {
+            MeshExtractableData::Data(data) => Ok(Some(data)),
+            MeshExtractableData::NoData => Ok(None),
+            MeshExtractableData::ExtractedToRenderWorld => {
+                Err(MeshAccessError::ExtractedToRenderWorld)
+            }
+        }
+    }
+
+    // extract data and replace self with `ExtractedToRenderWorld`. returns error if
+    // data has been extracted
+    fn extract(&mut self) -> Result<MeshExtractableData<T>, MeshAccessError> {
+        match core::mem::replace(self, MeshExtractableData::ExtractedToRenderWorld) {
+            MeshExtractableData::ExtractedToRenderWorld => {
+                Err(MeshAccessError::ExtractedToRenderWorld)
+            }
+            not_extracted => Ok(not_extracted),
+        }
+    }
+
+    // replace internal data. returns the existing data, or an error if data has been extracted
+    fn replace(
+        &mut self,
+        data: impl Into<MeshExtractableData<T>>,
+    ) -> Result<Option<T>, MeshAccessError> {
+        match core::mem::replace(self, data.into()) {
+            MeshExtractableData::ExtractedToRenderWorld => {
+                *self = MeshExtractableData::ExtractedToRenderWorld;
+                Err(MeshAccessError::ExtractedToRenderWorld)
+            }
+            MeshExtractableData::Data(t) => Ok(Some(t)),
+            MeshExtractableData::NoData => Ok(None),
+        }
+    }
+}
+
+impl<T> From<Option<T>> for MeshExtractableData<T> {
+    fn from(value: Option<T>) -> Self {
+        match value {
+            Some(data) => MeshExtractableData::Data(data),
+            None => MeshExtractableData::NoData,
+        }
+    }
+}
+
 /// A 3D object made out of vertices representing triangles, lines, or points,
 /// with "attribute" values for each vertex.
 ///
@@ -128,12 +232,12 @@ pub struct Mesh {
     /// Uses a [`BTreeMap`] because, unlike `HashMap`, it has a defined iteration order,
     /// which allows easy stable `VertexBuffers` (i.e. same buffer order)
     #[reflect(ignore, clone)]
-    attributes: BTreeMap<MeshVertexAttributeId, MeshAttributeData>,
-    indices: Option<Indices>,
+    attributes: MeshExtractableData<BTreeMap<MeshVertexAttributeId, MeshAttributeData>>,
+    indices: MeshExtractableData<Indices>,
     #[cfg(feature = "morph")]
-    morph_targets: Option<Handle<Image>>,
+    morph_targets: MeshExtractableData<Handle<Image>>,
     #[cfg(feature = "morph")]
-    morph_target_names: Option<Vec<String>>,
+    morph_target_names: MeshExtractableData<Vec<String>>,
     pub asset_usage: RenderAssetUsages,
     /// Whether or not to build a BLAS for use with `bevy_solari` raytracing.
     ///
@@ -150,6 +254,9 @@ pub struct Mesh {
     /// Does nothing if not used with `bevy_solari`, or if the mesh is not compatible
     /// with `bevy_solari` (see `bevy_solari`'s docs).
     pub enable_raytracing: bool,
+    /// Precomputed min and max extents of the mesh position data. Used mainly for constructing `Aabb`s for frustum culling.
+    /// This data will be set if/when a mesh is extracted to the GPU
+    pub final_aabb: Option<Aabb3d>,
 }
 
 impl Mesh {
@@ -233,14 +340,15 @@ impl Mesh {
     pub fn new(primitive_topology: PrimitiveTopology, asset_usage: RenderAssetUsages) -> Self {
         Mesh {
             primitive_topology,
-            attributes: Default::default(),
-            indices: None,
+            attributes: MeshExtractableData::Data(Default::default()),
+            indices: MeshExtractableData::NoData,
             #[cfg(feature = "morph")]
-            morph_targets: None,
+            morph_targets: MeshExtractableData::NoData,
             #[cfg(feature = "morph")]
-            morph_target_names: None,
+            morph_target_names: MeshExtractableData::NoData,
             asset_usage,
             enable_raytracing: true,
+            final_aabb: None,
         }
     }
 
@@ -256,12 +364,33 @@ impl Mesh {
     ///
     /// # Panics
     /// Panics when the format of the values does not match the attribute's format.
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_insert_attribute`]
     #[inline]
     pub fn insert_attribute(
         &mut self,
         attribute: MeshVertexAttribute,
         values: impl Into<VertexAttributeValues>,
     ) {
+        self.try_insert_attribute(attribute, values)
+            .expect(MESH_EXTRACTED_ERROR);
+    }
+
+    /// Sets the data for a vertex attribute (position, normal, etc.). The name will
+    /// often be one of the associated constants such as [`Mesh::ATTRIBUTE_POSITION`].
+    ///
+    /// `Aabb` of entities with modified mesh are not updated automatically.
+    ///
+    /// Returns an error if the mesh data has been extracted to `RenderWorld`.
+    ///
+    /// # Panics
+    /// Panics when the format of the values does not match the attribute's format.
+    #[inline]
+    pub fn try_insert_attribute(
+        &mut self,
+        attribute: MeshVertexAttribute,
+        values: impl Into<VertexAttributeValues>,
+    ) -> Result<(), MeshAccessError> {
         let values = values.into();
         let values_format = VertexFormat::from(&values);
         if values_format != attribute.format {
@@ -272,7 +401,9 @@ impl Mesh {
         }
 
         self.attributes
+            .as_mut()?
             .insert(attribute.id, MeshAttributeData { attribute, values });
+        Ok(())
     }
 
     /// Consumes the mesh and returns a mesh with data set for a vertex attribute (position, normal, etc.).
@@ -284,6 +415,8 @@ impl Mesh {
     ///
     /// # Panics
     /// Panics when the format of the values does not match the attribute's format.
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_with_inserted_attribute`]
     #[must_use]
     #[inline]
     pub fn with_inserted_attribute(
@@ -295,83 +428,272 @@ impl Mesh {
         self
     }
 
+    /// Consumes the mesh and returns a mesh with data set for a vertex attribute (position, normal, etc.).
+    /// The name will often be one of the associated constants such as [`Mesh::ATTRIBUTE_POSITION`].
+    ///
+    /// (Alternatively, you can use [`Mesh::insert_attribute`] to mutate an existing mesh in-place)
+    ///
+    /// `Aabb` of entities with modified mesh are not updated automatically.
+    ///
+    /// Returns an error if the mesh data has been extracted to `RenderWorld`.
+    #[inline]
+    pub fn try_with_inserted_attribute(
+        mut self,
+        attribute: MeshVertexAttribute,
+        values: impl Into<VertexAttributeValues>,
+    ) -> Result<Self, MeshAccessError> {
+        self.try_insert_attribute(attribute, values)?;
+        Ok(self)
+    }
+
     /// Removes the data for a vertex attribute
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_remove_attribute`]
     pub fn remove_attribute(
         &mut self,
         attribute: impl Into<MeshVertexAttributeId>,
     ) -> Option<VertexAttributeValues> {
         self.attributes
+            .as_mut()
+            .expect(MESH_EXTRACTED_ERROR)
             .remove(&attribute.into())
             .map(|data| data.values)
     }
 
+    /// Removes the data for a vertex attribute
+    /// Returns an error if the mesh data has been extracted to `RenderWorld`or
+    /// if the attribute does not exist.
+    pub fn try_remove_attribute(
+        &mut self,
+        attribute: impl Into<MeshVertexAttributeId>,
+    ) -> Result<VertexAttributeValues, MeshAccessError> {
+        Ok(self
+            .attributes
+            .as_mut()?
+            .remove(&attribute.into())
+            .ok_or(MeshAccessError::NotFound)?
+            .values)
+    }
+
     /// Consumes the mesh and returns a mesh without the data for a vertex attribute
     ///
     /// (Alternatively, you can use [`Mesh::remove_attribute`] to mutate an existing mesh in-place)
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_with_removed_attribute`]
     #[must_use]
     pub fn with_removed_attribute(mut self, attribute: impl Into<MeshVertexAttributeId>) -> Self {
         self.remove_attribute(attribute);
         self
     }
 
+    /// Consumes the mesh and returns a mesh without the data for a vertex attribute
+    ///
+    /// (Alternatively, you can use [`Mesh::remove_attribute`] to mutate an existing mesh in-place)
+    ///
+    /// Returns an error if the mesh data has been extracted to `RenderWorld`or
+    /// if the attribute does not exist.
+    pub fn try_with_removed_attribute(
+        mut self,
+        attribute: impl Into<MeshVertexAttributeId>,
+    ) -> Result<Self, MeshAccessError> {
+        self.try_remove_attribute(attribute)?;
+        Ok(self)
+    }
+
+    /// Returns a bool indicating if the attribute is present in this mesh's vertex data.
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_contains_attribute`]
     #[inline]
     pub fn contains_attribute(&self, id: impl Into<MeshVertexAttributeId>) -> bool {
-        self.attributes.contains_key(&id.into())
+        self.attributes
+            .as_ref()
+            .expect(MESH_EXTRACTED_ERROR)
+            .contains_key(&id.into())
+    }
+
+    /// Returns a bool indicating if the attribute is present in this mesh's vertex data.
+    ///
+    /// Returns an error if the mesh data has been extracted to `RenderWorld`.
+    #[inline]
+    pub fn try_contains_attribute(
+        &self,
+        id: impl Into<MeshVertexAttributeId>,
+    ) -> Result<bool, MeshAccessError> {
+        Ok(self.attributes.as_ref()?.contains_key(&id.into()))
     }
 
     /// Retrieves the data currently set to the vertex attribute with the specified [`MeshVertexAttributeId`].
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_attribute`] or [`Mesh::try_attribute_option`]
     #[inline]
     pub fn attribute(
         &self,
         id: impl Into<MeshVertexAttributeId>,
     ) -> Option<&VertexAttributeValues> {
-        self.attributes.get(&id.into()).map(|data| &data.values)
+        self.try_attribute_option(id).expect(MESH_EXTRACTED_ERROR)
+    }
+
+    /// Retrieves the data currently set to the vertex attribute with the specified [`MeshVertexAttributeId`].
+    ///
+    /// Returns an error if the mesh data has been extracted to `RenderWorld`or
+    /// if the attribute does not exist.
+    #[inline]
+    pub fn try_attribute(
+        &self,
+        id: impl Into<MeshVertexAttributeId>,
+    ) -> Result<&VertexAttributeValues, MeshAccessError> {
+        self.try_attribute_option(id)?
+            .ok_or(MeshAccessError::NotFound)
+    }
+
+    /// Retrieves the data currently set to the vertex attribute with the specified [`MeshVertexAttributeId`].
+    ///
+    /// Returns an error if the mesh data has been extracted to `RenderWorld`.
+    #[inline]
+    pub fn try_attribute_option(
+        &self,
+        id: impl Into<MeshVertexAttributeId>,
+    ) -> Result<Option<&VertexAttributeValues>, MeshAccessError> {
+        Ok(self
+            .attributes
+            .as_ref()?
+            .get(&id.into())
+            .map(|data| &data.values))
     }
 
     /// Retrieves the full data currently set to the vertex attribute with the specified [`MeshVertexAttributeId`].
     #[inline]
-    pub(crate) fn attribute_data(
+    pub(crate) fn try_attribute_data(
         &self,
         id: impl Into<MeshVertexAttributeId>,
-    ) -> Option<&MeshAttributeData> {
-        self.attributes.get(&id.into())
+    ) -> Result<Option<&MeshAttributeData>, MeshAccessError> {
+        Ok(self.attributes.as_ref()?.get(&id.into()))
     }
 
     /// Retrieves the data currently set to the vertex attribute with the specified `name` mutably.
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_attribute_mut`]
     #[inline]
     pub fn attribute_mut(
         &mut self,
         id: impl Into<MeshVertexAttributeId>,
     ) -> Option<&mut VertexAttributeValues> {
-        self.attributes
+        self.try_attribute_mut_option(id)
+            .expect(MESH_EXTRACTED_ERROR)
+    }
+
+    /// Retrieves the data currently set to the vertex attribute with the specified `name` mutably.
+    ///
+    /// Returns an error if the mesh data has been extracted to `RenderWorld`or
+    /// if the attribute does not exist.
+    #[inline]
+    pub fn try_attribute_mut(
+        &mut self,
+        id: impl Into<MeshVertexAttributeId>,
+    ) -> Result<&mut VertexAttributeValues, MeshAccessError> {
+        self.try_attribute_mut_option(id)?
+            .ok_or(MeshAccessError::NotFound)
+    }
+
+    /// Retrieves the data currently set to the vertex attribute with the specified `name` mutably.
+    ///
+    /// Returns an error if the mesh data has been extracted to `RenderWorld`.
+    #[inline]
+    pub fn try_attribute_mut_option(
+        &mut self,
+        id: impl Into<MeshVertexAttributeId>,
+    ) -> Result<Option<&mut VertexAttributeValues>, MeshAccessError> {
+        Ok(self
+            .attributes
+            .as_mut()?
             .get_mut(&id.into())
-            .map(|data| &mut data.values)
+            .map(|data| &mut data.values))
     }
 
     /// Returns an iterator that yields references to the data of each vertex attribute.
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_attributes`]
     pub fn attributes(
         &self,
     ) -> impl Iterator<Item = (&MeshVertexAttribute, &VertexAttributeValues)> {
-        self.attributes
+        self.try_attributes().expect(MESH_EXTRACTED_ERROR)
+    }
+
+    /// Returns an iterator that yields references to the data of each vertex attribute.
+    /// Returns an error if data has been extracted to `RenderWorld`
+    pub fn try_attributes(
+        &self,
+    ) -> Result<impl Iterator<Item = (&MeshVertexAttribute, &VertexAttributeValues)>, MeshAccessError>
+    {
+        Ok(self
+            .attributes
+            .as_ref()?
             .values()
-            .map(|data| (&data.attribute, &data.values))
+            .map(|data| (&data.attribute, &data.values)))
     }
 
     /// Returns an iterator that yields mutable references to the data of each vertex attribute.
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_attributes_mut`]
     pub fn attributes_mut(
         &mut self,
     ) -> impl Iterator<Item = (&MeshVertexAttribute, &mut VertexAttributeValues)> {
-        self.attributes
+        self.try_attributes_mut().expect(MESH_EXTRACTED_ERROR)
+    }
+
+    /// Returns an iterator that yields mutable references to the data of each vertex attribute.
+    ///
+    /// Returns an error if the mesh data has been extracted to `RenderWorld`.
+    pub fn try_attributes_mut(
+        &mut self,
+    ) -> Result<
+        impl Iterator<Item = (&MeshVertexAttribute, &mut VertexAttributeValues)>,
+        MeshAccessError,
+    > {
+        Ok(self
+            .attributes
+            .as_mut()?
             .values_mut()
-            .map(|data| (&data.attribute, &mut data.values))
+            .map(|data| (&data.attribute, &mut data.values)))
     }
 
     /// Sets the vertex indices of the mesh. They describe how triangles are constructed out of the
     /// vertex attributes and are therefore only useful for the [`PrimitiveTopology`] variants
     /// that use triangles.
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_insert_indices`]
     #[inline]
     pub fn insert_indices(&mut self, indices: Indices) {
-        self.indices = Some(indices);
+        self.indices
+            .replace(Some(indices))
+            .expect(MESH_EXTRACTED_ERROR);
+    }
+
+    /// Sets the vertex indices of the mesh. They describe how triangles are constructed out of the
+    /// vertex attributes and are therefore only useful for the [`PrimitiveTopology`] variants
+    /// that use triangles.
+    ///
+    /// Returns an error if the mesh data has been extracted to `RenderWorld`.
+    #[inline]
+    pub fn try_insert_indices(&mut self, indices: Indices) -> Result<(), MeshAccessError> {
+        self.indices.replace(Some(indices))?;
+        Ok(())
     }
 
     /// Consumes the mesh and returns a mesh with the given vertex indices. They describe how triangles
@@ -379,6 +701,10 @@ impl Mesh {
     /// [`PrimitiveTopology`] variants that use triangles.
     ///
     /// (Alternatively, you can use [`Mesh::insert_indices`] to mutate an existing mesh in-place)
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_with_inserted_indices`]
     #[must_use]
     #[inline]
     pub fn with_inserted_indices(mut self, indices: Indices) -> Self {
@@ -386,42 +712,126 @@ impl Mesh {
         self
     }
 
-    /// Retrieves the vertex `indices` of the mesh.
+    /// Consumes the mesh and returns a mesh with the given vertex indices. They describe how triangles
+    /// are constructed out of the vertex attributes and are therefore only useful for the
+    /// [`PrimitiveTopology`] variants that use triangles.
+    ///
+    /// (Alternatively, you can use [`Mesh::try_insert_indices`] to mutate an existing mesh in-place)
+    ///
+    /// Returns an error if the mesh data has been extracted to `RenderWorld`.
+    #[inline]
+    pub fn try_with_inserted_indices(mut self, indices: Indices) -> Result<Self, MeshAccessError> {
+        self.try_insert_indices(indices)?;
+        Ok(self)
+    }
+
+    /// Retrieves the vertex `indices` of the mesh, returns None if not found.
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_indices`]
     #[inline]
     pub fn indices(&self) -> Option<&Indices> {
+        self.indices.as_ref_option().expect(MESH_EXTRACTED_ERROR)
+    }
+
+    /// Retrieves the vertex `indices` of the mesh.
+    ///
+    /// Returns an error if the mesh data has been extracted to `RenderWorld`or
+    /// if the attribute does not exist.
+    #[inline]
+    pub fn try_indices(&self) -> Result<&Indices, MeshAccessError> {
         self.indices.as_ref()
     }
 
+    /// Retrieves the vertex `indices` of the mesh, returns None if not found.
+    ///
+    /// Returns an error if the mesh data has been extracted to `RenderWorld`.
+    #[inline]
+    pub fn try_indices_option(&self) -> Result<Option<&Indices>, MeshAccessError> {
+        self.indices.as_ref_option()
+    }
+
     /// Retrieves the vertex `indices` of the mesh mutably.
     #[inline]
     pub fn indices_mut(&mut self) -> Option<&mut Indices> {
+        self.try_indices_mut_option().expect(MESH_EXTRACTED_ERROR)
+    }
+
+    /// Retrieves the vertex `indices` of the mesh mutably.
+    ///
+    /// Returns an error if the mesh data has been extracted to `RenderWorld`.
+    #[inline]
+    pub fn try_indices_mut(&mut self) -> Result<&mut Indices, MeshAccessError> {
         self.indices.as_mut()
     }
 
+    /// Retrieves the vertex `indices` of the mesh mutably.
+    ///
+    /// Returns an error if the mesh data has been extracted to `RenderWorld`.
+    #[inline]
+    pub fn try_indices_mut_option(&mut self) -> Result<Option<&mut Indices>, MeshAccessError> {
+        self.indices.as_mut_option()
+    }
+
     /// Removes the vertex `indices` from the mesh and returns them.
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_remove_indices`]
     #[inline]
     pub fn remove_indices(&mut self) -> Option<Indices> {
-        core::mem::take(&mut self.indices)
+        self.try_remove_indices().expect(MESH_EXTRACTED_ERROR)
+    }
+
+    /// Removes the vertex `indices` from the mesh and returns them.
+    ///
+    /// Returns an error if the mesh data has been extracted to `RenderWorld`.
+    #[inline]
+    pub fn try_remove_indices(&mut self) -> Result<Option<Indices>, MeshAccessError> {
+        self.indices.replace(None)
     }
 
     /// Consumes the mesh and returns a mesh without the vertex `indices` of the mesh.
     ///
     /// (Alternatively, you can use [`Mesh::remove_indices`] to mutate an existing mesh in-place)
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_with_removed_indices`]
     #[must_use]
     pub fn with_removed_indices(mut self) -> Self {
         self.remove_indices();
         self
     }
 
+    /// Consumes the mesh and returns a mesh without the vertex `indices` of the mesh.
+    ///
+    /// (Alternatively, you can use [`Mesh::try_remove_indices`] to mutate an existing mesh in-place)
+    ///
+    /// Returns an error if the mesh data has been extracted to `RenderWorld`.
+    pub fn try_with_removed_indices(mut self) -> Result<Self, MeshAccessError> {
+        self.try_remove_indices()?;
+        Ok(self)
+    }
+
     /// Returns the size of a vertex in bytes.
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`.
     pub fn get_vertex_size(&self) -> u64 {
         self.attributes
+            .as_ref()
+            .expect(MESH_EXTRACTED_ERROR)
             .values()
             .map(|data| data.attribute.format.size())
             .sum()
     }
 
     /// Returns the size required for the vertex buffer in bytes.
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`.
     pub fn get_vertex_buffer_size(&self) -> usize {
         let vertex_size = self.get_vertex_size() as usize;
         let vertex_count = self.count_vertices();
@@ -430,22 +840,32 @@ impl Mesh {
 
     /// Computes and returns the index data of the mesh as bytes.
     /// This is used to transform the index data into a GPU friendly format.
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`.
     pub fn get_index_buffer_bytes(&self) -> Option<&[u8]> {
-        self.indices.as_ref().map(|indices| match &indices {
+        let mesh_indices = self.indices.as_ref_option().expect(MESH_EXTRACTED_ERROR);
+
+        mesh_indices.as_ref().map(|indices| match &indices {
             Indices::U16(indices) => cast_slice(&indices[..]),
             Indices::U32(indices) => cast_slice(&indices[..]),
         })
     }
 
     /// Get this `Mesh`'s [`MeshVertexBufferLayout`], used in `SpecializedMeshPipeline`.
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`.
     pub fn get_mesh_vertex_buffer_layout(
         &self,
         mesh_vertex_buffer_layouts: &mut MeshVertexBufferLayouts,
     ) -> MeshVertexBufferLayoutRef {
-        let mut attributes = Vec::with_capacity(self.attributes.len());
-        let mut attribute_ids = Vec::with_capacity(self.attributes.len());
+        let mesh_attributes = self.attributes.as_ref().expect(MESH_EXTRACTED_ERROR);
+
+        let mut attributes = Vec::with_capacity(mesh_attributes.len());
+        let mut attribute_ids = Vec::with_capacity(mesh_attributes.len());
         let mut accumulated_offset = 0;
-        for (index, data) in self.attributes.values().enumerate() {
+        for (index, data) in mesh_attributes.values().enumerate() {
             attribute_ids.push(data.attribute.id);
             attributes.push(VertexAttribute {
                 offset: accumulated_offset,
@@ -469,14 +889,18 @@ impl Mesh {
     /// Counts all vertices of the mesh.
     ///
     /// If the attributes have different vertex counts, the smallest is returned.
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`.
     pub fn count_vertices(&self) -> usize {
         let mut vertex_count: Option<usize> = None;
-        for (attribute_id, attribute_data) in &self.attributes {
+        let mesh_attributes = self.attributes.as_ref().expect(MESH_EXTRACTED_ERROR);
+
+        for (attribute_id, attribute_data) in mesh_attributes {
             let attribute_len = attribute_data.values.len();
             if let Some(previous_vertex_count) = vertex_count {
                 if previous_vertex_count != attribute_len {
-                    let name = self
-                        .attributes
+                    let name = mesh_attributes
                         .get(attribute_id)
                         .map(|data| data.attribute.name.to_string())
                         .unwrap_or_else(|| format!("{attribute_id:?}"));
@@ -502,6 +926,9 @@ impl Mesh {
     ///
     /// This is a convenience method which allocates a Vec.
     /// Prefer pre-allocating and using [`Mesh::write_packed_vertex_buffer_data`] when possible.
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`.
     pub fn create_packed_vertex_buffer_data(&self) -> Vec<u8> {
         let mut attributes_interleaved_buffer = vec![0; self.get_vertex_buffer_size()];
         self.write_packed_vertex_buffer_data(&mut attributes_interleaved_buffer);
@@ -514,12 +941,17 @@ impl Mesh {
     ///
     /// If the vertex attributes have different lengths, they are all truncated to
     /// the length of the smallest.
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`.
     pub fn write_packed_vertex_buffer_data(&self, slice: &mut [u8]) {
+        let mesh_attributes = self.attributes.as_ref().expect(MESH_EXTRACTED_ERROR);
+
         let vertex_size = self.get_vertex_size() as usize;
         let vertex_count = self.count_vertices();
         // bundle into interleaved buffers
         let mut attribute_offset = 0;
-        for attribute_data in self.attributes.values() {
+        for attribute_data in mesh_attributes.values() {
             let attribute_size = attribute_data.attribute.format.size() as usize;
             let attributes_bytes = attribute_data.values.get_bytes();
             for (vertex_index, attribute_bytes) in attributes_bytes
@@ -539,16 +971,32 @@ impl Mesh {
     ///
     /// This can dramatically increase the vertex count, so make sure this is what you want.
     /// Does nothing if no [Indices] are set.
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_duplicate_vertices`]
     pub fn duplicate_vertices(&mut self) {
+        self.try_duplicate_vertices().expect(MESH_EXTRACTED_ERROR);
+    }
+
+    /// Duplicates the vertex attributes so that no vertices are shared.
+    ///
+    /// This can dramatically increase the vertex count, so make sure this is what you want.
+    /// Does nothing if no [Indices] are set.
+    ///
+    /// Returns an error if the mesh data has been extracted to `RenderWorld`.
+    pub fn try_duplicate_vertices(&mut self) -> Result<(), MeshAccessError> {
         fn duplicate<T: Copy>(values: &[T], indices: impl Iterator<Item = usize>) -> Vec<T> {
             indices.map(|i| values[i]).collect()
         }
 
-        let Some(indices) = self.indices.take() else {
-            return;
+        let Some(indices) = self.indices.replace(None)? else {
+            return Ok(());
         };
 
-        for attributes in self.attributes.values_mut() {
+        let mesh_attributes = self.attributes.as_mut()?;
+
+        for attributes in mesh_attributes.values_mut() {
             let indices = indices.iter();
             #[expect(
                 clippy::match_same_arms,
@@ -585,6 +1033,8 @@ impl Mesh {
                 VertexAttributeValues::Unorm8x4(vec) => *vec = duplicate(vec, indices),
             }
         }
+
+        Ok(())
     }
 
     /// Consumes the mesh and returns a mesh with no shared vertices.
@@ -593,12 +1043,29 @@ impl Mesh {
     /// Does nothing if no [`Indices`] are set.
     ///
     /// (Alternatively, you can use [`Mesh::duplicate_vertices`] to mutate an existing mesh in-place)
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_with_duplicated_vertices`]
     #[must_use]
     pub fn with_duplicated_vertices(mut self) -> Self {
         self.duplicate_vertices();
         self
     }
 
+    /// Consumes the mesh and returns a mesh with no shared vertices.
+    ///
+    /// This can dramatically increase the vertex count, so make sure this is what you want.
+    /// Does nothing if no [`Indices`] are set.
+    ///
+    /// (Alternatively, you can use [`Mesh::try_duplicate_vertices`] to mutate an existing mesh in-place)
+    ///
+    /// Returns an error if the mesh data has been extracted to `RenderWorld`.
+    pub fn try_with_duplicated_vertices(mut self) -> Result<Self, MeshAccessError> {
+        self.try_duplicate_vertices()?;
+        Ok(self)
+    }
+
     /// Inverts the winding of the indices such that all counter-clockwise triangles are now
     /// clockwise and vice versa.
     /// For lines, their start and end indices are flipped.
@@ -640,7 +1107,10 @@ impl Mesh {
                 _ => Err(MeshWindingInvertError::WrongTopology),
             }
         }
-        match &mut self.indices {
+
+        let mesh_indices = self.indices.as_mut_option()?;
+
+        match mesh_indices {
             Some(Indices::U16(vec)) => invert(vec, self.primitive_topology),
             Some(Indices::U32(vec)) => invert(vec, self.primitive_topology),
             None => Ok(()),
@@ -662,15 +1132,28 @@ impl Mesh {
     /// # Panics
     /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
     /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].=
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_compute_normals`]
     pub fn compute_normals(&mut self) {
+        self.try_compute_normals().expect(MESH_EXTRACTED_ERROR);
+    }
+
+    /// Calculates the [`Mesh::ATTRIBUTE_NORMAL`] of a mesh.
+    /// If the mesh is indexed, this defaults to smooth normals. Otherwise, it defaults to flat
+    /// normals.
+    ///
+    /// # Panics
+    /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
+    /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].=
+    pub fn try_compute_normals(&mut self) -> Result<(), MeshAccessError> {
         assert!(
             matches!(self.primitive_topology, PrimitiveTopology::TriangleList),
             "`compute_normals` can only work on `TriangleList`s"
         );
-        if self.indices().is_none() {
-            self.compute_flat_normals();
+        if self.try_indices_option()?.is_none() {
+            self.try_compute_flat_normals()
         } else {
-            self.compute_smooth_normals();
+            self.try_compute_smooth_normals()
         }
     }
 
@@ -681,13 +1164,30 @@ impl Mesh {
     /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
     /// Consider calling [`Mesh::duplicate_vertices`] or exporting your mesh with normal
     /// attributes.
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_compute_flat_normals`]
     ///
     /// FIXME: This should handle more cases since this is called as a part of gltf
     /// mesh loading where we can't really blame users for loading meshes that might
     /// not conform to the limitations here!
     pub fn compute_flat_normals(&mut self) {
+        self.try_compute_flat_normals().expect(MESH_EXTRACTED_ERROR);
+    }
+
+    /// Calculates the [`Mesh::ATTRIBUTE_NORMAL`] of a mesh.
+    ///
+    /// # Panics
+    /// Panics if [`Indices`] are set or [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
+    /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
+    /// Consider calling [`Mesh::duplicate_vertices`] or exporting your mesh with normal
+    /// attributes.
+    ///
+    /// FIXME: This should handle more cases since this is called as a part of gltf
+    /// mesh loading where we can't really blame users for loading meshes that might
+    /// not conform to the limitations here!
+    pub fn try_compute_flat_normals(&mut self) -> Result<(), MeshAccessError> {
         assert!(
-            self.indices().is_none(),
+            self.try_indices_option()?.is_none(),
             "`compute_flat_normals` can't work on indexed geometry. Consider calling either `Mesh::compute_smooth_normals` or `Mesh::duplicate_vertices` followed by `Mesh::compute_flat_normals`."
         );
         assert!(
@@ -696,8 +1196,7 @@ impl Mesh {
         );
 
         let positions = self
-            .attribute(Mesh::ATTRIBUTE_POSITION)
-            .unwrap()
+            .try_attribute(Mesh::ATTRIBUTE_POSITION)?
             .as_float3()
             .expect("`Mesh::ATTRIBUTE_POSITION` vertex attributes should be of type `float3`");
 
@@ -707,7 +1206,7 @@ impl Mesh {
             .flat_map(|normal| [normal; 3])
             .collect();
 
-        self.insert_attribute(Mesh::ATTRIBUTE_NORMAL, normals);
+        self.try_insert_attribute(Mesh::ATTRIBUTE_NORMAL, normals)
     }
 
     /// Calculates the [`Mesh::ATTRIBUTE_NORMAL`] of an indexed mesh, smoothing normals for shared
@@ -726,8 +1225,31 @@ impl Mesh {
     /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
     /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
     /// Panics if the mesh does not have indices defined.
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_compute_smooth_normals`]
     pub fn compute_smooth_normals(&mut self) {
-        self.compute_custom_smooth_normals(|[a, b, c], positions, normals| {
+        self.try_compute_smooth_normals()
+            .expect(MESH_EXTRACTED_ERROR);
+    }
+
+    /// Calculates the [`Mesh::ATTRIBUTE_NORMAL`] of an indexed mesh, smoothing normals for shared
+    /// vertices.
+    ///
+    /// This method weights normals by the angles of the corners of connected triangles, thus
+    /// eliminating triangle area and count as factors in the final normal. This does make it
+    /// somewhat slower than [`Mesh::compute_area_weighted_normals`] which does not need to
+    /// greedily normalize each triangle's normal or calculate corner angles.
+    ///
+    /// If you would rather have the computed normals be weighted by triangle area, see
+    /// [`Mesh::compute_area_weighted_normals`] instead. If you need to weight them in some other
+    /// way, see [`Mesh::compute_custom_smooth_normals`].
+    ///
+    /// # Panics
+    /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
+    /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
+    /// Panics if the mesh does not have indices defined.
+    pub fn try_compute_smooth_normals(&mut self) -> Result<(), MeshAccessError> {
+        self.try_compute_custom_smooth_normals(|[a, b, c], positions, normals| {
             let pa = Vec3::from(positions[a]);
             let pb = Vec3::from(positions[b]);
             let pc = Vec3::from(positions[c]);
@@ -761,7 +1283,32 @@ impl Mesh {
             normals[a] += normal * weight_a;
             normals[b] += normal * weight_b;
             normals[c] += normal * weight_c;
-        });
+        })
+    }
+
+    /// Calculates the [`Mesh::ATTRIBUTE_NORMAL`] of an indexed mesh, smoothing normals for shared
+    /// vertices.
+    ///
+    /// This method weights normals by the area of each triangle containing the vertex. Thus,
+    /// larger triangles will skew the normals of their vertices towards their own normal more
+    /// than smaller triangles will.
+    ///
+    /// This method is actually somewhat faster than [`Mesh::compute_smooth_normals`] because an
+    /// intermediate result of triangle normal calculation is already scaled by the triangle's area.
+    ///
+    /// If you would rather have the computed normals be influenced only by the angles of connected
+    /// edges, see [`Mesh::compute_smooth_normals`] instead. If you need to weight them in some
+    /// other way, see [`Mesh::compute_custom_smooth_normals`].
+    ///
+    /// # Panics
+    /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
+    /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
+    /// Panics if the mesh does not have indices defined.
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_compute_area_weighted_normals`]
+    pub fn compute_area_weighted_normals(&mut self) {
+        self.try_compute_area_weighted_normals()
+            .expect(MESH_EXTRACTED_ERROR);
     }
 
     /// Calculates the [`Mesh::ATTRIBUTE_NORMAL`] of an indexed mesh, smoothing normals for shared
@@ -782,8 +1329,8 @@ impl Mesh {
     /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
     /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
     /// Panics if the mesh does not have indices defined.
-    pub fn compute_area_weighted_normals(&mut self) {
-        self.compute_custom_smooth_normals(|[a, b, c], positions, normals| {
+    pub fn try_compute_area_weighted_normals(&mut self) -> Result<(), MeshAccessError> {
+        self.try_compute_custom_smooth_normals(|[a, b, c], positions, normals| {
             let normal = Vec3::from(triangle_area_normal(
                 positions[a],
                 positions[b],
@@ -792,7 +1339,7 @@ impl Mesh {
             [a, b, c].into_iter().for_each(|pos| {
                 normals[pos] += normal;
             });
-        });
+        })
     }
 
     /// Calculates the [`Mesh::ATTRIBUTE_NORMAL`] of an indexed mesh, smoothing normals for shared
@@ -827,6 +1374,8 @@ impl Mesh {
     /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
     /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
     /// Panics if the mesh does not have indices defined.
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_compute_custom_smooth_normals`]
     //
     // FIXME: This should handle more cases since this is called as a part of gltf
     // mesh loading where we can't really blame users for loading meshes that might
@@ -839,27 +1388,75 @@ impl Mesh {
     // - [Mesh::with_computed_area_weighted_normals]
     pub fn compute_custom_smooth_normals(
         &mut self,
-        mut per_triangle: impl FnMut([usize; 3], &[[f32; 3]], &mut [Vec3]),
+        per_triangle: impl FnMut([usize; 3], &[[f32; 3]], &mut [Vec3]),
     ) {
+        self.try_compute_custom_smooth_normals(per_triangle)
+            .expect(MESH_EXTRACTED_ERROR);
+    }
+
+    /// Calculates the [`Mesh::ATTRIBUTE_NORMAL`] of an indexed mesh, smoothing normals for shared
+    /// vertices.
+    ///
+    /// This method allows you to customize how normals are weighted via the `per_triangle` parameter,
+    /// which must be a function or closure that accepts 3 parameters:
+    /// - The indices of the three vertices of the triangle as a `[usize; 3]`.
+    /// - A reference to the values of the [`Mesh::ATTRIBUTE_POSITION`] of the mesh (`&[[f32; 3]]`).
+    /// - A mutable reference to the sums of all normals so far.
+    ///
+    /// See also the standard methods included in Bevy for calculating smooth normals:
+    /// - [`Mesh::compute_smooth_normals`]
+    /// - [`Mesh::compute_area_weighted_normals`]
+    ///
+    /// An example that would weight each connected triangle's normal equally, thus skewing normals
+    /// towards the planes divided into the most triangles:
+    /// ```
+    /// # use bevy_asset::RenderAssetUsages;
+    /// # use bevy_mesh::{Mesh, PrimitiveTopology, Meshable, MeshBuilder};
+    /// # use bevy_math::{Vec3, primitives::Cuboid};
+    /// # let mut mesh = Cuboid::default().mesh().build();
+    /// mesh.compute_custom_smooth_normals(|[a, b, c], positions, normals| {
+    ///     let normal = Vec3::from(bevy_mesh::triangle_normal(positions[a], positions[b], positions[c]));
+    ///     for idx in [a, b, c] {
+    ///         normals[idx] += normal;
+    ///     }
+    /// });
+    /// ```
+    ///
+    /// # Panics
+    /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
+    /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
+    /// Panics if the mesh does not have indices defined.
+    //
+    // FIXME: This should handle more cases since this is called as a part of gltf
+    // mesh loading where we can't really blame users for loading meshes that might
+    // not conform to the limitations here!
+    //
+    // When fixed, also update "Panics" sections of
+    // - [Mesh::compute_smooth_normals]
+    // - [Mesh::with_computed_smooth_normals]
+    // - [Mesh::compute_area_weighted_normals]
+    // - [Mesh::with_computed_area_weighted_normals]
+    pub fn try_compute_custom_smooth_normals(
+        &mut self,
+        mut per_triangle: impl FnMut([usize; 3], &[[f32; 3]], &mut [Vec3]),
+    ) -> Result<(), MeshAccessError> {
         assert!(
             matches!(self.primitive_topology, PrimitiveTopology::TriangleList),
             "smooth normals can only be computed on `TriangleList`s"
         );
         assert!(
-            self.indices().is_some(),
+            self.try_indices_option()?.is_some(),
             "smooth normals can only be computed on indexed meshes"
         );
 
         let positions = self
-            .attribute(Mesh::ATTRIBUTE_POSITION)
-            .unwrap()
+            .try_attribute(Mesh::ATTRIBUTE_POSITION)?
             .as_float3()
             .expect("`Mesh::ATTRIBUTE_POSITION` vertex attributes should be of type `float3`");
 
         let mut normals = vec![Vec3::ZERO; positions.len()];
 
-        self.indices()
-            .unwrap()
+        self.try_indices()?
             .iter()
             .collect::<Vec<usize>>()
             .chunks_exact(3)
@@ -869,7 +1466,7 @@ impl Mesh {
             *normal = normal.try_normalize().unwrap_or(Vec3::ZERO);
         }
 
-        self.insert_attribute(Mesh::ATTRIBUTE_NORMAL, normals);
+        self.try_insert_attribute(Mesh::ATTRIBUTE_NORMAL, normals)
     }
 
     /// Consumes the mesh and returns a mesh with calculated [`Mesh::ATTRIBUTE_NORMAL`].
@@ -881,10 +1478,26 @@ impl Mesh {
     /// # Panics
     /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
     /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_with_computed_normals`]
     #[must_use]
-    pub fn with_computed_normals(mut self) -> Self {
-        self.compute_normals();
-        self
+    pub fn with_computed_normals(self) -> Self {
+        self.try_with_computed_normals()
+            .expect(MESH_EXTRACTED_ERROR)
+    }
+
+    /// Consumes the mesh and returns a mesh with calculated [`Mesh::ATTRIBUTE_NORMAL`].
+    /// If the mesh is indexed, this defaults to smooth normals. Otherwise, it defaults to flat
+    /// normals.
+    ///
+    /// (Alternatively, you can use [`Mesh::compute_normals`] to mutate an existing mesh in-place)
+    ///
+    /// # Panics
+    /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
+    /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
+    pub fn try_with_computed_normals(mut self) -> Result<Self, MeshAccessError> {
+        self.try_compute_normals()?;
+        Ok(self)
     }
 
     /// Consumes the mesh and returns a mesh with calculated [`Mesh::ATTRIBUTE_NORMAL`].
@@ -895,12 +1508,26 @@ impl Mesh {
     /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
     /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
     /// Panics if the mesh has indices defined
-    #[must_use]
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_with_computed_flat_normals`]
     pub fn with_computed_flat_normals(mut self) -> Self {
         self.compute_flat_normals();
         self
     }
 
+    /// Consumes the mesh and returns a mesh with calculated [`Mesh::ATTRIBUTE_NORMAL`].
+    ///
+    /// (Alternatively, you can use [`Mesh::compute_flat_normals`] to mutate an existing mesh in-place)
+    ///
+    /// # Panics
+    /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
+    /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
+    /// Panics if the mesh has indices defined
+    pub fn try_with_computed_flat_normals(mut self) -> Result<Self, MeshAccessError> {
+        self.try_compute_flat_normals()?;
+        Ok(self)
+    }
+
     /// Consumes the mesh and returns a mesh with calculated [`Mesh::ATTRIBUTE_NORMAL`].
     ///
     /// (Alternatively, you can use [`Mesh::compute_smooth_normals`] to mutate an existing mesh in-place)
@@ -913,11 +1540,28 @@ impl Mesh {
     /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
     /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
     /// Panics if the mesh does not have indices defined.
-    #[must_use]
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_with_computed_smooth_normals`]
     pub fn with_computed_smooth_normals(mut self) -> Self {
         self.compute_smooth_normals();
         self
     }
+    /// Consumes the mesh and returns a mesh with calculated [`Mesh::ATTRIBUTE_NORMAL`].
+    ///
+    /// (Alternatively, you can use [`Mesh::compute_smooth_normals`] to mutate an existing mesh in-place)
+    ///
+    /// This method weights normals by the angles of triangle corners connected to each vertex. If
+    /// you would rather have the computed normals be weighted by triangle area, see
+    /// [`Mesh::with_computed_area_weighted_normals`] instead.
+    ///
+    /// # Panics
+    /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
+    /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
+    /// Panics if the mesh does not have indices defined.
+    pub fn try_with_computed_smooth_normals(mut self) -> Result<Self, MeshAccessError> {
+        self.try_compute_smooth_normals()?;
+        Ok(self)
+    }
 
     /// Consumes the mesh and returns a mesh with calculated [`Mesh::ATTRIBUTE_NORMAL`].
     ///
@@ -932,12 +1576,31 @@ impl Mesh {
     /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
     /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
     /// Panics if the mesh does not have indices defined.
-    #[must_use]
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_with_computed_area_weighted_normals`]
     pub fn with_computed_area_weighted_normals(mut self) -> Self {
         self.compute_area_weighted_normals();
         self
     }
 
+    /// Consumes the mesh and returns a mesh with calculated [`Mesh::ATTRIBUTE_NORMAL`].
+    ///
+    /// (Alternatively, you can use [`Mesh::compute_area_weighted_normals`] to mutate an existing mesh in-place)
+    ///
+    /// This method weights normals by the area of each triangle containing the vertex. Thus,
+    /// larger triangles will skew the normals of their vertices towards their own normal more
+    /// than smaller triangles will. If you would rather have the computed normals be influenced
+    /// only by the angles of connected edges, see [`Mesh::with_computed_smooth_normals`] instead.
+    ///
+    /// # Panics
+    /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
+    /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
+    /// Panics if the mesh does not have indices defined.
+    pub fn try_with_computed_area_weighted_normals(mut self) -> Result<Self, MeshAccessError> {
+        self.try_compute_area_weighted_normals()?;
+        Ok(self)
+    }
+
     /// Generate tangents for the mesh using the `mikktspace` algorithm.
     ///
     /// Sets the [`Mesh::ATTRIBUTE_TANGENT`] attribute if successful.
@@ -945,7 +1608,7 @@ impl Mesh {
     #[cfg(feature = "bevy_mikktspace")]
     pub fn generate_tangents(&mut self) -> Result<(), super::GenerateTangentsError> {
         let tangents = super::generate_tangents_for_mesh(self)?;
-        self.insert_attribute(Mesh::ATTRIBUTE_TANGENT, tangents);
+        self.try_insert_attribute(Mesh::ATTRIBUTE_TANGENT, tangents)?;
         Ok(())
     }
 
@@ -994,8 +1657,8 @@ impl Mesh {
         let index_offset = self.count_vertices();
 
         // Extend attributes of `self` with attributes of `other`.
-        for (attribute, values) in self.attributes_mut() {
-            if let Some(other_values) = other.attribute(attribute.id) {
+        for (attribute, values) in self.try_attributes_mut()? {
+            if let Some(other_values) = other.try_attribute_option(attribute.id)? {
                 #[expect(
                     clippy::match_same_arms,
                     reason = "Although the bindings on some match arms may have different types, each variant has different semantics; thus it's not guaranteed that they will use the same type forever."
@@ -1033,7 +1696,7 @@ impl Mesh {
                         return Err(MeshMergeError::IncompatibleVertexAttributes {
                             self_attribute: *attribute,
                             other_attribute: other
-                                .attribute_data(attribute.id)
+                                .try_attribute_data(attribute.id)?
                                 .map(|data| data.attribute),
                         })
                     }
@@ -1042,7 +1705,9 @@ impl Mesh {
         }
 
         // Extend indices of `self` with indices of `other`.
-        if let (Some(indices), Some(other_indices)) = (self.indices_mut(), other.indices()) {
+        if let (Some(indices), Some(other_indices)) =
+            (self.try_indices_mut_option()?, other.try_indices_option()?)
+        {
             indices.extend(other_indices.iter().map(|i| (i + index_offset) as u32));
         }
         Ok(())
@@ -1051,15 +1716,39 @@ impl Mesh {
     /// Transforms the vertex positions, normals, and tangents of the mesh by the given [`Transform`].
     ///
     /// `Aabb` of entities with modified mesh are not updated automatically.
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_transformed_by`]
     pub fn transformed_by(mut self, transform: Transform) -> Self {
         self.transform_by(transform);
         self
     }
 
+    /// Transforms the vertex positions, normals, and tangents of the mesh by the given [`Transform`].
+    ///
+    /// `Aabb` of entities with modified mesh are not updated automatically.
+    pub fn try_transformed_by(mut self, transform: Transform) -> Result<Self, MeshAccessError> {
+        self.try_transform_by(transform)?;
+        Ok(self)
+    }
+
     /// Transforms the vertex positions, normals, and tangents of the mesh in place by the given [`Transform`].
     ///
     /// `Aabb` of entities with modified mesh are not updated automatically.
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_transform_by`]
     pub fn transform_by(&mut self, transform: Transform) {
+        self.try_transform_by(transform)
+            .expect(MESH_EXTRACTED_ERROR);
+    }
+
+    /// Transforms the vertex positions, normals, and tangents of the mesh in place by the given [`Transform`].
+    ///
+    /// `Aabb` of entities with modified mesh are not updated automatically.
+    pub fn try_transform_by(&mut self, transform: Transform) -> Result<(), MeshAccessError> {
         // Needed when transforming normals and tangents
         let scale_recip = 1. / transform.scale;
         debug_assert!(
@@ -1068,7 +1757,7 @@ impl Mesh {
         );
 
         if let Some(VertexAttributeValues::Float32x3(positions)) =
-            self.attribute_mut(Mesh::ATTRIBUTE_POSITION)
+            self.try_attribute_mut_option(Mesh::ATTRIBUTE_POSITION)?
         {
             // Apply scale, rotation, and translation to vertex positions
             positions
@@ -1081,11 +1770,11 @@ impl Mesh {
             && transform.scale.x == transform.scale.y
             && transform.scale.y == transform.scale.z
         {
-            return;
+            return Ok(());
         }
 
         if let Some(VertexAttributeValues::Float32x3(normals)) =
-            self.attribute_mut(Mesh::ATTRIBUTE_NORMAL)
+            self.try_attribute_mut_option(Mesh::ATTRIBUTE_NORMAL)?
         {
             // Transform normals, taking into account non-uniform scaling and rotation
             normals.iter_mut().for_each(|normal| {
@@ -1096,7 +1785,7 @@ impl Mesh {
         }
 
         if let Some(VertexAttributeValues::Float32x4(tangents)) =
-            self.attribute_mut(Mesh::ATTRIBUTE_TANGENT)
+            self.try_attribute_mut_option(Mesh::ATTRIBUTE_TANGENT)?
         {
             // Transform tangents, taking into account non-uniform scaling and rotation
             tangents.iter_mut().for_each(|tangent| {
@@ -1107,48 +1796,99 @@ impl Mesh {
                     .to_array();
             });
         }
+
+        Ok(())
     }
 
     /// Translates the vertex positions of the mesh by the given [`Vec3`].
     ///
     /// `Aabb` of entities with modified mesh are not updated automatically.
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_translated_by`]
     pub fn translated_by(mut self, translation: Vec3) -> Self {
         self.translate_by(translation);
         self
     }
 
+    /// Translates the vertex positions of the mesh by the given [`Vec3`].
+    ///
+    /// `Aabb` of entities with modified mesh are not updated automatically.
+    pub fn try_translated_by(mut self, translation: Vec3) -> Result<Self, MeshAccessError> {
+        self.try_translate_by(translation)?;
+        Ok(self)
+    }
+
     /// Translates the vertex positions of the mesh in place by the given [`Vec3`].
     ///
     /// `Aabb` of entities with modified mesh are not updated automatically.
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_translate_by`]
     pub fn translate_by(&mut self, translation: Vec3) {
+        self.try_translate_by(translation)
+            .expect(MESH_EXTRACTED_ERROR);
+    }
+
+    /// Translates the vertex positions of the mesh in place by the given [`Vec3`].
+    ///
+    /// `Aabb` of entities with modified mesh are not updated automatically.
+    pub fn try_translate_by(&mut self, translation: Vec3) -> Result<(), MeshAccessError> {
         if translation == Vec3::ZERO {
-            return;
+            return Ok(());
         }
 
         if let Some(VertexAttributeValues::Float32x3(positions)) =
-            self.attribute_mut(Mesh::ATTRIBUTE_POSITION)
+            self.try_attribute_mut_option(Mesh::ATTRIBUTE_POSITION)?
         {
             // Apply translation to vertex positions
             positions
                 .iter_mut()
                 .for_each(|pos| *pos = (Vec3::from_slice(pos) + translation).to_array());
         }
+
+        Ok(())
     }
 
     /// Rotates the vertex positions, normals, and tangents of the mesh by the given [`Quat`].
     ///
     /// `Aabb` of entities with modified mesh are not updated automatically.
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_rotated_by`]
     pub fn rotated_by(mut self, rotation: Quat) -> Self {
-        self.rotate_by(rotation);
+        self.try_rotate_by(rotation).expect(MESH_EXTRACTED_ERROR);
         self
     }
 
+    /// Rotates the vertex positions, normals, and tangents of the mesh by the given [`Quat`].
+    ///
+    /// `Aabb` of entities with modified mesh are not updated automatically.
+    pub fn try_rotated_by(mut self, rotation: Quat) -> Result<Self, MeshAccessError> {
+        self.try_rotate_by(rotation)?;
+        Ok(self)
+    }
+
     /// Rotates the vertex positions, normals, and tangents of the mesh in place by the given [`Quat`].
     ///
     /// `Aabb` of entities with modified mesh are not updated automatically.
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_rotate_by`]
     pub fn rotate_by(&mut self, rotation: Quat) {
+        self.try_rotate_by(rotation).expect(MESH_EXTRACTED_ERROR);
+    }
+
+    /// Rotates the vertex positions, normals, and tangents of the mesh in place by the given [`Quat`].
+    ///
+    /// `Aabb` of entities with modified mesh are not updated automatically.
+    pub fn try_rotate_by(&mut self, rotation: Quat) -> Result<(), MeshAccessError> {
         if let Some(VertexAttributeValues::Float32x3(positions)) =
-            self.attribute_mut(Mesh::ATTRIBUTE_POSITION)
+            self.try_attribute_mut_option(Mesh::ATTRIBUTE_POSITION)?
         {
             // Apply rotation to vertex positions
             positions
@@ -1158,11 +1898,11 @@ impl Mesh {
 
         // No need to transform normals or tangents if rotation is near identity
         if rotation.is_near_identity() {
-            return;
+            return Ok(());
         }
 
         if let Some(VertexAttributeValues::Float32x3(normals)) =
-            self.attribute_mut(Mesh::ATTRIBUTE_NORMAL)
+            self.try_attribute_mut_option(Mesh::ATTRIBUTE_NORMAL)?
         {
             // Transform normals
             normals.iter_mut().for_each(|normal| {
@@ -1171,7 +1911,7 @@ impl Mesh {
         }
 
         if let Some(VertexAttributeValues::Float32x4(tangents)) =
-            self.attribute_mut(Mesh::ATTRIBUTE_TANGENT)
+            self.try_attribute_mut_option(Mesh::ATTRIBUTE_TANGENT)?
         {
             // Transform tangents
             tangents.iter_mut().for_each(|tangent| {
@@ -1181,20 +1921,45 @@ impl Mesh {
                     .to_array();
             });
         }
+
+        Ok(())
     }
 
     /// Scales the vertex positions, normals, and tangents of the mesh by the given [`Vec3`].
     ///
     /// `Aabb` of entities with modified mesh are not updated automatically.
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_scaled_by`]
     pub fn scaled_by(mut self, scale: Vec3) -> Self {
         self.scale_by(scale);
         self
     }
 
+    /// Scales the vertex positions, normals, and tangents of the mesh by the given [`Vec3`].
+    ///
+    /// `Aabb` of entities with modified mesh are not updated automatically.
+    pub fn try_scaled_by(mut self, scale: Vec3) -> Result<Self, MeshAccessError> {
+        self.try_scale_by(scale)?;
+        Ok(self)
+    }
+
     /// Scales the vertex positions, normals, and tangents of the mesh in place by the given [`Vec3`].
     ///
     /// `Aabb` of entities with modified mesh are not updated automatically.
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_scale_by`]
     pub fn scale_by(&mut self, scale: Vec3) {
+        self.try_scale_by(scale).expect(MESH_EXTRACTED_ERROR);
+    }
+
+    /// Scales the vertex positions, normals, and tangents of the mesh in place by the given [`Vec3`].
+    ///
+    /// `Aabb` of entities with modified mesh are not updated automatically.
+    pub fn try_scale_by(&mut self, scale: Vec3) -> Result<(), MeshAccessError> {
         // Needed when transforming normals and tangents
         let scale_recip = 1. / scale;
         debug_assert!(
@@ -1203,7 +1968,7 @@ impl Mesh {
         );
 
         if let Some(VertexAttributeValues::Float32x3(positions)) =
-            self.attribute_mut(Mesh::ATTRIBUTE_POSITION)
+            self.try_attribute_mut_option(Mesh::ATTRIBUTE_POSITION)?
         {
             // Apply scale to vertex positions
             positions
@@ -1213,11 +1978,11 @@ impl Mesh {
 
         // No need to transform normals or tangents if scale is uniform
         if scale.x == scale.y && scale.y == scale.z {
-            return;
+            return Ok(());
         }
 
         if let Some(VertexAttributeValues::Float32x3(normals)) =
-            self.attribute_mut(Mesh::ATTRIBUTE_NORMAL)
+            self.try_attribute_mut_option(Mesh::ATTRIBUTE_NORMAL)?
         {
             // Transform normals, taking into account non-uniform scaling
             normals.iter_mut().for_each(|normal| {
@@ -1226,7 +1991,7 @@ impl Mesh {
         }
 
         if let Some(VertexAttributeValues::Float32x4(tangents)) =
-            self.attribute_mut(Mesh::ATTRIBUTE_TANGENT)
+            self.try_attribute_mut_option(Mesh::ATTRIBUTE_TANGENT)?
         {
             // Transform tangents, taking into account non-uniform scaling
             tangents.iter_mut().for_each(|tangent| {
@@ -1238,15 +2003,25 @@ impl Mesh {
                     .to_array();
             });
         }
+
+        Ok(())
     }
 
     /// Normalize joint weights so they sum to 1.
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_normalize_joint_weights`]
     pub fn normalize_joint_weights(&mut self) {
-        if let Some(joints) = self.attribute_mut(Self::ATTRIBUTE_JOINT_WEIGHT) {
-            let VertexAttributeValues::Float32x4(joints) = joints else {
-                panic!("unexpected joint weight format");
-            };
+        self.try_normalize_joint_weights()
+            .expect(MESH_EXTRACTED_ERROR);
+    }
 
+    /// Normalize joint weights so they sum to 1.
+    pub fn try_normalize_joint_weights(&mut self) -> Result<(), MeshAccessError> {
+        if let Some(VertexAttributeValues::Float32x4(joints)) =
+            self.try_attribute_mut_option(Self::ATTRIBUTE_JOINT_WEIGHT)?
+        {
             for weights in joints.iter_mut() {
                 // force negative weights to zero
                 weights.iter_mut().for_each(|w| *w = w.max(0.0));
@@ -1263,6 +2038,8 @@ impl Mesh {
                 }
             }
         }
+
+        Ok(())
     }
 
     /// Get a list of this Mesh's [triangles] as an iterator if possible.
@@ -1275,17 +2052,13 @@ impl Mesh {
     /// [primitive topology]: PrimitiveTopology
     /// [triangles]: Triangle3d
     pub fn triangles(&self) -> Result<impl Iterator<Item = Triangle3d> + '_, MeshTrianglesError> {
-        let Some(position_data) = self.attribute(Mesh::ATTRIBUTE_POSITION) else {
-            return Err(MeshTrianglesError::MissingPositions);
-        };
+        let position_data = self.try_attribute(Mesh::ATTRIBUTE_POSITION)?;
 
         let Some(vertices) = position_data.as_float3() else {
             return Err(MeshTrianglesError::PositionsFormat);
         };
 
-        let Some(indices) = self.indices() else {
-            return Err(MeshTrianglesError::MissingIndices);
-        };
+        let indices = self.try_indices()?;
 
         match self.primitive_topology {
             PrimitiveTopology::TriangleList => {
@@ -1362,23 +2135,105 @@ impl Mesh {
             })
         }
     }
+
+    /// Extracts the mesh vertex, index and morph target data for GPU upload.
+    /// This function is called internally in render world extraction, it is
+    /// unlikely to be useful outside of that context.
+    ///
+    /// Returns an error if the mesh data has been extracted to `RenderWorld`.
+    pub fn take_gpu_data(&mut self) -> Result<Self, MeshAccessError> {
+        let attributes = self.attributes.extract()?;
+        let indices = self.indices.extract()?;
+        #[cfg(feature = "morph")]
+        let morph_targets = self.morph_targets.extract()?;
+        #[cfg(feature = "morph")]
+        let morph_target_names = self.morph_target_names.extract()?;
+
+        // store the aabb extents as they cannot be computed after extraction
+        if let Some(MeshAttributeData {
+            values: VertexAttributeValues::Float32x3(position_values),
+            ..
+        }) = attributes
+            .as_ref_option()?
+            .and_then(|attrs| attrs.get(&Self::ATTRIBUTE_POSITION.id))
+            && !position_values.is_empty()
+        {
+            let mut iter = position_values.iter().map(|p| Vec3::from_slice(p));
+            let mut min = iter.next().unwrap();
+            let mut max = min;
+            for v in iter {
+                min = Vec3::min(min, v);
+                max = Vec3::max(max, v);
+            }
+            self.final_aabb = Some(Aabb3d::new(min, max));
+        }
+
+        Ok(Self {
+            attributes,
+            indices,
+            #[cfg(feature = "morph")]
+            morph_targets,
+            #[cfg(feature = "morph")]
+            morph_target_names,
+            ..self.clone()
+        })
+    }
 }
 
 #[cfg(feature = "morph")]
 impl Mesh {
     /// Whether this mesh has morph targets.
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_has_morph_targets`]
     pub fn has_morph_targets(&self) -> bool {
-        self.morph_targets.is_some()
+        self.try_has_morph_targets().expect(MESH_EXTRACTED_ERROR)
+    }
+
+    /// Whether this mesh has morph targets.
+    pub fn try_has_morph_targets(&self) -> Result<bool, MeshAccessError> {
+        Ok(self.morph_targets.as_ref_option()?.is_some())
     }
 
     /// Set [morph targets] image for this mesh. This requires a "morph target image". See [`MorphTargetImage`](crate::morph::MorphTargetImage) for info.
     ///
     /// [morph targets]: https://en.wikipedia.org/wiki/Morph_target_animation
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_set_morph_targets`]
     pub fn set_morph_targets(&mut self, morph_targets: Handle<Image>) {
-        self.morph_targets = Some(morph_targets);
+        self.try_set_morph_targets(morph_targets)
+            .expect(MESH_EXTRACTED_ERROR);
+    }
+
+    /// Set [morph targets] image for this mesh. This requires a "morph target image". See [`MorphTargetImage`](crate::morph::MorphTargetImage) for info.
+    ///
+    /// [morph targets]: https://en.wikipedia.org/wiki/Morph_target_animation
+    pub fn try_set_morph_targets(
+        &mut self,
+        morph_targets: Handle<Image>,
+    ) -> Result<(), MeshAccessError> {
+        self.morph_targets.replace(Some(morph_targets))?;
+        Ok(())
     }
 
+    /// Retrieve the morph targets for this mesh, or None if there are no morph targets.
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_morph_targets`]
     pub fn morph_targets(&self) -> Option<&Handle<Image>> {
+        self.morph_targets
+            .as_ref_option()
+            .expect(MESH_EXTRACTED_ERROR)
+    }
+
+    /// Retrieve the morph targets for this mesh, or None if there are no morph targets.
+    ///
+    /// Returns an error if the mesh data has been extracted to `RenderWorld`or
+    /// if the morph targets do not exist.
+    pub fn try_morph_targets(&self) -> Result<&Handle<Image>, MeshAccessError> {
         self.morph_targets.as_ref()
     }
 
@@ -1389,30 +2244,100 @@ impl Mesh {
     /// (Alternatively, you can use [`Mesh::set_morph_targets`] to mutate an existing mesh in-place)
     ///
     /// [morph targets]: https://en.wikipedia.org/wiki/Morph_target_animation
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_with_morph_targets`]
     #[must_use]
     pub fn with_morph_targets(mut self, morph_targets: Handle<Image>) -> Self {
         self.set_morph_targets(morph_targets);
         self
     }
 
+    /// Consumes the mesh and returns a mesh with the given [morph targets].
+    ///
+    /// This requires a "morph target image". See [`MorphTargetImage`](crate::morph::MorphTargetImage) for info.
+    ///
+    /// (Alternatively, you can use [`Mesh::set_morph_targets`] to mutate an existing mesh in-place)
+    ///
+    /// [morph targets]: https://en.wikipedia.org/wiki/Morph_target_animation
+    ///
+    /// Returns an error if the mesh data has been extracted to `RenderWorld`.
+    pub fn try_with_morph_targets(
+        mut self,
+        morph_targets: Handle<Image>,
+    ) -> Result<Self, MeshAccessError> {
+        self.try_set_morph_targets(morph_targets)?;
+        Ok(self)
+    }
+
     /// Sets the names of each morph target. This should correspond to the order of the morph targets in `set_morph_targets`.
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_set_morph_target_names`]
     pub fn set_morph_target_names(&mut self, names: Vec<String>) {
-        self.morph_target_names = Some(names);
+        self.try_set_morph_target_names(names)
+            .expect(MESH_EXTRACTED_ERROR);
+    }
+
+    /// Sets the names of each morph target. This should correspond to the order of the morph targets in `set_morph_targets`.
+    ///
+    /// Returns an error if the mesh data has been extracted to `RenderWorld`.
+    pub fn try_set_morph_target_names(
+        &mut self,
+        names: Vec<String>,
+    ) -> Result<(), MeshAccessError> {
+        self.morph_target_names.replace(Some(names))?;
+        Ok(())
     }
 
     /// Consumes the mesh and returns a mesh with morph target names.
     /// Names should correspond to the order of the morph targets in `set_morph_targets`.
     ///
     /// (Alternatively, you can use [`Mesh::set_morph_target_names`] to mutate an existing mesh in-place)
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_set_morph_target_names`]
     #[must_use]
-    pub fn with_morph_target_names(mut self, names: Vec<String>) -> Self {
-        self.set_morph_target_names(names);
-        self
+    pub fn with_morph_target_names(self, names: Vec<String>) -> Self {
+        self.try_with_morph_target_names(names)
+            .expect(MESH_EXTRACTED_ERROR)
+    }
+
+    /// Consumes the mesh and returns a mesh with morph target names.
+    /// Names should correspond to the order of the morph targets in `set_morph_targets`.
+    ///
+    /// (Alternatively, you can use [`Mesh::set_morph_target_names`] to mutate an existing mesh in-place)
+    ///
+    /// Returns an error if the mesh data has been extracted to `RenderWorld`.
+    pub fn try_with_morph_target_names(
+        mut self,
+        names: Vec<String>,
+    ) -> Result<Self, MeshAccessError> {
+        self.try_set_morph_target_names(names)?;
+        Ok(self)
     }
 
     /// Gets a list of all morph target names, if they exist.
+    ///
+    /// # Panics
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`Mesh::try_morph_target_names`]
     pub fn morph_target_names(&self) -> Option<&[String]> {
-        self.morph_target_names.as_deref()
+        self.try_morph_target_names().expect(MESH_EXTRACTED_ERROR)
+    }
+
+    /// Gets a list of all morph target names, if they exist.
+    ///
+    /// Returns an error if the mesh data has been extracted to `RenderWorld`or
+    /// if the morph targets do not exist.
+    pub fn try_morph_target_names(&self) -> Result<Option<&[String]>, MeshAccessError> {
+        Ok(self
+            .morph_target_names
+            .as_ref_option()?
+            .map(core::ops::Deref::deref))
     }
 }
 
@@ -1465,11 +2390,14 @@ pub struct SerializedMesh {
 #[cfg(feature = "serialize")]
 impl SerializedMesh {
     /// Create a [`SerializedMesh`] from a [`Mesh`]. See the documentation for [`SerializedMesh`] for caveats.
-    pub fn from_mesh(mesh: Mesh) -> Self {
+    pub fn from_mesh(mut mesh: Mesh) -> Self {
         Self {
             primitive_topology: mesh.primitive_topology,
             attributes: mesh
                 .attributes
+                .replace(None)
+                .expect(MESH_EXTRACTED_ERROR)
+                .unwrap()
                 .into_iter()
                 .map(|(id, data)| {
                     (
@@ -1478,7 +2406,7 @@ impl SerializedMesh {
                     )
                 })
                 .collect(),
-            indices: mesh.indices,
+            indices: mesh.indices.replace(None).expect(MESH_EXTRACTED_ERROR),
         }
     }
 
@@ -1542,7 +2470,7 @@ impl MeshDeserializer {
     /// See the documentation for [`SerializedMesh`] for caveats.
     pub fn deserialize(&self, serialized_mesh: SerializedMesh) -> Mesh {
         Mesh {
-            attributes:
+            attributes: MeshExtractableData::Data(
                 serialized_mesh
                 .attributes
                 .into_iter()
@@ -1559,8 +2487,8 @@ impl MeshDeserializer {
                     };
                     Some((id, data))
                 })
-                .collect(),
-            indices: serialized_mesh.indices,
+                .collect()),
+            indices: serialized_mesh.indices.into(),
             ..Mesh::new(serialized_mesh.primitive_topology, RenderAssetUsages::default())
         }
     }
@@ -1583,6 +2511,8 @@ pub enum MeshMergeError {
         self_primitive_topology: PrimitiveTopology,
         other_primitive_topology: PrimitiveTopology,
     },
+    #[error("Mesh access error: {0}")]
+    MeshAccessError(#[from] MeshAccessError),
 }
 
 #[cfg(test)]
diff --git a/crates/bevy_mesh/src/mikktspace.rs b/crates/bevy_mesh/src/mikktspace.rs
index 6c7b2a1cb653a..36b24353c7c13 100644
--- a/crates/bevy_mesh/src/mikktspace.rs
+++ b/crates/bevy_mesh/src/mikktspace.rs
@@ -1,3 +1,5 @@
+use crate::MeshAccessError;
+
 use super::{Indices, Mesh, VertexAttributeValues};
 use thiserror::Error;
 use wgpu_types::{PrimitiveTopology, VertexFormat};
@@ -70,6 +72,8 @@ pub enum GenerateTangentsError {
     InvalidVertexAttributeFormat(&'static str, VertexFormat),
     #[error("mesh not suitable for tangent generation")]
     MikktspaceError(#[from] bevy_mikktspace::GenerateTangentSpaceError),
+    #[error("Mesh access error: {0}")]
+    MeshAccessError(#[from] MeshAccessError),
 }
 
 pub(crate) fn generate_tangents_for_mesh(
@@ -80,7 +84,7 @@ pub(crate) fn generate_tangents_for_mesh(
         other => return Err(GenerateTangentsError::UnsupportedTopology(other)),
     };
 
-    let positions = mesh.attribute(Mesh::ATTRIBUTE_POSITION).ok_or(
+    let positions = mesh.try_attribute_option(Mesh::ATTRIBUTE_POSITION)?.ok_or(
         GenerateTangentsError::MissingVertexAttribute(Mesh::ATTRIBUTE_POSITION.name),
     )?;
     let VertexAttributeValues::Float32x3(positions) = positions else {
@@ -89,7 +93,7 @@ pub(crate) fn generate_tangents_for_mesh(
             VertexFormat::Float32x3,
         ));
     };
-    let normals = mesh.attribute(Mesh::ATTRIBUTE_NORMAL).ok_or(
+    let normals = mesh.try_attribute_option(Mesh::ATTRIBUTE_NORMAL)?.ok_or(
         GenerateTangentsError::MissingVertexAttribute(Mesh::ATTRIBUTE_NORMAL.name),
     )?;
     let VertexAttributeValues::Float32x3(normals) = normals else {
@@ -98,7 +102,7 @@ pub(crate) fn generate_tangents_for_mesh(
             VertexFormat::Float32x3,
         ));
     };
-    let uvs = mesh.attribute(Mesh::ATTRIBUTE_UV_0).ok_or(
+    let uvs = mesh.try_attribute_option(Mesh::ATTRIBUTE_UV_0)?.ok_or(
         GenerateTangentsError::MissingVertexAttribute(Mesh::ATTRIBUTE_UV_0.name),
     )?;
     let VertexAttributeValues::Float32x2(uvs) = uvs else {
@@ -111,7 +115,7 @@ pub(crate) fn generate_tangents_for_mesh(
     let len = positions.len();
     let tangents = vec![[0., 0., 0., 0.]; len];
     let mut mikktspace_mesh = MikktspaceGeometryHelper {
-        indices: mesh.indices(),
+        indices: mesh.try_indices_option()?,
         positions,
         normals,
         uvs,
diff --git a/crates/bevy_pbr/src/render/mesh.rs b/crates/bevy_pbr/src/render/mesh.rs
index c55bbe94d2066..ecb4b5c543560 100644
--- a/crates/bevy_pbr/src/render/mesh.rs
+++ b/crates/bevy_pbr/src/render/mesh.rs
@@ -1910,6 +1910,7 @@ pub fn build_dummy_white_gpu_image(
         sampler,
         size: image.texture_descriptor.size,
         mip_level_count: image.texture_descriptor.mip_level_count,
+        had_data: true,
     }
 }
 
diff --git a/crates/bevy_render/src/mesh/mod.rs b/crates/bevy_render/src/mesh/mod.rs
index 2c2f84a0a9e66..fb849cd51b3aa 100644
--- a/crates/bevy_render/src/mesh/mod.rs
+++ b/crates/bevy_render/src/mesh/mod.rs
@@ -1,6 +1,8 @@
 pub mod allocator;
 use crate::{
-    render_asset::{PrepareAssetError, RenderAsset, RenderAssetPlugin, RenderAssets},
+    render_asset::{
+        AssetExtractionError, PrepareAssetError, RenderAsset, RenderAssetPlugin, RenderAssets,
+    },
     texture::GpuImage,
     RenderApp,
 };
@@ -131,6 +133,15 @@ impl RenderAsset for RenderMesh {
         mesh.asset_usage
     }
 
+    fn take_gpu_data(
+        source: &mut Self::SourceAsset,
+        _previous_gpu_asset: Option<&Self>,
+    ) -> Result<Self::SourceAsset, AssetExtractionError> {
+        source
+            .take_gpu_data()
+            .map_err(|_| AssetExtractionError::AlreadyExtracted)
+    }
+
     fn byte_len(mesh: &Self::SourceAsset) -> Option<usize> {
         let mut vertex_size = 0;
         for attribute_data in mesh.attributes() {
diff --git a/crates/bevy_render/src/render_asset.rs b/crates/bevy_render/src/render_asset.rs
index 894ad7b65269a..8790f32fbfaa4 100644
--- a/crates/bevy_render/src/render_asset.rs
+++ b/crates/bevy_render/src/render_asset.rs
@@ -28,6 +28,15 @@ pub enum PrepareAssetError<E: Send + Sync + 'static> {
 #[derive(SystemSet, Clone, PartialEq, Eq, Debug, Hash)]
 pub struct AssetExtractionSystems;
 
+/// Error returned when an asset due for extraction has already been extracted
+#[derive(Debug, Error)]
+pub enum AssetExtractionError {
+    #[error("The asset has already been extracted")]
+    AlreadyExtracted,
+    #[error("The asset type does not support extraction. To clone the asset to the renderworld, use `RenderAssetUsages::default()`")]
+    NoExtractionImplementation,
+}
+
 /// Describes how an asset gets extracted and prepared for rendering.
 ///
 /// In the [`ExtractSchedule`] step the [`RenderAsset::SourceAsset`] is transferred
@@ -82,6 +91,18 @@ pub trait RenderAsset: Send + Sync + 'static + Sized {
         _param: &mut SystemParamItem<Self::Param>,
     ) {
     }
+
+    /// Make a copy of the asset to be moved to the `RenderWorld` / gpu. Heavy internal data (pixels, vertex attributes)
+    /// should be moved into the copy, leaving this asset with only metadata.
+    /// An error may be returned to indicate that the asset has already been extracted, and should not
+    /// have been modified on the CPU side (as it cannot be transferred to GPU again).
+    /// The previous GPU asset is also provided, which can be used to check if the modification is valid.
+    fn take_gpu_data(
+        _source: &mut Self::SourceAsset,
+        _previous_gpu_asset: Option<&Self>,
+    ) -> Result<Self::SourceAsset, AssetExtractionError> {
+        Err(AssetExtractionError::NoExtractionImplementation)
+    }
 }
 
 /// This plugin extracts the changed assets from the "app world" into the "render world"
@@ -220,6 +241,7 @@ struct CachedExtractRenderAssetSystemState<A: RenderAsset> {
     state: SystemState<(
         MessageReader<'static, 'static, AssetEvent<A::SourceAsset>>,
         ResMut<'static, Assets<A::SourceAsset>>,
+        Option<Res<'static, RenderAssets<A>>>,
     )>,
 }
 
@@ -239,7 +261,7 @@ pub(crate) fn extract_render_asset<A: RenderAsset>(
 ) {
     main_world.resource_scope(
         |world, mut cached_state: Mut<CachedExtractRenderAssetSystemState<A>>| {
-            let (mut events, mut assets) = cached_state.state.get_mut(world);
+            let (mut events, mut assets, maybe_render_assets) = cached_state.state.get_mut(world);
 
             let mut needs_extracting = <HashSet<_>>::default();
             let mut removed = <HashSet<_>>::default();
@@ -280,9 +302,17 @@ pub(crate) fn extract_render_asset<A: RenderAsset>(
                     let asset_usage = A::asset_usage(asset);
                     if asset_usage.contains(RenderAssetUsages::RENDER_WORLD) {
                         if asset_usage == RenderAssetUsages::RENDER_WORLD {
-                            if let Some(asset) = assets.remove(id) {
-                                extracted_assets.push((id, asset));
-                                added.insert(id);
+                            if let Some(asset) = assets.get_mut_untracked(id) {
+                                let previous_asset = maybe_render_assets.as_ref().and_then(|render_assets| render_assets.get(id));
+                                match A::take_gpu_data(asset, previous_asset) {
+                                    Ok(gpu_data_asset) => {
+                                        extracted_assets.push((id, gpu_data_asset));
+                                        added.insert(id);
+                                    }
+                                    Err(e) => {
+                                        error!("{} with RenderAssetUsages == RENDER_WORLD cannot be extracted: {e}", core::any::type_name::<A>());
+                                    }
+                                };
                             }
                         } else {
                             extracted_assets.push((id, asset.clone()));
diff --git a/crates/bevy_render/src/storage.rs b/crates/bevy_render/src/storage.rs
index d7c208f001bf3..0362add4ed959 100644
--- a/crates/bevy_render/src/storage.rs
+++ b/crates/bevy_render/src/storage.rs
@@ -1,5 +1,5 @@
 use crate::{
-    render_asset::{PrepareAssetError, RenderAsset, RenderAssetPlugin},
+    render_asset::{AssetExtractionError, PrepareAssetError, RenderAsset, RenderAssetPlugin},
     render_resource::{Buffer, BufferUsages},
     renderer::RenderDevice,
 };
@@ -101,6 +101,7 @@ where
 /// A storage buffer that is prepared as a [`RenderAsset`] and uploaded to the GPU.
 pub struct GpuShaderStorageBuffer {
     pub buffer: Buffer,
+    pub had_data: bool,
 }
 
 impl RenderAsset for GpuShaderStorageBuffer {
@@ -111,6 +112,22 @@ impl RenderAsset for GpuShaderStorageBuffer {
         source_asset.asset_usage
     }
 
+    fn take_gpu_data(
+        source: &mut Self::SourceAsset,
+        previous_gpu_asset: Option<&Self>,
+    ) -> Result<Self::SourceAsset, AssetExtractionError> {
+        let data = source.data.take();
+
+        let valid_upload = data.is_some() || previous_gpu_asset.is_none_or(|prev| !prev.had_data);
+
+        valid_upload
+            .then(|| Self::SourceAsset {
+                data,
+                ..source.clone()
+            })
+            .ok_or(AssetExtractionError::AlreadyExtracted)
+    }
+
     fn prepare_asset(
         source_asset: Self::SourceAsset,
         _: AssetId<Self::SourceAsset>,
@@ -124,11 +141,17 @@ impl RenderAsset for GpuShaderStorageBuffer {
                     contents: &data,
                     usage: source_asset.buffer_description.usage,
                 });
-                Ok(GpuShaderStorageBuffer { buffer })
+                Ok(GpuShaderStorageBuffer {
+                    buffer,
+                    had_data: true,
+                })
             }
             None => {
                 let buffer = render_device.create_buffer(&source_asset.buffer_description);
-                Ok(GpuShaderStorageBuffer { buffer })
+                Ok(GpuShaderStorageBuffer {
+                    buffer,
+                    had_data: false,
+                })
             }
         }
     }
diff --git a/crates/bevy_render/src/texture/fallback_image.rs b/crates/bevy_render/src/texture/fallback_image.rs
index c6d4c271f958c..738c84bcb9241 100644
--- a/crates/bevy_render/src/texture/fallback_image.rs
+++ b/crates/bevy_render/src/texture/fallback_image.rs
@@ -139,6 +139,7 @@ fn fallback_image_new(
         sampler,
         size: image.texture_descriptor.size,
         mip_level_count: image.texture_descriptor.mip_level_count,
+        had_data: true,
     }
 }
 
diff --git a/crates/bevy_render/src/texture/gpu_image.rs b/crates/bevy_render/src/texture/gpu_image.rs
index 92e9d5b2be9b3..43483fc993d1d 100644
--- a/crates/bevy_render/src/texture/gpu_image.rs
+++ b/crates/bevy_render/src/texture/gpu_image.rs
@@ -1,5 +1,5 @@
 use crate::{
-    render_asset::{PrepareAssetError, RenderAsset},
+    render_asset::{AssetExtractionError, PrepareAssetError, RenderAsset},
     render_resource::{DefaultImageSampler, Sampler, Texture, TextureView},
     renderer::{RenderDevice, RenderQueue},
 };
@@ -21,6 +21,7 @@ pub struct GpuImage {
     pub sampler: Sampler,
     pub size: Extent3d,
     pub mip_level_count: u32,
+    pub had_data: bool,
 }
 
 impl RenderAsset for GpuImage {
@@ -36,6 +37,24 @@ impl RenderAsset for GpuImage {
         image.asset_usage
     }
 
+    fn take_gpu_data(
+        source: &mut Self::SourceAsset,
+        previous_gpu_asset: Option<&Self>,
+    ) -> Result<Self::SourceAsset, AssetExtractionError> {
+        let data = source.data.take();
+
+        // check if this image originally had data and no longer does, that implies it
+        // has already been extracted
+        let valid_upload = data.is_some() || previous_gpu_asset.is_none_or(|prev| !prev.had_data);
+
+        valid_upload
+            .then(|| Self::SourceAsset {
+                data,
+                ..source.clone()
+            })
+            .ok_or(AssetExtractionError::AlreadyExtracted)
+    }
+
     #[inline]
     fn byte_len(image: &Self::SourceAsset) -> Option<usize> {
         image.data.as_ref().map(Vec::len)
@@ -48,6 +67,7 @@ impl RenderAsset for GpuImage {
         (render_device, render_queue, default_sampler): &mut SystemParamItem<Self::Param>,
         previous_asset: Option<&Self>,
     ) -> Result<Self, PrepareAssetError<Self::SourceAsset>> {
+        let had_data = image.data.is_some();
         let texture = if let Some(ref data) = image.data {
             render_device.create_texture_with_data(
                 render_queue,
@@ -111,6 +131,7 @@ impl RenderAsset for GpuImage {
             sampler,
             size: image.texture_descriptor.size,
             mip_level_count: image.texture_descriptor.mip_level_count,
+            had_data,
         })
     }
 }

From be4f4e762afaf31fc1ab09cf2bf6a9a1cff6c7c0 Mon Sep 17 00:00:00 2001
From: momoluna <32905054+momoluna444@users.noreply.github.com>
Date: Mon, 15 Dec 2025 06:07:06 +0800
Subject: [PATCH 108/133] Fix shadow caster/receiver toggle not working
 (#22004)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

Fixes #21582

## Solution

In the original implementation of `extract_meshes_for_gpu_building`, we
didn’t account for the case where components are removed. This patch
adds fixes for all affected components.

## Testing

The example `shadow_caster_receiver` works now.
---
 crates/bevy_pbr/src/render/mesh.rs | 51 ++++++++++++++++++++++++++++--
 1 file changed, 49 insertions(+), 2 deletions(-)

diff --git a/crates/bevy_pbr/src/render/mesh.rs b/crates/bevy_pbr/src/render/mesh.rs
index ecb4b5c543560..e0243899f6b8d 100644
--- a/crates/bevy_pbr/src/render/mesh.rs
+++ b/crates/bevy_pbr/src/render/mesh.rs
@@ -17,8 +17,10 @@ use bevy_core_pipeline::{
 use bevy_derive::{Deref, DerefMut};
 use bevy_diagnostic::FrameCount;
 use bevy_ecs::{
+    entity::EntityHashSet,
     prelude::*,
     query::{QueryData, ROQueryItem},
+    relationship::RelationshipSourceCollection,
     system::{lifetimeless::*, SystemParamItem, SystemState},
 };
 use bevy_image::{BevyDefault, ImageSampler, TextureFormatPixelInfo};
@@ -1507,11 +1509,39 @@ pub fn extract_meshes_for_gpu_building(
             )>,
         >,
     >,
+    (
+        mut removed_previous_global_transform_query,
+        mut removed_lightmap_query,
+        mut removed_aabb_query,
+        mut removed_mesh_tag_query,
+        mut removed_no_frustum_culling_query,
+        mut removed_not_shadow_receiver_query,
+        mut removed_transmitted_receiver_query,
+        mut removed_not_shadow_caster_query,
+        mut removed_no_automatic_batching_query,
+        mut removed_visibility_range_query,
+        mut removed_skinned_mesh_query,
+    ): (
+        Extract<RemovedComponents<PreviousGlobalTransform>>,
+        Extract<RemovedComponents<Lightmap>>,
+        Extract<RemovedComponents<Aabb>>,
+        Extract<RemovedComponents<MeshTag>>,
+        Extract<RemovedComponents<NoFrustumCulling>>,
+        Extract<RemovedComponents<NotShadowReceiver>>,
+        Extract<RemovedComponents<TransmittedShadowReceiver>>,
+        Extract<RemovedComponents<NotShadowCaster>>,
+        Extract<RemovedComponents<NoAutomaticBatching>>,
+        Extract<RemovedComponents<VisibilityRange>>,
+        Extract<RemovedComponents<SkinnedMesh>>,
+    ),
     all_meshes_query: Extract<Query<GpuMeshExtractionQuery>>,
     mut removed_meshes_query: Extract<RemovedComponents<Mesh3d>>,
     gpu_culling_query: Extract<Query<(), (With<Camera>, Without<NoIndirectDrawing>)>>,
     meshes_to_reextract_next_frame: ResMut<MeshesToReextractNextFrame>,
+    mut reextract_entities: Local<EntityHashSet>,
 ) {
+    reextract_entities.clear();
+
     let any_gpu_culling = !gpu_culling_query.is_empty();
 
     for render_mesh_instance_queue in render_mesh_instance_queues.iter_mut() {
@@ -1549,9 +1579,26 @@ pub fn extract_meshes_for_gpu_building(
     // because the material hadn't yet been loaded. We reextract such materials
     // on subsequent frames so that `collect_meshes_for_gpu_building` will check
     // to see if their materials have been prepared.
+    let iters = meshes_to_reextract_next_frame
+        .iter()
+        .map(|&e| *e)
+        .chain(removed_previous_global_transform_query.read())
+        .chain(removed_lightmap_query.read())
+        .chain(removed_aabb_query.read())
+        .chain(removed_mesh_tag_query.read())
+        .chain(removed_no_frustum_culling_query.read())
+        .chain(removed_not_shadow_receiver_query.read())
+        .chain(removed_transmitted_receiver_query.read())
+        .chain(removed_not_shadow_caster_query.read())
+        .chain(removed_no_automatic_batching_query.read())
+        .chain(removed_visibility_range_query.read())
+        .chain(removed_skinned_mesh_query.read());
+
+    reextract_entities.extend_from_iter(iters);
+
     let mut queue = render_mesh_instance_queues.borrow_local_mut();
-    for &mesh_entity in &**meshes_to_reextract_next_frame {
-        if let Ok(query_row) = all_meshes_query.get(*mesh_entity) {
+    for entity in &reextract_entities {
+        if let Ok(query_row) = all_meshes_query.get(*entity) {
             extract_mesh_for_gpu_building(
                 query_row,
                 &render_visibility_ranges,

From fa12668fa027904c89e840babbc7f50d9cc2a9b8 Mon Sep 17 00:00:00 2001
From: Janis <130913856+janis-bhm@users.noreply.github.com>
Date: Sun, 14 Dec 2025 23:34:36 +0100
Subject: [PATCH 109/133] system combinators short circuiting with system
 failure (#20671)

# Objective

Fixes https://github.com/bevyengine/bevy/issues/20376:

CombinatorSystems short circuit if one of the systems fails to validate,
e.g. because it queries a Component that isn't resident in the world.

## Solution

Instead, we can treat the system failing as the system yielding `false`,
appropriately querying the second system depending on the logical
operator.

## Testing

I added a new test that calls the combinators in different
configurations with a failing system as both the rhs and lhs of the
combinator and counts the invocations of the system and the condition.

---

---------

Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
---
 crates/bevy_ecs/src/schedule/condition.rs     | 262 +++++++++++++++++-
 crates/bevy_ecs/src/system/combinator.rs      |  58 +++-
 .../migration-guides/combinator_system.md     |  38 +++
 3 files changed, 336 insertions(+), 22 deletions(-)
 create mode 100644 release-content/migration-guides/combinator_system.md

diff --git a/crates/bevy_ecs/src/schedule/condition.rs b/crates/bevy_ecs/src/schedule/condition.rs
index c6a5c99b8cc68..f9963a5200bc7 100644
--- a/crates/bevy_ecs/src/schedule/condition.rs
+++ b/crates/bevy_ecs/src/schedule/condition.rs
@@ -1133,7 +1133,7 @@ where
         a: impl FnOnce(SystemIn<'_, A>, &mut T) -> Result<A::Out, RunSystemError>,
         b: impl FnOnce(SystemIn<'_, A>, &mut T) -> Result<B::Out, RunSystemError>,
     ) -> Result<Self::Out, RunSystemError> {
-        Ok(a(input, data)? && b(input, data)?)
+        Ok(a(input, data).unwrap_or(false) && b(input, data).unwrap_or(false))
     }
 }
 
@@ -1155,7 +1155,7 @@ where
         a: impl FnOnce(SystemIn<'_, A>, &mut T) -> Result<A::Out, RunSystemError>,
         b: impl FnOnce(SystemIn<'_, A>, &mut T) -> Result<B::Out, RunSystemError>,
     ) -> Result<Self::Out, RunSystemError> {
-        Ok(!(a(input, data)? && b(input, data)?))
+        Ok(!(a(input, data).unwrap_or(false) && b(input, data).unwrap_or(false)))
     }
 }
 
@@ -1177,7 +1177,7 @@ where
         a: impl FnOnce(SystemIn<'_, A>, &mut T) -> Result<A::Out, RunSystemError>,
         b: impl FnOnce(SystemIn<'_, A>, &mut T) -> Result<B::Out, RunSystemError>,
     ) -> Result<Self::Out, RunSystemError> {
-        Ok(!(a(input, data)? || b(input, data)?))
+        Ok(!(a(input, data).unwrap_or(false) || b(input, data).unwrap_or(false)))
     }
 }
 
@@ -1199,7 +1199,7 @@ where
         a: impl FnOnce(SystemIn<'_, A>, &mut T) -> Result<A::Out, RunSystemError>,
         b: impl FnOnce(SystemIn<'_, A>, &mut T) -> Result<B::Out, RunSystemError>,
     ) -> Result<Self::Out, RunSystemError> {
-        Ok(a(input, data)? || b(input, data)?)
+        Ok(a(input, data).unwrap_or(false) || b(input, data).unwrap_or(false))
     }
 }
 
@@ -1221,7 +1221,7 @@ where
         a: impl FnOnce(SystemIn<'_, A>, &mut T) -> Result<A::Out, RunSystemError>,
         b: impl FnOnce(SystemIn<'_, A>, &mut T) -> Result<B::Out, RunSystemError>,
     ) -> Result<Self::Out, RunSystemError> {
-        Ok(!(a(input, data)? ^ b(input, data)?))
+        Ok(!(a(input, data).unwrap_or(false) ^ b(input, data).unwrap_or(false)))
     }
 }
 
@@ -1243,7 +1243,7 @@ where
         a: impl FnOnce(SystemIn<'_, A>, &mut T) -> Result<A::Out, RunSystemError>,
         b: impl FnOnce(SystemIn<'_, A>, &mut T) -> Result<B::Out, RunSystemError>,
     ) -> Result<Self::Out, RunSystemError> {
-        Ok(a(input, data)? ^ b(input, data)?)
+        Ok(a(input, data).unwrap_or(false) ^ b(input, data).unwrap_or(false))
     }
 }
 
@@ -1252,12 +1252,12 @@ mod tests {
     use super::{common_conditions::*, SystemCondition};
     use crate::error::{BevyError, DefaultErrorHandler, ErrorContext};
     use crate::{
-        change_detection::ResMut,
+        change_detection::{Res, ResMut},
         component::Component,
         message::Message,
         query::With,
         schedule::{IntoScheduleConfigs, Schedule},
-        system::{IntoSystem, Local, Res, System},
+        system::{IntoSystem, Local, System},
         world::World,
     };
     use bevy_ecs_macros::{Resource, SystemSet};
@@ -1305,6 +1305,252 @@ mod tests {
         assert_eq!(world.resource::<Counter>().0, 6);
     }
 
+    #[test]
+    fn combinators_with_maybe_failing_condition() {
+        #![allow(
+            clippy::nonminimal_bool,
+            clippy::overly_complex_bool_expr,
+            reason = "Trailing `|| false` and `&& true` are used in this test to visually remain consistent with the combinators"
+        )]
+
+        use crate::system::RunSystemOnce;
+        use alloc::sync::Arc;
+        use std::sync::Mutex;
+
+        // Things that should be tested:
+        // - the final result of the combinator is correct
+        // - the systems that are expected to run do run
+        // - the systems that are expected to not run do not run
+
+        #[derive(Component)]
+        struct Vacant;
+
+        // SystemConditions don't have mutable access to the world, so we use a
+        // `Res<AtomicCounter>` to count invocations.
+        #[derive(Resource, Default)]
+        struct Counter(Arc<Mutex<usize>>);
+
+        // The following constants are used to represent a system having run.
+        // both are prime so that when multiplied they give a unique value for any TRUE^n*FALSE^m
+        const FALSE: usize = 2;
+        const TRUE: usize = 3;
+
+        // this is a system, but has the same side effect as `test_true`
+        fn is_true_inc(counter: Res<Counter>) -> bool {
+            test_true(&counter)
+        }
+
+        // this is a system, but has the same side effect as `test_false`
+        fn is_false_inc(counter: Res<Counter>) -> bool {
+            test_false(&counter)
+        }
+
+        // This condition will always yield `false`, because `Vacant` is never present.
+        fn vacant(_: crate::system::Single<&Vacant>) -> bool {
+            true
+        }
+
+        fn test_true(counter: &Counter) -> bool {
+            *counter.0.lock().unwrap() *= TRUE;
+            true
+        }
+
+        fn test_false(counter: &Counter) -> bool {
+            *counter.0.lock().unwrap() *= FALSE;
+            false
+        }
+
+        // Helper function that runs a logic call and returns the result, as
+        // well as the composite number of the calls.
+        fn logic_call_result(f: impl FnOnce(&Counter) -> bool) -> (usize, bool) {
+            let counter = Counter(Arc::new(Mutex::new(1)));
+            let result = f(&counter);
+            (*counter.0.lock().unwrap(), result)
+        }
+
+        // `test_true` and `test_false` can't fail like the systems can, and so
+        // we use them to model the short circuiting behavior of rust's logical
+        // operators. The goal is to end up with a composite number that
+        // describes rust's behavior and compare that to the result of the
+        // combinators.
+
+        // we expect `true() || false()` to yield `true`, and short circuit
+        // after `true()`
+        assert_eq!(
+            logic_call_result(|c| test_true(c) || test_false(c)),
+            (TRUE.pow(1) * FALSE.pow(0), true)
+        );
+
+        let mut world = World::new();
+        world.init_resource::<Counter>();
+
+        // ensure there are no `Vacant` entities
+        assert!(world.query::<&Vacant>().iter(&world).next().is_none());
+        assert!(matches!(
+            world.run_system_once((|| true).or(vacant)),
+            Ok(true)
+        ));
+
+        // This system should fail
+        assert!(RunSystemOnce::run_system_once(&mut world, vacant).is_err());
+
+        #[track_caller]
+        fn assert_system<Marker>(
+            world: &mut World,
+            system: impl IntoSystem<(), bool, Marker>,
+            equivalent_to: impl FnOnce(&Counter) -> bool,
+        ) {
+            use crate::system::System;
+
+            *world.resource::<Counter>().0.lock().unwrap() = 1;
+
+            let system = IntoSystem::into_system(system);
+            let name = system.name();
+
+            let out = RunSystemOnce::run_system_once(&mut *world, system).unwrap_or(false);
+
+            let (expected_counter, expected) = logic_call_result(equivalent_to);
+            let caller = core::panic::Location::caller();
+            let counter = *world.resource::<Counter>().0.lock().unwrap();
+
+            assert_eq!(
+                out,
+                expected,
+                "At {}:{} System `{name}` yielded unexpected value `{out}`, expected `{expected}`",
+                caller.file(),
+                caller.line(),
+            );
+
+            assert_eq!(
+                counter, expected_counter,
+                "At {}:{} System `{name}` did not increment counter as expected: expected `{expected_counter}`, got `{counter}`",
+                caller.file(),
+                caller.line(),
+            );
+        }
+
+        assert_system(&mut world, is_true_inc.or(vacant), |c| {
+            test_true(c) || false
+        });
+        assert_system(&mut world, is_true_inc.nor(vacant), |c| {
+            !(test_true(c) || false)
+        });
+        assert_system(&mut world, is_true_inc.xor(vacant), |c| {
+            test_true(c) ^ false
+        });
+        assert_system(&mut world, is_true_inc.xnor(vacant), |c| {
+            !(test_true(c) ^ false)
+        });
+        assert_system(&mut world, is_true_inc.and(vacant), |c| {
+            test_true(c) && false
+        });
+        assert_system(&mut world, is_true_inc.nand(vacant), |c| {
+            !(test_true(c) && false)
+        });
+
+        // even if `vacant` fails as the first condition, where applicable (or,
+        // xor), `is_true_inc` should still be called. `and` and `nand` short
+        // circuit on an initial `false`.
+        assert_system(&mut world, vacant.or(is_true_inc), |c| {
+            false || test_true(c)
+        });
+        assert_system(&mut world, vacant.nor(is_true_inc), |c| {
+            !(false || test_true(c))
+        });
+        assert_system(&mut world, vacant.xor(is_true_inc), |c| {
+            false ^ test_true(c)
+        });
+        assert_system(&mut world, vacant.xnor(is_true_inc), |c| {
+            !(false ^ test_true(c))
+        });
+        assert_system(&mut world, vacant.and(is_true_inc), |c| {
+            false && test_true(c)
+        });
+        assert_system(&mut world, vacant.nand(is_true_inc), |c| {
+            !(false && test_true(c))
+        });
+
+        // the same logic ought to be the case with a condition that runs, but yields `false`:
+        assert_system(&mut world, is_true_inc.or(is_false_inc), |c| {
+            test_true(c) || test_false(c)
+        });
+        assert_system(&mut world, is_true_inc.nor(is_false_inc), |c| {
+            !(test_true(c) || test_false(c))
+        });
+        assert_system(&mut world, is_true_inc.xor(is_false_inc), |c| {
+            test_true(c) ^ test_false(c)
+        });
+        assert_system(&mut world, is_true_inc.xnor(is_false_inc), |c| {
+            !(test_true(c) ^ test_false(c))
+        });
+        assert_system(&mut world, is_true_inc.and(is_false_inc), |c| {
+            test_true(c) && test_false(c)
+        });
+        assert_system(&mut world, is_true_inc.nand(is_false_inc), |c| {
+            !(test_true(c) && test_false(c))
+        });
+
+        // and where one condition yields `false` and the other fails:
+        assert_system(&mut world, is_false_inc.or(vacant), |c| {
+            test_false(c) || false
+        });
+        assert_system(&mut world, is_false_inc.nor(vacant), |c| {
+            !(test_false(c) || false)
+        });
+        assert_system(&mut world, is_false_inc.xor(vacant), |c| {
+            test_false(c) ^ false
+        });
+        assert_system(&mut world, is_false_inc.xnor(vacant), |c| {
+            !(test_false(c) ^ false)
+        });
+        assert_system(&mut world, is_false_inc.and(vacant), |c| {
+            test_false(c) && false
+        });
+        assert_system(&mut world, is_false_inc.nand(vacant), |c| {
+            !(test_false(c) && false)
+        });
+
+        // and where both conditions yield `true`:
+        assert_system(&mut world, is_true_inc.or(is_true_inc), |c| {
+            test_true(c) || test_true(c)
+        });
+        assert_system(&mut world, is_true_inc.nor(is_true_inc), |c| {
+            !(test_true(c) || test_true(c))
+        });
+        assert_system(&mut world, is_true_inc.xor(is_true_inc), |c| {
+            test_true(c) ^ test_true(c)
+        });
+        assert_system(&mut world, is_true_inc.xnor(is_true_inc), |c| {
+            !(test_true(c) ^ test_true(c))
+        });
+        assert_system(&mut world, is_true_inc.and(is_true_inc), |c| {
+            test_true(c) && test_true(c)
+        });
+        assert_system(&mut world, is_true_inc.nand(is_true_inc), |c| {
+            !(test_true(c) && test_true(c))
+        });
+
+        // and where both conditions yield `false`:
+        assert_system(&mut world, is_false_inc.or(is_false_inc), |c| {
+            test_false(c) || test_false(c)
+        });
+        assert_system(&mut world, is_false_inc.nor(is_false_inc), |c| {
+            !(test_false(c) || test_false(c))
+        });
+        assert_system(&mut world, is_false_inc.xor(is_false_inc), |c| {
+            test_false(c) ^ test_false(c)
+        });
+        assert_system(&mut world, is_false_inc.xnor(is_false_inc), |c| {
+            !(test_false(c) ^ test_false(c))
+        });
+        assert_system(&mut world, is_false_inc.and(is_false_inc), |c| {
+            test_false(c) && test_false(c)
+        });
+        assert_system(&mut world, is_false_inc.nand(is_false_inc), |c| {
+            !(test_false(c) && test_false(c))
+        });
+    }
+
     #[test]
     fn run_condition_combinators() {
         let mut world = World::new();
diff --git a/crates/bevy_ecs/src/system/combinator.rs b/crates/bevy_ecs/src/system/combinator.rs
index a12b3469a4651..b05711569ea0b 100644
--- a/crates/bevy_ecs/src/system/combinator.rs
+++ b/crates/bevy_ecs/src/system/combinator.rs
@@ -4,6 +4,7 @@ use core::marker::PhantomData;
 
 use crate::{
     change_detection::{CheckChangeTicks, Tick},
+    error::ErrorContext,
     prelude::World,
     query::FilteredAccessSet,
     schedule::InternedSystemSet,
@@ -157,6 +158,42 @@ where
     ) -> Result<Self::Out, RunSystemError> {
         struct PrivateUnsafeWorldCell<'w>(UnsafeWorldCell<'w>);
 
+        // Since control over handling system run errors is passed on to the
+        // implementation of `Func::combine`, which may run the two closures
+        // however it wants, errors must be intercepted here if they should be
+        // handled by the world's error handler.
+        unsafe fn run_system<S: System>(
+            system: &mut S,
+            input: SystemIn<S>,
+            world: &mut PrivateUnsafeWorldCell,
+        ) -> Result<S::Out, RunSystemError> {
+            // SAFETY: see comment on `Func::combine` call
+            match (|| unsafe {
+                system.validate_param_unsafe(world.0)?;
+                system.run_unsafe(input, world.0)
+            })() {
+                Err(RunSystemError::Failed(err)) => {
+                    // let the world's default error handler handle the error if `Failed(_)`
+                    (world.0.default_error_handler())(
+                        err,
+                        ErrorContext::System {
+                            name: system.name(),
+                            last_run: system.get_last_run(),
+                        },
+                    );
+
+                    // Since the error handler takes the error by value, create a new error:
+                    // The original error has already been handled, including
+                    // the reason for the failure here isn't important.
+                    Err(format!("System `{}` failed", system.name()).into())
+                }
+                // `Skipped(_)` and `Ok(_)` are passed through:
+                // system skipping is not an error, and isn't passed to the
+                // world's error handler by the executors.
+                result @ (Ok(_) | Err(RunSystemError::Skipped(_))) => result,
+            }
+        }
+
         Func::combine(
             input,
             &mut PrivateUnsafeWorldCell(world),
@@ -167,14 +204,9 @@ where
             // passed to a function as an unbound non-'static generic argument, they can never be called in parallel
             // or re-entrantly because that would require forging another instance of `PrivateUnsafeWorldCell`.
             // This means that the world accesses in the two closures will not conflict with each other.
-            |input, world| unsafe { self.a.run_unsafe(input, world.0) },
-            // `Self::validate_param_unsafe` already validated the first system,
-            // but we still need to validate the second system once the first one runs.
+            |input, world| unsafe { run_system(&mut self.a, input, world) },
             // SAFETY: See the comment above.
-            |input, world| unsafe {
-                self.b.validate_param_unsafe(world.0)?;
-                self.b.run_unsafe(input, world.0)
-            },
+            |input, world| unsafe { run_system(&mut self.b, input, world) },
         )
     }
 
@@ -200,14 +232,12 @@ where
     #[inline]
     unsafe fn validate_param_unsafe(
         &mut self,
-        world: UnsafeWorldCell,
+        _world: UnsafeWorldCell,
     ) -> Result<(), SystemParamValidationError> {
-        // We only validate parameters for the first system,
-        // since it may make changes to the world that affect
-        // whether the second system has valid parameters.
-        // The second system will be validated in `Self::run_unsafe`.
-        // SAFETY: Delegate to other `System` implementations.
-        unsafe { self.a.validate_param_unsafe(world) }
+        // Both systems are validated in `Self::run_unsafe`, so that we get the
+        // chance to run the second system even if the first one fails to
+        // validate.
+        Ok(())
     }
 
     fn initialize(&mut self, world: &mut World) -> FilteredAccessSet {
diff --git a/release-content/migration-guides/combinator_system.md b/release-content/migration-guides/combinator_system.md
new file mode 100644
index 0000000000000..7af01c344e41c
--- /dev/null
+++ b/release-content/migration-guides/combinator_system.md
@@ -0,0 +1,38 @@
+---
+title: System Combinators
+pull_requests: [20671]
+---
+
+The `CombinatorSystem`s can be used to combine multiple `SystemCondition`s with logical operators. Previously, the conditions would short circuit if the system failed to run, for example because it's query could not be filled by the world.
+
+Now, the `CombinatorSystem`s will work as expected, following the semantics of rust's logical operators.
+Namely, if a `SystemCondition` fails, it will be considered to have returned `false` and in combinators that don't short circuit the other condition will now be run.
+
+Specifically, the combinators act as follows:
+
+| Combinator | Rust Equivalent |
+|:----------:|:---------------:|
+| `and`      | `a && b`        |
+| `or`       | `a \|\| b`      |
+| `xor`      | `a ^ b`         |
+| `nand`     | `!(a && b)`     |
+| `nor`      | `!(a \|\| b)`   |
+| `xnor`     | `!(a ^ b)`      |
+
+```rust
+fn vacant(_: crate::system::Single<&Vacant>) -> bool {
+    true
+}
+
+fn is_true() -> bool {
+    true
+}
+
+assert!(world.query::<&Vacant>().iter(&world).next().is_none());
+
+// previously:
+assert!(world.run_system_once(is_true.or(vacant)).is_err());
+
+// now:
+assert!(matches!(world.run_system_once(is_true.or(vacant)), Ok(true)));
+```

From 681751647a588b5500ad0b9fe5cd2690c10b1003 Mon Sep 17 00:00:00 2001
From: IceSentry <IceSentry@users.noreply.github.com>
Date: Sun, 14 Dec 2025 17:35:20 -0500
Subject: [PATCH 110/133] Add FullscreenMaterial (#20414)

# Objective

- Users often want to run a fullscreen shader but the current solution
involves copying the custom_post_processing example which is a 350 line
file with a lot of low level wgpu complexity. Users shouldn't have to
deal with that just to make a fullscreen shader

## Solution

- Introduce a new FullscreenMaterial trait and FullscsreenMaterialPlugin
- This new material will run a fullscreen triangle with the specified
shader. It builds on top of the existing FullscreenShader infrastructure
- It lets user customize the node ordering. There's no defaults right
now becausae it's intended as a bit of a primitive plugin. Eventually we
could have some kind of default for custom post processing

## Testing

Made a new fullscreen_material example and made sure it works

## Follow up

Once this is merged there are various things that should be done to
improve it. Add the option to bind the depth texture, offer defaults for
post processing, use a full AsBindGroup, add a way to bind the gbuffer.

---------

Co-authored-by: JMS55 <47158642+JMS55@users.noreply.github.com>
Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
---
 Cargo.toml                                    |  17 +-
 assets/shaders/fullscreen_effect.wgsl         |  50 +++
 .../src/fullscreen_material.rs                | 329 ++++++++++++++++++
 crates/bevy_core_pipeline/src/lib.rs          |   1 +
 crates/bevy_render/src/render_graph/node.rs   |   6 +
 examples/README.md                            |   7 +
 .../shader_advanced/fullscreen_material.rs    |  89 +++++
 .../release-notes/fullscreen_material.md      |   7 +
 8 files changed, 503 insertions(+), 3 deletions(-)
 create mode 100644 assets/shaders/fullscreen_effect.wgsl
 create mode 100644 crates/bevy_core_pipeline/src/fullscreen_material.rs
 create mode 100644 examples/shader_advanced/fullscreen_material.rs
 create mode 100644 release-content/release-notes/fullscreen_material.md

diff --git a/Cargo.toml b/Cargo.toml
index c3d1dfb93f35f..61d0d5a580a80 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3113,6 +3113,17 @@ description = "Demonstrates how to write a specialized mesh pipeline"
 category = "Shaders"
 wasm = true
 
+[[example]]
+name = "fullscreen_material"
+path = "examples/shader_advanced/fullscreen_material.rs"
+doc-scrape-examples = true
+
+[package.metadata.example.fullscreen_material]
+name = "Fullscreen Material"
+description = "Demonstrates how to write a fullscreen material"
+category = "Shaders Advanced"
+wasm = true
+
 # Stress tests
 [[package.metadata.example_category]]
 name = "Stress Tests"
@@ -3992,6 +4003,9 @@ name = "fallback_image"
 path = "examples/shader/fallback_image.rs"
 doc-scrape-examples = true
 
+[package.metadata.example.fallback_image]
+hidden = true
+
 [[example]]
 name = "reflection_probes"
 path = "examples/3d/reflection_probes.rs"
@@ -4003,9 +4017,6 @@ description = "Demonstrates reflection probes"
 category = "3D Rendering"
 wasm = false
 
-[package.metadata.example.fallback_image]
-hidden = true
-
 [package.metadata.example.window_resizing]
 name = "Window Resizing"
 description = "Demonstrates resizing and responding to resizing a window"
diff --git a/assets/shaders/fullscreen_effect.wgsl b/assets/shaders/fullscreen_effect.wgsl
new file mode 100644
index 0000000000000..b4a88cff94da2
--- /dev/null
+++ b/assets/shaders/fullscreen_effect.wgsl
@@ -0,0 +1,50 @@
+// This shader computes the chromatic aberration effect
+
+// Since post processing is a fullscreen effect, we use the fullscreen vertex shader provided by bevy.
+// This will import a vertex shader that renders a single fullscreen triangle.
+//
+// A fullscreen triangle is a single triangle that covers the entire screen.
+// The box in the top left in that diagram is the screen. The 4 x are the corner of the screen
+//
+// Y axis
+//  1 |  x-----x......
+//  0 |  |  s  |  . ´
+// -1 |  x_____x´
+// -2 |  :  .´
+// -3 |  :´
+//    +---------------  X axis
+//      -1  0  1  2  3
+//
+// As you can see, the triangle ends up bigger than the screen.
+//
+// You don't need to worry about this too much since bevy will compute the correct UVs for you.
+#import bevy_core_pipeline::fullscreen_vertex_shader::FullscreenVertexOutput
+
+@group(0) @binding(0) var screen_texture: texture_2d<f32>;
+@group(0) @binding(1) var texture_sampler: sampler;
+
+struct FullScreenEffect {
+    intensity: f32,
+#ifdef SIXTEEN_BYTE_ALIGNMENT
+    // WebGL2 structs must be 16 byte aligned.
+    _webgl2_padding: vec3<f32>
+#endif
+}
+
+@group(0) @binding(2) var<uniform> settings: FullScreenEffect;
+
+@fragment
+fn fragment(in: FullscreenVertexOutput) -> @location(0) vec4<f32> {
+    // Chromatic aberration strength
+    let offset_strength = settings.intensity;
+
+    // Sample each color channel with an arbitrary shift
+    return vec4<f32>(
+        textureSample(screen_texture, texture_sampler, in.uv + vec2<f32>(offset_strength, -offset_strength)).r,
+        textureSample(screen_texture, texture_sampler, in.uv + vec2<f32>(-offset_strength, 0.0)).g,
+        textureSample(screen_texture, texture_sampler, in.uv + vec2<f32>(0.0, offset_strength)).b,
+        1.0
+    );
+}
+
+
diff --git a/crates/bevy_core_pipeline/src/fullscreen_material.rs b/crates/bevy_core_pipeline/src/fullscreen_material.rs
new file mode 100644
index 0000000000000..4de57f54cbfc9
--- /dev/null
+++ b/crates/bevy_core_pipeline/src/fullscreen_material.rs
@@ -0,0 +1,329 @@
+//! This is mostly a pluginified version of the `custom_post_processing` example
+//!
+//! The plugin will create a new node that runs a fullscreen triangle.
+//!
+//! Users need to use the [`FullscreenMaterial`] trait to define the parameters like the graph label or the graph ordering.
+
+use core::any::type_name;
+use core::marker::PhantomData;
+
+use crate::{core_2d::graph::Core2d, core_3d::graph::Core3d, FullscreenShader};
+use bevy_app::{App, Plugin};
+use bevy_asset::AssetServer;
+use bevy_camera::{Camera2d, Camera3d};
+use bevy_ecs::{
+    component::Component,
+    entity::Entity,
+    query::{Added, Has, QueryItem},
+    resource::Resource,
+    system::{Commands, Res},
+    world::{FromWorld, World},
+};
+use bevy_image::BevyDefault;
+use bevy_render::{
+    extract_component::{
+        ComponentUniforms, DynamicUniformIndex, ExtractComponent, ExtractComponentPlugin,
+        UniformComponentPlugin,
+    },
+    render_graph::{
+        InternedRenderLabel, InternedRenderSubGraph, NodeRunError, RenderGraph, RenderGraphContext,
+        RenderGraphError, RenderGraphExt, RenderLabel, ViewNode, ViewNodeRunner,
+    },
+    render_resource::{
+        binding_types::{sampler, texture_2d, uniform_buffer},
+        encase::internal::WriteInto,
+        BindGroupEntries, BindGroupLayoutDescriptor, BindGroupLayoutEntries,
+        CachedRenderPipelineId, ColorTargetState, ColorWrites, FragmentState, Operations,
+        PipelineCache, RenderPassColorAttachment, RenderPassDescriptor, RenderPipelineDescriptor,
+        Sampler, SamplerBindingType, SamplerDescriptor, ShaderStages, ShaderType, TextureFormat,
+        TextureSampleType,
+    },
+    renderer::{RenderContext, RenderDevice},
+    view::ViewTarget,
+    ExtractSchedule, MainWorld, RenderApp, RenderStartup,
+};
+use bevy_shader::ShaderRef;
+use bevy_utils::default;
+use tracing::warn;
+
+#[derive(Default)]
+pub struct FullscreenMaterialPlugin<T: FullscreenMaterial> {
+    _marker: PhantomData<T>,
+}
+impl<T: FullscreenMaterial> Plugin for FullscreenMaterialPlugin<T> {
+    fn build(&self, app: &mut App) {
+        app.add_plugins((
+            ExtractComponentPlugin::<T>::default(),
+            UniformComponentPlugin::<T>::default(),
+        ));
+
+        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
+            return;
+        };
+
+        render_app.add_systems(RenderStartup, init_pipeline::<T>);
+
+        if let Some(sub_graph) = T::sub_graph() {
+            render_app.add_render_graph_node::<ViewNodeRunner<FullscreenMaterialNode<T>>>(
+                sub_graph,
+                T::node_label(),
+            );
+
+            // We can't use add_render_graph_edges because it doesn't accept a Vec<RenderLabel>
+            if let Some(mut render_graph) = render_app.world_mut().get_resource_mut::<RenderGraph>()
+                && let Some(graph) = render_graph.get_sub_graph_mut(sub_graph)
+            {
+                for window in T::node_edges().windows(2) {
+                    let [a, b] = window else {
+                        break;
+                    };
+                    let Err(err) = graph.try_add_node_edge(*a, *b) else {
+                        continue;
+                    };
+                    match err {
+                        // Already existing edges are very easy to produce with this api
+                        // and shouldn't cause a panic
+                        RenderGraphError::EdgeAlreadyExists(_) => {}
+                        _ => panic!("{err:?}"),
+                    }
+                }
+            } else {
+                warn!("Failed to add edges for FullscreenMaterial");
+            };
+        } else {
+            // If there was no sub_graph specified we try to determine the graph based on the camera
+            // it gets added to.
+            render_app.add_systems(ExtractSchedule, extract_on_add::<T>);
+        }
+    }
+}
+
+fn extract_on_add<T: FullscreenMaterial>(world: &mut World) {
+    world.resource_scope::<MainWorld, ()>(|world, mut main_world| {
+        // Extract the material from the main world
+        let mut query =
+            main_world.query_filtered::<(Entity, Has<Camera3d>, Has<Camera2d>), Added<T>>();
+
+        // Create the node and add it to the render graph
+        world.resource_scope::<RenderGraph, ()>(|world, mut render_graph| {
+            for (_entity, is_3d, is_2d) in query.iter(&main_world) {
+                let graph = if is_3d && let Some(graph) = render_graph.get_sub_graph_mut(Core3d) {
+                    graph
+                } else if is_2d && let Some(graph) = render_graph.get_sub_graph_mut(Core2d) {
+                    graph
+                } else {
+                    warn!("FullscreenMaterial was added to an entity that isn't a camera");
+                    continue;
+                };
+
+                let node = ViewNodeRunner::<FullscreenMaterialNode<T>>::from_world(world);
+                graph.add_node(T::node_label(), node);
+
+                for window in T::node_edges().windows(2) {
+                    let [a, b] = window else {
+                        break;
+                    };
+                    let Err(err) = graph.try_add_node_edge(*a, *b) else {
+                        continue;
+                    };
+                    match err {
+                        // Already existing edges are very easy to produce with this api
+                        // and shouldn't cause a panic
+                        RenderGraphError::EdgeAlreadyExists(_) => {}
+                        _ => panic!("{err:?}"),
+                    }
+                }
+            }
+        });
+    });
+}
+
+/// A trait to define a material that will render to the entire screen using a fullscrene triangle
+pub trait FullscreenMaterial:
+    Component + ExtractComponent + Clone + Copy + ShaderType + WriteInto + Default
+{
+    /// The shader that will run on the entire screen using a fullscreen triangle
+    fn fragment_shader() -> ShaderRef;
+
+    /// The list of `node_edges`. In 3d, for a post processing effect, it would look like this:
+    ///
+    /// ```compile_fail
+    /// # use bevy_core_pipeline::core_3d::graph::Node3d;
+    /// # use bevy_render::render_graph::RenderLabel;
+    /// vec![
+    ///     Node3d::Tonemapping.intern(),
+    ///     // Self::sub_graph().intern(), // <--- your own label here
+    ///     Node3d::EndMainPassPostProcessing.intern(),
+    /// ]
+    /// ```
+    ///
+    /// This tell the render graph to run your fullscreen effect after the tonemapping pass but
+    /// before the end of post processing. For 2d, it would be the same but using Node2d. You can
+    /// specify any edges you want but make sure to include your own label.
+    fn node_edges() -> Vec<InternedRenderLabel>;
+
+    /// The [`bevy_render::render_graph::RenderSubGraph`] the effect will run in
+    ///
+    /// For 2d this is generally [`crate::core_2d::graph::Core2d`] and for 3d it's
+    /// [`crate::core_3d::graph::Core3d`]
+    fn sub_graph() -> Option<InternedRenderSubGraph> {
+        None
+    }
+
+    /// The label used to represent the render node that will run the pass
+    fn node_label() -> impl RenderLabel {
+        FullscreenMaterialLabel(type_name::<Self>())
+    }
+}
+
+#[derive(Debug, Hash, PartialEq, Eq, Clone)]
+struct FullscreenMaterialLabel(&'static str);
+
+impl RenderLabel for FullscreenMaterialLabel
+where
+    Self: 'static + Send + Sync + Clone + Eq + ::core::fmt::Debug + ::core::hash::Hash,
+{
+    fn dyn_clone(&self) -> Box<dyn RenderLabel> {
+        Box::new(::core::clone::Clone::clone(self))
+    }
+}
+
+#[derive(Resource)]
+struct FullscreenMaterialPipeline {
+    layout: BindGroupLayoutDescriptor,
+    sampler: Sampler,
+    pipeline_id: CachedRenderPipelineId,
+    pipeline_id_hdr: CachedRenderPipelineId,
+}
+
+fn init_pipeline<T: FullscreenMaterial>(
+    mut commands: Commands,
+    render_device: Res<RenderDevice>,
+    asset_server: Res<AssetServer>,
+    fullscreen_shader: Res<FullscreenShader>,
+    pipeline_cache: Res<PipelineCache>,
+) {
+    let layout = BindGroupLayoutDescriptor::new(
+        "post_process_bind_group_layout",
+        &BindGroupLayoutEntries::sequential(
+            ShaderStages::FRAGMENT,
+            (
+                // The screen texture
+                texture_2d(TextureSampleType::Float { filterable: true }),
+                // The sampler that will be used to sample the screen texture
+                sampler(SamplerBindingType::Filtering),
+                // We use a uniform buffer so users can pass some data to the effect
+                // Eventually we should just use a separate bind group for user data
+                uniform_buffer::<T>(true),
+            ),
+        ),
+    );
+    let sampler = render_device.create_sampler(&SamplerDescriptor::default());
+    let shader = match T::fragment_shader() {
+        ShaderRef::Default => {
+            // TODO not sure what an actual fallback should be. An empty shader or output a solid
+            // color to indicate a missing shader?
+            unimplemented!(
+                "FullscreenMaterial::fragment_shader() must not return ShaderRef::Default"
+            )
+        }
+        ShaderRef::Handle(handle) => handle,
+        ShaderRef::Path(path) => asset_server.load(path),
+    };
+    // Setup a fullscreen triangle for the vertex state.
+    let vertex_state = fullscreen_shader.to_vertex_state();
+    let mut desc = RenderPipelineDescriptor {
+        label: Some("post_process_pipeline".into()),
+        layout: vec![layout.clone()],
+        vertex: vertex_state,
+        fragment: Some(FragmentState {
+            shader,
+            targets: vec![Some(ColorTargetState {
+                format: TextureFormat::bevy_default(),
+                blend: None,
+                write_mask: ColorWrites::ALL,
+            })],
+            ..default()
+        }),
+        ..default()
+    };
+    let pipeline_id = pipeline_cache.queue_render_pipeline(desc.clone());
+    desc.fragment.as_mut().unwrap().targets[0]
+        .as_mut()
+        .unwrap()
+        .format = ViewTarget::TEXTURE_FORMAT_HDR;
+    let pipeline_id_hdr = pipeline_cache.queue_render_pipeline(desc);
+    commands.insert_resource(FullscreenMaterialPipeline {
+        layout,
+        sampler,
+        pipeline_id,
+        pipeline_id_hdr,
+    });
+}
+
+#[derive(Default)]
+struct FullscreenMaterialNode<T: FullscreenMaterial> {
+    _marker: PhantomData<T>,
+}
+
+impl<T: FullscreenMaterial> ViewNode for FullscreenMaterialNode<T> {
+    // TODO we should expose the depth buffer and the gbuffer if using deferred
+    type ViewQuery = (&'static ViewTarget, &'static DynamicUniformIndex<T>);
+
+    fn run<'w>(
+        &self,
+        _graph: &mut RenderGraphContext,
+        render_context: &mut RenderContext,
+        (view_target, settings_index): QueryItem<Self::ViewQuery>,
+        world: &World,
+    ) -> Result<(), NodeRunError> {
+        let fullscreen_pipeline = world.resource::<FullscreenMaterialPipeline>();
+
+        let pipeline_cache = world.resource::<PipelineCache>();
+        let pipeline_id = if view_target.is_hdr() {
+            fullscreen_pipeline.pipeline_id_hdr
+        } else {
+            fullscreen_pipeline.pipeline_id
+        };
+
+        let Some(pipeline) = pipeline_cache.get_render_pipeline(pipeline_id) else {
+            return Ok(());
+        };
+
+        let data_uniforms = world.resource::<ComponentUniforms<T>>();
+        let Some(settings_binding) = data_uniforms.uniforms().binding() else {
+            return Ok(());
+        };
+
+        let post_process = view_target.post_process_write();
+
+        let bind_group = render_context.render_device().create_bind_group(
+            "post_process_bind_group",
+            &pipeline_cache.get_bind_group_layout(&fullscreen_pipeline.layout),
+            &BindGroupEntries::sequential((
+                post_process.source,
+                &fullscreen_pipeline.sampler,
+                settings_binding.clone(),
+            )),
+        );
+
+        let mut render_pass = render_context.begin_tracked_render_pass(RenderPassDescriptor {
+            label: Some("post_process_pass"),
+            color_attachments: &[Some(RenderPassColorAttachment {
+                view: post_process.destination,
+                depth_slice: None,
+                resolve_target: None,
+                ops: Operations::default(),
+            })],
+            depth_stencil_attachment: None,
+            timestamp_writes: None,
+            occlusion_query_set: None,
+        });
+
+        render_pass.set_render_pipeline(pipeline);
+        render_pass.set_bind_group(0, &bind_group, &[settings_index.index()]);
+        render_pass.draw(0..3, 0..1);
+
+        Ok(())
+    }
+}
diff --git a/crates/bevy_core_pipeline/src/lib.rs b/crates/bevy_core_pipeline/src/lib.rs
index 0f084152d8665..6037e89cc325d 100644
--- a/crates/bevy_core_pipeline/src/lib.rs
+++ b/crates/bevy_core_pipeline/src/lib.rs
@@ -11,6 +11,7 @@ pub mod core_2d;
 pub mod core_3d;
 pub mod deferred;
 pub mod experimental;
+pub mod fullscreen_material;
 pub mod oit;
 pub mod prepass;
 pub mod tonemapping;
diff --git a/crates/bevy_render/src/render_graph/node.rs b/crates/bevy_render/src/render_graph/node.rs
index c75218c0a2941..bfc007b12754a 100644
--- a/crates/bevy_render/src/render_graph/node.rs
+++ b/crates/bevy_render/src/render_graph/node.rs
@@ -38,6 +38,12 @@ pub trait IntoRenderNodeArray<const N: usize> {
     fn into_array(self) -> [InternedRenderLabel; N];
 }
 
+impl<const N: usize> IntoRenderNodeArray<N> for Vec<InternedRenderLabel> {
+    fn into_array(self) -> [InternedRenderLabel; N] {
+        self.try_into().unwrap()
+    }
+}
+
 macro_rules! impl_render_label_tuples {
     ($N: expr, $(#[$meta:meta])* $(($T: ident, $I: ident)),*) => {
         $(#[$meta])*
diff --git a/examples/README.md b/examples/README.md
index 52f0379ea915f..06e451d4f5c91 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -62,6 +62,7 @@ git checkout v0.4.0
   - [Scene](#scene)
   - [Shader Advanced](#shader-advanced)
   - [Shaders](#shaders)
+  - [Shaders Advanced](#shaders-advanced)
   - [State](#state)
   - [Stress Tests](#stress-tests)
   - [Time](#time)
@@ -488,6 +489,12 @@ Example | Description
 [Storage Buffer](../examples/shader/storage_buffer.rs) | A shader that shows how to bind a storage buffer using a custom material.
 [Texture Binding Array (Bindless Textures)](../examples/shader_advanced/texture_binding_array.rs) | A shader that shows how to bind and sample multiple textures as a binding array (a.k.a. bindless textures).
 
+### Shaders Advanced
+
+Example | Description
+--- | ---
+[Fullscreen Material](../examples/shader_advanced/fullscreen_material.rs) | Demonstrates how to write a fullscreen material
+
 ### State
 
 Example | Description
diff --git a/examples/shader_advanced/fullscreen_material.rs b/examples/shader_advanced/fullscreen_material.rs
new file mode 100644
index 0000000000000..4cd5ed6da50e7
--- /dev/null
+++ b/examples/shader_advanced/fullscreen_material.rs
@@ -0,0 +1,89 @@
+//! Demonstrates how to write a custom fullscreen shader
+//!
+//! This is currently limited to 3d only but work is in progress to make it work in 2d
+
+use bevy::{
+    core_pipeline::{
+        core_3d::graph::Node3d,
+        fullscreen_material::{FullscreenMaterial, FullscreenMaterialPlugin},
+    },
+    prelude::*,
+    render::{
+        extract_component::ExtractComponent,
+        render_graph::{InternedRenderLabel, RenderLabel},
+        render_resource::ShaderType,
+    },
+    shader::ShaderRef,
+};
+
+fn main() {
+    App::new()
+        .add_plugins((
+            DefaultPlugins,
+            FullscreenMaterialPlugin::<FullscreenEffect>::default(),
+        ))
+        .add_systems(Startup, setup)
+        .run();
+}
+
+fn setup(
+    mut commands: Commands,
+    mut meshes: ResMut<Assets<Mesh>>,
+    mut materials: ResMut<Assets<StandardMaterial>>,
+) {
+    // camera
+    commands.spawn((
+        Camera3d::default(),
+        Transform::from_translation(Vec3::new(0.0, 0.0, 5.0)).looking_at(Vec3::default(), Vec3::Y),
+        FullscreenEffect { intensity: 0.005 },
+    ));
+
+    // cube
+    commands.spawn((
+        Mesh3d(meshes.add(Cuboid::default())),
+        MeshMaterial3d(materials.add(Color::srgb(0.8, 0.7, 0.6))),
+        Transform::default(),
+    ));
+
+    // light
+    commands.spawn(DirectionalLight {
+        illuminance: 1_000.,
+        ..default()
+    });
+}
+
+// This is the struct that will be sent to your shader
+//
+// Currently, this doesn't support AsBindGroup so you can only use it to send a struct to your
+// shader. We are working on adding AsBindGroup support in the future so you can bind anything you
+// need.
+#[derive(Component, ExtractComponent, Clone, Copy, ShaderType, Default)]
+struct FullscreenEffect {
+    // For this example, this is used as the intensity of the effect, but you can pass in any valid
+    // ShaderType
+    //
+    // In the future, you will be able to use a full bind group
+    intensity: f32,
+}
+
+impl FullscreenMaterial for FullscreenEffect {
+    // The shader that will be used
+    fn fragment_shader() -> ShaderRef {
+        "shaders/fullscreen_effect.wgsl".into()
+    }
+
+    // This let's you specify a list of edges used to order when your effect pass will run
+    //
+    // This example is a post processing effect so it will run after tonemapping but before the end
+    // post processing pass.
+    //
+    // In 2d you would need to use [`Node2d`] instead of [`Node3d`]
+    fn node_edges() -> Vec<InternedRenderLabel> {
+        vec![
+            Node3d::Tonemapping.intern(),
+            // The label is automatically generated from the name of the struct
+            Self::node_label().intern(),
+            Node3d::EndMainPassPostProcessing.intern(),
+        ]
+    }
+}
diff --git a/release-content/release-notes/fullscreen_material.md b/release-content/release-notes/fullscreen_material.md
new file mode 100644
index 0000000000000..59f0307107982
--- /dev/null
+++ b/release-content/release-notes/fullscreen_material.md
@@ -0,0 +1,7 @@
+---
+title: Fullscreen Material
+authors: ["@IceSentry"]
+pull_requests: [20414]
+---
+
+Users often want to run a fullscreen shader but currently the only to do this is to copy the custom_post_processing example which is very verbose and contains a lot of low level details. We introduced a new `FullscreenMaterial` trait and `FullscreenMaterialPlugin` that let you easily run a fullscreen shader and specify in which order it will run relative to other render passes in the engine.

From ac7ee143d6c615b4dfce693562b1a5300b9c371d Mon Sep 17 00:00:00 2001
From: Shane Celis <shane.celis@gmail.com>
Date: Sun, 14 Dec 2025 14:40:38 -0800
Subject: [PATCH 111/133] bug: Fix stackoverflow on asset reload. (#21619)

# Objective

Fix the stackoverflow on asset reload when asset contains its own path
as a dependency.

## Problem
There is a way to create a circular dependency graph with an asset
loader. I don't know how I managed to do it. I have tried to create a
minimal example, but it has not exhibited the error yet. But I do have a
means of exhibiting the error with my project Nano-9, reproduction
details below.

## Solution

This commit has two fixes: one at the insertion point (introducing
self-reference), and one at the recursion point (following
self-reference).

### Insertion point
Issue warning when an asset wants to mark itself as a dependency and do
not allow inserting itself as a dependent.

### Recursion point
Check for self loops. Warn on self detection and do not loop.

It's likely that if you fix it at the insertion point, you don't need to
worry about it at the recursion point. You will have stopped the cause
of the issue. I left both in for transparency about where the issue lies
so far as I could see.

## Testing

I can reproduce this error with an example from my [Nano-9
project](https://github.com/shanecelis/nano-9). I wish it were a minimal
example. It's not, but I have put it on a branch to isolate this issue.
It uses my Bevy fork that is v0.16.1 plus a commit tagged v0.16.1b,
which was required for it to build. This PR is a cherry pick of the fix
commit against Bevy's main branch.

I can reproduce this error by doing the following:

```sh
git clone -b bevy-asset-stackoverflow https://github.com/shanecelis/nano-9.git
cd nano-9
cargo run --example sprite --features watcher --no-default-features &
touch assets/BirdSprite.png
```
Here is an excerpt of the crash report on macOS 15.6.1, M4 Max:

```
...
Thread 0 Crashed:: main Dispatch queue: com.apple.main-thread
0   libsystem_kernel.dylib        	       0x18cc2a388 __pthread_kill + 8
1   libsystem_pthread.dylib       	       0x18cc6388c pthread_kill + 296
2   libsystem_c.dylib             	       0x18cb6ca3c abort + 124
3   sprite                        	       0x10598d09c std::sys::pal::unix::abort_internal::h1edcc850f5dec78e + 12
4   sprite                        	       0x10598c5b0 std::process::abort::hffd6db68ff0662a6 + 12
5   sprite                        	       0x10580d464 std::sys::pal::unix::stack_overflow::imp::signal_handler::h7b8eae417c5ee98d + 604
6   libsystem_platform.dylib      	       0x18cc9d6a4 _sigtramp + 56
7   sprite                        	       0x10573f890 _$LT$std..path..Path$u20$as$u20$core..hash..Hash$GT$::hash::h732e05949b6a170e + 136
8   sprite                        	       0x10573f890 _$LT$std..path..Path$u20$as$u20$core..hash..Hash$GT$::hash::h732e05949b6a170e + 136
9   sprite                        	       0x104d5f278 _$LT$atomicow..CowArc$LT$T$GT$$u20$as$u20$core..hash..Hash$GT$::hash::h6c45383281764a05 + 40
10  sprite                        	       0x104ed62d8 _$LT$bevy_asset..path..AssetPath$u20$as$u20$core..hash..Hash$GT$::hash::h11b348528182d76d + 52
11  sprite                        	       0x104ded598 hashbrown::map::make_hash::hb7812997186aa817 + 56
12  sprite                        	       0x104de8eec hashbrown::map::HashMap$LT$K$C$V$C$S$C$A$GT$::insert::h3a8b107dcf9615e9 + 64
13  sprite                        	       0x104da7264 hashbrown::set::HashSet$LT$T$C$S$C$A$GT$::insert::h44e988e7a7752688 + 24
14  sprite                        	       0x104e7b15c bevy_platform::collections::hash_set::HashSet$LT$T$C$S$GT$::insert::hb1d23d506d548fcc + 24
15  sprite                        	       0x104dba770 bevy_asset::server::handle_internal_asset_events::_$u7b$$u7b$closure$u7d$$u7d$::queue_ancestors::hd1670687bb18ae9f + 216
16  sprite                        	       0x104dba780 bevy_asset::server::handle_internal_asset_events::_$u7b$$u7b$closure$u7d$$u7d$::queue_ancestors::hd1670687bb18ae9f + 232
17  sprite                        	       0x104dba780 bevy_asset::server::handle_internal_asset_events::_$u7b$$u7b$closure$u7d$$u7d$::queue_ancestors::hd1670687bb18ae9f + 232
18  sprite                        	       0x104dba780 bevy_asset::server::handle_internal_asset_events::_$u7b$$u7b$closure$u7d$$u7d$::queue_ancestors::hd1670687bb18ae9f + 232
19  sprite                        	       0x104dba780 bevy_asset::server::handle_internal_asset_events::_$u7b$$u7b$closure$u7d$$u7d$::queue_ancestors::hd1670687bb18ae9f + 232
...
```

### Exercising the fix

Alter Nano-9's Cargo file to use the fix branch:

```diff
-bevy = { git = "https://github.com/shanecelis/bevy.git", tag = "v0.16.1b" }
+bevy = { git = "https://github.com/shanecelis/bevy.git", branch = "fix/asset-reload-overflow" }
```
Run the same command again, and you will see a warning:

```sh
2025-10-21T04:10:52.348726Z  WARN bevy_asset::server::info: Asset 'BirdSprite.png' wants to treat itself as a dependency
```

## Alternative Solution

This commit fixes the immediate stackoverflow issue; however, it would
be even better if the user were prevented from making a circular
dependency graph in the first place.

---------

Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
---
 crates/bevy_asset/src/lib.rs             | 378 +++++++++++++++++++++++
 crates/bevy_asset/src/loader.rs          |  11 +-
 crates/bevy_asset/src/loader_builders.rs |  28 +-
 crates/bevy_asset/src/server/mod.rs      |   7 +
 4 files changed, 420 insertions(+), 4 deletions(-)

diff --git a/crates/bevy_asset/src/lib.rs b/crates/bevy_asset/src/lib.rs
index cdaf34bffe8c2..d7aa964ef497a 100644
--- a/crates/bevy_asset/src/lib.rs
+++ b/crates/bevy_asset/src/lib.rs
@@ -1978,6 +1978,384 @@ mod tests {
         });
     }
 
+    #[test]
+    fn error_on_immediate_load_of_self_path() {
+        let (mut app, dir, _source_events) = create_app_with_source_event_sender();
+        let asset_server = app.world().resource::<AssetServer>().clone();
+
+        // Extension "rsp" for Recursive Self Path (RSP).
+        dir.insert_asset_text(Path::new("abc.rsp"), "");
+
+        struct ImmediateSelfLoader;
+
+        impl AssetLoader for ImmediateSelfLoader {
+            type Asset = TestAsset;
+            type Error = crate::loader::LoadDirectError;
+            type Settings = ();
+
+            async fn load(
+                &self,
+                _: &mut dyn Reader,
+                _: &Self::Settings,
+                load_context: &mut LoadContext<'_>,
+            ) -> Result<Self::Asset, Self::Error> {
+                let asset_path = load_context.path().clone();
+                let loaded_asset = load_context
+                    .loader()
+                    .immediate()
+                    .load::<TestAsset>(asset_path)
+                    .await?;
+                load_context.add_loaded_labeled_asset("myself".to_string(), loaded_asset);
+                Ok(TestAsset)
+            }
+
+            fn extensions(&self) -> &[&str] {
+                &["rsp"]
+            }
+        }
+
+        app.init_asset::<TestAsset>()
+            .register_asset_loader(ImmediateSelfLoader);
+
+        let handle: Handle<TestAsset> = asset_server.load("abc.rsp");
+
+        run_app_until(&mut app, |_world| match asset_server.load_state(&handle) {
+            LoadState::Loading => None,
+            LoadState::Failed(err) => {
+                assert!(
+                    format!("{:?}", &err).contains("RequestedSelfPath"),
+                    "Error did not contain RequestedSelfPath: {:?}",
+                    &err
+                );
+                Some(())
+            }
+            state => panic!("Unexpected asset state: {state:?}"),
+        });
+    }
+
+    #[test]
+    fn error_on_unknown_type_immediate_load_of_self_path() {
+        let (mut app, dir, _source_events) = create_app_with_source_event_sender();
+        let asset_server = app.world().resource::<AssetServer>().clone();
+
+        dir.insert_asset_text(Path::new("abc.rsp"), "");
+
+        struct ImmediateSelfLoader;
+
+        impl AssetLoader for ImmediateSelfLoader {
+            type Asset = TestAsset;
+            type Error = crate::loader::LoadDirectError;
+            type Settings = ();
+
+            async fn load(
+                &self,
+                _: &mut dyn Reader,
+                _: &Self::Settings,
+                load_context: &mut LoadContext<'_>,
+            ) -> Result<Self::Asset, Self::Error> {
+                let asset_path = load_context.path().clone();
+                let loaded_asset = load_context
+                    .loader()
+                    .immediate()
+                    .with_unknown_type()
+                    .load(asset_path)
+                    .await?;
+                let Ok(loaded_asset) = loaded_asset.downcast::<TestAsset>() else {
+                    panic!("Could not downcast to `TestAsset`")
+                };
+                load_context.add_loaded_labeled_asset("myself".to_string(), loaded_asset);
+                Ok(TestAsset)
+            }
+
+            fn extensions(&self) -> &[&str] {
+                &["rsp"]
+            }
+        }
+
+        app.init_asset::<TestAsset>()
+            .register_asset_loader(ImmediateSelfLoader);
+
+        let handle: Handle<TestAsset> = asset_server.load("abc.rsp");
+
+        run_app_until(&mut app, |_world| match asset_server.load_state(&handle) {
+            LoadState::Loading => None,
+            LoadState::Failed(err) => {
+                assert!(
+                    format!("{:?}", &err).contains("RequestedSelfPath"),
+                    "Error did not contain RequestedSelfPath: {:?}",
+                    &err
+                );
+                Some(())
+            }
+            state => panic!("Unexpected asset state: {state:?}"),
+        });
+    }
+
+    /// This is not a statement of intent but of behavior: One may load their
+    /// own path deferred without error. It has the correct handle to itself.
+    /// And it can reload.
+    #[test]
+    fn no_error_on_deferred_load_of_self_path() {
+        let (mut app, dir, source_events) = create_app_with_source_event_sender();
+        let asset_server = app.world().resource::<AssetServer>().clone();
+
+        dir.insert_asset_text(Path::new("abc.rsp"), "");
+
+        #[derive(Asset, TypePath)]
+        pub struct TestAsset(Handle<TestAsset>);
+        struct DeferredSelfLoader;
+
+        impl AssetLoader for DeferredSelfLoader {
+            type Asset = TestAsset;
+            type Error = crate::loader::LoadDirectError;
+            type Settings = ();
+
+            async fn load(
+                &self,
+                _: &mut dyn Reader,
+                _: &Self::Settings,
+                load_context: &mut LoadContext<'_>,
+            ) -> Result<Self::Asset, Self::Error> {
+                let asset_path = load_context.path().clone();
+                let loaded_asset = load_context.load::<TestAsset>(asset_path);
+                Ok(TestAsset(loaded_asset))
+            }
+
+            fn extensions(&self) -> &[&str] {
+                &["rsp"]
+            }
+        }
+
+        app.init_asset::<TestAsset>()
+            .register_asset_loader(DeferredSelfLoader);
+
+        let handle: Handle<TestAsset> = asset_server.load("abc.rsp");
+
+        run_app_until(&mut app, |world| match asset_server.load_state(&handle) {
+            LoadState::Loading => None,
+            LoadState::Loaded => {
+                let test_assets = world.resource::<Assets<TestAsset>>();
+                let asset = test_assets.get(&handle).unwrap();
+                assert_eq!(handle, asset.0);
+                Some(())
+            }
+            state => panic!("Unexpected asset state: {state:?}"),
+        });
+
+        run_app_until(&mut app, |world| {
+            let messages = collect_asset_events(world);
+            if messages.is_empty() {
+                return None;
+            }
+            assert_eq!(
+                messages,
+                [
+                    AssetEvent::LoadedWithDependencies { id: handle.id() },
+                    AssetEvent::Added { id: handle.id() }
+                ]
+            );
+            Some(())
+        });
+
+        // Sending an asset event should result in the asset being reloaded - resulting in a
+        // "Modified" message.
+        source_events
+            .send_blocking(AssetSourceEvent::ModifiedAsset(PathBuf::from("abc.rsp")))
+            .unwrap();
+
+        run_app_until(&mut app, |world| {
+            let messages = collect_asset_events(world);
+            if messages.is_empty() {
+                return None;
+            }
+            assert_eq!(
+                messages,
+                [
+                    AssetEvent::LoadedWithDependencies { id: handle.id() },
+                    AssetEvent::Modified { id: handle.id() }
+                ]
+            );
+            Some(())
+        });
+    }
+
+    #[test]
+    fn no_error_on_read_bytes_of_self_path() {
+        let (mut app, dir, source_events) = create_app_with_source_event_sender();
+        let asset_server = app.world().resource::<AssetServer>().clone();
+
+        dir.insert_asset_text(Path::new("abc.rsp"), "");
+
+        struct ReadBytesSelfLoader;
+
+        impl AssetLoader for ReadBytesSelfLoader {
+            type Asset = TestAsset;
+            type Error = crate::loader::LoadDirectError;
+            type Settings = ();
+
+            async fn load(
+                &self,
+                _: &mut dyn Reader,
+                _: &Self::Settings,
+                load_context: &mut LoadContext<'_>,
+            ) -> Result<Self::Asset, Self::Error> {
+                let asset_path = load_context.path().clone();
+                let _bytes = load_context.read_asset_bytes(asset_path).await.unwrap();
+                Ok(TestAsset)
+            }
+
+            fn extensions(&self) -> &[&str] {
+                &["rsp"]
+            }
+        }
+
+        app.init_asset::<TestAsset>()
+            .register_asset_loader(ReadBytesSelfLoader);
+
+        let handle: Handle<TestAsset> = asset_server.load("abc.rsp");
+
+        run_app_until(&mut app, |_world| match asset_server.load_state(&handle) {
+            LoadState::Loading => None,
+            LoadState::Loaded => Some(()),
+            state => panic!("Unexpected asset state: {state:?}"),
+        });
+
+        run_app_until(&mut app, |world| {
+            let messages = collect_asset_events(world);
+            if messages.is_empty() {
+                return None;
+            }
+            assert_eq!(
+                messages,
+                [
+                    AssetEvent::LoadedWithDependencies { id: handle.id() },
+                    AssetEvent::Added { id: handle.id() }
+                ]
+            );
+            Some(())
+        });
+
+        // Sending an asset event should result in the asset being reloaded - resulting in a
+        // "Modified" message.
+        source_events
+            .send_blocking(AssetSourceEvent::ModifiedAsset(PathBuf::from("abc.rsp")))
+            .unwrap();
+
+        run_app_until(&mut app, |world| {
+            let messages = collect_asset_events(world);
+            if messages.is_empty() {
+                return None;
+            }
+            assert_eq!(
+                messages,
+                [
+                    AssetEvent::LoadedWithDependencies { id: handle.id() },
+                    AssetEvent::Modified { id: handle.id() }
+                ]
+            );
+            Some(())
+        });
+    }
+
+    /// This is not a statement of intent but of behavior: One may load
+    /// their self path deferred of unknown type without error. It has the same
+    /// asset index as the original handle, but not the same type. And it can
+    /// reload.
+    #[test]
+    fn no_error_on_unknown_type_deferred_load_of_self_path() {
+        let (mut app, dir, source_events) = create_app_with_source_event_sender();
+        let asset_server = app.world().resource::<AssetServer>().clone();
+
+        dir.insert_asset_text(Path::new("abc.rsp"), "");
+
+        #[derive(Asset, TypePath)]
+        pub struct TestAssetUD(Handle<crate::LoadedUntypedAsset>);
+        struct ImmediateSelfLoader;
+
+        impl AssetLoader for ImmediateSelfLoader {
+            type Asset = TestAssetUD;
+            type Error = crate::loader::LoadDirectError;
+            type Settings = ();
+
+            async fn load(
+                &self,
+                _: &mut dyn Reader,
+                _: &Self::Settings,
+                load_context: &mut LoadContext<'_>,
+            ) -> Result<Self::Asset, Self::Error> {
+                let asset_path = load_context.path().clone();
+                let untyped_handle: Handle<crate::LoadedUntypedAsset> =
+                    load_context.loader().with_unknown_type().load(asset_path);
+
+                Ok(TestAssetUD(untyped_handle))
+            }
+
+            fn extensions(&self) -> &[&str] {
+                &["rsp"]
+            }
+        }
+
+        app.init_asset::<TestAssetUD>()
+            .register_asset_loader(ImmediateSelfLoader);
+
+        let handle: Handle<TestAssetUD> = asset_server.load("abc.rsp");
+
+        run_app_until(&mut app, |world| match asset_server.load_state(&handle) {
+            LoadState::Loading => None,
+            LoadState::Loaded => {
+                let asset_id = {
+                    let test_assets = world.resource::<Assets<TestAssetUD>>();
+                    let asset = test_assets.get(&handle).unwrap();
+                    asset.0.id()
+                };
+                let untyped = world.resource::<Assets<crate::LoadedUntypedAsset>>();
+                if let Some(untyped_handle) = untyped.get(asset_id) {
+                    assert_eq!(handle.id(), untyped_handle.handle.id());
+                    Some(())
+                } else {
+                    None
+                }
+            }
+            state => panic!("Unexpected asset state: {state:?}"),
+        });
+
+        run_app_until(&mut app, |world| {
+            let messages = collect_asset_events(world);
+            if messages.is_empty() {
+                return None;
+            }
+            assert_eq!(
+                messages,
+                [
+                    AssetEvent::LoadedWithDependencies { id: handle.id() },
+                    AssetEvent::Added { id: handle.id() }
+                ]
+            );
+            Some(())
+        });
+
+        // Sending an asset event should result in the asset being reloaded - resulting in a
+        // "Modified" message.
+        source_events
+            .send_blocking(AssetSourceEvent::ModifiedAsset(PathBuf::from("abc.rsp")))
+            .unwrap();
+
+        run_app_until(&mut app, |world| {
+            let messages = collect_asset_events(world);
+            if messages.is_empty() {
+                return None;
+            }
+            assert_eq!(
+                messages,
+                [
+                    AssetEvent::LoadedWithDependencies { id: handle.id() },
+                    AssetEvent::Modified { id: handle.id() }
+                ]
+            );
+            Some(())
+        });
+    }
+
     // validate the Asset derive macro for various asset types
     #[derive(Asset, TypePath)]
     pub struct TestAsset;
diff --git a/crates/bevy_asset/src/loader.rs b/crates/bevy_asset/src/loader.rs
index cf40e8840ad50..3b0a2cfd7dc91 100644
--- a/crates/bevy_asset/src/loader.rs
+++ b/crates/bevy_asset/src/loader.rs
@@ -305,6 +305,8 @@ pub enum LoadDirectError {
         dependency: AssetPath<'static>,
         error: AssetLoadError,
     },
+    #[error("The asset at path `{0:?}` requested to immediately load itself recursively, but this is not supported")]
+    RequestedSelfPath(AssetPath<'static>),
 }
 
 /// An error that occurs while deserializing [`AssetMeta`].
@@ -507,7 +509,9 @@ impl<'a> LoadContext<'a> {
                 path: path.path().to_path_buf(),
                 source,
             })?;
-        self.loader_dependencies.insert(path.clone_owned(), hash);
+        if self.asset_path != path {
+            self.loader_dependencies.insert(path.clone_owned(), hash);
+        }
         Ok(bytes)
     }
 
@@ -533,6 +537,11 @@ impl<'a> LoadContext<'a> {
         loader: &dyn ErasedAssetLoader,
         reader: &mut dyn Reader,
     ) -> Result<ErasedLoadedAsset, LoadDirectError> {
+        if self.asset_path == path {
+            return Err(LoadDirectError::RequestedSelfPath(
+                self.asset_path.clone_owned(),
+            ));
+        }
         let loaded_asset = self
             .asset_server
             .load_with_meta_loader_and_reader(
diff --git a/crates/bevy_asset/src/loader_builders.rs b/crates/bevy_asset/src/loader_builders.rs
index 994eb33590bee..77a5702d82f98 100644
--- a/crates/bevy_asset/src/loader_builders.rs
+++ b/crates/bevy_asset/src/loader_builders.rs
@@ -9,6 +9,7 @@ use crate::{
 };
 use alloc::{borrow::ToOwned, boxed::Box, sync::Arc};
 use core::any::TypeId;
+use tracing::debug;
 
 // Utility type for handling the sources of reader references
 enum ReaderRef<'a> {
@@ -304,6 +305,8 @@ impl NestedLoader<'_, '_, StaticTyped, Deferred> {
     /// [`with_unknown_type`]: Self::with_unknown_type
     pub fn load<'c, A: Asset>(self, path: impl Into<AssetPath<'c>>) -> Handle<A> {
         let path = path.into().to_owned();
+
+        let is_self_path = *self.load_context.path() == path;
         let handle = if self.load_context.should_load_dependencies {
             self.load_context.asset_server.load_with_meta_transform(
                 path,
@@ -318,8 +321,15 @@ impl NestedLoader<'_, '_, StaticTyped, Deferred> {
         };
         // `load_with_meta_transform` and `get_or_create_path_handle` always returns a Strong
         // variant, so we are safe to unwrap.
-        let index = (&handle).try_into().unwrap();
-        self.load_context.dependencies.insert(index);
+        if !is_self_path {
+            let index = (&handle).try_into().unwrap();
+            self.load_context.dependencies.insert(index);
+        } else {
+            debug!(
+                "Asset from path `{:?}` loaded its self path",
+                self.load_context.path()
+            );
+        }
         handle
     }
 }
@@ -367,6 +377,7 @@ impl NestedLoader<'_, '_, UnknownTyped, Deferred> {
     /// This will infer the asset type from metadata.
     pub fn load<'p>(self, path: impl Into<AssetPath<'p>>) -> Handle<LoadedUntypedAsset> {
         let path = path.into().to_owned();
+        let is_self_path = *self.load_context.path() == path;
         let handle = if self.load_context.should_load_dependencies {
             self.load_context
                 .asset_server
@@ -379,7 +390,15 @@ impl NestedLoader<'_, '_, UnknownTyped, Deferred> {
         // `load_unknown_type_with_meta_transform` and `get_or_create_path_handle` always returns a
         // Strong variant, so we are safe to unwrap.
         let index = (&handle).try_into().unwrap();
-        self.load_context.dependencies.insert(index);
+
+        if !is_self_path {
+            self.load_context.dependencies.insert(index);
+        } else {
+            debug!(
+                "Asset from path `{:?}` of unknown type loaded its self path",
+                self.load_context.path()
+            );
+        }
         handle
     }
 }
@@ -402,6 +421,9 @@ impl<'builder, 'reader, T> NestedLoader<'_, '_, T, Immediate<'builder, 'reader>>
         if path.label().is_some() {
             return Err(LoadDirectError::RequestedSubasset(path.clone()));
         }
+        if self.load_context.path() == path {
+            return Err(LoadDirectError::RequestedSelfPath(path.clone()));
+        }
         self.load_context
             .asset_server
             .write_infos()
diff --git a/crates/bevy_asset/src/server/mod.rs b/crates/bevy_asset/src/server/mod.rs
index 9f7d594e5d3bb..d08ca3a6518e6 100644
--- a/crates/bevy_asset/src/server/mod.rs
+++ b/crates/bevy_asset/src/server/mod.rs
@@ -1788,6 +1788,13 @@ pub fn handle_internal_asset_events(world: &mut World) {
         ) {
             if let Some(dependents) = infos.loader_dependents.get(asset_path) {
                 for dependent in dependents {
+                    assert_ne!(
+                        asset_path, dependent,
+                        "The asset path `{}` contains itself as a dependent.",
+                        &asset_path
+                    );
+                    // If the above assertion fails, the following code would
+                    // cause a stackoverflow.
                     paths_to_reload.insert(dependent.to_owned());
                     queue_ancestors(dependent, infos, paths_to_reload);
                 }

From 18c2b568c666f20d993f5e4073c80aae5db46b39 Mon Sep 17 00:00:00 2001
From: Emerson Coskey <emerson@coskey.dev>
Date: Sun, 14 Dec 2025 16:26:51 -0800
Subject: [PATCH 112/133] `spec_v2`: migrate TAA (#22070)

# Objective

- Migrate TAA to `spec_v2`

## Testing

- Ran `anti_aliasing` example, seems fine
---
 crates/bevy_anti_alias/src/taa/mod.rs | 104 ++++++++++++++------------
 1 file changed, 57 insertions(+), 47 deletions(-)

diff --git a/crates/bevy_anti_alias/src/taa/mod.rs b/crates/bevy_anti_alias/src/taa/mod.rs
index e396e9accd67b..377de519c1560 100644
--- a/crates/bevy_anti_alias/src/taa/mod.rs
+++ b/crates/bevy_anti_alias/src/taa/mod.rs
@@ -1,5 +1,5 @@
 use bevy_app::{App, Plugin};
-use bevy_asset::{embedded_asset, load_embedded_asset, AssetServer, Handle};
+use bevy_asset::{embedded_asset, load_embedded_asset, AssetServer};
 use bevy_camera::{Camera, Camera3d};
 use bevy_core_pipeline::{
     core_3d::graph::{Core3d, Node3d},
@@ -8,6 +8,7 @@ use bevy_core_pipeline::{
 };
 use bevy_diagnostic::FrameCount;
 use bevy_ecs::{
+    error::BevyError,
     prelude::{Component, Entity, ReflectComponent},
     query::{QueryItem, With},
     resource::Resource,
@@ -25,11 +26,11 @@ use bevy_render::{
     render_resource::{
         binding_types::{sampler, texture_2d, texture_depth_2d},
         BindGroupEntries, BindGroupLayoutDescriptor, BindGroupLayoutEntries,
-        CachedRenderPipelineId, ColorTargetState, ColorWrites, FilterMode, FragmentState,
-        Operations, PipelineCache, RenderPassColorAttachment, RenderPassDescriptor,
-        RenderPipelineDescriptor, Sampler, SamplerBindingType, SamplerDescriptor, ShaderStages,
-        SpecializedRenderPipeline, SpecializedRenderPipelines, TextureDescriptor, TextureDimension,
-        TextureFormat, TextureSampleType, TextureUsages,
+        CachedRenderPipelineId, Canonical, ColorTargetState, ColorWrites, FilterMode,
+        FragmentState, Operations, PipelineCache, RenderPassColorAttachment, RenderPassDescriptor,
+        RenderPipeline, RenderPipelineDescriptor, Sampler, SamplerBindingType, SamplerDescriptor,
+        ShaderStages, Specializer, SpecializerKey, TextureDescriptor, TextureDimension,
+        TextureFormat, TextureSampleType, TextureUsages, Variants,
     },
     renderer::{RenderContext, RenderDevice},
     sync_component::SyncComponentPlugin,
@@ -38,7 +39,6 @@ use bevy_render::{
     view::{ExtractedView, Msaa, ViewTarget},
     ExtractSchedule, MainWorld, Render, RenderApp, RenderStartup, RenderSystems,
 };
-use bevy_shader::Shader;
 use bevy_utils::default;
 use tracing::warn;
 
@@ -58,7 +58,6 @@ impl Plugin for TemporalAntiAliasPlugin {
             return;
         };
         render_app
-            .init_resource::<SpecializedRenderPipelines<TaaPipeline>>()
             .add_systems(RenderStartup, init_taa_pipeline)
             .add_systems(ExtractSchedule, extract_taa_settings)
             .add_systems(
@@ -239,8 +238,7 @@ struct TaaPipeline {
     taa_bind_group_layout: BindGroupLayoutDescriptor,
     nearest_sampler: Sampler,
     linear_sampler: Sampler,
-    fullscreen_shader: FullscreenShader,
-    fragment_shader: Handle<Shader>,
+    variants: Variants<RenderPipeline, TaaPipelineSpecializer>,
 }
 
 fn init_taa_pipeline(
@@ -283,61 +281,68 @@ fn init_taa_pipeline(
         ),
     );
 
+    let fragment_shader = load_embedded_asset!(asset_server.as_ref(), "taa.wgsl");
+
+    let variants = Variants::new(
+        TaaPipelineSpecializer,
+        RenderPipelineDescriptor {
+            label: Some("taa_pipeline".into()),
+            layout: vec![taa_bind_group_layout.clone()],
+            vertex: fullscreen_shader.to_vertex_state(),
+            fragment: Some(FragmentState {
+                shader: fragment_shader,
+                ..default()
+            }),
+            ..default()
+        },
+    );
+
     commands.insert_resource(TaaPipeline {
         taa_bind_group_layout,
         nearest_sampler,
         linear_sampler,
-        fullscreen_shader: fullscreen_shader.clone(),
-        fragment_shader: load_embedded_asset!(asset_server.as_ref(), "taa.wgsl"),
+        variants,
     });
 }
 
-#[derive(PartialEq, Eq, Hash, Clone)]
+struct TaaPipelineSpecializer;
+
+#[derive(PartialEq, Eq, Hash, Clone, SpecializerKey)]
 struct TaaPipelineKey {
     hdr: bool,
     reset: bool,
 }
 
-impl SpecializedRenderPipeline for TaaPipeline {
+impl Specializer<RenderPipeline> for TaaPipelineSpecializer {
     type Key = TaaPipelineKey;
 
-    fn specialize(&self, key: Self::Key) -> RenderPipelineDescriptor {
-        let mut shader_defs = vec![];
-
+    fn specialize(
+        &self,
+        key: Self::Key,
+        descriptor: &mut RenderPipelineDescriptor,
+    ) -> Result<Canonical<Self::Key>, BevyError> {
+        let fragment = descriptor.fragment_mut()?;
         let format = if key.hdr {
-            shader_defs.push("TONEMAP".into());
+            fragment.shader_defs.push("TONEMAP".into());
             ViewTarget::TEXTURE_FORMAT_HDR
         } else {
             TextureFormat::bevy_default()
         };
 
         if key.reset {
-            shader_defs.push("RESET".into());
+            fragment.shader_defs.push("RESET".into());
         }
 
-        RenderPipelineDescriptor {
-            label: Some("taa_pipeline".into()),
-            layout: vec![self.taa_bind_group_layout.clone()],
-            vertex: self.fullscreen_shader.to_vertex_state(),
-            fragment: Some(FragmentState {
-                shader: self.fragment_shader.clone(),
-                shader_defs,
-                targets: vec![
-                    Some(ColorTargetState {
-                        format,
-                        blend: None,
-                        write_mask: ColorWrites::ALL,
-                    }),
-                    Some(ColorTargetState {
-                        format,
-                        blend: None,
-                        write_mask: ColorWrites::ALL,
-                    }),
-                ],
-                ..default()
-            }),
-            ..default()
-        }
+        let color_target_state = ColorTargetState {
+            format,
+            blend: None,
+            write_mask: ColorWrites::ALL,
+        };
+
+        fragment.set_target(0, color_target_state.clone());
+        fragment.set_target(1, color_target_state);
+
+        Ok(key)
     }
 }
 
@@ -455,25 +460,30 @@ pub struct TemporalAntiAliasPipelineId(CachedRenderPipelineId);
 fn prepare_taa_pipelines(
     mut commands: Commands,
     pipeline_cache: Res<PipelineCache>,
-    mut pipelines: ResMut<SpecializedRenderPipelines<TaaPipeline>>,
-    pipeline: Res<TaaPipeline>,
+    mut pipeline: ResMut<TaaPipeline>,
     views: Query<(Entity, &ExtractedView, &TemporalAntiAliasing)>,
-) {
+) -> Result<(), BevyError> {
     for (entity, view, taa_settings) in &views {
         let mut pipeline_key = TaaPipelineKey {
             hdr: view.hdr,
             reset: taa_settings.reset,
         };
-        let pipeline_id = pipelines.specialize(&pipeline_cache, &pipeline, pipeline_key.clone());
+        let pipeline_id = pipeline
+            .variants
+            .specialize(&pipeline_cache, pipeline_key.clone())?;
 
         // Prepare non-reset pipeline anyways - it will be necessary next frame
         if pipeline_key.reset {
             pipeline_key.reset = false;
-            pipelines.specialize(&pipeline_cache, &pipeline, pipeline_key);
+            pipeline
+                .variants
+                .specialize(&pipeline_cache, pipeline_key)?;
         }
 
         commands
             .entity(entity)
             .insert(TemporalAntiAliasPipelineId(pipeline_id));
     }
+
+    Ok(())
 }

From 48efe26c6809881158b2b544d9852d79cbf43dc0 Mon Sep 17 00:00:00 2001
From: ickshonpe <david.curthoys@googlemail.com>
Date: Mon, 15 Dec 2025 00:31:23 +0000
Subject: [PATCH 113/133] UI scrollbars clipping fix (#21910)

# Objective
#### Fix two problems
1. Scrollbars are placed in the padding region of the node, not the
content region. The content insets returned by
`ComputedNode::content_inset` should account for the sizes of the
scrollbars.
3. In `update_clipping_system` the clipping rect calculations are
incorrect, `scrollbar_size` should only be added to the `right` and
`bottom` when `visual_area` is set to `ContentBox`. For `BorderBox` and
`PaddingBox`, the scrollbars are inside the clipping rect.

## Solution

1. Add the scrollbar size to the `right` and `bottom` insets returned by
`ComputedNode::content_inset`.
2. Since `content_inset` now includes `scrollbar size`, remove the
subtraction from `clip_rect.max` in `update_clipping_system`.

## Testing

Look at:
```
cargo run --example scrollbars --features="experimental_bevy_ui_widgets"
```
---
 crates/bevy_ui/src/ui_node.rs | 17 ++++++++++-------
 crates/bevy_ui/src/update.rs  |  4 ++--
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/crates/bevy_ui/src/ui_node.rs b/crates/bevy_ui/src/ui_node.rs
index e4b18e6f53c22..7d114ea72d802 100644
--- a/crates/bevy_ui/src/ui_node.rs
+++ b/crates/bevy_ui/src/ui_node.rs
@@ -222,7 +222,10 @@ impl ComputedNode {
     /// Returns the combined inset on each edge including both padding and border thickness in physical pixels.
     #[inline]
     pub fn content_inset(&self) -> BorderRect {
-        self.border + self.padding
+        let mut content_inset = self.border + self.padding;
+        content_inset.right += self.scrollbar_size.x;
+        content_inset.bottom += self.scrollbar_size.y;
+        content_inset
     }
 
     /// Returns the inverse of the scale factor for this node.
@@ -322,9 +325,9 @@ impl ComputedNode {
         let content_inset = self.content_inset();
         let half_size = 0.5 * self.size;
         let min_x = -half_size.x + content_inset.left;
-        let max_x = half_size.x - content_inset.right - self.scrollbar_size.x;
-        let max_y = half_size.y - content_inset.bottom;
-        let min_y = max_y - self.scrollbar_size.y;
+        let max_x = half_size.x - content_inset.right;
+        let min_y = half_size.y - content_inset.bottom;
+        let max_y = min_y + self.scrollbar_size.y;
         let gutter = Rect {
             min: Vec2::new(min_x, min_y),
             max: Vec2::new(max_x, max_y),
@@ -348,10 +351,10 @@ impl ComputedNode {
         }
         let content_inset = self.content_inset();
         let half_size = 0.5 * self.size;
-        let max_x = half_size.x - content_inset.right;
-        let min_x = max_x - self.scrollbar_size.x;
+        let min_x = half_size.x - content_inset.right;
+        let max_x = min_x + self.scrollbar_size.x;
         let min_y = -half_size.y + content_inset.top;
-        let max_y = half_size.y - content_inset.bottom - self.scrollbar_size.y;
+        let max_y = half_size.y - content_inset.bottom;
         let gutter = Rect {
             min: Vec2::new(min_x, min_y),
             max: Vec2::new(max_x, max_y),
diff --git a/crates/bevy_ui/src/update.rs b/crates/bevy_ui/src/update.rs
index e1e789577c53f..ff2317e9fecdd 100644
--- a/crates/bevy_ui/src/update.rs
+++ b/crates/bevy_ui/src/update.rs
@@ -111,8 +111,8 @@ fn update_clipping(
 
         clip_rect.min.x += clip_inset.left;
         clip_rect.min.y += clip_inset.top;
-        clip_rect.max.x -= clip_inset.right + computed_node.scrollbar_size.x;
-        clip_rect.max.y -= clip_inset.bottom + computed_node.scrollbar_size.y;
+        clip_rect.max.x -= clip_inset.right;
+        clip_rect.max.y -= clip_inset.bottom;
 
         clip_rect = clip_rect
             .inflate(node.overflow_clip_margin.margin.max(0.) / computed_node.inverse_scale_factor);

From 4eed4d042727a139d8d6513790c4bf5b161103f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Mockers?= <francois.mockers@vleue.com>
Date: Mon, 15 Dec 2025 01:39:25 +0100
Subject: [PATCH 114/133] Easy screenrecording plugin (#21237)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

- Followup on #21235
- See
https://github.com/mockersf/bevy/compare/easy-screenshots...mockersf:bevy:easy-screenrecording
for what's new
- Be able to record videos from Bevy in a consistent manner

## Solution

- Make a new `EasyScreenRecordPlugin` in the dev tools

## Testing

- Add to any example
```
        .add_plugins(bevy::dev_tools::EasyScreenRecordPlugin::default())
```
- Run the example with the feature `bevy_internal/screenrecording`
enabled
- press the space bar
- wait for it...
- press the space bar again
- screen recording! 🎉
- almost... you now have a h264 file. VLC can read them, but they are
not the most friendly format
- `ffmpeg` is our friend! `for file in *.h264; do ffmpeg -i $file
$file.mp4; done`
- you now have a .mp4 file that can be shared anywhere!

---

## Showcase

directly taken by Bevy


https://github.com/user-attachments/assets/217f5093-9443-40e5-b2ce-33f65f6a56c6
---
 .github/actions/install-linux-deps/action.yml |   5 +
 .github/workflows/ci.yml                      |   2 +
 crates/bevy_dev_tools/Cargo.toml              |   3 +
 crates/bevy_dev_tools/src/easy_screenshot.rs  | 192 ++++++++++++++++++
 crates/bevy_internal/Cargo.toml               |   2 +
 .../release-notes/easy_marketing_material.md  |   9 +
 6 files changed, 213 insertions(+)
 create mode 100644 release-content/release-notes/easy_marketing_material.md

diff --git a/.github/actions/install-linux-deps/action.yml b/.github/actions/install-linux-deps/action.yml
index c494200e5a649..401eaa76d2562 100644
--- a/.github/actions/install-linux-deps/action.yml
+++ b/.github/actions/install-linux-deps/action.yml
@@ -33,6 +33,10 @@ inputs:
     description: Install xkb (libxkbcommon-dev)
     required: false
     default: "false"
+  x264:
+    description: Install x264 (libx264-dev)
+    required: false
+    default: "false"
 runs:
   using: composite
   steps:
@@ -47,3 +51,4 @@ runs:
         ${{ fromJSON(inputs.udev) && 'libudev-dev' || '' }}
         ${{ fromJSON(inputs.wayland) && 'libwayland-dev' || '' }}
         ${{ fromJSON(inputs.xkb) && 'libxkbcommon-dev' || '' }}
+        ${{ fromJSON(inputs.x264) && 'libx264-164 libx264-dev' || '' }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b687b032e3d13..ed7694c281301 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -83,6 +83,7 @@ jobs:
         with:
           wayland: true
           xkb: true
+          x264: true
       - name: CI job
         # See tools/ci/src/main.rs for the commands this runs
         run: cargo run -p ci -- lints
@@ -371,6 +372,7 @@ jobs:
         with:
           wayland: true
           xkb: true
+          x264: true
       - name: Build and check doc
         # See tools/ci/src/main.rs for the commands this runs
         run: cargo run -p ci -- doc
diff --git a/crates/bevy_dev_tools/Cargo.toml b/crates/bevy_dev_tools/Cargo.toml
index dc218f023baef..36854b3f5088e 100644
--- a/crates/bevy_dev_tools/Cargo.toml
+++ b/crates/bevy_dev_tools/Cargo.toml
@@ -10,6 +10,7 @@ keywords = ["bevy"]
 
 [features]
 bevy_ci_testing = ["serde", "ron"]
+screenrecording = ["x264"]
 webgl = ["bevy_render/webgl"]
 webgpu = ["bevy_render/webgpu"]
 
@@ -21,6 +22,7 @@ bevy_camera = { path = "../bevy_camera", version = "0.18.0-dev" }
 bevy_color = { path = "../bevy_color", version = "0.18.0-dev" }
 bevy_diagnostic = { path = "../bevy_diagnostic", version = "0.18.0-dev" }
 bevy_ecs = { path = "../bevy_ecs", version = "0.18.0-dev" }
+bevy_image = { path = "../bevy_image", version = "0.18.0-dev" }
 bevy_input = { path = "../bevy_input", version = "0.18.0-dev" }
 bevy_math = { path = "../bevy_math", version = "0.18.0-dev" }
 bevy_picking = { path = "../bevy_picking", version = "0.18.0-dev" }
@@ -38,6 +40,7 @@ bevy_state = { path = "../bevy_state", version = "0.18.0-dev" }
 serde = { version = "1.0", features = ["derive"], optional = true }
 ron = { version = "0.12", optional = true }
 tracing = { version = "0.1", default-features = false, features = ["std"] }
+x264 = { version = "0.5.0", optional = true }
 
 [lints]
 workspace = true
diff --git a/crates/bevy_dev_tools/src/easy_screenshot.rs b/crates/bevy_dev_tools/src/easy_screenshot.rs
index 4bfacf995f261..4b5933038313e 100644
--- a/crates/bevy_dev_tools/src/easy_screenshot.rs
+++ b/crates/bevy_dev_tools/src/easy_screenshot.rs
@@ -1,10 +1,26 @@
+#[cfg(feature = "screenrecording")]
+use core::time::Duration;
 use std::time::{SystemTime, UNIX_EPOCH};
+#[cfg(feature = "screenrecording")]
+use std::{fs::File, io::Write, sync::mpsc::channel};
 
 use bevy_app::{App, Plugin, Update};
 use bevy_ecs::prelude::*;
+#[cfg(feature = "screenrecording")]
+use bevy_image::Image;
 use bevy_input::{common_conditions::input_just_pressed, keyboard::KeyCode};
+#[cfg(feature = "screenrecording")]
+use bevy_render::view::screenshot::ScreenshotCaptured;
 use bevy_render::view::screenshot::{save_to_disk, Screenshot};
+#[cfg(feature = "screenrecording")]
+use bevy_time::Time;
 use bevy_window::{PrimaryWindow, Window};
+#[cfg(feature = "screenrecording")]
+use tracing::info;
+#[cfg(feature = "screenrecording")]
+use x264::{Colorspace, Encoder, Setup};
+#[cfg(feature = "screenrecording")]
+pub use x264::{Preset, Tune};
 
 /// File format the screenshot will be saved in
 #[derive(Clone, Copy)]
@@ -65,3 +81,179 @@ impl Plugin for EasyScreenshotPlugin {
         );
     }
 }
+
+#[cfg(feature = "screenrecording")]
+/// Add this plugin to your app to enable easy screen recording.
+pub struct EasyScreenRecordPlugin {
+    /// The key to toggle recording.
+    pub toggle: KeyCode,
+    /// h264 encoder preset
+    pub preset: Preset,
+    /// h264 encoder tune
+    pub tune: Tune,
+    /// target frame time
+    pub frame_time: Duration,
+}
+
+#[cfg(feature = "screenrecording")]
+impl Default for EasyScreenRecordPlugin {
+    fn default() -> Self {
+        EasyScreenRecordPlugin {
+            toggle: KeyCode::Space,
+            preset: Preset::Medium,
+            tune: Tune::Animation,
+            frame_time: Duration::from_millis(33),
+        }
+    }
+}
+
+#[cfg(feature = "screenrecording")]
+enum RecordCommand {
+    Start(String, Preset, Tune),
+    Stop,
+    Frame(Image),
+}
+
+#[cfg(feature = "screenrecording")]
+/// Controls screen recording
+#[derive(Message)]
+pub enum RecordScreen {
+    /// Starts screen recording
+    Start,
+    /// Stops screen recording
+    Stop,
+}
+
+#[cfg(feature = "screenrecording")]
+impl Plugin for EasyScreenRecordPlugin {
+    fn build(&self, app: &mut App) {
+        let (tx, rx) = channel::<RecordCommand>();
+
+        let frame_time = self.frame_time;
+
+        std::thread::spawn(move || {
+            let mut encoder: Option<Encoder> = None;
+            let mut setup = None;
+            let mut file: Option<File> = None;
+            let mut frame = 0;
+            loop {
+                let Ok(next) = rx.recv() else {
+                    break;
+                };
+                match next {
+                    RecordCommand::Start(name, preset, tune) => {
+                        info!("starting recording at {}", name);
+                        file = Some(File::create(name).unwrap());
+                        setup = Some(Setup::preset(preset, tune, false, true).high());
+                    }
+                    RecordCommand::Stop => {
+                        info!("stopping recording");
+                        if let Some(encoder) = encoder.take() {
+                            let mut flush = encoder.flush();
+                            let mut file = file.take().unwrap();
+                            while let Some(result) = flush.next() {
+                                let (data, _) = result.unwrap();
+                                file.write_all(data.entirety()).unwrap();
+                            }
+                        }
+                    }
+                    RecordCommand::Frame(image) => {
+                        if let Some(setup) = setup.take() {
+                            let mut new_encoder = setup
+                                .fps((1000 / frame_time.as_millis()) as u32, 1)
+                                .build(Colorspace::RGB, image.width() as i32, image.height() as i32)
+                                .unwrap();
+                            let headers = new_encoder.headers().unwrap();
+                            file.as_mut()
+                                .unwrap()
+                                .write_all(headers.entirety())
+                                .unwrap();
+                            encoder = Some(new_encoder);
+                        }
+                        if let Some(encoder) = encoder.as_mut() {
+                            let pts = (frame_time.as_millis() * frame) as i64;
+
+                            frame += 1;
+                            let (data, _) = encoder
+                                .encode(
+                                    pts,
+                                    x264::Image::rgb(
+                                        image.width() as i32,
+                                        image.height() as i32,
+                                        &image.try_into_dynamic().unwrap().to_rgb8(),
+                                    ),
+                                )
+                                .unwrap();
+                            file.as_mut().unwrap().write_all(data.entirety()).unwrap();
+                        }
+                    }
+                }
+            }
+        });
+
+        let frame_time = self.frame_time;
+
+        app.add_message::<RecordScreen>().add_systems(
+            Update,
+            (
+                (move |mut messages: MessageWriter<RecordScreen>, mut recording: Local<bool>| {
+                    *recording = !*recording;
+                    if *recording {
+                        messages.write(RecordScreen::Start);
+                    } else {
+                        messages.write(RecordScreen::Stop);
+                    }
+                })
+                .run_if(input_just_pressed(self.toggle)),
+                {
+                    let tx = tx.clone();
+                    let preset = self.preset;
+                    let tune = self.tune;
+                    move |mut commands: Commands,
+                          mut recording: Local<bool>,
+                          mut messages: MessageReader<RecordScreen>,
+                          window: Single<&Window, With<PrimaryWindow>>,
+                          current_screenshot: Query<(), With<Screenshot>>,
+                          mut virtual_time: ResMut<Time<bevy_time::Virtual>>| {
+                        match messages.read().last() {
+                            Some(RecordScreen::Start) => {
+                                let since_the_epoch = SystemTime::now()
+                                    .duration_since(UNIX_EPOCH)
+                                    .expect("time should go forward");
+                                let filename = format!(
+                                    "{}-{}.h264",
+                                    window.title,
+                                    since_the_epoch.as_millis(),
+                                );
+                                tx.send(RecordCommand::Start(filename, preset, tune))
+                                    .unwrap();
+                                *recording = true;
+                                virtual_time.pause();
+                            }
+                            Some(RecordScreen::Stop) => {
+                                tx.send(RecordCommand::Stop).unwrap();
+                                *recording = false;
+                                virtual_time.unpause();
+                            }
+                            _ => {}
+                        }
+                        if *recording && current_screenshot.single().is_err() {
+                            let tx = tx.clone();
+                            commands.spawn(Screenshot::primary_window()).observe(
+                                move |screenshot_captured: On<ScreenshotCaptured>,
+                                      mut virtual_time: ResMut<Time<bevy_time::Virtual>>,
+                                      mut time: ResMut<Time<()>>| {
+                                    let img = screenshot_captured.image.clone();
+                                    tx.send(RecordCommand::Frame(img)).unwrap();
+                                    virtual_time.advance_by(frame_time);
+                                    *time = virtual_time.as_generic();
+                                },
+                            );
+                        }
+                    }
+                },
+            )
+                .chain(),
+        );
+    }
+}
diff --git a/crates/bevy_internal/Cargo.toml b/crates/bevy_internal/Cargo.toml
index c894e3664405f..7aac25bb4b432 100644
--- a/crates/bevy_internal/Cargo.toml
+++ b/crates/bevy_internal/Cargo.toml
@@ -430,6 +430,8 @@ hotpatching = ["bevy_app/hotpatching", "bevy_ecs/hotpatching"]
 
 debug = ["bevy_utils/debug", "bevy_ecs/debug"]
 
+screenrecording = ["bevy_dev_tools/screenrecording"]
+
 [dependencies]
 # bevy (no_std)
 bevy_app = { path = "../bevy_app", version = "0.18.0-dev", default-features = false, features = [
diff --git a/release-content/release-notes/easy_marketing_material.md b/release-content/release-notes/easy_marketing_material.md
new file mode 100644
index 0000000000000..953db7e9dcaf2
--- /dev/null
+++ b/release-content/release-notes/easy_marketing_material.md
@@ -0,0 +1,9 @@
+---
+title: Helpers to Produce Marketing Material
+authors: ["@mockersf"]
+pull_requests: [21235, 21237]
+---
+
+Bevy can take a screenshot of what's rendered since 0.11. This is now easier to setup to help you create marketing material, so that you can take screenshot with consistent formatting with the new `EasyScreenshotPlugin`. With its default settings, once you add this plugin to your application, a PNG screenshot will be taken when you press the `PrintScreen` key. You can change the trigger key, or the screenshot format between PNG, JPEG or BMP.
+
+It is now possible to record a movie from Bevy, with the new `EasyScreenRecordPlugin`. This plugins add a toggle key, space bar by default, that will toggle screen recording. Recording can also be started and stopped programmatically with the `RecordScreen` messages.

From 9abb6238c1778950c85aa69c7566e513ae591142 Mon Sep 17 00:00:00 2001
From: ickshonpe <david.curthoys@googlemail.com>
Date: Mon, 15 Dec 2025 01:48:56 +0000
Subject: [PATCH 115/133] single query per node in UI picking backend  (#22049)

# Objective

The UI picking backend queries twice for the node data. Simplify
`ui_picking` by storing the camera entity and picking data in
`hit_nodes` instead of the second query.

## Solution

Store the camera entity and picking data in `hit_nodes` instead of
querying for them again.
---
 crates/bevy_ui/src/picking_backend.rs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/crates/bevy_ui/src/picking_backend.rs b/crates/bevy_ui/src/picking_backend.rs
index 1028cfb6b0e5a..d3648ced54f90 100644
--- a/crates/bevy_ui/src/picking_backend.rs
+++ b/crates/bevy_ui/src/picking_backend.rs
@@ -149,7 +149,8 @@ pub fn ui_picking(
     }
 
     // The list of node entities hovered for each (camera, pointer) combo
-    let mut hit_nodes = HashMap::<(Entity, PointerId), Vec<(Entity, Entity, Vec2)>>::default();
+    let mut hit_nodes =
+        HashMap::<(Entity, PointerId), Vec<(Entity, Entity, Option<Pickable>, Vec2)>>::default();
 
     // prepare an iterator that contains all the nodes that have the cursor in their rect,
     // from the top node to the bottom one. this will also reset the interaction to `None`
@@ -222,6 +223,7 @@ pub fn ui_picking(
                             .push((
                                 text_entity,
                                 camera_entity,
+                                node.pickable.cloned(),
                                 node.transform.inverse().transform_point2(*cursor_position)
                                     / node.node.size(),
                             ));
@@ -240,6 +242,7 @@ pub fn ui_picking(
                         .push((
                             node_entity,
                             camera_entity,
+                            node.pickable.cloned(),
                             node.transform.inverse().transform_point2(*cursor_position)
                                 / node.node.size(),
                         ));
@@ -254,13 +257,13 @@ pub fn ui_picking(
         let mut picks = Vec::new();
         let mut depth = 0.0;
 
-        for (hovered_node, camera_entity, position) in hovered {
+        for (hovered_node, camera_entity, pickable, position) in hovered {
             picks.push((
                 *hovered_node,
                 HitData::new(*camera_entity, depth, Some(position.extend(0.0)), None),
             ));
 
-            if let Ok(pickable) = pickable_query.get(*hovered_node) {
+            if let Some(pickable) = pickable {
                 // If an entity has a `Pickable` component, we will use that as the source of truth.
                 if pickable.should_block_lower {
                     break;

From c18838fd3574ba8a89e16bcd88d94aad0e8226bb Mon Sep 17 00:00:00 2001
From: ickshonpe <david.curthoys@googlemail.com>
Date: Mon, 15 Dec 2025 01:58:40 +0000
Subject: [PATCH 116/133] `ComputedNode` box model helper functions (#21903)

# Objective

Add helper functions to `ComputedNode` that return the bounds of the
node's border, padding, and content areas.

## Solution

Add helper functions `border_box`, `padding_box`, and `content_box` to
`ComputedNode`.

#

Included a release note. These changes are very trivial and don't really
need one, but I've got quite a few more less trivial changes to
`ComputedNode` that I want to add later.

## Testing

This PR also includes a couple of trivial tests.
---
 crates/bevy_ui/src/ui_node.rs                 | 85 ++++++++++++++++++-
 .../computed_node_helper_functions.md         |  7 ++
 2 files changed, 89 insertions(+), 3 deletions(-)
 create mode 100644 release-content/release-notes/computed_node_helper_functions.md

diff --git a/crates/bevy_ui/src/ui_node.rs b/crates/bevy_ui/src/ui_node.rs
index 7d114ea72d802..7ab5cd97a9bfc 100644
--- a/crates/bevy_ui/src/ui_node.rs
+++ b/crates/bevy_ui/src/ui_node.rs
@@ -302,6 +302,38 @@ impl ComputedNode {
         clip_rect
     }
 
+    /// Returns the node's border-box in object-centered physical coordinates.
+    /// This is the full rectangle enclosing the node.
+    #[inline]
+    pub fn border_box(&self) -> Rect {
+        Rect::from_center_size(Vec2::ZERO, self.size)
+    }
+
+    /// Returns the node's padding-box in object-centered physical coordinates.
+    /// This is the region inside the border containing the node's padding and content areas.
+    #[inline]
+    pub fn padding_box(&self) -> Rect {
+        let mut out = self.border_box();
+        out.min.x += self.border.left;
+        out.max.x -= self.border.right;
+        out.min.y += self.border.top;
+        out.max.y -= self.border.bottom;
+        out
+    }
+
+    /// Returns the node's content-box in object-centered physical coordinates.
+    /// This is the innermost region of the node, where its content is placed.
+    #[inline]
+    pub fn content_box(&self) -> Rect {
+        let mut out = self.border_box();
+        let content_inset = self.content_inset();
+        out.min.x += content_inset.left;
+        out.max.x -= content_inset.right;
+        out.min.y += content_inset.top;
+        out.max.y -= content_inset.bottom;
+        out
+    }
+
     const fn compute_thumb(
         gutter_min: f32,
         content_length: f32,
@@ -2987,11 +3019,10 @@ impl ComputedUiRenderTargetInfo {
 
 #[cfg(test)]
 mod tests {
-    use bevy_math::Rect;
-    use bevy_math::Vec2;
-
     use crate::ComputedNode;
     use crate::GridPlacement;
+    use bevy_math::{Rect, Vec2};
+    use bevy_sprite::BorderRect;
 
     #[test]
     fn invalid_grid_placement_values() {
@@ -3116,4 +3147,52 @@ mod tests {
         );
         assert_eq!(thumb, [0., 50.]);
     }
+
+    #[test]
+    fn border_box_is_centered_rect_of_node_size() {
+        let node = ComputedNode {
+            size: Vec2::new(100.0, 50.0),
+            ..Default::default()
+        };
+        let border_box = node.border_box();
+
+        assert_eq!(border_box.min, Vec2::new(-50.0, -25.0));
+        assert_eq!(border_box.max, Vec2::new(50.0, 25.0));
+    }
+
+    #[test]
+    fn padding_box_subtracts_border_thickness() {
+        let node = ComputedNode {
+            size: Vec2::new(100.0, 60.0),
+            border: BorderRect {
+                left: 5.0,
+                right: 7.0,
+                top: 3.0,
+                bottom: 9.0,
+            },
+            ..Default::default()
+        };
+        let padding_box = node.padding_box();
+
+        assert_eq!(padding_box.min, Vec2::new(-50.0 + 5.0, -30.0 + 3.0));
+        assert_eq!(padding_box.max, Vec2::new(50.0 - 7.0, 30.0 - 9.0));
+    }
+
+    #[test]
+    fn content_box_uses_content_inset() {
+        let node = ComputedNode {
+            size: Vec2::new(80.0, 40.0),
+            padding: BorderRect {
+                left: 4.0,
+                right: 6.0,
+                top: 2.0,
+                bottom: 8.0,
+            },
+            ..Default::default()
+        };
+        let content_box = node.content_box();
+
+        assert_eq!(content_box.min, Vec2::new(-40.0 + 4.0, -20.0 + 2.0));
+        assert_eq!(content_box.max, Vec2::new(40.0 - 6.0, 20.0 - 8.0));
+    }
 }
diff --git a/release-content/release-notes/computed_node_helper_functions.md b/release-content/release-notes/computed_node_helper_functions.md
new file mode 100644
index 0000000000000..b9a08ab8440ca
--- /dev/null
+++ b/release-content/release-notes/computed_node_helper_functions.md
@@ -0,0 +1,7 @@
+---
+title: "`ComputedNode` helper functions"
+authors: ["@ickshonpe"]
+pull_requests: [21903]
+---
+
+Helper functions `border_box`, `padding_box`, and `content_box` that return a node’s object-centered border, padding, and content boxes have been added to `ComputedNode`.

From ec072d8f117763f214a6fe56f4b1ecf4af90c0d4 Mon Sep 17 00:00:00 2001
From: Chris Biscardi <chris@christopherbiscardi.com>
Date: Sun, 14 Dec 2025 18:03:18 -0800
Subject: [PATCH 117/133] reflect rendertarget (#22113)

RenderTarget was a Component that derived Reflect but did not Reflect
Component

as of this merge today:
https://github.com/bevyengine/bevy/commit/67633b34da677a825ea3c6900b884d012d56999b

Without this fix, spawning a scene with a camera (such as from a Blender
export) causes a panic:

> scene contains the unregistered component
`bevy_camera::camera::RenderTarget`. consider adding
`#[reflect(Component)]` to your type
---
 crates/bevy_camera/src/camera.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/bevy_camera/src/camera.rs b/crates/bevy_camera/src/camera.rs
index 073e6a06b2f35..f83834aef5cc4 100644
--- a/crates/bevy_camera/src/camera.rs
+++ b/crates/bevy_camera/src/camera.rs
@@ -811,7 +811,7 @@ impl Default for CameraOutputMode {
 /// The "target" that a [`Camera`] will render to. For example, this could be a `Window`
 /// swapchain or an [`Image`].
 #[derive(Component, Debug, Clone, Reflect, From)]
-#[reflect(Clone)]
+#[reflect(Clone, Component)]
 pub enum RenderTarget {
     /// Window to which the camera's view is rendered.
     Window(WindowRef),

From 6ee5067857fe8f83e0cfa77130c1db06bb0115a8 Mon Sep 17 00:00:00 2001
From: Federico Rinaldi <gisquerin@gmail.com>
Date: Mon, 15 Dec 2025 03:14:04 +0100
Subject: [PATCH 118/133] Make BRP builtins utilities `parse` and `parse_some`
 public (#22005)

# Objective

Builtin BRP methods make constant use of `parse` and `parse_some` in
parsing utilities. Making them public allows users to use them in their
own code.

## Solution

Make both functions `pub`.

## Testing

I think testing is not necessary, especially since doc strings do not
link anywhere.
---
 crates/bevy_remote/src/builtin_methods.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/bevy_remote/src/builtin_methods.rs b/crates/bevy_remote/src/builtin_methods.rs
index 4ee7f336aefc2..3c4c97d1388d3 100644
--- a/crates/bevy_remote/src/builtin_methods.rs
+++ b/crates/bevy_remote/src/builtin_methods.rs
@@ -479,7 +479,7 @@ pub struct BrpQueryRow {
 }
 
 /// A helper function used to parse a `serde_json::Value`.
-fn parse<T: for<'de> Deserialize<'de>>(value: Value) -> Result<T, BrpError> {
+pub fn parse<T: for<'de> Deserialize<'de>>(value: Value) -> Result<T, BrpError> {
     serde_json::from_value(value).map_err(|err| BrpError {
         code: error_codes::INVALID_PARAMS,
         message: err.to_string(),
@@ -488,7 +488,7 @@ fn parse<T: for<'de> Deserialize<'de>>(value: Value) -> Result<T, BrpError> {
 }
 
 /// A helper function used to parse a `serde_json::Value` wrapped in an `Option`.
-fn parse_some<T: for<'de> Deserialize<'de>>(value: Option<Value>) -> Result<T, BrpError> {
+pub fn parse_some<T: for<'de> Deserialize<'de>>(value: Option<Value>) -> Result<T, BrpError> {
     match value {
         Some(value) => parse(value),
         None => Err(BrpError {

From 030657a28bcb4f66fd6e3f09c2bb4c34736a3c9b Mon Sep 17 00:00:00 2001
From: Mike <mike.hsu@gmail.com>
Date: Sun, 14 Dec 2025 18:15:43 -0800
Subject: [PATCH 119/133] Doc trivial ecs unsafe (#22014)

# Objective

- Trying to doc most of the unsafe in the ecs crate so we can turn on
`unsafe_op_in_unsafe_fn`.

## Solution

- Unfortunately reviewing the unsafe docs will probably not be trivial
if we try to do it all in one pr. There are 400+ warnings when you turn
on the lint. So we need to break it up as much as possible as reviewing
the safety contracts in some cases isn't the easiest.
- This pr includes two types of unsafe blocks.
1. Blocks that already had safety comments, but were missing the `unsafe
{}` block.
2. Unsafe functions that have the same safety contract as their unsafe
parent function and are very short. (Usually just the call to the
function).
---
 crates/bevy_ecs/src/bundle/impls.rs           | 16 ++++-
 crates/bevy_ecs/src/bundle/insert.rs          | 16 +++--
 crates/bevy_ecs/src/component/required.rs     | 23 +++---
 crates/bevy_ecs/src/entity/mod.rs             |  2 +-
 crates/bevy_ecs/src/query/state.rs            | 15 ++--
 crates/bevy_ecs/src/schedule/executor/mod.rs  |  6 +-
 crates/bevy_ecs/src/spawn.rs                  |  4 +-
 crates/bevy_ecs/src/storage/blob_array.rs     |  3 +-
 crates/bevy_ecs/src/storage/mod.rs            |  3 +-
 crates/bevy_ecs/src/storage/table/column.rs   | 15 ++--
 crates/bevy_ecs/src/system/combinator.rs      | 13 ++--
 crates/bevy_ecs/src/system/commands/mod.rs    | 28 +++++---
 crates/bevy_ecs/src/system/schedule_system.rs | 12 ++--
 crates/bevy_ecs/src/system/system_param.rs    | 70 ++++++++++++++-----
 .../world/entity_access/component_fetch.rs    |  9 ++-
 .../src/world/entity_access/filtered.rs       |  3 +-
 .../src/world/entity_access/world_mut.rs      | 31 +++++---
 crates/bevy_ecs/src/world/entity_fetch.rs     |  9 ++-
 .../bevy_ecs/src/world/unsafe_world_cell.rs   |  3 +-
 19 files changed, 186 insertions(+), 95 deletions(-)

diff --git a/crates/bevy_ecs/src/bundle/impls.rs b/crates/bevy_ecs/src/bundle/impls.rs
index c8d9160dc2135..4083ae916b7d2 100644
--- a/crates/bevy_ecs/src/bundle/impls.rs
+++ b/crates/bevy_ecs/src/bundle/impls.rs
@@ -138,8 +138,14 @@ macro_rules! tuple_impl {
                 bevy_ptr::deconstruct_moving_ptr!({
                     let tuple { $($index: $alias,)* } = ptr;
                 });
+                #[allow(
+                    unused_unsafe,
+                    reason = "Zero-length tuples will generate a function body equivalatent to (); however, this macro is meant for all applicable tuples, and as such it makes no sense to rewrite it just for that case."
+                )]
                 // SAFETY: Caller ensures requirements for calling `get_components` are met.
-                $( $name::get_components($alias, func); )*
+                unsafe {
+                    $( $name::get_components($alias, func); )*
+                }
             }
 
             #[allow(
@@ -151,8 +157,14 @@ macro_rules! tuple_impl {
                 bevy_ptr::deconstruct_moving_ptr!({
                     let MaybeUninit::<tuple> { $($index: $alias,)* } = ptr;
                 });
+                #[allow(
+                    unused_unsafe,
+                    reason = "Zero-length tuples will generate a function body equivalent to `()`; however, this macro is meant for all applicable tuples, and as such it makes no sense to rewrite it just for that case."
+                )]
                 // SAFETY: Caller ensures requirements for calling `apply_effect` are met.
-                $( $name::apply_effect($alias, entity); )*
+                unsafe {
+                    $( $name::apply_effect($alias, entity); )*
+                }
             }
         }
 
diff --git a/crates/bevy_ecs/src/bundle/insert.rs b/crates/bevy_ecs/src/bundle/insert.rs
index cefdde59172fa..cc6d852d0f705 100644
--- a/crates/bevy_ecs/src/bundle/insert.rs
+++ b/crates/bevy_ecs/src/bundle/insert.rs
@@ -535,13 +535,15 @@ impl BundleInfo {
                 };
             };
             // SAFETY: ids in self must be valid
-            let (new_archetype_id, is_new_created) = archetypes.get_id_or_insert(
-                components,
-                observers,
-                table_id,
-                table_components,
-                sparse_set_components,
-            );
+            let (new_archetype_id, is_new_created) = unsafe {
+                archetypes.get_id_or_insert(
+                    components,
+                    observers,
+                    table_id,
+                    table_components,
+                    sparse_set_components,
+                )
+            };
 
             // Add an edge from the old archetype to the new archetype.
             archetypes[archetype_id]
diff --git a/crates/bevy_ecs/src/component/required.rs b/crates/bevy_ecs/src/component/required.rs
index 9974763623a2e..04abda66a9de6 100644
--- a/crates/bevy_ecs/src/component/required.rs
+++ b/crates/bevy_ecs/src/component/required.rs
@@ -390,11 +390,12 @@ impl Components {
         let old_required_count = required_components.all.len();
 
         // SAFETY: the caller guarantees that `requiree` is valid in `self`.
-        self.required_components_scope(requiree, |this, required_components| {
-            // SAFETY: the caller guarantees that `required` is valid for type `R` in `self`
-            unsafe { required_components.register_by_id(required, this, constructor) };
-        });
-
+        unsafe {
+            self.required_components_scope(requiree, |this, required_components| {
+                // SAFETY: the caller guarantees that `required` is valid for type `R` in `self`
+                required_components.register_by_id(required, this, constructor);
+            });
+        }
         // Third step: update the required components and required_by of all the indirect requirements/requirees.
 
         // Borrow again otherwise it conflicts with the `self.required_components_scope` call.
@@ -435,11 +436,13 @@ impl Components {
         // Skip the first one (requiree) because we already updates it.
         for &indirect_requiree in &new_requiree_components[1..] {
             // SAFETY: `indirect_requiree` comes from `self` so it must be valid.
-            self.required_components_scope(indirect_requiree, |this, required_components| {
-                // Rebuild the inherited required components.
-                // SAFETY: `required_components` comes from `self`, so all its components must have be valid in `self`.
-                unsafe { required_components.rebuild_inherited_required_components(this) };
-            });
+            unsafe {
+                self.required_components_scope(indirect_requiree, |this, required_components| {
+                    // Rebuild the inherited required components.
+                    // SAFETY: `required_components` comes from `self`, so all its components must have be valid in `self`.
+                    required_components.rebuild_inherited_required_components(this);
+                });
+            }
         }
 
         // Update the `required_by` of all the components that were newly required (directly or indirectly).
diff --git a/crates/bevy_ecs/src/entity/mod.rs b/crates/bevy_ecs/src/entity/mod.rs
index 62c1c3de94eb7..db8425c260448 100644
--- a/crates/bevy_ecs/src/entity/mod.rs
+++ b/crates/bevy_ecs/src/entity/mod.rs
@@ -993,7 +993,7 @@ impl Entities {
     ) -> Option<EntityLocation> {
         self.ensure_index_index_is_valid(index);
         // SAFETY: We just did `ensure_index`
-        self.update_existing_location(index, location)
+        unsafe { self.update_existing_location(index, location) }
     }
 
     /// Ensures the index is within the bounds of [`Self::meta`], expanding it if necessary.
diff --git a/crates/bevy_ecs/src/query/state.rs b/crates/bevy_ecs/src/query/state.rs
index 79ecf09b20176..448335db8ed0f 100644
--- a/crates/bevy_ecs/src/query/state.rs
+++ b/crates/bevy_ecs/src/query/state.rs
@@ -1099,7 +1099,8 @@ impl<D: QueryData, F: QueryFilter> QueryState<D, F> {
         world: UnsafeWorldCell<'w>,
         entity: Entity,
     ) -> Result<D::Item<'w, '_>, QueryEntityError> {
-        self.query_unchecked(world).get_inner(entity)
+        // SAFETY: Upheld by caller
+        unsafe { self.query_unchecked(world) }.get_inner(entity)
     }
 
     /// Returns an [`Iterator`] over the query results for the given [`World`].
@@ -1314,7 +1315,8 @@ impl<D: QueryData, F: QueryFilter> QueryState<D, F> {
         &'s mut self,
         world: UnsafeWorldCell<'w>,
     ) -> QueryIter<'w, 's, D, F> {
-        self.query_unchecked(world).into_iter()
+        // SAFETY: Upheld by caller
+        unsafe { self.query_unchecked(world) }.into_iter()
     }
 
     /// Returns an [`Iterator`] over all possible combinations of `K` query results for the
@@ -1333,7 +1335,8 @@ impl<D: QueryData, F: QueryFilter> QueryState<D, F> {
         &'s mut self,
         world: UnsafeWorldCell<'w>,
     ) -> QueryCombinationIter<'w, 's, D, F, K> {
-        self.query_unchecked(world).iter_combinations_inner()
+        // SAFETY: Upheld by caller
+        unsafe { self.query_unchecked(world) }.iter_combinations_inner()
     }
 
     /// Returns a parallel iterator over the query results for the given [`World`].
@@ -1755,7 +1758,8 @@ impl<D: QueryData, F: QueryFilter> QueryState<D, F> {
         &mut self,
         world: UnsafeWorldCell<'w>,
     ) -> Result<D::Item<'w, '_>, QuerySingleError> {
-        self.query_unchecked(world).single_inner()
+        // SAFETY: Upheld by caller
+        unsafe { self.query_unchecked(world) }.single_inner()
     }
 
     /// Returns a query result when there is exactly one entity matching the query,
@@ -1780,8 +1784,7 @@ impl<D: QueryData, F: QueryFilter> QueryState<D, F> {
         // SAFETY:
         // - The caller ensured we have the correct access to the world.
         // - The caller ensured that the world matches.
-        self.query_unchecked_manual_with_ticks(world, last_run, this_run)
-            .single_inner()
+        unsafe { self.query_unchecked_manual_with_ticks(world, last_run, this_run) }.single_inner()
     }
 }
 
diff --git a/crates/bevy_ecs/src/schedule/executor/mod.rs b/crates/bevy_ecs/src/schedule/executor/mod.rs
index 197ba52be51c5..df297637a6037 100644
--- a/crates/bevy_ecs/src/schedule/executor/mod.rs
+++ b/crates/bevy_ecs/src/schedule/executor/mod.rs
@@ -260,7 +260,8 @@ mod __rust_begin_short_backtrace {
         system: &mut ScheduleSystem,
         world: UnsafeWorldCell,
     ) -> Result<(), RunSystemError> {
-        let result = system.run_unsafe((), world);
+        // SAFETY: Upheld by caller
+        let result = unsafe { system.run_unsafe((), world) };
         // Call `black_box` to prevent this frame from being tail-call optimized away
         black_box(());
         result
@@ -276,7 +277,8 @@ mod __rust_begin_short_backtrace {
         world: UnsafeWorldCell,
     ) -> Result<O, RunSystemError> {
         // Call `black_box` to prevent this frame from being tail-call optimized away
-        black_box(system.run_unsafe((), world))
+        // SAFETY: Upheld by caller
+        black_box(unsafe { system.run_unsafe((), world) })
     }
 
     #[cfg(feature = "std")]
diff --git a/crates/bevy_ecs/src/spawn.rs b/crates/bevy_ecs/src/spawn.rs
index c01897870f953..c4224b99efc87 100644
--- a/crates/bevy_ecs/src/spawn.rs
+++ b/crates/bevy_ecs/src/spawn.rs
@@ -327,7 +327,7 @@ impl<R: Relationship, L: SpawnableList<R>> DynamicBundle for SpawnRelatedBundle<
         //   called exactly once for each component being fetched with the correct `StorageType`
         // - `Effect: !NoBundleEffect`, which means the caller is responsible for calling this type's `apply_effect`
         //   at least once before returning to safe code.
-        <R::RelationshipTarget as DynamicBundle>::get_components(target, func);
+        unsafe { <R::RelationshipTarget as DynamicBundle>::get_components(target, func) };
         // Forget the pointer so that the value is available in `apply_effect`.
         mem::forget(ptr);
     }
@@ -372,7 +372,7 @@ impl<R: Relationship, B: Bundle> DynamicBundle for SpawnOneRelated<R, B> {
         //   called exactly once for each component being fetched with the correct `StorageType`
         // - `Effect: !NoBundleEffect`, which means the caller is responsible for calling this type's `apply_effect`
         //   at least once before returning to safe code.
-        <R::RelationshipTarget as DynamicBundle>::get_components(target, func);
+        unsafe { <R::RelationshipTarget as DynamicBundle>::get_components(target, func) };
         // Forget the pointer so that the value is available in `apply_effect`.
         mem::forget(ptr);
     }
diff --git a/crates/bevy_ecs/src/storage/blob_array.rs b/crates/bevy_ecs/src/storage/blob_array.rs
index bab0aad03c443..8ea20fc5c21fd 100644
--- a/crates/bevy_ecs/src/storage/blob_array.rs
+++ b/crates/bevy_ecs/src/storage/blob_array.rs
@@ -54,7 +54,8 @@ impl BlobArray {
                 capacity,
             }
         } else {
-            let mut arr = Self::with_capacity(item_layout, drop_fn, 0);
+            // SAFETY: Upheld by caller
+            let mut arr = unsafe { Self::with_capacity(item_layout, drop_fn, 0) };
             // SAFETY: `capacity` > 0
             unsafe { arr.alloc(NonZeroUsize::new_unchecked(capacity)) }
             arr
diff --git a/crates/bevy_ecs/src/storage/mod.rs b/crates/bevy_ecs/src/storage/mod.rs
index 0b163b1b4feca..0584ae15c6738 100644
--- a/crates/bevy_ecs/src/storage/mod.rs
+++ b/crates/bevy_ecs/src/storage/mod.rs
@@ -102,7 +102,8 @@ impl<T> VecExtensions<T> for Vec<T> {
         // SAFETY: We replace self[index] with the last element. The caller must ensure that
         // both the last element and `index` must be valid and cannot point to the same place.
         unsafe { core::ptr::copy_nonoverlapping(base_ptr.add(len - 1), base_ptr.add(index), 1) };
-        self.set_len(len - 1);
+        // SAFETY: Upheld by caller
+        unsafe { self.set_len(len - 1) };
         value
     }
 }
diff --git a/crates/bevy_ecs/src/storage/table/column.rs b/crates/bevy_ecs/src/storage/table/column.rs
index 239a7bfeb7244..903147449c849 100644
--- a/crates/bevy_ecs/src/storage/table/column.rs
+++ b/crates/bevy_ecs/src/storage/table/column.rs
@@ -336,7 +336,8 @@ impl Column {
     /// - `T` must match the type of data that's stored in this [`Column`]
     /// - `len` must match the actual length of this column (number of elements stored)
     pub unsafe fn get_data_slice<T>(&self, len: usize) -> &[UnsafeCell<T>] {
-        self.data.get_sub_slice(len)
+        // SAFETY: Upheld by caller
+        unsafe { self.data.get_sub_slice(len) }
     }
 
     /// Get a slice to the added [`ticks`](Tick) in this [`Column`].
@@ -344,7 +345,8 @@ impl Column {
     /// # Safety
     /// - `len` must match the actual length of this column (number of elements stored)
     pub unsafe fn get_added_ticks_slice(&self, len: usize) -> &[UnsafeCell<Tick>] {
-        self.added_ticks.as_slice(len)
+        // SAFETY: Upheld by caller
+        unsafe { self.added_ticks.as_slice(len) }
     }
 
     /// Get a slice to the changed [`ticks`](Tick) in this [`Column`].
@@ -352,7 +354,8 @@ impl Column {
     /// # Safety
     /// - `len` must match the actual length of this column (number of elements stored)
     pub unsafe fn get_changed_ticks_slice(&self, len: usize) -> &[UnsafeCell<Tick>] {
-        self.changed_ticks.as_slice(len)
+        // SAFETY: Upheld by caller
+        unsafe { self.changed_ticks.as_slice(len) }
     }
 
     /// Get a slice to the calling locations that last changed each value in this [`Column`]
@@ -402,7 +405,8 @@ impl Column {
     /// `row` must be within the range `[0, self.len())`.
     #[inline]
     pub unsafe fn get_added_tick_unchecked(&self, row: TableRow) -> &UnsafeCell<Tick> {
-        self.added_ticks.get_unchecked(row.index())
+        // SAFETY: Upheld by caller
+        unsafe { self.added_ticks.get_unchecked(row.index()) }
     }
 
     /// Fetches the "changed" change detection tick for the value at `row`
@@ -412,7 +416,8 @@ impl Column {
     /// `row` must be within the range `[0, self.len())`.
     #[inline]
     pub unsafe fn get_changed_tick_unchecked(&self, row: TableRow) -> &UnsafeCell<Tick> {
-        self.changed_ticks.get_unchecked(row.index())
+        // SAFETY: Upheld by caller
+        unsafe { self.changed_ticks.get_unchecked(row.index()) }
     }
 
     /// Fetches the change detection ticks for the value at `row`.
diff --git a/crates/bevy_ecs/src/system/combinator.rs b/crates/bevy_ecs/src/system/combinator.rs
index b05711569ea0b..e51c49d82e771 100644
--- a/crates/bevy_ecs/src/system/combinator.rs
+++ b/crates/bevy_ecs/src/system/combinator.rs
@@ -403,11 +403,14 @@ where
         input: SystemIn<'_, Self>,
         world: UnsafeWorldCell,
     ) -> Result<Self::Out, RunSystemError> {
-        let value = self.a.run_unsafe(input, world)?;
-        // `Self::validate_param_unsafe` already validated the first system,
-        // but we still need to validate the second system once the first one runs.
-        self.b.validate_param_unsafe(world)?;
-        self.b.run_unsafe(value, world)
+        // SAFETY: Upheld by caller
+        unsafe {
+            let value = self.a.run_unsafe(input, world)?;
+            // `Self::validate_param_unsafe` already validated the first system,
+            // but we still need to validate the second system once the first one runs.
+            self.b.validate_param_unsafe(world)?;
+            self.b.run_unsafe(value, world)
+        }
     }
 
     #[cfg(feature = "hotpatching")]
diff --git a/crates/bevy_ecs/src/system/commands/mod.rs b/crates/bevy_ecs/src/system/commands/mod.rs
index 8422ceacaa643..6df15e84c7492 100644
--- a/crates/bevy_ecs/src/system/commands/mod.rs
+++ b/crates/bevy_ecs/src/system/commands/mod.rs
@@ -182,11 +182,14 @@ const _: () = {
             system_meta: &bevy_ecs::system::SystemMeta,
             world: UnsafeWorldCell,
         ) -> Result<(), SystemParamValidationError> {
-            <__StructFieldsAlias as bevy_ecs::system::SystemParam>::validate_param(
-                &mut state.state,
-                system_meta,
-                world,
-            )
+            // SAFETY: Upheld by caller
+            unsafe {
+                <__StructFieldsAlias as bevy_ecs::system::SystemParam>::validate_param(
+                    &mut state.state,
+                    system_meta,
+                    world,
+                )
+            }
         }
 
         #[inline]
@@ -196,12 +199,15 @@ const _: () = {
             world: UnsafeWorldCell<'w>,
             change_tick: bevy_ecs::change_detection::Tick,
         ) -> Self::Item<'w, 's> {
-            let params = <__StructFieldsAlias as bevy_ecs::system::SystemParam>::get_param(
-                &mut state.state,
-                system_meta,
-                world,
-                change_tick,
-            );
+            // SAFETY: Upheld by caller
+            let params = unsafe {
+                <__StructFieldsAlias as bevy_ecs::system::SystemParam>::get_param(
+                    &mut state.state,
+                    system_meta,
+                    world,
+                    change_tick,
+                )
+            };
             Commands {
                 queue: InternalQueue::CommandQueue(params.0),
                 allocator: params.1,
diff --git a/crates/bevy_ecs/src/system/schedule_system.rs b/crates/bevy_ecs/src/system/schedule_system.rs
index 2481bb5f25f4f..8116f6c06b400 100644
--- a/crates/bevy_ecs/src/system/schedule_system.rs
+++ b/crates/bevy_ecs/src/system/schedule_system.rs
@@ -66,7 +66,8 @@ where
         _input: SystemIn<'_, Self>,
         world: UnsafeWorldCell,
     ) -> Result<Self::Out, RunSystemError> {
-        self.system.run_unsafe(&mut self.value, world)
+        // SAFETY: Upheld by caller
+        unsafe { self.system.run_unsafe(&mut self.value, world) }
     }
 
     #[cfg(feature = "hotpatching")]
@@ -87,7 +88,8 @@ where
         &mut self,
         world: UnsafeWorldCell,
     ) -> Result<(), SystemParamValidationError> {
-        self.system.validate_param_unsafe(world)
+        // SAFETY: Upheld by caller
+        unsafe { self.system.validate_param_unsafe(world) }
     }
 
     fn initialize(&mut self, world: &mut World) -> FilteredAccessSet {
@@ -163,7 +165,8 @@ where
             .value
             .as_mut()
             .expect("System input value was not found. Did you forget to initialize the system before running it?");
-        self.system.run_unsafe(value, world)
+        // SAFETY: Upheld by caller
+        unsafe { self.system.run_unsafe(value, world) }
     }
 
     #[cfg(feature = "hotpatching")]
@@ -184,7 +187,8 @@ where
         &mut self,
         world: UnsafeWorldCell,
     ) -> Result<(), SystemParamValidationError> {
-        self.system.validate_param_unsafe(world)
+        // SAFETY: Upheld by caller
+        unsafe { self.system.validate_param_unsafe(world) }
     }
 
     fn initialize(&mut self, world: &mut World) -> FilteredAccessSet {
diff --git a/crates/bevy_ecs/src/system/system_param.rs b/crates/bevy_ecs/src/system/system_param.rs
index de15c850ccdb9..16af1523376e4 100644
--- a/crates/bevy_ecs/src/system/system_param.rs
+++ b/crates/bevy_ecs/src/system/system_param.rs
@@ -703,7 +703,10 @@ macro_rules! impl_param_set {
                 system_meta: &SystemMeta,
                 world: UnsafeWorldCell<'w>,
             ) -> Result<(), SystemParamValidationError> {
-                <($($param,)*) as SystemParam>::validate_param(state, system_meta, world)
+                // SAFETY: Upheld by caller
+                unsafe {
+                    <($($param,)*) as SystemParam>::validate_param(state, system_meta, world)
+                }
             }
 
             #[inline]
@@ -968,7 +971,8 @@ unsafe impl<'w> SystemParam for DeferredWorld<'w> {
         world: UnsafeWorldCell<'world>,
         _change_tick: Tick,
     ) -> Self::Item<'world, 'state> {
-        world.into_deferred()
+        // SAFETY: Upheld by caller
+        unsafe { world.into_deferred() }
     }
 }
 
@@ -1807,9 +1811,12 @@ unsafe impl<T: SystemParam> SystemParam for Option<T> {
         world: UnsafeWorldCell<'world>,
         change_tick: Tick,
     ) -> Self::Item<'world, 'state> {
-        T::validate_param(state, system_meta, world)
-            .ok()
-            .map(|()| T::get_param(state, system_meta, world, change_tick))
+        // SAFETY: Upheld by caller
+        unsafe {
+            T::validate_param(state, system_meta, world)
+                .ok()
+                .map(|()| T::get_param(state, system_meta, world, change_tick))
+        }
     }
 
     fn apply(state: &mut Self::State, system_meta: &SystemMeta, world: &mut World) {
@@ -1850,8 +1857,11 @@ unsafe impl<T: SystemParam> SystemParam for Result<T, SystemParamValidationError
         world: UnsafeWorldCell<'world>,
         change_tick: Tick,
     ) -> Self::Item<'world, 'state> {
-        T::validate_param(state, system_meta, world)
-            .map(|()| T::get_param(state, system_meta, world, change_tick))
+        // SAFETY: Upheld by caller
+        unsafe {
+            T::validate_param(state, system_meta, world)
+                .map(|()| T::get_param(state, system_meta, world, change_tick))
+        }
     }
 
     fn apply(state: &mut Self::State, system_meta: &SystemMeta, world: &mut World) {
@@ -1944,7 +1954,8 @@ unsafe impl<T: SystemParam> SystemParam for If<T> {
         system_meta: &SystemMeta,
         world: UnsafeWorldCell,
     ) -> Result<(), SystemParamValidationError> {
-        T::validate_param(state, system_meta, world).map_err(|mut e| {
+        // SAFETY: Upheld by caller
+        unsafe { T::validate_param(state, system_meta, world) }.map_err(|mut e| {
             e.skipped = true;
             e
         })
@@ -1957,7 +1968,8 @@ unsafe impl<T: SystemParam> SystemParam for If<T> {
         world: UnsafeWorldCell<'world>,
         change_tick: Tick,
     ) -> Self::Item<'world, 'state> {
-        If(T::get_param(state, system_meta, world, change_tick))
+        // SAFETY: Upheld by caller.
+        If(unsafe { T::get_param(state, system_meta, world, change_tick) })
     }
 
     fn apply(state: &mut Self::State, system_meta: &SystemMeta, world: &mut World) {
@@ -2001,7 +2013,8 @@ unsafe impl<T: SystemParam> SystemParam for Vec<T> {
         world: UnsafeWorldCell,
     ) -> Result<(), SystemParamValidationError> {
         for state in state {
-            T::validate_param(state, system_meta, world)?;
+            // SAFETY: Upheld by caller
+            unsafe { T::validate_param(state, system_meta, world)? };
         }
         Ok(())
     }
@@ -2183,9 +2196,17 @@ macro_rules! impl_system_param_tuple {
                 world: UnsafeWorldCell,
             ) -> Result<(), SystemParamValidationError> {
                 let ($($param,)*) = state;
-                $(
-                    $param::validate_param($param, system_meta, world)?;
-                )*
+
+                #[allow(
+                    unused_unsafe,
+                    reason = "Zero-length tuples won't have any params to validate."
+                )]
+                // SAFETY: Upheld by caller
+                unsafe {
+                    $(
+                        $param::validate_param($param, system_meta, world)?;
+                    )*
+                }
                 Ok(())
             }
 
@@ -2197,11 +2218,19 @@ macro_rules! impl_system_param_tuple {
                 change_tick: Tick,
             ) -> Self::Item<'w, 's> {
                 let ($($param,)*) = state;
+
                 #[allow(
-                    clippy::unused_unit,
-                    reason = "Zero-length tuples won't have any params to get."
+                    unused_unsafe,
+                    reason = "Zero-length tuples won't have any params to validate."
                 )]
-                ($($param::get_param($param, system_meta, world, change_tick),)*)
+                // SAFETY: Upheld by caller
+                unsafe {
+                    #[allow(
+                        clippy::unused_unit,
+                        reason = "Zero-length tuples won't have any params to get."
+                    )]
+                    ($($param::get_param($param, system_meta, world, change_tick),)*)
+                }
             }
         }
     };
@@ -2354,7 +2383,8 @@ unsafe impl<P: SystemParam + 'static> SystemParam for StaticSystemParam<'_, '_,
         system_meta: &SystemMeta,
         world: UnsafeWorldCell,
     ) -> Result<(), SystemParamValidationError> {
-        P::validate_param(state, system_meta, world)
+        // SAFETY: Upheld by caller
+        unsafe { P::validate_param(state, system_meta, world) }
     }
 
     #[inline]
@@ -2639,7 +2669,8 @@ impl<T: SystemParam + 'static> DynParamState for ParamState<T> {
         system_meta: &SystemMeta,
         world: UnsafeWorldCell,
     ) -> Result<(), SystemParamValidationError> {
-        T::validate_param(&mut self.0, system_meta, world)
+        // SAFETY: Upheld by caller
+        unsafe { T::validate_param(&mut self.0, system_meta, world) }
     }
 }
 
@@ -2670,7 +2701,8 @@ unsafe impl SystemParam for DynSystemParam<'_, '_> {
         system_meta: &SystemMeta,
         world: UnsafeWorldCell,
     ) -> Result<(), SystemParamValidationError> {
-        state.0.validate_param(system_meta, world)
+        // SAFETY: Upheld by caller.
+        unsafe { state.0.validate_param(system_meta, world) }
     }
 
     #[inline]
diff --git a/crates/bevy_ecs/src/world/entity_access/component_fetch.rs b/crates/bevy_ecs/src/world/entity_access/component_fetch.rs
index ee074bcf20f78..18dce1d725708 100644
--- a/crates/bevy_ecs/src/world/entity_access/component_fetch.rs
+++ b/crates/bevy_ecs/src/world/entity_access/component_fetch.rs
@@ -140,21 +140,24 @@ unsafe impl<const N: usize> DynamicComponentFetch for [ComponentId; N] {
         self,
         cell: UnsafeEntityCell<'_>,
     ) -> Result<Self::Ref<'_>, EntityComponentError> {
-        <&Self>::fetch_ref(&self, cell)
+        // SAFETY: Uphelp by caller.
+        unsafe { <&Self>::fetch_ref(&self, cell) }
     }
 
     unsafe fn fetch_mut(
         self,
         cell: UnsafeEntityCell<'_>,
     ) -> Result<Self::Mut<'_>, EntityComponentError> {
-        <&Self>::fetch_mut(&self, cell)
+        // SAFETY: Uphelp by caller.
+        unsafe { <&Self>::fetch_mut(&self, cell) }
     }
 
     unsafe fn fetch_mut_assume_mutable(
         self,
         cell: UnsafeEntityCell<'_>,
     ) -> Result<Self::Mut<'_>, EntityComponentError> {
-        <&Self>::fetch_mut_assume_mutable(&self, cell)
+        // SAFETY: Uphelp by caller.
+        unsafe { <&Self>::fetch_mut_assume_mutable(&self, cell) }
     }
 }
 
diff --git a/crates/bevy_ecs/src/world/entity_access/filtered.rs b/crates/bevy_ecs/src/world/entity_access/filtered.rs
index 4459fc262e517..b72540e452b8a 100644
--- a/crates/bevy_ecs/src/world/entity_access/filtered.rs
+++ b/crates/bevy_ecs/src/world/entity_access/filtered.rs
@@ -325,7 +325,8 @@ impl<'w, 's> UnsafeFilteredEntityMut<'w, 's> {
     /// - The user must ensure that no aliasing violations occur when using the returned `FilteredEntityMut`.
     #[inline]
     pub unsafe fn into_mut(self) -> FilteredEntityMut<'w, 's> {
-        FilteredEntityMut::new(self.entity, self.access)
+        // SAFETY: Upheld by caller.
+        unsafe { FilteredEntityMut::new(self.entity, self.access) }
     }
 }
 
diff --git a/crates/bevy_ecs/src/world/entity_access/world_mut.rs b/crates/bevy_ecs/src/world/entity_access/world_mut.rs
index 97cb0e4007584..b8a816d84835e 100644
--- a/crates/bevy_ecs/src/world/entity_access/world_mut.rs
+++ b/crates/bevy_ecs/src/world/entity_access/world_mut.rs
@@ -859,8 +859,11 @@ impl<'w> EntityWorldMut<'w> {
         &mut self,
         component_ids: F,
     ) -> Result<F::Mut<'_>, EntityComponentError> {
-        self.as_mutable()
-            .into_mut_assume_mutable_by_id(component_ids)
+        // SAFETY: Upheld by caller
+        unsafe {
+            self.as_mutable()
+                .into_mut_assume_mutable_by_id(component_ids)
+        }
     }
 
     /// Consumes `self` and returns [untyped mutable reference(s)](MutUntyped)
@@ -929,8 +932,11 @@ impl<'w> EntityWorldMut<'w> {
         self,
         component_ids: F,
     ) -> Result<F::Mut<'w>, EntityComponentError> {
-        self.into_mutable()
-            .into_mut_assume_mutable_by_id(component_ids)
+        // SAFETY: Upheld by caller
+        unsafe {
+            self.into_mutable()
+                .into_mut_assume_mutable_by_id(component_ids)
+        }
     }
 
     /// Adds a [`Bundle`] of components to the entity.
@@ -1060,13 +1066,16 @@ impl<'w> EntityWorldMut<'w> {
         component_id: ComponentId,
         component: OwningPtr<'_>,
     ) -> &mut Self {
-        self.insert_by_id_with_caller(
-            component_id,
-            component,
-            InsertMode::Replace,
-            MaybeLocation::caller(),
-            RelationshipHookMode::Run,
-        )
+        // SAFETY: Upheld by caller
+        unsafe {
+            self.insert_by_id_with_caller(
+                component_id,
+                component,
+                InsertMode::Replace,
+                MaybeLocation::caller(),
+                RelationshipHookMode::Run,
+            )
+        }
     }
 
     /// # Safety
diff --git a/crates/bevy_ecs/src/world/entity_fetch.rs b/crates/bevy_ecs/src/world/entity_fetch.rs
index 1c2e2d2fcf705..457f176d0457d 100644
--- a/crates/bevy_ecs/src/world/entity_fetch.rs
+++ b/crates/bevy_ecs/src/world/entity_fetch.rs
@@ -247,7 +247,8 @@ unsafe impl<const N: usize> WorldEntityFetch for [Entity; N] {
         self,
         cell: UnsafeWorldCell<'_>,
     ) -> Result<Self::Ref<'_>, EntityNotSpawnedError> {
-        <&Self>::fetch_ref(&self, cell)
+        // SAFETY: Upheld by caller
+        unsafe { <&Self>::fetch_ref(&self, cell) }
     }
 
     #[inline]
@@ -255,7 +256,8 @@ unsafe impl<const N: usize> WorldEntityFetch for [Entity; N] {
         self,
         cell: UnsafeWorldCell<'_>,
     ) -> Result<Self::Mut<'_>, EntityMutableFetchError> {
-        <&Self>::fetch_mut(&self, cell)
+        // SAFETY: Upheld by caller
+        unsafe { <&Self>::fetch_mut(&self, cell) }
     }
 
     #[inline]
@@ -263,7 +265,8 @@ unsafe impl<const N: usize> WorldEntityFetch for [Entity; N] {
         self,
         cell: UnsafeWorldCell<'_>,
     ) -> Result<Self::DeferredMut<'_>, EntityMutableFetchError> {
-        <&Self>::fetch_deferred_mut(&self, cell)
+        // SAFETY: Upheld by caller
+        unsafe { <&Self>::fetch_deferred_mut(&self, cell) }
     }
 }
 
diff --git a/crates/bevy_ecs/src/world/unsafe_world_cell.rs b/crates/bevy_ecs/src/world/unsafe_world_cell.rs
index 54a835e2863ab..cae3f5d333db7 100644
--- a/crates/bevy_ecs/src/world/unsafe_world_cell.rs
+++ b/crates/bevy_ecs/src/world/unsafe_world_cell.rs
@@ -697,7 +697,8 @@ impl<'w> UnsafeWorldCell<'w> {
     /// Must have read access to [`DefaultErrorHandler`].
     #[inline]
     pub unsafe fn default_error_handler(&self) -> ErrorHandler {
-        self.get_resource::<DefaultErrorHandler>()
+        // SAFETY: Upheld by caller
+        unsafe { self.get_resource::<DefaultErrorHandler>() }
             .copied()
             .unwrap_or_default()
             .0

From 86224b5cb2e08ca4e0cc51d32a7bc74939baa3b6 Mon Sep 17 00:00:00 2001
From: Chris Biscardi <chris@christopherbiscardi.com>
Date: Sun, 14 Dec 2025 18:18:20 -0800
Subject: [PATCH 120/133] Refactor GltfExtensionHandler Hooks (#22114)

As it turns out, many glTF extensions require accessing the data from
other extensions.

Trying to isolate and scope access is much less helpful than exposing
the glTF objects for consumers to take what they want.

This includes

- extension data in the "others" category (anything the gltf crate
doesn't support explicitly)
- the functions that return the extension data the gltf crate *does*
have hardcoded support for
- names and any other available data

---

The diff for users is that they

- no longer have to worry about defining extension ids to process
- no longer have to worry about multiple calls due to those ids
- now have to use `.extension_value()`, `.name()`, or similar to get
relevant data
- Can now access `.light()` or any other data built-in to the gltf
crate, such as
[`.variants`](https://docs.rs/gltf/1.4.1/gltf/struct.Document.html#method.variants)
for `KHR_materials_variants`.

An example diff on the user side can be viewed in the update commit for
the Skein PR:
https://github.com/rust-adventure/skein/pull/89/changes/ac1e510c9d136d60c23decd68b10f35f6e24f76b
---
 crates/bevy_gltf/src/loader/extensions/mod.rs |  74 +++---------
 crates/bevy_gltf/src/loader/mod.rs            | 110 ++++--------------
 .../gltf/gltf_extension_animation_graph.rs    |  18 +--
 3 files changed, 40 insertions(+), 162 deletions(-)

diff --git a/crates/bevy_gltf/src/loader/extensions/mod.rs b/crates/bevy_gltf/src/loader/extensions/mod.rs
index 32ec5ce6a7fb5..133420881a9cf 100644
--- a/crates/bevy_gltf/src/loader/extensions/mod.rs
+++ b/crates/bevy_gltf/src/loader/extensions/mod.rs
@@ -47,46 +47,26 @@ pub struct GltfExtensionHandlers(pub Arc<RwLock<Vec<Box<dyn GltfExtensionHandler
 /// The type a `GltfExtensionHandler` is implemented for can define data
 /// which will be cloned for each new glTF load. This enables stateful
 /// handling of glTF extension data during a single load.
+///
+/// When loading a glTF file, a glTF object that could contain extension
+/// data will cause the relevant hook to execute once per object.
+/// Each invocation will receive all extension data, which is required because
+/// many extensions require accessing data defined by other extensions.
+///
+/// The hooks are always called once, even if there is no extension data
+/// This is useful for scenarios where additional extension data isn't
+/// required, but processing should still happen.
 pub trait GltfExtensionHandler: Send + Sync {
     /// Required for dyn cloning
     fn dyn_clone(&self) -> Box<dyn GltfExtensionHandler>;
 
-    /// When loading a glTF file, a glTF object that could contain extension
-    /// data will cause the relevant hook to execute once for each id in this list.
-    /// Each invocation will receive the extension data for one of the extension ids,
-    /// along with the `extension_id` itself so implementors can differentiate
-    /// between different calls and parse data correctly.
-    ///
-    /// The hooks are always called, even if there is no extension data
-    /// for a specified id. This is useful for scenarios where additional
-    /// extension data isn't required, but processing should still happen.
-    ///
-    /// Most implementors will pick one extension for this list, causing the
-    /// relevant hooks to fire once per object. An implementor that does not
-    /// wish to receive any data but still wants hooks to be called can use
-    /// an empty string `""` as the extension id, which is also the default
-    /// value if the function is not implemented by an implementor. If the
-    /// empty string is used, all extension data in hooks will be `None`.
-    ///
-    /// Some implementors will choose to list multiple extensions here.
-    /// This is an advanced use case and the alternative of having multiple
-    /// independent handlers should be considered as an option first.
-    /// If multiple extension ids are listed here, the hooks will fire once
-    /// for each extension id, and each successive call will receive the data for
-    /// a separate extension. The extension id is also included in hook arguments
-    /// for this reason, so multiple extension id implementors can differentiate
-    /// between the data received.
-    fn extension_ids(&self) -> &'static [&'static str] {
-        &[""]
-    }
-
     /// Called when the "global" data for an extension
     /// at the root of a glTF file is encountered.
     #[expect(
         unused,
         reason = "default trait implementations do not use the arguments because they are no-ops"
     )]
-    fn on_root_data(&mut self, extension_id: &str, value: Option<&serde_json::Value>) {}
+    fn on_root(&mut self, gltf: &gltf::Gltf) {}
 
     #[cfg(feature = "bevy_animation")]
     #[expect(
@@ -94,15 +74,7 @@ pub trait GltfExtensionHandler: Send + Sync {
         reason = "default trait implementations do not use the arguments because they are no-ops"
     )]
     /// Called when an individual animation is processed
-    fn on_animation(
-        &mut self,
-        extension_id: &str,
-        extension_data: Option<&serde_json::Value>,
-        gltf_animation: &gltf::Animation,
-        name: Option<&str>,
-        handle: Handle<AnimationClip>,
-    ) {
-    }
+    fn on_animation(&mut self, gltf_animation: &gltf::Animation, handle: Handle<AnimationClip>) {}
 
     #[cfg(feature = "bevy_animation")]
     #[expect(
@@ -123,14 +95,15 @@ pub trait GltfExtensionHandler: Send + Sync {
     }
 
     /// Called when an individual texture is processed
+    /// Unlike other hooks, this hook does not receive its glTF
+    /// object due to internal constraints.
     #[expect(
         unused,
         reason = "default trait implementations do not use the arguments because they are no-ops"
     )]
     fn on_texture(
         &mut self,
-        extension_id: &str,
-        extension_data: Option<&serde_json::Value>,
+        extension_data: Option<&serde_json::Map<String, serde_json::Value>>,
         texture: Handle<bevy_image::Image>,
     ) {
     }
@@ -142,11 +115,8 @@ pub trait GltfExtensionHandler: Send + Sync {
     )]
     fn on_material(
         &mut self,
-        extension_id: &str,
-        extension_data: Option<&serde_json::Value>,
         load_context: &mut LoadContext<'_>,
         gltf_material: &gltf::Material,
-        name: Option<&str>,
         material: Handle<StandardMaterial>,
     ) {
     }
@@ -158,11 +128,8 @@ pub trait GltfExtensionHandler: Send + Sync {
     )]
     fn on_gltf_mesh(
         &mut self,
-        extension_id: &str,
-        extension_data: Option<&serde_json::Value>,
         load_context: &mut LoadContext<'_>,
         gltf_mesh: &gltf::Mesh,
-        name: Option<&str>,
         mesh: Handle<GltfMesh>,
     ) {
     }
@@ -191,13 +158,10 @@ pub trait GltfExtensionHandler: Send + Sync {
     )]
     fn on_scene_completed(
         &mut self,
-        extension_id: &str,
-        extension_data: Option<&serde_json::Value>,
+        load_context: &mut LoadContext<'_>,
         scene: &gltf::Scene,
-        name: Option<&str>,
         world_root_id: Entity,
         scene_world: &mut World,
-        load_context: &mut LoadContext<'_>,
     ) {
     }
 
@@ -208,8 +172,6 @@ pub trait GltfExtensionHandler: Send + Sync {
     )]
     fn on_gltf_node(
         &mut self,
-        extension_id: &str,
-        extension_data: Option<&serde_json::Value>,
         load_context: &mut LoadContext<'_>,
         gltf_node: &Node,
         entity: &mut EntityWorldMut,
@@ -225,8 +187,6 @@ pub trait GltfExtensionHandler: Send + Sync {
     )]
     fn on_spawn_light_directional(
         &mut self,
-        extension_id: &str,
-        extension_data: Option<&serde_json::Value>,
         load_context: &mut LoadContext<'_>,
         gltf_node: &Node,
         entity: &mut EntityWorldMut,
@@ -241,8 +201,6 @@ pub trait GltfExtensionHandler: Send + Sync {
     )]
     fn on_spawn_light_point(
         &mut self,
-        extension_id: &str,
-        extension_data: Option<&serde_json::Value>,
         load_context: &mut LoadContext<'_>,
         gltf_node: &Node,
         entity: &mut EntityWorldMut,
@@ -257,8 +215,6 @@ pub trait GltfExtensionHandler: Send + Sync {
     )]
     fn on_spawn_light_spot(
         &mut self,
-        extension_id: &str,
-        extension_data: Option<&serde_json::Value>,
         load_context: &mut LoadContext<'_>,
         gltf_node: &Node,
         entity: &mut EntityWorldMut,
diff --git a/crates/bevy_gltf/src/loader/mod.rs b/crates/bevy_gltf/src/loader/mod.rs
index 1c5bbd94e74c1..e4ecf35f814d4 100644
--- a/crates/bevy_gltf/src/loader/mod.rs
+++ b/crates/bevy_gltf/src/loader/mod.rs
@@ -258,9 +258,7 @@ impl GltfLoader {
         // Let extensions process the root data for the extension ids
         // they've subscribed to.
         for extension in extensions.iter_mut() {
-            for id in extension.extension_ids() {
-                extension.on_root_data(id, gltf.extension_value(id));
-            }
+            extension.on_root(&gltf);
         }
 
         let file_name = load_context
@@ -597,15 +595,7 @@ impl GltfLoader {
 
                 // let extensions handle extension data placed on animations
                 for extension in extensions.iter_mut() {
-                    for id in extension.extension_ids() {
-                        extension.on_animation(
-                            id,
-                            animation.extension_value(id),
-                            &animation,
-                            animation.name(),
-                            handle.clone(),
-                        );
-                    }
+                    extension.on_animation(&animation, handle.clone());
                 }
 
                 animations.push(handle);
@@ -654,13 +644,10 @@ impl GltfLoader {
                 image.process_loaded_texture(load_context, &mut texture_handles);
                 // let extensions handle texture data
                 for extension in extensions.iter_mut() {
-                    for id in extension.extension_ids() {
-                        extension.on_texture(
-                            id,
-                            texture.extension_value(id),
-                            texture_handles.iter().last().unwrap().clone(),
-                        );
-                    }
+                    extension.on_texture(
+                        texture.extensions(),
+                        texture_handles.iter().last().unwrap().clone(),
+                    );
                 }
             }
         } else {
@@ -695,13 +682,10 @@ impl GltfLoader {
                         // We do this differently here because of the IoTaskPool vs
                         // gltf::Texture lifetimes
                         for extension in extensions.iter_mut() {
-                            for id in extension.extension_ids() {
-                                extension.on_texture(
-                                    id,
-                                    extension_data.as_ref().and_then(|map| map.get(*id)),
-                                    texture_handles.iter().last().unwrap().clone(),
-                                );
-                            }
+                            extension.on_texture(
+                                extension_data.as_ref(),
+                                texture_handles.iter().last().unwrap().clone(),
+                            );
                         }
                     }
                     Err(err) => {
@@ -723,16 +707,7 @@ impl GltfLoader {
 
                 // let extensions handle material data
                 for extension in extensions.iter_mut() {
-                    for id in extension.extension_ids() {
-                        extension.on_material(
-                            id,
-                            material.extension_value(id),
-                            load_context,
-                            &material,
-                            material.name(),
-                            handle.clone(),
-                        );
-                    }
+                    extension.on_material(load_context, &material, handle.clone());
                 }
 
                 materials.push(handle);
@@ -899,16 +874,7 @@ impl GltfLoader {
                 named_meshes.insert(name.into(), handle.clone());
             }
             for extension in extensions.iter_mut() {
-                for id in extension.extension_ids() {
-                    extension.on_gltf_mesh(
-                        id,
-                        gltf_mesh.extension_value(id),
-                        load_context,
-                        &gltf_mesh,
-                        gltf_mesh.name(),
-                        handle.clone(),
-                    );
-                }
+                extension.on_gltf_mesh(load_context, &gltf_mesh, handle.clone());
             }
 
             meshes.push(handle);
@@ -1114,17 +1080,12 @@ impl GltfLoader {
 
             // let extensions handle scene extension data
             for extension in extensions.iter_mut() {
-                for id in extension.extension_ids() {
-                    extension.on_scene_completed(
-                        id,
-                        scene.extension_value(id),
-                        &scene,
-                        scene.name(),
-                        world_root_id,
-                        &mut world,
-                        &mut scene_load_context,
-                    );
-                }
+                extension.on_scene_completed(
+                    &mut scene_load_context,
+                    &scene,
+                    world_root_id,
+                    &mut world,
+                );
             }
 
             let loaded_scene = scene_load_context.finish(Scene::new(world));
@@ -1755,15 +1716,7 @@ fn load_node(
                         });
                     }
                     for extension in extensions.iter_mut() {
-                        for id in extension.extension_ids() {
-                            extension.on_spawn_light_directional(
-                                id,
-                                gltf_node.extension_value(id),
-                                load_context,
-                                gltf_node,
-                                &mut entity,
-                            );
-                        }
+                        extension.on_spawn_light_directional(load_context, gltf_node, &mut entity);
                     }
                 }
                 gltf::khr_lights_punctual::Kind::Point => {
@@ -1786,15 +1739,7 @@ fn load_node(
                         });
                     }
                     for extension in extensions.iter_mut() {
-                        for id in extension.extension_ids() {
-                            extension.on_spawn_light_point(
-                                id,
-                                gltf_node.extension_value(id),
-                                load_context,
-                                gltf_node,
-                                &mut entity,
-                            );
-                        }
+                        extension.on_spawn_light_point(load_context, gltf_node, &mut entity);
                     }
                 }
                 gltf::khr_lights_punctual::Kind::Spot {
@@ -1822,15 +1767,7 @@ fn load_node(
                         });
                     }
                     for extension in extensions.iter_mut() {
-                        for id in extension.extension_ids() {
-                            extension.on_spawn_light_spot(
-                                id,
-                                gltf_node.extension_value(id),
-                                load_context,
-                                gltf_node,
-                                &mut entity,
-                            );
-                        }
+                        extension.on_spawn_light_spot(load_context, gltf_node, &mut entity);
                     }
                 }
             }
@@ -1881,10 +1818,7 @@ fn load_node(
     // accessing Mesh and Material extension data, which
     // are merged onto the same entity in Bevy
     for extension in extensions.iter_mut() {
-        for id in extension.extension_ids() {
-            let data = gltf_node.extension_value(id);
-            extension.on_gltf_node(id, data, load_context, gltf_node, &mut node);
-        }
+        extension.on_gltf_node(load_context, gltf_node, &mut node);
     }
 
     if let Some(err) = gltf_error {
diff --git a/examples/gltf/gltf_extension_animation_graph.rs b/examples/gltf/gltf_extension_animation_graph.rs
index dea4112a980b9..7c0d8d0748426 100644
--- a/examples/gltf/gltf_extension_animation_graph.rs
+++ b/examples/gltf/gltf_extension_animation_graph.rs
@@ -135,15 +135,8 @@ impl GltfExtensionHandler for GltfExtensionHandlerAnimation {
     }
 
     #[cfg(feature = "bevy_animation")]
-    fn on_animation(
-        &mut self,
-        _extension_id: &str,
-        _value: Option<&serde_json::Value>,
-        _gltf_animation: &gltf::Animation,
-        name: Option<&str>,
-        handle: Handle<AnimationClip>,
-    ) {
-        if name.is_some_and(|v| v == "Walk") {
+    fn on_animation(&mut self, gltf_animation: &gltf::Animation, handle: Handle<AnimationClip>) {
+        if gltf_animation.name().is_some_and(|v| v == "Walk") {
             self.clip = Some(handle.clone());
         }
     }
@@ -160,8 +153,6 @@ impl GltfExtensionHandler for GltfExtensionHandlerAnimation {
 
     fn on_gltf_node(
         &mut self,
-        _extension_id: &str,
-        _value: Option<&serde_json::Value>,
         _load_context: &mut LoadContext<'_>,
         gltf_node: &gltf::Node,
         entity: &mut EntityWorldMut,
@@ -174,13 +165,10 @@ impl GltfExtensionHandler for GltfExtensionHandlerAnimation {
     /// Called when an individual Scene is done processing
     fn on_scene_completed(
         &mut self,
-        _extension_id: &str,
-        _value: Option<&serde_json::Value>,
+        load_context: &mut LoadContext<'_>,
         _scene: &gltf::Scene,
-        _name: Option<&str>,
         _world_root_id: Entity,
         world: &mut World,
-        load_context: &mut LoadContext<'_>,
     ) {
         // Create an AnimationGraph from the desired clip
         let (graph, index) = AnimationGraph::from_clip(self.clip.clone().unwrap());

From 82acdfdacae2d14b9079ee1b02484293dcea77a1 Mon Sep 17 00:00:00 2001
From: databasedav <31483365+databasedav@users.noreply.github.com>
Date: Sun, 14 Dec 2025 22:37:43 -0800
Subject: [PATCH 121/133] derive `Clone` and `Copy` for newer
 `interaction_states` unit structs (#22115)

# Objective

- derive `Clone` and `Copy` for the newer unit structs in
`interaction_states`, this is useful for frameworks that are generic
over `Component + Clone/Copy` and is also the status quo for the
existing `InteractionDisabled` component defined a few lines above

## Solution

- derive `Clone` and `Copy` for `Pressed`, `Checkable`, and `Checked`
---
 crates/bevy_ui/src/interaction_states.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/bevy_ui/src/interaction_states.rs b/crates/bevy_ui/src/interaction_states.rs
index a5793ca778a57..41e80114062a9 100644
--- a/crates/bevy_ui/src/interaction_states.rs
+++ b/crates/bevy_ui/src/interaction_states.rs
@@ -37,15 +37,15 @@ pub(crate) fn on_remove_disabled(
 
 /// Component that indicates whether a button or widget is currently in a pressed or "held down"
 /// state.
-#[derive(Component, Default, Debug)]
+#[derive(Component, Debug, Clone, Copy, Default)]
 pub struct Pressed;
 
 /// Component that indicates that a widget can be checked.
-#[derive(Component, Default, Debug)]
+#[derive(Component, Debug, Clone, Copy, Default)]
 pub struct Checkable;
 
 /// Component that indicates whether a checkbox or radio button is in a checked state.
-#[derive(Component, Default, Debug)]
+#[derive(Component, Debug, Clone, Copy, Default)]
 pub struct Checked;
 
 pub(crate) fn on_add_checkable(add: On<Add, Checked>, mut world: DeferredWorld) {

From 45955c72b9e4659613ed1a4726c182ab0eb181b8 Mon Sep 17 00:00:00 2001
From: andriyDev <andriydzikh@gmail.com>
Date: Mon, 15 Dec 2025 00:20:21 -0800
Subject: [PATCH 122/133] Use slice `last` instead of iter `last. (#22116)

# Objective

- Followup to #22106.

## Solution

- Use slice `last` instead of iter `last` for better performance - we
don't need to iterate just to find the last element.
---
 crates/bevy_gltf/src/loader/mod.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/bevy_gltf/src/loader/mod.rs b/crates/bevy_gltf/src/loader/mod.rs
index e4ecf35f814d4..68e5eb41dc69d 100644
--- a/crates/bevy_gltf/src/loader/mod.rs
+++ b/crates/bevy_gltf/src/loader/mod.rs
@@ -646,7 +646,7 @@ impl GltfLoader {
                 for extension in extensions.iter_mut() {
                     extension.on_texture(
                         texture.extensions(),
-                        texture_handles.iter().last().unwrap().clone(),
+                        texture_handles.last().unwrap().clone(),
                     );
                 }
             }
@@ -684,7 +684,7 @@ impl GltfLoader {
                         for extension in extensions.iter_mut() {
                             extension.on_texture(
                                 extension_data.as_ref(),
-                                texture_handles.iter().last().unwrap().clone(),
+                                texture_handles.last().unwrap().clone(),
                             );
                         }
                     }

From 2765ba8803d6a040526edfa6af5cdad25c0f6c6f Mon Sep 17 00:00:00 2001
From: andriyDev <andriydzikh@gmail.com>
Date: Mon, 15 Dec 2025 00:30:43 -0800
Subject: [PATCH 123/133] Fix compilation errors and warnings when running
 bevy_gltf with no features. (#22125)

# Objective

- #22106 accidentally added imports for AnimationClip, HashMap, and
HashSet - but these are only available/used if the bevy_animation
feature is enabled. So running `cargo t -p bevy_gltf` fails to compile
and gives warnings!

## Solution

- Guard these `use` statements on the bevy_animation feature.

## Testing

- Ran `cargo t -p bevy_gltf`.
- Ran `cargo t -p bevy_gltf --all-features`.
---
 crates/bevy_gltf/src/loader/extensions/mod.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/crates/bevy_gltf/src/loader/extensions/mod.rs b/crates/bevy_gltf/src/loader/extensions/mod.rs
index 133420881a9cf..d024f39175c94 100644
--- a/crates/bevy_gltf/src/loader/extensions/mod.rs
+++ b/crates/bevy_gltf/src/loader/extensions/mod.rs
@@ -7,7 +7,6 @@ mod khr_materials_specular;
 use alloc::sync::Arc;
 use async_lock::RwLock;
 
-use bevy_animation::AnimationClip;
 use bevy_asset::{Handle, LoadContext};
 use bevy_ecs::{
     entity::Entity,
@@ -15,9 +14,14 @@ use bevy_ecs::{
     world::{EntityWorldMut, World},
 };
 use bevy_pbr::StandardMaterial;
-use bevy_platform::collections::{HashMap, HashSet};
 use gltf::Node;
 
+#[cfg(feature = "bevy_animation")]
+use {
+    bevy_animation::AnimationClip,
+    bevy_platform::collections::{HashMap, HashSet},
+};
+
 use crate::GltfMesh;
 
 pub(crate) use self::{

From 545a97d67cdb87237e0bc5f02ecd17ec7e4b5c24 Mon Sep 17 00:00:00 2001
From: Kevin Chen <chen.kevin.f@gmail.com>
Date: Mon, 15 Dec 2025 15:24:36 -0500
Subject: [PATCH 124/133] Fix: Clears directional navigation map between
 rebuilds (#22124)

# Objective

- Closes #21949

## Solution

- Implements the solution as suggested by 21949. The Directional
Navigation Map does not prune any old edges that may be connected to
removed Nodes, so we clear the map between rebuilds of the map.

(If the more preferable solution figures out what nodes were removed and
then calls `map.remove_multiple` instead, you can feel free to reject
this)

## Testing

- Did you test these changes? If so, how?
I did not test this change, but the reporter of the issue did (via
backport to an older version of Bevy). However, the fix is
straightforward and explains itself. If you would like an automated test
somehow, some pointers to tests that do similar would be welcome.
---
 crates/bevy_input_focus/src/directional_navigation.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crates/bevy_input_focus/src/directional_navigation.rs b/crates/bevy_input_focus/src/directional_navigation.rs
index ed34e84bcc067..b4ce6ff319e5b 100644
--- a/crates/bevy_input_focus/src/directional_navigation.rs
+++ b/crates/bevy_input_focus/src/directional_navigation.rs
@@ -773,6 +773,8 @@ fn auto_rebuild_ui_navigation_graph(
         })
         .collect();
 
+    // clear the old nav map between rebuilds to ensure any removed entities' edges are pruned
+    directional_nav_map.clear();
     auto_generate_navigation_edges(&mut directional_nav_map, &nodes, &config);
 }
 

From 59717100d99b7cb0370770be63e1adc5db0d7a2c Mon Sep 17 00:00:00 2001
From: atlv <rodol@rivalrebels.com>
Date: Mon, 15 Dec 2025 15:28:45 -0500
Subject: [PATCH 125/133] Global Gizmos (#22107)

# Objective

- use gizmos in non-system contexts, such as deep in a math library or
callback without ecs access.
- kind of upstream https://github.com/atlv24/glizmo
- builds off of https://github.com/bevyengine/bevy/pull/22105

## Solution

- mutex + deref

## Testing

-
---
 crates/bevy_gizmos/src/global.rs | 48 ++++++++++++++++++++++++++++++++
 crates/bevy_gizmos/src/lib.rs    |  4 ++-
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 crates/bevy_gizmos/src/global.rs

diff --git a/crates/bevy_gizmos/src/global.rs b/crates/bevy_gizmos/src/global.rs
new file mode 100644
index 0000000000000..14d180b066ac2
--- /dev/null
+++ b/crates/bevy_gizmos/src/global.rs
@@ -0,0 +1,48 @@
+use std::sync::Mutex;
+
+use bevy_app::{App, Last, Plugin};
+use bevy_ecs::schedule::IntoScheduleConfigs;
+
+use crate::{
+    config::DefaultGizmoConfigGroup,
+    gizmos::{GizmoBuffer, Gizmos},
+    GizmoMeshSystems,
+};
+
+static GLOBAL_GIZMO: Mutex<GizmoBuffer<DefaultGizmoConfigGroup, ()>> =
+    Mutex::new(GizmoBuffer::new());
+
+/// Lets you use bevy gizmos outside of systems.
+pub struct GlobalGizmosPlugin;
+
+impl Plugin for GlobalGizmosPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_systems(Last, flush_global_gizmos.before(GizmoMeshSystems));
+    }
+}
+
+fn flush_global_gizmos(mut gizmos: Gizmos) {
+    let mut buffer = GizmoBuffer::new();
+    {
+        core::mem::swap(&mut buffer, &mut GLOBAL_GIZMO.lock().unwrap());
+    }
+    gizmos.strip_positions.extend(buffer.strip_positions);
+    gizmos.strip_colors.extend(buffer.strip_colors);
+    gizmos.list_positions.extend(buffer.list_positions);
+    gizmos.list_colors.extend(buffer.list_colors);
+}
+
+/// A global gizmo context for use outside of bevy systems.
+///
+/// # Example
+/// ```
+/// # use bevy_gizmos::prelude::*;
+/// # use bevy_math::prelude::*;
+/// # use bevy_color::palettes::basic::WHITE;
+/// fn draw() {
+///     gizmo().sphere(Isometry3d::IDENTITY, 0.5, WHITE);
+/// }
+/// ```
+pub fn gizmo() -> impl core::ops::DerefMut<Target = GizmoBuffer<DefaultGizmoConfigGroup, ()>> {
+    GLOBAL_GIZMO.lock().unwrap()
+}
diff --git a/crates/bevy_gizmos/src/lib.rs b/crates/bevy_gizmos/src/lib.rs
index 9d6f6500f1476..a693c43d26e80 100755
--- a/crates/bevy_gizmos/src/lib.rs
+++ b/crates/bevy_gizmos/src/lib.rs
@@ -30,6 +30,7 @@ pub mod config;
 pub mod cross;
 pub mod curves;
 pub mod gizmos;
+mod global;
 pub mod grid;
 pub mod primitives;
 pub mod retained;
@@ -52,6 +53,7 @@ pub mod prelude {
             GizmoLineConfig, GizmoLineJoint, GizmoLineStyle,
         },
         gizmos::Gizmos,
+        global::gizmo,
         primitives::{dim2::GizmoPrimitive2d, dim3::GizmoPrimitive3d},
         retained::Gizmo,
         AppGizmoBuilder, GizmoAsset,
@@ -92,7 +94,7 @@ impl Plugin for GizmoPlugin {
             // We insert the Resource GizmoConfigStore into the world implicitly here if it does not exist.
             .init_gizmo_group::<DefaultGizmoConfigGroup>();
 
-        app.add_plugins(aabb::AabbGizmoPlugin);
+        app.add_plugins((aabb::AabbGizmoPlugin, global::GlobalGizmosPlugin));
 
         #[cfg(feature = "bevy_light")]
         app.add_plugins(LightGizmoPlugin);

From 0303bd664b76ea0ae5ed1473545467cf30cebcfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Mockers?= <francois.mockers@vleue.com>
Date: Mon, 15 Dec 2025 21:30:09 +0100
Subject: [PATCH 126/133] disable screenrecording on windows (#22130)

# Objective

- Screen Recording is not ready to be exposed, and very hard to build on
windows

## Solution

- Disable it for now on windows

---------

Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
Co-authored-by: JMS55 <47158642+JMS55@users.noreply.github.com>
---
 crates/bevy_dev_tools/Cargo.toml              |   4 +-
 crates/bevy_dev_tools/src/easy_screenshot.rs  | 246 +++++++++++-------
 .../release-notes/easy_marketing_material.md  |   2 +
 3 files changed, 155 insertions(+), 97 deletions(-)

diff --git a/crates/bevy_dev_tools/Cargo.toml b/crates/bevy_dev_tools/Cargo.toml
index 36854b3f5088e..9d1506356e215 100644
--- a/crates/bevy_dev_tools/Cargo.toml
+++ b/crates/bevy_dev_tools/Cargo.toml
@@ -10,7 +10,7 @@ keywords = ["bevy"]
 
 [features]
 bevy_ci_testing = ["serde", "ron"]
-screenrecording = ["x264"]
+screenrecording = ["dep:x264"]
 webgl = ["bevy_render/webgl"]
 webgpu = ["bevy_render/webgpu"]
 
@@ -40,6 +40,8 @@ bevy_state = { path = "../bevy_state", version = "0.18.0-dev" }
 serde = { version = "1.0", features = ["derive"], optional = true }
 ron = { version = "0.12", optional = true }
 tracing = { version = "0.1", default-features = false, features = ["std"] }
+
+[target.'cfg(not(target_os = "windows"))'.dependencies]
 x264 = { version = "0.5.0", optional = true }
 
 [lints]
diff --git a/crates/bevy_dev_tools/src/easy_screenshot.rs b/crates/bevy_dev_tools/src/easy_screenshot.rs
index 4b5933038313e..84f93e9879820 100644
--- a/crates/bevy_dev_tools/src/easy_screenshot.rs
+++ b/crates/bevy_dev_tools/src/easy_screenshot.rs
@@ -1,25 +1,13 @@
 #[cfg(feature = "screenrecording")]
 use core::time::Duration;
 use std::time::{SystemTime, UNIX_EPOCH};
-#[cfg(feature = "screenrecording")]
-use std::{fs::File, io::Write, sync::mpsc::channel};
 
 use bevy_app::{App, Plugin, Update};
 use bevy_ecs::prelude::*;
-#[cfg(feature = "screenrecording")]
-use bevy_image::Image;
 use bevy_input::{common_conditions::input_just_pressed, keyboard::KeyCode};
-#[cfg(feature = "screenrecording")]
-use bevy_render::view::screenshot::ScreenshotCaptured;
 use bevy_render::view::screenshot::{save_to_disk, Screenshot};
-#[cfg(feature = "screenrecording")]
-use bevy_time::Time;
 use bevy_window::{PrimaryWindow, Window};
-#[cfg(feature = "screenrecording")]
-use tracing::info;
-#[cfg(feature = "screenrecording")]
-use x264::{Colorspace, Encoder, Setup};
-#[cfg(feature = "screenrecording")]
+#[cfg(all(not(target_os = "windows"), feature = "screenrecording"))]
 pub use x264::{Preset, Tune};
 
 /// File format the screenshot will be saved in
@@ -82,6 +70,50 @@ impl Plugin for EasyScreenshotPlugin {
     }
 }
 
+/// Placeholder
+#[cfg(all(target_os = "windows", feature = "screenrecording"))]
+pub enum Preset {
+    /// Placeholder
+    Ultrafast,
+    /// Placeholder
+    Superfast,
+    /// Placeholder
+    Veryfast,
+    /// Placeholder
+    Faster,
+    /// Placeholder
+    Fast,
+    /// Placeholder
+    Medium,
+    /// Placeholder
+    Slow,
+    /// Placeholder
+    Slower,
+    /// Placeholder
+    Veryslow,
+    /// Placeholder
+    Placebo,
+}
+
+/// Placeholder
+#[cfg(all(target_os = "windows", feature = "screenrecording"))]
+pub enum Tune {
+    /// Placeholder
+    None,
+    /// Placeholder
+    Film,
+    /// Placeholder
+    Animation,
+    /// Placeholder
+    Grain,
+    /// Placeholder
+    StillImage,
+    /// Placeholder
+    Psnr,
+    /// Placeholder
+    Ssim,
+}
+
 #[cfg(feature = "screenrecording")]
 /// Add this plugin to your app to enable easy screen recording.
 pub struct EasyScreenRecordPlugin {
@@ -107,13 +139,6 @@ impl Default for EasyScreenRecordPlugin {
     }
 }
 
-#[cfg(feature = "screenrecording")]
-enum RecordCommand {
-    Start(String, Preset, Tune),
-    Stop,
-    Frame(Image),
-}
-
 #[cfg(feature = "screenrecording")]
 /// Controls screen recording
 #[derive(Message)]
@@ -126,90 +151,118 @@ pub enum RecordScreen {
 
 #[cfg(feature = "screenrecording")]
 impl Plugin for EasyScreenRecordPlugin {
+    #[cfg_attr(
+        target_os = "windows",
+        expect(unused_variables, reason = "not working on windows")
+    )]
     fn build(&self, app: &mut App) {
-        let (tx, rx) = channel::<RecordCommand>();
+        #[cfg(target_os = "windows")]
+        {
+            tracing::warn!("Screen recording is not currently supported on Windows: see https://github.com/bevyengine/bevy/issues/22132");
+        }
+        #[cfg(not(target_os = "windows"))]
+        {
+            use bevy_image::Image;
+            use bevy_render::view::screenshot::ScreenshotCaptured;
+            use bevy_time::Time;
+            use std::{fs::File, io::Write, sync::mpsc::channel};
+            use tracing::info;
+            use x264::{Colorspace, Encoder, Setup};
 
-        let frame_time = self.frame_time;
+            enum RecordCommand {
+                Start(String, Preset, Tune),
+                Stop,
+                Frame(Image),
+            }
 
-        std::thread::spawn(move || {
-            let mut encoder: Option<Encoder> = None;
-            let mut setup = None;
-            let mut file: Option<File> = None;
-            let mut frame = 0;
-            loop {
-                let Ok(next) = rx.recv() else {
-                    break;
-                };
-                match next {
-                    RecordCommand::Start(name, preset, tune) => {
-                        info!("starting recording at {}", name);
-                        file = Some(File::create(name).unwrap());
-                        setup = Some(Setup::preset(preset, tune, false, true).high());
-                    }
-                    RecordCommand::Stop => {
-                        info!("stopping recording");
-                        if let Some(encoder) = encoder.take() {
-                            let mut flush = encoder.flush();
-                            let mut file = file.take().unwrap();
-                            while let Some(result) = flush.next() {
-                                let (data, _) = result.unwrap();
-                                file.write_all(data.entirety()).unwrap();
-                            }
+            let (tx, rx) = channel::<RecordCommand>();
+
+            let frame_time = self.frame_time;
+
+            std::thread::spawn(move || {
+                let mut encoder: Option<Encoder> = None;
+                let mut setup = None;
+                let mut file: Option<File> = None;
+                let mut frame = 0;
+                loop {
+                    let Ok(next) = rx.recv() else {
+                        break;
+                    };
+                    match next {
+                        RecordCommand::Start(name, preset, tune) => {
+                            info!("starting recording at {}", name);
+                            file = Some(File::create(name).unwrap());
+                            setup = Some(Setup::preset(preset, tune, false, true).high());
                         }
-                    }
-                    RecordCommand::Frame(image) => {
-                        if let Some(setup) = setup.take() {
-                            let mut new_encoder = setup
-                                .fps((1000 / frame_time.as_millis()) as u32, 1)
-                                .build(Colorspace::RGB, image.width() as i32, image.height() as i32)
-                                .unwrap();
-                            let headers = new_encoder.headers().unwrap();
-                            file.as_mut()
-                                .unwrap()
-                                .write_all(headers.entirety())
-                                .unwrap();
-                            encoder = Some(new_encoder);
+                        RecordCommand::Stop => {
+                            info!("stopping recording");
+                            if let Some(encoder) = encoder.take() {
+                                let mut flush = encoder.flush();
+                                let mut file = file.take().unwrap();
+                                while let Some(result) = flush.next() {
+                                    let (data, _) = result.unwrap();
+                                    file.write_all(data.entirety()).unwrap();
+                                }
+                            }
                         }
-                        if let Some(encoder) = encoder.as_mut() {
-                            let pts = (frame_time.as_millis() * frame) as i64;
-
-                            frame += 1;
-                            let (data, _) = encoder
-                                .encode(
-                                    pts,
-                                    x264::Image::rgb(
+                        RecordCommand::Frame(image) => {
+                            if let Some(setup) = setup.take() {
+                                let mut new_encoder = setup
+                                    .fps((1000 / frame_time.as_millis()) as u32, 1)
+                                    .build(
+                                        Colorspace::RGB,
                                         image.width() as i32,
                                         image.height() as i32,
-                                        &image.try_into_dynamic().unwrap().to_rgb8(),
-                                    ),
-                                )
-                                .unwrap();
-                            file.as_mut().unwrap().write_all(data.entirety()).unwrap();
+                                    )
+                                    .unwrap();
+                                let headers = new_encoder.headers().unwrap();
+                                file.as_mut()
+                                    .unwrap()
+                                    .write_all(headers.entirety())
+                                    .unwrap();
+                                encoder = Some(new_encoder);
+                            }
+                            if let Some(encoder) = encoder.as_mut() {
+                                let pts = (frame_time.as_millis() * frame) as i64;
+
+                                frame += 1;
+                                let (data, _) = encoder
+                                    .encode(
+                                        pts,
+                                        x264::Image::rgb(
+                                            image.width() as i32,
+                                            image.height() as i32,
+                                            &image.try_into_dynamic().unwrap().to_rgb8(),
+                                        ),
+                                    )
+                                    .unwrap();
+                                file.as_mut().unwrap().write_all(data.entirety()).unwrap();
+                            }
                         }
                     }
                 }
-            }
-        });
+            });
 
-        let frame_time = self.frame_time;
+            let frame_time = self.frame_time;
 
-        app.add_message::<RecordScreen>().add_systems(
-            Update,
-            (
-                (move |mut messages: MessageWriter<RecordScreen>, mut recording: Local<bool>| {
-                    *recording = !*recording;
-                    if *recording {
-                        messages.write(RecordScreen::Start);
-                    } else {
-                        messages.write(RecordScreen::Stop);
-                    }
-                })
-                .run_if(input_just_pressed(self.toggle)),
-                {
-                    let tx = tx.clone();
-                    let preset = self.preset;
-                    let tune = self.tune;
-                    move |mut commands: Commands,
+            app.add_message::<RecordScreen>().add_systems(
+                Update,
+                (
+                    (move |mut messages: MessageWriter<RecordScreen>,
+                           mut recording: Local<bool>| {
+                        *recording = !*recording;
+                        if *recording {
+                            messages.write(RecordScreen::Start);
+                        } else {
+                            messages.write(RecordScreen::Stop);
+                        }
+                    })
+                    .run_if(input_just_pressed(self.toggle)),
+                    {
+                        let tx = tx.clone();
+                        let preset = self.preset;
+                        let tune = self.tune;
+                        move |mut commands: Commands,
                           mut recording: Local<bool>,
                           mut messages: MessageReader<RecordScreen>,
                           window: Single<&Window, With<PrimaryWindow>>,
@@ -251,9 +304,10 @@ impl Plugin for EasyScreenRecordPlugin {
                             );
                         }
                     }
-                },
-            )
-                .chain(),
-        );
+                    },
+                )
+                    .chain(),
+            );
+        }
     }
 }
diff --git a/release-content/release-notes/easy_marketing_material.md b/release-content/release-notes/easy_marketing_material.md
index 953db7e9dcaf2..943a9b26a61e7 100644
--- a/release-content/release-notes/easy_marketing_material.md
+++ b/release-content/release-notes/easy_marketing_material.md
@@ -7,3 +7,5 @@ pull_requests: [21235, 21237]
 Bevy can take a screenshot of what's rendered since 0.11. This is now easier to setup to help you create marketing material, so that you can take screenshot with consistent formatting with the new `EasyScreenshotPlugin`. With its default settings, once you add this plugin to your application, a PNG screenshot will be taken when you press the `PrintScreen` key. You can change the trigger key, or the screenshot format between PNG, JPEG or BMP.
 
 It is now possible to record a movie from Bevy, with the new `EasyScreenRecordPlugin`. This plugins add a toggle key, space bar by default, that will toggle screen recording. Recording can also be started and stopped programmatically with the `RecordScreen` messages.
+
+Screen recording is not working for now on Windows.

From 5ac16eb00845ac97a9a625b5ac1554b0b92b6c58 Mon Sep 17 00:00:00 2001
From: Kevin Chen <chen.kevin.f@gmail.com>
Date: Mon, 15 Dec 2025 15:36:10 -0500
Subject: [PATCH 127/133] Fix: Ignores nodes that are hidden via their parents
 in directional nav (#22123)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Objective

- Fixes #21950

## Solution

- Updated the query as suggested in the issue to also check for
`InheritedVisibility`. Entities that have `Visibility::INHERITED` and
`InheritedVisibility::HIDDEN` should also be ignored for directional
navigation

## Testing

- Did you test these changes? If so, how?
I did not test this change at all! And I wasn’t sure how best to set up
an automated test for this since there is not an existing one for that
function, else I would have. However, the logic change is simple at
least… So if a test is desired, just let me know and please provide me
with a little direction :)
---
 .../src/directional_navigation.rs             | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/crates/bevy_input_focus/src/directional_navigation.rs b/crates/bevy_input_focus/src/directional_navigation.rs
index b4ce6ff319e5b..98e6407a1a9c7 100644
--- a/crates/bevy_input_focus/src/directional_navigation.rs
+++ b/crates/bevy_input_focus/src/directional_navigation.rs
@@ -60,7 +60,7 @@
 
 use alloc::vec::Vec;
 use bevy_app::prelude::*;
-use bevy_camera::visibility::Visibility;
+use bevy_camera::visibility::{InheritedVisibility, Visibility};
 use bevy_ecs::{
     entity::{EntityHashMap, EntityHashSet},
     prelude::*,
@@ -749,6 +749,7 @@ fn auto_rebuild_ui_navigation_graph(
             &ComputedNode,
             &UiGlobalTransform,
             Option<&Visibility>,
+            Option<&InheritedVisibility>,
         ),
         With<AutoDirectionalNavigation>,
     >,
@@ -759,18 +760,24 @@ fn auto_rebuild_ui_navigation_graph(
 
     let nodes: Vec<FocusableArea> = all_nodes
         .iter()
-        .filter_map(|(entity, computed, transform, visibility)| {
-            // Skip hidden or zero-size nodes
-            if computed.is_empty() || matches!(visibility, Some(Visibility::Hidden)) {
-                return None;
-            }
-            let (_scale, _rotation, translation) = transform.to_scale_angle_translation();
-            Some(FocusableArea {
-                entity,
-                position: translation,
-                size: computed.size(),
-            })
-        })
+        .filter_map(
+            |(entity, computed, transform, visibility, inherited_visibility)| {
+                // Skip hidden or zero-size nodes
+                if computed.is_empty()
+                    || matches!(visibility, Some(Visibility::Hidden))
+                    || (matches!(visibility, Some(Visibility::Inherited))
+                        && matches!(inherited_visibility, Some(&InheritedVisibility::HIDDEN)))
+                {
+                    return None;
+                }
+                let (_scale, _rotation, translation) = transform.to_scale_angle_translation();
+                Some(FocusableArea {
+                    entity,
+                    position: translation,
+                    size: computed.size(),
+                })
+            },
+        )
         .collect();
 
     // clear the old nav map between rebuilds to ensure any removed entities' edges are pruned

From 3ab5c2c746506ecee720c11648ed31b98c543088 Mon Sep 17 00:00:00 2001
From: Chris Biscardi <chris@christopherbiscardi.com>
Date: Mon, 15 Dec 2025 12:38:49 -0800
Subject: [PATCH 128/133] GltfExtensionHandler::on_texture: pass Texture
 references (#22131)

# Objective

extension hooks for `on_texture` currently pass the extension data and
not the gltf object.

## Solution

`IoTaskPool::scope` preserves ordering if the futures are only spawned
from the root scope, so we can use that to zip with the texture
references for hooks
---
 crates/bevy_gltf/src/loader/extensions/mod.rs |  9 +-------
 crates/bevy_gltf/src/loader/mod.rs            | 22 ++++++-------------
 2 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/crates/bevy_gltf/src/loader/extensions/mod.rs b/crates/bevy_gltf/src/loader/extensions/mod.rs
index d024f39175c94..370b767f723b1 100644
--- a/crates/bevy_gltf/src/loader/extensions/mod.rs
+++ b/crates/bevy_gltf/src/loader/extensions/mod.rs
@@ -99,18 +99,11 @@ pub trait GltfExtensionHandler: Send + Sync {
     }
 
     /// Called when an individual texture is processed
-    /// Unlike other hooks, this hook does not receive its glTF
-    /// object due to internal constraints.
     #[expect(
         unused,
         reason = "default trait implementations do not use the arguments because they are no-ops"
     )]
-    fn on_texture(
-        &mut self,
-        extension_data: Option<&serde_json::Map<String, serde_json::Value>>,
-        texture: Handle<bevy_image::Image>,
-    ) {
-    }
+    fn on_texture(&mut self, gltf_texture: &gltf::Texture, texture: Handle<bevy_image::Image>) {}
 
     /// Called when an individual material is processed
     #[expect(
diff --git a/crates/bevy_gltf/src/loader/mod.rs b/crates/bevy_gltf/src/loader/mod.rs
index 68e5eb41dc69d..d18324a3ba9b0 100644
--- a/crates/bevy_gltf/src/loader/mod.rs
+++ b/crates/bevy_gltf/src/loader/mod.rs
@@ -644,10 +644,7 @@ impl GltfLoader {
                 image.process_loaded_texture(load_context, &mut texture_handles);
                 // let extensions handle texture data
                 for extension in extensions.iter_mut() {
-                    extension.on_texture(
-                        texture.extensions(),
-                        texture_handles.last().unwrap().clone(),
-                    );
+                    extension.on_texture(&texture, texture_handles.last().unwrap().clone());
                 }
             }
         } else {
@@ -658,9 +655,8 @@ impl GltfLoader {
                         let asset_path = load_context.path().clone();
                         let linear_textures = &linear_textures;
                         let buffer_data = &buffer_data;
-                        let extension_data = gltf_texture.extensions().map(ToOwned::to_owned);
                         scope.spawn(async move {
-                            let result = load_image(
+                            load_image(
                                 gltf_texture,
                                 buffer_data,
                                 linear_textures,
@@ -669,23 +665,19 @@ impl GltfLoader {
                                 default_sampler,
                                 settings,
                             )
-                            .await;
-                            (extension_data, result)
+                            .await
                         });
                     });
                 })
                 .into_iter()
-                .for_each(|(extension_data, result)| match result {
+                // order is preserved if the futures are only spawned from the root scope
+                .zip(gltf.textures())
+                .for_each(|(result, texture)| match result {
                     Ok(image) => {
                         image.process_loaded_texture(load_context, &mut texture_handles);
                         // let extensions handle texture data
-                        // We do this differently here because of the IoTaskPool vs
-                        // gltf::Texture lifetimes
                         for extension in extensions.iter_mut() {
-                            extension.on_texture(
-                                extension_data.as_ref(),
-                                texture_handles.last().unwrap().clone(),
-                            );
+                            extension.on_texture(&texture, texture_handles.last().unwrap().clone());
                         }
                     }
                     Err(err) => {

From 0558f321ec4d7172d98cb934eb69e1a1e5b939b0 Mon Sep 17 00:00:00 2001
From: robtfm <50659922+robtfm@users.noreply.github.com>
Date: Sun, 30 Nov 2025 16:20:16 +0000
Subject: [PATCH 129/133] InfallibleMesh

---
 .../benches/bevy_render/compute_normals.rs    |    4 +-
 crates/bevy_camera/src/primitives.rs          |    3 +-
 crates/bevy_gltf/src/loader/mod.rs            |    7 +-
 crates/bevy_mesh/src/mesh.rs                  | 1493 ++++++++---------
 crates/bevy_mesh/src/mikktspace.rs            |    8 +-
 crates/bevy_mesh/src/primitives/dim2.rs       |   69 +-
 .../bevy_mesh/src/primitives/dim3/capsule.rs  |    6 +-
 crates/bevy_mesh/src/primitives/dim3/cone.rs  |    8 +-
 .../src/primitives/dim3/conical_frustum.rs    |    6 +-
 .../bevy_mesh/src/primitives/dim3/cuboid.rs   |    6 +-
 .../bevy_mesh/src/primitives/dim3/cylinder.rs |    6 +-
 crates/bevy_mesh/src/primitives/dim3/plane.rs |    6 +-
 .../src/primitives/dim3/polyline3d.rs         |    6 +-
 .../src/primitives/dim3/segment3d.rs          |    6 +-
 .../bevy_mesh/src/primitives/dim3/sphere.rs   |   12 +-
 .../src/primitives/dim3/tetrahedron.rs        |    6 +-
 crates/bevy_mesh/src/primitives/dim3/torus.rs |    6 +-
 .../src/primitives/dim3/triangle3d.rs         |    6 +-
 crates/bevy_mesh/src/primitives/extrusion.rs  |   14 +-
 crates/bevy_mesh/src/primitives/mod.rs        |   15 +-
 crates/bevy_pbr/src/decal/forward.rs          |    2 +-
 crates/bevy_pbr/src/meshlet/from_mesh.rs      |   10 +-
 .../mesh_picking/ray_cast/intersections.rs    |   15 +-
 crates/bevy_render/src/mesh/allocator.rs      |    5 +-
 crates/bevy_render/src/mesh/mod.rs            |   21 +-
 crates/bevy_solari/src/scene/blas.rs          |    7 +-
 examples/2d/mesh2d_manual.rs                  |    4 +-
 examples/2d/mesh2d_vertex_color_texture.rs    |    4 +-
 examples/3d/generate_custom_mesh.rs           |    6 +-
 examples/3d/lines.rs                          |    8 +-
 examples/3d/motion_blur.rs                    |    3 +-
 examples/3d/solari.rs                         |   14 +-
 examples/3d/vertex_colors.rs                  |    7 +-
 examples/animation/custom_skinned_mesh.rs     |    4 +-
 examples/animation/morph_targets.rs           |    2 +-
 examples/asset/alter_mesh.rs                  |    2 +-
 examples/gltf/query_gltf_primitives.rs        |    2 +-
 examples/math/custom_primitives.rs            |    6 +-
 examples/math/sampling_primitives.rs          |    3 +-
 .../custom_vertex_attribute.rs                |    4 +-
 .../specialized_mesh_pipeline.rs              |    4 +-
 .../tools/scene_viewer/morph_viewer_plugin.rs |    2 +-
 tests/3d/test_invalid_skinned_mesh.rs         |    4 +-
 43 files changed, 929 insertions(+), 903 deletions(-)

diff --git a/benches/benches/bevy_render/compute_normals.rs b/benches/benches/bevy_render/compute_normals.rs
index 74fcbfe7b11bd..0306038196e21 100644
--- a/benches/benches/bevy_render/compute_normals.rs
+++ b/benches/benches/bevy_render/compute_normals.rs
@@ -5,7 +5,7 @@ use rand::random;
 use std::time::{Duration, Instant};
 
 use bevy_asset::RenderAssetUsages;
-use bevy_mesh::{Indices, Mesh, PrimitiveTopology};
+use bevy_mesh::{Indices, InfallibleMesh, Mesh, PrimitiveTopology};
 
 const GRID_SIZE: usize = 256;
 
@@ -28,7 +28,7 @@ fn compute_normals(c: &mut Criterion) {
             .flat_map(|i| std::iter::repeat(i).zip(0..GRID_SIZE))
             .map(|(i, j)| [i as f32, j as f32, random::<f32>()])
             .collect::<Vec<_>>();
-        Mesh::new(
+        InfallibleMesh::new(
             PrimitiveTopology::TriangleList,
             RenderAssetUsages::MAIN_WORLD,
         )
diff --git a/crates/bevy_camera/src/primitives.rs b/crates/bevy_camera/src/primitives.rs
index 9d2a5203c6669..c3edf3f5f1a77 100644
--- a/crates/bevy_camera/src/primitives.rs
+++ b/crates/bevy_camera/src/primitives.rs
@@ -23,8 +23,7 @@ impl MeshAabb for Mesh {
             return Some(aabb.into());
         }
 
-        let Ok(VertexAttributeValues::Float32x3(values)) =
-            self.try_attribute(Mesh::ATTRIBUTE_POSITION)
+        let Ok(VertexAttributeValues::Float32x3(values)) = self.attribute(Mesh::ATTRIBUTE_POSITION)
         else {
             return None;
         };
diff --git a/crates/bevy_gltf/src/loader/mod.rs b/crates/bevy_gltf/src/loader/mod.rs
index d18324a3ba9b0..2667b7ca3b86c 100644
--- a/crates/bevy_gltf/src/loader/mod.rs
+++ b/crates/bevy_gltf/src/loader/mod.rs
@@ -31,7 +31,7 @@ use bevy_math::{Mat4, Vec3};
 use bevy_mesh::{
     morph::{MeshMorphWeights, MorphAttributes, MorphTargetImage, MorphWeights},
     skinning::{SkinnedMesh, SkinnedMeshInverseBindposes},
-    Indices, Mesh, Mesh3d, MeshVertexAttribute, PrimitiveTopology,
+    Indices, InfallibleMesh, Mesh, Mesh3d, MeshVertexAttribute, PrimitiveTopology,
 };
 #[cfg(feature = "pbr_transmission_textures")]
 use bevy_pbr::UvChannel;
@@ -727,7 +727,7 @@ impl GltfLoader {
                 };
                 let primitive_topology = primitive_topology(primitive.mode())?;
 
-                let mut mesh = Mesh::new(primitive_topology, settings.load_meshes);
+                let mut mesh = InfallibleMesh::new(primitive_topology, settings.load_meshes);
 
                 // Read vertex attributes
                 for (semantic, accessor) in primitive.attributes() {
@@ -837,7 +837,8 @@ impl GltfLoader {
                     });
                 }
 
-                let mesh_handle = load_context.add_labeled_asset(primitive_label.to_string(), mesh);
+                let mesh_handle =
+                    load_context.add_labeled_asset(primitive_label.to_string(), mesh.into());
                 primitives.push(super::GltfPrimitive::new(
                     &gltf_mesh,
                     &primitive,
diff --git a/crates/bevy_mesh/src/mesh.rs b/crates/bevy_mesh/src/mesh.rs
index ca224d6e286eb..a1ce73ddeb943 100644
--- a/crates/bevy_mesh/src/mesh.rs
+++ b/crates/bevy_mesh/src/mesh.rs
@@ -133,6 +133,604 @@ impl<T> From<Option<T>> for MeshExtractableData<T> {
     }
 }
 
+/// A struct which wraps a `Mesh` which is guaranteed to not be extracted to the `RenderWorld`,
+/// that can be converted into a normal `Mesh` using `InfallibleMesh::into_mesh`.
+/// Designed for use during cpu-side mesh construction. Methods on this struct whose `Mesh`
+/// counterparts may return `MeshAccessError::ExtractedToRenderWorld` instead return plain values.
+#[derive(Asset, Debug, Clone, Reflect, PartialEq)]
+#[reflect(Clone)]
+pub struct InfallibleMesh(Mesh);
+
+impl InfallibleMesh {
+    /// Construct a new mesh. You need to provide a [`PrimitiveTopology`] so that the
+    /// renderer knows how to treat the vertex data. Most of the time this will be
+    /// [`PrimitiveTopology::TriangleList`].
+    pub fn new(primitive_topology: PrimitiveTopology, asset_usage: RenderAssetUsages) -> Self {
+        Self(Mesh::new(primitive_topology, asset_usage))
+    }
+
+    /// Returns the topology of the mesh.
+    pub fn primitive_topology(&self) -> PrimitiveTopology {
+        self.0.primitive_topology
+    }
+
+    /// Sets the data for a vertex attribute (position, normal, etc.). The name will
+    /// often be one of the associated constants such as [`Mesh::ATTRIBUTE_POSITION`].
+    ///
+    /// `Aabb` of entities with modified mesh are not updated automatically.
+    ///
+    /// Returns an error if the mesh data has been extracted to `RenderWorld`.
+    ///
+    /// # Panics
+    /// Panics when the format of the values does not match the attribute's format.
+    pub fn insert_attribute(
+        &mut self,
+        attribute: MeshVertexAttribute,
+        values: impl Into<VertexAttributeValues>,
+    ) {
+        self.0.insert_attribute(attribute, values).unwrap();
+    }
+
+    /// Consumes the mesh and returns a mesh with data set for a vertex attribute (position, normal, etc.).
+    /// The name will often be one of the associated constants such as [`Mesh::ATTRIBUTE_POSITION`].
+    ///
+    /// (Alternatively, you can use [`InfallibleMesh::insert_attribute`] to mutate an existing mesh in-place)
+    ///
+    /// `Aabb` of entities with modified mesh are not updated automatically.
+    ///
+    /// # Panics
+    /// Panics when the format of the values does not match the attribute's format.
+    #[must_use]
+    #[inline]
+    pub fn with_inserted_attribute(
+        mut self,
+        attribute: MeshVertexAttribute,
+        values: impl Into<VertexAttributeValues>,
+    ) -> Self {
+        self.insert_attribute(attribute, values);
+        self
+    }
+
+    /// Removes the data for a vertex attribute
+    pub fn remove_attribute(
+        &mut self,
+        attribute: impl Into<MeshVertexAttributeId>,
+    ) -> Option<VertexAttributeValues> {
+        match self.0.remove_attribute(attribute) {
+            Ok(attr) => Some(attr),
+            Err(MeshAccessError::NotFound) => None,
+            _ => unreachable!(),
+        }
+    }
+
+    /// Consumes the mesh and returns a mesh without the data for a vertex attribute
+    ///
+    /// (Alternatively, you can use [`InfallibleMesh::remove_attribute`] to mutate an existing mesh in-place)
+    #[must_use]
+    pub fn with_removed_attribute(mut self, attribute: impl Into<MeshVertexAttributeId>) -> Self {
+        self.remove_attribute(attribute);
+        self
+    }
+
+    /// Returns a bool indicating if the attribute is present in this mesh's vertex data.
+    #[inline]
+    pub fn contains_attribute(&self, id: impl Into<MeshVertexAttributeId>) -> bool {
+        self.0
+            .attributes
+            .as_ref()
+            .expect(MESH_EXTRACTED_ERROR)
+            .contains_key(&id.into())
+    }
+
+    /// Retrieves the data currently set to the vertex attribute with the specified [`MeshVertexAttributeId`].
+    #[inline]
+    pub fn attribute(
+        &self,
+        id: impl Into<MeshVertexAttributeId>,
+    ) -> Option<&VertexAttributeValues> {
+        self.0.attribute_option(id).expect(MESH_EXTRACTED_ERROR)
+    }
+
+    /// Retrieves the data currently set to the vertex attribute with the specified `name` mutably.
+    #[inline]
+    pub fn attribute_mut(
+        &mut self,
+        id: impl Into<MeshVertexAttributeId>,
+    ) -> Option<&mut VertexAttributeValues> {
+        self.0.attribute_mut_option(id).expect(MESH_EXTRACTED_ERROR)
+    }
+
+    /// Returns an iterator that yields references to the data of each vertex attribute.
+    pub fn attributes(
+        &self,
+    ) -> impl Iterator<Item = (&MeshVertexAttribute, &VertexAttributeValues)> {
+        self.0.attributes().expect(MESH_EXTRACTED_ERROR)
+    }
+
+    /// Returns an iterator that yields mutable references to the data of each vertex attribute.
+    pub fn attributes_mut(
+        &mut self,
+    ) -> impl Iterator<Item = (&MeshVertexAttribute, &mut VertexAttributeValues)> {
+        self.0.attributes_mut().expect(MESH_EXTRACTED_ERROR)
+    }
+
+    /// Sets the vertex indices of the mesh. They describe how triangles are constructed out of the
+    /// vertex attributes and are therefore only useful for the [`PrimitiveTopology`] variants
+    /// that use triangles.
+    #[inline]
+    pub fn insert_indices(&mut self, indices: Indices) {
+        self.0.insert_indices(indices).expect(MESH_EXTRACTED_ERROR);
+    }
+
+    /// Consumes the mesh and returns a mesh with the given vertex indices. They describe how triangles
+    /// are constructed out of the vertex attributes and are therefore only useful for the
+    /// [`PrimitiveTopology`] variants that use triangles.
+    ///
+    /// (Alternatively, you can use [`InfallibleMesh::insert_indices`] to mutate an existing mesh in-place)
+    #[must_use]
+    #[inline]
+    pub fn with_inserted_indices(mut self, indices: Indices) -> Self {
+        self.insert_indices(indices);
+        self
+    }
+
+    /// Retrieves the vertex `indices` of the mesh, returns None if not found.
+    #[inline]
+    pub fn indices(&self) -> Option<&Indices> {
+        self.0.indices.as_ref_option().expect(MESH_EXTRACTED_ERROR)
+    }
+
+    /// Retrieves the vertex `indices` of the mesh mutably.
+    #[inline]
+    pub fn indices_mut(&mut self) -> Option<&mut Indices> {
+        self.0.indices_mut_option().expect(MESH_EXTRACTED_ERROR)
+    }
+
+    /// Removes the vertex `indices` from the mesh and returns them.
+    #[inline]
+    pub fn remove_indices(&mut self) -> Option<Indices> {
+        self.0.remove_indices().expect(MESH_EXTRACTED_ERROR)
+    }
+
+    /// Consumes the mesh and returns a mesh without the vertex `indices` of the mesh.
+    ///
+    /// (Alternatively, you can use [`InfallibleMesh::remove_indices`] to mutate an existing mesh in-place)
+    #[must_use]
+    pub fn with_removed_indices(mut self) -> Self {
+        self.remove_indices();
+        self
+    }
+
+    pub fn duplicate_vertices(&mut self) {
+        self.0.duplicate_vertices().expect(MESH_EXTRACTED_ERROR);
+    }
+
+    /// Consumes the mesh and returns a mesh with no shared vertices.
+    ///
+    /// This can dramatically increase the vertex count, so make sure this is what you want.
+    /// Does nothing if no [`Indices`] are set.
+    ///
+    /// (Alternatively, you can use [`InfallibleMesh::duplicate_vertices`] to mutate an existing mesh in-place)
+    #[must_use]
+    pub fn with_duplicated_vertices(self) -> Self {
+        Self(
+            self.0
+                .with_duplicated_vertices()
+                .expect(MESH_EXTRACTED_ERROR),
+        )
+    }
+
+    /// Inverts the winding of the indices such that all counter-clockwise triangles are now
+    /// clockwise and vice versa.
+    /// For lines, their start and end indices are flipped.
+    ///
+    /// Does nothing if no [`Indices`] are set.
+    /// If this operation succeeded, an [`Ok`] result is returned.
+    pub fn invert_winding(&mut self) -> Result<(), MeshWindingInvertError> {
+        self.0.invert_winding()
+    }
+
+    /// Consumes the mesh and returns a mesh with inverted winding of the indices such
+    /// that all counter-clockwise triangles are now clockwise and vice versa.
+    ///
+    /// Does nothing if no [`Indices`] are set.
+    pub fn with_inverted_winding(mut self) -> Result<Self, MeshWindingInvertError> {
+        self.0.invert_winding().map(|_| self)
+    }
+
+    /// Calculates the [`Mesh::ATTRIBUTE_NORMAL`] of a mesh.
+    /// If the mesh is indexed, this defaults to smooth normals. Otherwise, it defaults to flat
+    /// normals.
+    ///
+    /// # Panics
+    /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
+    /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].=
+    pub fn compute_normals(&mut self) {
+        self.0.compute_normals().expect(MESH_EXTRACTED_ERROR);
+    }
+
+    /// Calculates the [`Mesh::ATTRIBUTE_NORMAL`] of a mesh.
+    ///
+    /// # Panics
+    /// Panics if [`Indices`] are set or [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
+    /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
+    /// Consider calling [`InfallibleMesh::duplicate_vertices`] or exporting your mesh with normal
+    /// attributes.
+    /// FIXME: This should handle more cases since this is called as a part of gltf
+    /// mesh loading where we can't really blame users for loading meshes that might
+    /// not conform to the limitations here!
+    pub fn compute_flat_normals(&mut self) {
+        self.0.compute_flat_normals().expect(MESH_EXTRACTED_ERROR);
+    }
+
+    /// Calculates the [`Mesh::ATTRIBUTE_NORMAL`] of an indexed mesh, smoothing normals for shared
+    /// vertices.
+    ///
+    /// This method weights normals by the angles of the corners of connected triangles, thus
+    /// eliminating triangle area and count as factors in the final normal. This does make it
+    /// somewhat slower than [`InfallibleMesh::compute_area_weighted_normals`] which does not need to
+    /// greedily normalize each triangle's normal or calculate corner angles.
+    ///
+    /// If you would rather have the computed normals be weighted by triangle area, see
+    /// [`InfallibleMesh::compute_area_weighted_normals`] instead. If you need to weight them in some other
+    /// way, see [`InfallibleMesh::compute_custom_smooth_normals`].
+    ///
+    /// # Panics
+    /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
+    /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
+    /// Panics if the mesh does not have indices defined.
+    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
+    /// this as an error use [`InfallibleMesh::compute_smooth_normals`]
+    pub fn compute_smooth_normals(&mut self) {
+        self.0.compute_smooth_normals().expect(MESH_EXTRACTED_ERROR);
+    }
+
+    /// Calculates the [`Mesh::ATTRIBUTE_NORMAL`] of an indexed mesh, smoothing normals for shared
+    /// vertices.
+    ///
+    /// This method weights normals by the area of each triangle containing the vertex. Thus,
+    /// larger triangles will skew the normals of their vertices towards their own normal more
+    /// than smaller triangles will.
+    ///
+    /// This method is actually somewhat faster than [`InfallibleMesh::compute_smooth_normals`] because an
+    /// intermediate result of triangle normal calculation is already scaled by the triangle's area.
+    ///
+    /// If you would rather have the computed normals be influenced only by the angles of connected
+    /// edges, see [`InfallibleMesh::compute_smooth_normals`] instead. If you need to weight them in some
+    /// other way, see [`InfallibleMesh::compute_custom_smooth_normals`].
+    ///
+    /// # Panics
+    /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
+    /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
+    /// Panics if the mesh does not have indices defined.
+    pub fn compute_area_weighted_normals(&mut self) {
+        self.0
+            .compute_area_weighted_normals()
+            .expect(MESH_EXTRACTED_ERROR);
+    }
+
+    /// Calculates the [`Mesh::ATTRIBUTE_NORMAL`] of an indexed mesh, smoothing normals for shared
+    /// vertices.
+    ///
+    /// This method allows you to customize how normals are weighted via the `per_triangle` parameter,
+    /// which must be a function or closure that accepts 3 parameters:
+    /// - The indices of the three vertices of the triangle as a `[usize; 3]`.
+    /// - A reference to the values of the [`Mesh::ATTRIBUTE_POSITION`] of the mesh (`&[[f32; 3]]`).
+    /// - A mutable reference to the sums of all normals so far.
+    ///
+    /// See also the standard methods included in Bevy for calculating smooth normals:
+    /// - [`InfallibleMesh::compute_smooth_normals`]
+    /// - [`InfallibleMesh::compute_area_weighted_normals`]
+    ///
+    /// An example that would weight each connected triangle's normal equally, thus skewing normals
+    /// towards the planes divided into the most triangles:
+    /// ```
+    /// # use bevy_asset::RenderAssetUsages;
+    /// # use bevy_mesh::{Mesh, PrimitiveTopology, Meshable, MeshBuilder};
+    /// # use bevy_math::{Vec3, primitives::Cuboid};
+    /// # let mut mesh = Cuboid::default().mesh().build();
+    /// mesh.compute_custom_smooth_normals(|[a, b, c], positions, normals| {
+    ///     let normal = Vec3::from(bevy_mesh::triangle_normal(positions[a], positions[b], positions[c]));
+    ///     for idx in [a, b, c] {
+    ///         normals[idx] += normal;
+    ///     }
+    /// });
+    /// ```
+    ///
+    /// # Panics
+    /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
+    /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
+    /// Panics if the mesh does not have indices defined.
+    //
+    // FIXME: This should handle more cases since this is called as a part of gltf
+    // mesh loading where we can't really blame users for loading meshes that might
+    // not conform to the limitations here!
+    //
+    // When fixed, also update "Panics" sections of
+    // - [Mesh::compute_smooth_normals]
+    // - [Mesh::with_computed_smooth_normals]
+    // - [Mesh::compute_area_weighted_normals]
+    // - [Mesh::with_computed_area_weighted_normals]
+    pub fn compute_custom_smooth_normals(
+        &mut self,
+        per_triangle: impl FnMut([usize; 3], &[[f32; 3]], &mut [Vec3]),
+    ) {
+        self.0
+            .compute_custom_smooth_normals(per_triangle)
+            .expect(MESH_EXTRACTED_ERROR);
+    }
+
+    /// Consumes the mesh and returns a mesh with calculated [`Mesh::ATTRIBUTE_NORMAL`].
+    /// If the mesh is indexed, this defaults to smooth normals. Otherwise, it defaults to flat
+    /// normals.
+    ///
+    /// (Alternatively, you can use [`InfallibleMesh::compute_normals`] to mutate an existing mesh in-place)
+    ///
+    /// # Panics
+    /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
+    /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
+    #[must_use]
+    pub fn with_computed_normals(mut self) -> Self {
+        self.compute_normals();
+        self
+    }
+
+    /// Consumes the mesh and returns a mesh with calculated [`Mesh::ATTRIBUTE_NORMAL`].
+    ///
+    /// (Alternatively, you can use [`InfallibleMesh::compute_flat_normals`] to mutate an existing mesh in-place)
+    ///
+    /// # Panics
+    /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
+    /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
+    /// Panics if the mesh has indices defined
+    pub fn with_computed_flat_normals(mut self) -> Self {
+        self.compute_flat_normals();
+        self
+    }
+
+    /// Consumes the mesh and returns a mesh with calculated [`Mesh::ATTRIBUTE_NORMAL`].
+    ///
+    /// (Alternatively, you can use [`InfallibleMesh::compute_smooth_normals`] to mutate an existing mesh in-place)
+    ///
+    /// This method weights normals by the angles of triangle corners connected to each vertex. If
+    /// you would rather have the computed normals be weighted by triangle area, see
+    /// [`InfallibleMesh::with_computed_area_weighted_normals`] instead.
+    ///
+    /// # Panics
+    /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
+    /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
+    /// Panics if the mesh does not have indices defined.
+    pub fn with_computed_smooth_normals(mut self) -> Self {
+        self.compute_smooth_normals();
+        self
+    }
+
+    /// Consumes the mesh and returns a mesh with calculated [`Mesh::ATTRIBUTE_NORMAL`].
+    ///
+    /// (Alternatively, you can use [`InfallibleMesh::compute_area_weighted_normals`] to mutate an existing mesh in-place)
+    ///
+    /// This method weights normals by the area of each triangle containing the vertex. Thus,
+    /// larger triangles will skew the normals of their vertices towards their own normal more
+    /// than smaller triangles will. If you would rather have the computed normals be influenced
+    /// only by the angles of connected edges, see [`InfallibleMesh::with_computed_smooth_normals`] instead.
+    ///
+    /// # Panics
+    /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
+    /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
+    /// Panics if the mesh does not have indices defined.
+    pub fn with_computed_area_weighted_normals(mut self) -> Self {
+        self.compute_area_weighted_normals();
+        self
+    }
+
+    /// Generate tangents for the mesh using the `mikktspace` algorithm.
+    ///
+    /// Sets the [`Mesh::ATTRIBUTE_TANGENT`] attribute if successful.
+    /// Requires a [`PrimitiveTopology::TriangleList`] topology and the [`Mesh::ATTRIBUTE_POSITION`], [`Mesh::ATTRIBUTE_NORMAL`] and [`Mesh::ATTRIBUTE_UV_0`] attributes set.
+    #[cfg(feature = "bevy_mikktspace")]
+    pub fn generate_tangents(&mut self) -> Result<(), super::GenerateTangentsError> {
+        let tangents = super::generate_tangents_for_mesh(&self.0)?;
+        self.insert_attribute(Mesh::ATTRIBUTE_TANGENT, tangents);
+        Ok(())
+    }
+
+    /// Consumes the mesh and returns a mesh with tangents generated using the `mikktspace` algorithm.
+    ///
+    /// The resulting mesh will have the [`Mesh::ATTRIBUTE_TANGENT`] attribute if successful.
+    ///
+    /// (Alternatively, you can use [`InfallibleMesh::generate_tangents`] to mutate an existing mesh in-place)
+    ///
+    /// Requires a [`PrimitiveTopology::TriangleList`] topology and the [`Mesh::ATTRIBUTE_POSITION`], [`Mesh::ATTRIBUTE_NORMAL`] and [`Mesh::ATTRIBUTE_UV_0`] attributes set.
+    #[cfg(feature = "bevy_mikktspace")]
+    pub fn with_generated_tangents(mut self) -> Result<Self, super::GenerateTangentsError> {
+        self.generate_tangents()?;
+        Ok(self)
+    }
+
+    /// Merges the [`Mesh`] data of `other` with `self`. The attributes and indices of `other` will be appended to `self`.
+    ///
+    /// Note that attributes of `other` that don't exist on `self` will be ignored.
+    ///
+    /// `Aabb` of entities with modified mesh are not updated automatically.
+    ///
+    /// # Errors
+    ///
+    /// If any of the following conditions are not met, this function errors:
+    /// * All of the vertex attributes that have the same attribute id, must also
+    ///   have the same attribute type.
+    ///   For example two attributes with the same id, but where one is a
+    ///   [`VertexAttributeValues::Float32`] and the other is a
+    ///   [`VertexAttributeValues::Float32x3`], would be invalid.
+    /// * Both meshes must have the same primitive topology.
+    pub fn merge(&mut self, other: &Mesh) -> Result<(), MeshMergeError> {
+        self.0.merge(other)
+    }
+
+    /// Transforms the vertex positions, normals, and tangents of the mesh by the given [`Transform`].
+    ///
+    /// `Aabb` of entities with modified mesh are not updated automatically.
+    pub fn transformed_by(mut self, transform: Transform) -> Self {
+        self.transform_by(transform);
+        self
+    }
+
+    /// Transforms the vertex positions, normals, and tangents of the mesh in place by the given [`Transform`].
+    ///
+    /// `Aabb` of entities with modified mesh are not updated automatically.
+    pub fn transform_by(&mut self, transform: Transform) {
+        self.0.transform_by(transform).expect(MESH_EXTRACTED_ERROR);
+    }
+
+    /// Translates the vertex positions of the mesh by the given [`Vec3`].
+    ///
+    /// `Aabb` of entities with modified mesh are not updated automatically.
+    pub fn translated_by(mut self, translation: Vec3) -> Self {
+        self.translate_by(translation);
+        self
+    }
+
+    /// Translates the vertex positions of the mesh in place by the given [`Vec3`].
+    ///
+    /// `Aabb` of entities with modified mesh are not updated automatically.
+    pub fn translate_by(&mut self, translation: Vec3) {
+        self.0
+            .translate_by(translation)
+            .expect(MESH_EXTRACTED_ERROR);
+    }
+
+    /// Rotates the vertex positions, normals, and tangents of the mesh by the given [`Quat`].
+    ///
+    /// `Aabb` of entities with modified mesh are not updated automatically.
+    pub fn rotated_by(mut self, rotation: Quat) -> Self {
+        self.rotate_by(rotation);
+        self
+    }
+
+    /// Rotates the vertex positions, normals, and tangents of the mesh in place by the given [`Quat`].
+    ///
+    /// `Aabb` of entities with modified mesh are not updated automatically.
+    pub fn rotate_by(&mut self, rotation: Quat) {
+        self.0.rotate_by(rotation).expect(MESH_EXTRACTED_ERROR);
+    }
+
+    /// Scales the vertex positions, normals, and tangents of the mesh by the given [`Vec3`].
+    ///
+    /// `Aabb` of entities with modified mesh are not updated automatically.
+    pub fn scaled_by(mut self, scale: Vec3) -> Self {
+        self.scale_by(scale);
+        self
+    }
+
+    /// Scales the vertex positions, normals, and tangents of the mesh in place by the given [`Vec3`].
+    ///
+    /// `Aabb` of entities with modified mesh are not updated automatically.
+    pub fn scale_by(&mut self, scale: Vec3) {
+        self.0.scale_by(scale).expect(MESH_EXTRACTED_ERROR);
+    }
+
+    /// Normalize joint weights so they sum to 1.
+    pub fn normalize_joint_weights(&mut self) {
+        self.0
+            .normalize_joint_weights()
+            .expect(MESH_EXTRACTED_ERROR);
+    }
+
+    /// Get a list of this Mesh's [triangles] as an iterator if possible.
+    ///
+    /// Returns an error if any of the following conditions are met (see [`MeshTrianglesError`]):
+    /// * The Mesh's [primitive topology] is not `TriangleList` or `TriangleStrip`.
+    /// * The Mesh is missing position or index data.
+    /// * The Mesh's position data has the wrong format (not `Float32x3`).
+    ///
+    /// [primitive topology]: PrimitiveTopology
+    /// [triangles]: Triangle3d
+    pub fn triangles(&self) -> Result<impl Iterator<Item = Triangle3d> + '_, MeshTrianglesError> {
+        self.0.triangles()
+    }
+
+    pub fn into_mesh(self) -> Mesh {
+        self.0
+    }
+}
+
+impl From<InfallibleMesh> for Mesh {
+    fn from(value: InfallibleMesh) -> Self {
+        value.into_mesh()
+    }
+}
+
+#[cfg(feature = "morph")]
+impl InfallibleMesh {
+    /// Whether this mesh has morph targets.
+    pub fn has_morph_targets(&self) -> bool {
+        self.0.has_morph_targets().expect(MESH_EXTRACTED_ERROR)
+    }
+
+    /// Set [morph targets] image for this mesh. This requires a "morph target image". See [`MorphTargetImage`](crate::morph::MorphTargetImage) for info.
+    ///
+    /// [morph targets]: https://en.wikipedia.org/wiki/Morph_target_animation
+    pub fn set_morph_targets(&mut self, morph_targets: Handle<Image>) {
+        self.0
+            .set_morph_targets(morph_targets)
+            .expect(MESH_EXTRACTED_ERROR);
+    }
+
+    /// Retrieve the morph targets for this mesh, or None if there are no morph targets.
+    pub fn morph_targets(&self) -> Option<&Handle<Image>> {
+        match self.0.morph_targets() {
+            Ok(targets) => Some(targets),
+            Err(MeshAccessError::NotFound) => None,
+            Err(MeshAccessError::ExtractedToRenderWorld) => panic!("{MESH_EXTRACTED_ERROR}"),
+        }
+    }
+
+    /// Consumes the mesh and returns a mesh with the given [morph targets].
+    ///
+    /// This requires a "morph target image". See [`MorphTargetImage`](crate::morph::MorphTargetImage) for info.
+    ///
+    /// (Alternatively, you can use [`InfallibleMesh::set_morph_targets`] to mutate an existing mesh in-place)
+    ///
+    /// [morph targets]: https://en.wikipedia.org/wiki/Morph_target_animation
+    #[must_use]
+    pub fn with_morph_targets(mut self, morph_targets: Handle<Image>) -> Self {
+        self.set_morph_targets(morph_targets);
+        self
+    }
+
+    /// Sets the names of each morph target. This should correspond to the order of the morph targets in `set_morph_targets`.
+    pub fn set_morph_target_names(&mut self, names: Vec<String>) {
+        self.0
+            .set_morph_target_names(names)
+            .expect(MESH_EXTRACTED_ERROR);
+    }
+
+    /// Consumes the mesh and returns a mesh with morph target names.
+    /// Names should correspond to the order of the morph targets in `set_morph_targets`.
+    ///
+    /// (Alternatively, you can use [`InfallibleMesh::set_morph_target_names`] to mutate an existing mesh in-place)
+    #[must_use]
+    pub fn with_morph_target_names(self, names: Vec<String>) -> Self {
+        Self(
+            self.0
+                .with_morph_target_names(names)
+                .expect(MESH_EXTRACTED_ERROR),
+        )
+    }
+
+    /// Gets a list of all morph target names, if they exist.
+    pub fn morph_target_names(&self) -> Option<&[String]> {
+        self.0.morph_target_names().expect(MESH_EXTRACTED_ERROR)
+    }
+}
+
+impl core::ops::Deref for InfallibleMesh {
+    type Target = Mesh;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
 /// A 3D object made out of vertices representing triangles, lines, or points,
 /// with "attribute" values for each vertex.
 ///
@@ -357,25 +955,6 @@ impl Mesh {
         self.primitive_topology
     }
 
-    /// Sets the data for a vertex attribute (position, normal, etc.). The name will
-    /// often be one of the associated constants such as [`Mesh::ATTRIBUTE_POSITION`].
-    ///
-    /// `Aabb` of entities with modified mesh are not updated automatically.
-    ///
-    /// # Panics
-    /// Panics when the format of the values does not match the attribute's format.
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_insert_attribute`]
-    #[inline]
-    pub fn insert_attribute(
-        &mut self,
-        attribute: MeshVertexAttribute,
-        values: impl Into<VertexAttributeValues>,
-    ) {
-        self.try_insert_attribute(attribute, values)
-            .expect(MESH_EXTRACTED_ERROR);
-    }
-
     /// Sets the data for a vertex attribute (position, normal, etc.). The name will
     /// often be one of the associated constants such as [`Mesh::ATTRIBUTE_POSITION`].
     ///
@@ -386,7 +965,7 @@ impl Mesh {
     /// # Panics
     /// Panics when the format of the values does not match the attribute's format.
     #[inline]
-    pub fn try_insert_attribute(
+    pub fn insert_attribute(
         &mut self,
         attribute: MeshVertexAttribute,
         values: impl Into<VertexAttributeValues>,
@@ -406,28 +985,6 @@ impl Mesh {
         Ok(())
     }
 
-    /// Consumes the mesh and returns a mesh with data set for a vertex attribute (position, normal, etc.).
-    /// The name will often be one of the associated constants such as [`Mesh::ATTRIBUTE_POSITION`].
-    ///
-    /// (Alternatively, you can use [`Mesh::insert_attribute`] to mutate an existing mesh in-place)
-    ///
-    /// `Aabb` of entities with modified mesh are not updated automatically.
-    ///
-    /// # Panics
-    /// Panics when the format of the values does not match the attribute's format.
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_with_inserted_attribute`]
-    #[must_use]
-    #[inline]
-    pub fn with_inserted_attribute(
-        mut self,
-        attribute: MeshVertexAttribute,
-        values: impl Into<VertexAttributeValues>,
-    ) -> Self {
-        self.insert_attribute(attribute, values);
-        self
-    }
-
     /// Consumes the mesh and returns a mesh with data set for a vertex attribute (position, normal, etc.).
     /// The name will often be one of the associated constants such as [`Mesh::ATTRIBUTE_POSITION`].
     ///
@@ -437,35 +994,19 @@ impl Mesh {
     ///
     /// Returns an error if the mesh data has been extracted to `RenderWorld`.
     #[inline]
-    pub fn try_with_inserted_attribute(
+    pub fn with_inserted_attribute(
         mut self,
         attribute: MeshVertexAttribute,
         values: impl Into<VertexAttributeValues>,
     ) -> Result<Self, MeshAccessError> {
-        self.try_insert_attribute(attribute, values)?;
+        self.insert_attribute(attribute, values)?;
         Ok(self)
     }
 
-    /// Removes the data for a vertex attribute
-    ///
-    /// # Panics
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_remove_attribute`]
-    pub fn remove_attribute(
-        &mut self,
-        attribute: impl Into<MeshVertexAttributeId>,
-    ) -> Option<VertexAttributeValues> {
-        self.attributes
-            .as_mut()
-            .expect(MESH_EXTRACTED_ERROR)
-            .remove(&attribute.into())
-            .map(|data| data.values)
-    }
-
     /// Removes the data for a vertex attribute
     /// Returns an error if the mesh data has been extracted to `RenderWorld`or
     /// if the attribute does not exist.
-    pub fn try_remove_attribute(
+    pub fn remove_attribute(
         &mut self,
         attribute: impl Into<MeshVertexAttributeId>,
     ) -> Result<VertexAttributeValues, MeshAccessError> {
@@ -477,88 +1018,48 @@ impl Mesh {
             .values)
     }
 
-    /// Consumes the mesh and returns a mesh without the data for a vertex attribute
-    ///
-    /// (Alternatively, you can use [`Mesh::remove_attribute`] to mutate an existing mesh in-place)
-    ///
-    /// # Panics
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_with_removed_attribute`]
-    #[must_use]
-    pub fn with_removed_attribute(mut self, attribute: impl Into<MeshVertexAttributeId>) -> Self {
-        self.remove_attribute(attribute);
-        self
-    }
-
     /// Consumes the mesh and returns a mesh without the data for a vertex attribute
     ///
     /// (Alternatively, you can use [`Mesh::remove_attribute`] to mutate an existing mesh in-place)
     ///
     /// Returns an error if the mesh data has been extracted to `RenderWorld`or
     /// if the attribute does not exist.
-    pub fn try_with_removed_attribute(
+    pub fn with_removed_attribute(
         mut self,
         attribute: impl Into<MeshVertexAttributeId>,
     ) -> Result<Self, MeshAccessError> {
-        self.try_remove_attribute(attribute)?;
+        self.remove_attribute(attribute)?;
         Ok(self)
     }
 
-    /// Returns a bool indicating if the attribute is present in this mesh's vertex data.
-    ///
-    /// # Panics
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_contains_attribute`]
-    #[inline]
-    pub fn contains_attribute(&self, id: impl Into<MeshVertexAttributeId>) -> bool {
-        self.attributes
-            .as_ref()
-            .expect(MESH_EXTRACTED_ERROR)
-            .contains_key(&id.into())
-    }
-
     /// Returns a bool indicating if the attribute is present in this mesh's vertex data.
     ///
     /// Returns an error if the mesh data has been extracted to `RenderWorld`.
     #[inline]
-    pub fn try_contains_attribute(
+    pub fn contains_attribute(
         &self,
         id: impl Into<MeshVertexAttributeId>,
     ) -> Result<bool, MeshAccessError> {
         Ok(self.attributes.as_ref()?.contains_key(&id.into()))
     }
 
-    /// Retrieves the data currently set to the vertex attribute with the specified [`MeshVertexAttributeId`].
-    ///
-    /// # Panics
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_attribute`] or [`Mesh::try_attribute_option`]
-    #[inline]
-    pub fn attribute(
-        &self,
-        id: impl Into<MeshVertexAttributeId>,
-    ) -> Option<&VertexAttributeValues> {
-        self.try_attribute_option(id).expect(MESH_EXTRACTED_ERROR)
-    }
-
     /// Retrieves the data currently set to the vertex attribute with the specified [`MeshVertexAttributeId`].
     ///
     /// Returns an error if the mesh data has been extracted to `RenderWorld`or
     /// if the attribute does not exist.
     #[inline]
-    pub fn try_attribute(
+    pub fn attribute(
         &self,
         id: impl Into<MeshVertexAttributeId>,
     ) -> Result<&VertexAttributeValues, MeshAccessError> {
-        self.try_attribute_option(id)?
-            .ok_or(MeshAccessError::NotFound)
+        self.attribute_option(id)?.ok_or(MeshAccessError::NotFound)
     }
 
     /// Retrieves the data currently set to the vertex attribute with the specified [`MeshVertexAttributeId`].
     ///
     /// Returns an error if the mesh data has been extracted to `RenderWorld`.
     #[inline]
-    pub fn try_attribute_option(
+    pub fn attribute_option(
         &self,
         id: impl Into<MeshVertexAttributeId>,
     ) -> Result<Option<&VertexAttributeValues>, MeshAccessError> {
@@ -571,37 +1072,23 @@ impl Mesh {
 
     /// Retrieves the full data currently set to the vertex attribute with the specified [`MeshVertexAttributeId`].
     #[inline]
-    pub(crate) fn try_attribute_data(
+    pub(crate) fn attribute_data(
         &self,
         id: impl Into<MeshVertexAttributeId>,
     ) -> Result<Option<&MeshAttributeData>, MeshAccessError> {
         Ok(self.attributes.as_ref()?.get(&id.into()))
     }
 
-    /// Retrieves the data currently set to the vertex attribute with the specified `name` mutably.
-    ///
-    /// # Panics
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_attribute_mut`]
-    #[inline]
-    pub fn attribute_mut(
-        &mut self,
-        id: impl Into<MeshVertexAttributeId>,
-    ) -> Option<&mut VertexAttributeValues> {
-        self.try_attribute_mut_option(id)
-            .expect(MESH_EXTRACTED_ERROR)
-    }
-
     /// Retrieves the data currently set to the vertex attribute with the specified `name` mutably.
     ///
     /// Returns an error if the mesh data has been extracted to `RenderWorld`or
     /// if the attribute does not exist.
     #[inline]
-    pub fn try_attribute_mut(
+    pub fn attribute_mut(
         &mut self,
         id: impl Into<MeshVertexAttributeId>,
     ) -> Result<&mut VertexAttributeValues, MeshAccessError> {
-        self.try_attribute_mut_option(id)?
+        self.attribute_mut_option(id)?
             .ok_or(MeshAccessError::NotFound)
     }
 
@@ -609,7 +1096,7 @@ impl Mesh {
     ///
     /// Returns an error if the mesh data has been extracted to `RenderWorld`.
     #[inline]
-    pub fn try_attribute_mut_option(
+    pub fn attribute_mut_option(
         &mut self,
         id: impl Into<MeshVertexAttributeId>,
     ) -> Result<Option<&mut VertexAttributeValues>, MeshAccessError> {
@@ -620,20 +1107,9 @@ impl Mesh {
             .map(|data| &mut data.values))
     }
 
-    /// Returns an iterator that yields references to the data of each vertex attribute.
-    ///
-    /// # Panics
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_attributes`]
-    pub fn attributes(
-        &self,
-    ) -> impl Iterator<Item = (&MeshVertexAttribute, &VertexAttributeValues)> {
-        self.try_attributes().expect(MESH_EXTRACTED_ERROR)
-    }
-
     /// Returns an iterator that yields references to the data of each vertex attribute.
     /// Returns an error if data has been extracted to `RenderWorld`
-    pub fn try_attributes(
+    pub fn attributes(
         &self,
     ) -> Result<impl Iterator<Item = (&MeshVertexAttribute, &VertexAttributeValues)>, MeshAccessError>
     {
@@ -644,21 +1120,10 @@ impl Mesh {
             .map(|data| (&data.attribute, &data.values)))
     }
 
-    /// Returns an iterator that yields mutable references to the data of each vertex attribute.
-    ///
-    /// # Panics
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_attributes_mut`]
-    pub fn attributes_mut(
-        &mut self,
-    ) -> impl Iterator<Item = (&MeshVertexAttribute, &mut VertexAttributeValues)> {
-        self.try_attributes_mut().expect(MESH_EXTRACTED_ERROR)
-    }
-
     /// Returns an iterator that yields mutable references to the data of each vertex attribute.
     ///
     /// Returns an error if the mesh data has been extracted to `RenderWorld`.
-    pub fn try_attributes_mut(
+    pub fn attributes_mut(
         &mut self,
     ) -> Result<
         impl Iterator<Item = (&MeshVertexAttribute, &mut VertexAttributeValues)>,
@@ -671,27 +1136,13 @@ impl Mesh {
             .map(|data| (&data.attribute, &mut data.values)))
     }
 
-    /// Sets the vertex indices of the mesh. They describe how triangles are constructed out of the
-    /// vertex attributes and are therefore only useful for the [`PrimitiveTopology`] variants
-    /// that use triangles.
-    ///
-    /// # Panics
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_insert_indices`]
-    #[inline]
-    pub fn insert_indices(&mut self, indices: Indices) {
-        self.indices
-            .replace(Some(indices))
-            .expect(MESH_EXTRACTED_ERROR);
-    }
-
     /// Sets the vertex indices of the mesh. They describe how triangles are constructed out of the
     /// vertex attributes and are therefore only useful for the [`PrimitiveTopology`] variants
     /// that use triangles.
     ///
     /// Returns an error if the mesh data has been extracted to `RenderWorld`.
     #[inline]
-    pub fn try_insert_indices(&mut self, indices: Indices) -> Result<(), MeshAccessError> {
+    pub fn insert_indices(&mut self, indices: Indices) -> Result<(), MeshAccessError> {
         self.indices.replace(Some(indices))?;
         Ok(())
     }
@@ -702,45 +1153,19 @@ impl Mesh {
     ///
     /// (Alternatively, you can use [`Mesh::insert_indices`] to mutate an existing mesh in-place)
     ///
-    /// # Panics
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_with_inserted_indices`]
-    #[must_use]
-    #[inline]
-    pub fn with_inserted_indices(mut self, indices: Indices) -> Self {
-        self.insert_indices(indices);
-        self
-    }
-
-    /// Consumes the mesh and returns a mesh with the given vertex indices. They describe how triangles
-    /// are constructed out of the vertex attributes and are therefore only useful for the
-    /// [`PrimitiveTopology`] variants that use triangles.
-    ///
-    /// (Alternatively, you can use [`Mesh::try_insert_indices`] to mutate an existing mesh in-place)
-    ///
     /// Returns an error if the mesh data has been extracted to `RenderWorld`.
     #[inline]
-    pub fn try_with_inserted_indices(mut self, indices: Indices) -> Result<Self, MeshAccessError> {
-        self.try_insert_indices(indices)?;
+    pub fn with_inserted_indices(mut self, indices: Indices) -> Result<Self, MeshAccessError> {
+        self.insert_indices(indices)?;
         Ok(self)
     }
 
-    /// Retrieves the vertex `indices` of the mesh, returns None if not found.
-    ///
-    /// # Panics
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_indices`]
-    #[inline]
-    pub fn indices(&self) -> Option<&Indices> {
-        self.indices.as_ref_option().expect(MESH_EXTRACTED_ERROR)
-    }
-
     /// Retrieves the vertex `indices` of the mesh.
     ///
     /// Returns an error if the mesh data has been extracted to `RenderWorld`or
     /// if the attribute does not exist.
     #[inline]
-    pub fn try_indices(&self) -> Result<&Indices, MeshAccessError> {
+    pub fn indices(&self) -> Result<&Indices, MeshAccessError> {
         self.indices.as_ref()
     }
 
@@ -748,21 +1173,15 @@ impl Mesh {
     ///
     /// Returns an error if the mesh data has been extracted to `RenderWorld`.
     #[inline]
-    pub fn try_indices_option(&self) -> Result<Option<&Indices>, MeshAccessError> {
+    pub fn indices_option(&self) -> Result<Option<&Indices>, MeshAccessError> {
         self.indices.as_ref_option()
     }
 
-    /// Retrieves the vertex `indices` of the mesh mutably.
-    #[inline]
-    pub fn indices_mut(&mut self) -> Option<&mut Indices> {
-        self.try_indices_mut_option().expect(MESH_EXTRACTED_ERROR)
-    }
-
     /// Retrieves the vertex `indices` of the mesh mutably.
     ///
     /// Returns an error if the mesh data has been extracted to `RenderWorld`.
     #[inline]
-    pub fn try_indices_mut(&mut self) -> Result<&mut Indices, MeshAccessError> {
+    pub fn indices_mut(&mut self) -> Result<&mut Indices, MeshAccessError> {
         self.indices.as_mut()
     }
 
@@ -770,25 +1189,15 @@ impl Mesh {
     ///
     /// Returns an error if the mesh data has been extracted to `RenderWorld`.
     #[inline]
-    pub fn try_indices_mut_option(&mut self) -> Result<Option<&mut Indices>, MeshAccessError> {
+    pub fn indices_mut_option(&mut self) -> Result<Option<&mut Indices>, MeshAccessError> {
         self.indices.as_mut_option()
     }
 
-    /// Removes the vertex `indices` from the mesh and returns them.
-    ///
-    /// # Panics
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_remove_indices`]
-    #[inline]
-    pub fn remove_indices(&mut self) -> Option<Indices> {
-        self.try_remove_indices().expect(MESH_EXTRACTED_ERROR)
-    }
-
     /// Removes the vertex `indices` from the mesh and returns them.
     ///
     /// Returns an error if the mesh data has been extracted to `RenderWorld`.
     #[inline]
-    pub fn try_remove_indices(&mut self) -> Result<Option<Indices>, MeshAccessError> {
+    pub fn remove_indices(&mut self) -> Result<Option<Indices>, MeshAccessError> {
         self.indices.replace(None)
     }
 
@@ -796,22 +1205,9 @@ impl Mesh {
     ///
     /// (Alternatively, you can use [`Mesh::remove_indices`] to mutate an existing mesh in-place)
     ///
-    /// # Panics
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_with_removed_indices`]
-    #[must_use]
-    pub fn with_removed_indices(mut self) -> Self {
-        self.remove_indices();
-        self
-    }
-
-    /// Consumes the mesh and returns a mesh without the vertex `indices` of the mesh.
-    ///
-    /// (Alternatively, you can use [`Mesh::try_remove_indices`] to mutate an existing mesh in-place)
-    ///
     /// Returns an error if the mesh data has been extracted to `RenderWorld`.
-    pub fn try_with_removed_indices(mut self) -> Result<Self, MeshAccessError> {
-        self.try_remove_indices()?;
+    pub fn with_removed_indices(mut self) -> Result<Self, MeshAccessError> {
+        self.remove_indices()?;
         Ok(self)
     }
 
@@ -967,25 +1363,13 @@ impl Mesh {
         }
     }
 
-    /// Duplicates the vertex attributes so that no vertices are shared.
-    ///
-    /// This can dramatically increase the vertex count, so make sure this is what you want.
-    /// Does nothing if no [Indices] are set.
-    ///
-    /// # Panics
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_duplicate_vertices`]
-    pub fn duplicate_vertices(&mut self) {
-        self.try_duplicate_vertices().expect(MESH_EXTRACTED_ERROR);
-    }
-
     /// Duplicates the vertex attributes so that no vertices are shared.
     ///
     /// This can dramatically increase the vertex count, so make sure this is what you want.
     /// Does nothing if no [Indices] are set.
     ///
     /// Returns an error if the mesh data has been extracted to `RenderWorld`.
-    pub fn try_duplicate_vertices(&mut self) -> Result<(), MeshAccessError> {
+    pub fn duplicate_vertices(&mut self) -> Result<(), MeshAccessError> {
         fn duplicate<T: Copy>(values: &[T], indices: impl Iterator<Item = usize>) -> Vec<T> {
             indices.map(|i| values[i]).collect()
         }
@@ -1044,25 +1428,9 @@ impl Mesh {
     ///
     /// (Alternatively, you can use [`Mesh::duplicate_vertices`] to mutate an existing mesh in-place)
     ///
-    /// # Panics
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_with_duplicated_vertices`]
-    #[must_use]
-    pub fn with_duplicated_vertices(mut self) -> Self {
-        self.duplicate_vertices();
-        self
-    }
-
-    /// Consumes the mesh and returns a mesh with no shared vertices.
-    ///
-    /// This can dramatically increase the vertex count, so make sure this is what you want.
-    /// Does nothing if no [`Indices`] are set.
-    ///
-    /// (Alternatively, you can use [`Mesh::try_duplicate_vertices`] to mutate an existing mesh in-place)
-    ///
     /// Returns an error if the mesh data has been extracted to `RenderWorld`.
-    pub fn try_with_duplicated_vertices(mut self) -> Result<Self, MeshAccessError> {
-        self.try_duplicate_vertices()?;
+    pub fn with_duplicated_vertices(mut self) -> Result<Self, MeshAccessError> {
+        self.duplicate_vertices()?;
         Ok(self)
     }
 
@@ -1132,48 +1500,18 @@ impl Mesh {
     /// # Panics
     /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
     /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].=
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_compute_normals`]
-    pub fn compute_normals(&mut self) {
-        self.try_compute_normals().expect(MESH_EXTRACTED_ERROR);
-    }
-
-    /// Calculates the [`Mesh::ATTRIBUTE_NORMAL`] of a mesh.
-    /// If the mesh is indexed, this defaults to smooth normals. Otherwise, it defaults to flat
-    /// normals.
-    ///
-    /// # Panics
-    /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
-    /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].=
-    pub fn try_compute_normals(&mut self) -> Result<(), MeshAccessError> {
+    pub fn compute_normals(&mut self) -> Result<(), MeshAccessError> {
         assert!(
             matches!(self.primitive_topology, PrimitiveTopology::TriangleList),
             "`compute_normals` can only work on `TriangleList`s"
         );
-        if self.try_indices_option()?.is_none() {
-            self.try_compute_flat_normals()
+        if self.indices_option()?.is_none() {
+            self.compute_flat_normals()
         } else {
-            self.try_compute_smooth_normals()
+            self.compute_smooth_normals()
         }
     }
 
-    /// Calculates the [`Mesh::ATTRIBUTE_NORMAL`] of a mesh.
-    ///
-    /// # Panics
-    /// Panics if [`Indices`] are set or [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
-    /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
-    /// Consider calling [`Mesh::duplicate_vertices`] or exporting your mesh with normal
-    /// attributes.
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_compute_flat_normals`]
-    ///
-    /// FIXME: This should handle more cases since this is called as a part of gltf
-    /// mesh loading where we can't really blame users for loading meshes that might
-    /// not conform to the limitations here!
-    pub fn compute_flat_normals(&mut self) {
-        self.try_compute_flat_normals().expect(MESH_EXTRACTED_ERROR);
-    }
-
     /// Calculates the [`Mesh::ATTRIBUTE_NORMAL`] of a mesh.
     ///
     /// # Panics
@@ -1185,9 +1523,9 @@ impl Mesh {
     /// FIXME: This should handle more cases since this is called as a part of gltf
     /// mesh loading where we can't really blame users for loading meshes that might
     /// not conform to the limitations here!
-    pub fn try_compute_flat_normals(&mut self) -> Result<(), MeshAccessError> {
+    pub fn compute_flat_normals(&mut self) -> Result<(), MeshAccessError> {
         assert!(
-            self.try_indices_option()?.is_none(),
+            self.indices_option()?.is_none(),
             "`compute_flat_normals` can't work on indexed geometry. Consider calling either `Mesh::compute_smooth_normals` or `Mesh::duplicate_vertices` followed by `Mesh::compute_flat_normals`."
         );
         assert!(
@@ -1196,7 +1534,7 @@ impl Mesh {
         );
 
         let positions = self
-            .try_attribute(Mesh::ATTRIBUTE_POSITION)?
+            .attribute(Mesh::ATTRIBUTE_POSITION)?
             .as_float3()
             .expect("`Mesh::ATTRIBUTE_POSITION` vertex attributes should be of type `float3`");
 
@@ -1206,30 +1544,7 @@ impl Mesh {
             .flat_map(|normal| [normal; 3])
             .collect();
 
-        self.try_insert_attribute(Mesh::ATTRIBUTE_NORMAL, normals)
-    }
-
-    /// Calculates the [`Mesh::ATTRIBUTE_NORMAL`] of an indexed mesh, smoothing normals for shared
-    /// vertices.
-    ///
-    /// This method weights normals by the angles of the corners of connected triangles, thus
-    /// eliminating triangle area and count as factors in the final normal. This does make it
-    /// somewhat slower than [`Mesh::compute_area_weighted_normals`] which does not need to
-    /// greedily normalize each triangle's normal or calculate corner angles.
-    ///
-    /// If you would rather have the computed normals be weighted by triangle area, see
-    /// [`Mesh::compute_area_weighted_normals`] instead. If you need to weight them in some other
-    /// way, see [`Mesh::compute_custom_smooth_normals`].
-    ///
-    /// # Panics
-    /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
-    /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
-    /// Panics if the mesh does not have indices defined.
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_compute_smooth_normals`]
-    pub fn compute_smooth_normals(&mut self) {
-        self.try_compute_smooth_normals()
-            .expect(MESH_EXTRACTED_ERROR);
+        self.insert_attribute(Mesh::ATTRIBUTE_NORMAL, normals)
     }
 
     /// Calculates the [`Mesh::ATTRIBUTE_NORMAL`] of an indexed mesh, smoothing normals for shared
@@ -1248,8 +1563,8 @@ impl Mesh {
     /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
     /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
     /// Panics if the mesh does not have indices defined.
-    pub fn try_compute_smooth_normals(&mut self) -> Result<(), MeshAccessError> {
-        self.try_compute_custom_smooth_normals(|[a, b, c], positions, normals| {
+    pub fn compute_smooth_normals(&mut self) -> Result<(), MeshAccessError> {
+        self.compute_custom_smooth_normals(|[a, b, c], positions, normals| {
             let pa = Vec3::from(positions[a]);
             let pb = Vec3::from(positions[b]);
             let pc = Vec3::from(positions[c]);
@@ -1291,107 +1606,30 @@ impl Mesh {
     ///
     /// This method weights normals by the area of each triangle containing the vertex. Thus,
     /// larger triangles will skew the normals of their vertices towards their own normal more
-    /// than smaller triangles will.
-    ///
-    /// This method is actually somewhat faster than [`Mesh::compute_smooth_normals`] because an
-    /// intermediate result of triangle normal calculation is already scaled by the triangle's area.
-    ///
-    /// If you would rather have the computed normals be influenced only by the angles of connected
-    /// edges, see [`Mesh::compute_smooth_normals`] instead. If you need to weight them in some
-    /// other way, see [`Mesh::compute_custom_smooth_normals`].
-    ///
-    /// # Panics
-    /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
-    /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
-    /// Panics if the mesh does not have indices defined.
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_compute_area_weighted_normals`]
-    pub fn compute_area_weighted_normals(&mut self) {
-        self.try_compute_area_weighted_normals()
-            .expect(MESH_EXTRACTED_ERROR);
-    }
-
-    /// Calculates the [`Mesh::ATTRIBUTE_NORMAL`] of an indexed mesh, smoothing normals for shared
-    /// vertices.
-    ///
-    /// This method weights normals by the area of each triangle containing the vertex. Thus,
-    /// larger triangles will skew the normals of their vertices towards their own normal more
-    /// than smaller triangles will.
-    ///
-    /// This method is actually somewhat faster than [`Mesh::compute_smooth_normals`] because an
-    /// intermediate result of triangle normal calculation is already scaled by the triangle's area.
-    ///
-    /// If you would rather have the computed normals be influenced only by the angles of connected
-    /// edges, see [`Mesh::compute_smooth_normals`] instead. If you need to weight them in some
-    /// other way, see [`Mesh::compute_custom_smooth_normals`].
-    ///
-    /// # Panics
-    /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
-    /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
-    /// Panics if the mesh does not have indices defined.
-    pub fn try_compute_area_weighted_normals(&mut self) -> Result<(), MeshAccessError> {
-        self.try_compute_custom_smooth_normals(|[a, b, c], positions, normals| {
-            let normal = Vec3::from(triangle_area_normal(
-                positions[a],
-                positions[b],
-                positions[c],
-            ));
-            [a, b, c].into_iter().for_each(|pos| {
-                normals[pos] += normal;
-            });
-        })
-    }
-
-    /// Calculates the [`Mesh::ATTRIBUTE_NORMAL`] of an indexed mesh, smoothing normals for shared
-    /// vertices.
-    ///
-    /// This method allows you to customize how normals are weighted via the `per_triangle` parameter,
-    /// which must be a function or closure that accepts 3 parameters:
-    /// - The indices of the three vertices of the triangle as a `[usize; 3]`.
-    /// - A reference to the values of the [`Mesh::ATTRIBUTE_POSITION`] of the mesh (`&[[f32; 3]]`).
-    /// - A mutable reference to the sums of all normals so far.
-    ///
-    /// See also the standard methods included in Bevy for calculating smooth normals:
-    /// - [`Mesh::compute_smooth_normals`]
-    /// - [`Mesh::compute_area_weighted_normals`]
-    ///
-    /// An example that would weight each connected triangle's normal equally, thus skewing normals
-    /// towards the planes divided into the most triangles:
-    /// ```
-    /// # use bevy_asset::RenderAssetUsages;
-    /// # use bevy_mesh::{Mesh, PrimitiveTopology, Meshable, MeshBuilder};
-    /// # use bevy_math::{Vec3, primitives::Cuboid};
-    /// # let mut mesh = Cuboid::default().mesh().build();
-    /// mesh.compute_custom_smooth_normals(|[a, b, c], positions, normals| {
-    ///     let normal = Vec3::from(bevy_mesh::triangle_normal(positions[a], positions[b], positions[c]));
-    ///     for idx in [a, b, c] {
-    ///         normals[idx] += normal;
-    ///     }
-    /// });
-    /// ```
-    ///
-    /// # Panics
-    /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
-    /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
-    /// Panics if the mesh does not have indices defined.
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_compute_custom_smooth_normals`]
-    //
-    // FIXME: This should handle more cases since this is called as a part of gltf
-    // mesh loading where we can't really blame users for loading meshes that might
-    // not conform to the limitations here!
-    //
-    // When fixed, also update "Panics" sections of
-    // - [Mesh::compute_smooth_normals]
-    // - [Mesh::with_computed_smooth_normals]
-    // - [Mesh::compute_area_weighted_normals]
-    // - [Mesh::with_computed_area_weighted_normals]
-    pub fn compute_custom_smooth_normals(
-        &mut self,
-        per_triangle: impl FnMut([usize; 3], &[[f32; 3]], &mut [Vec3]),
-    ) {
-        self.try_compute_custom_smooth_normals(per_triangle)
-            .expect(MESH_EXTRACTED_ERROR);
+    /// than smaller triangles will.
+    ///
+    /// This method is actually somewhat faster than [`Mesh::compute_smooth_normals`] because an
+    /// intermediate result of triangle normal calculation is already scaled by the triangle's area.
+    ///
+    /// If you would rather have the computed normals be influenced only by the angles of connected
+    /// edges, see [`Mesh::compute_smooth_normals`] instead. If you need to weight them in some
+    /// other way, see [`Mesh::compute_custom_smooth_normals`].
+    ///
+    /// # Panics
+    /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
+    /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
+    /// Panics if the mesh does not have indices defined.
+    pub fn compute_area_weighted_normals(&mut self) -> Result<(), MeshAccessError> {
+        self.compute_custom_smooth_normals(|[a, b, c], positions, normals| {
+            let normal = Vec3::from(triangle_area_normal(
+                positions[a],
+                positions[b],
+                positions[c],
+            ));
+            [a, b, c].into_iter().for_each(|pos| {
+                normals[pos] += normal;
+            });
+        })
     }
 
     /// Calculates the [`Mesh::ATTRIBUTE_NORMAL`] of an indexed mesh, smoothing normals for shared
@@ -1436,7 +1674,7 @@ impl Mesh {
     // - [Mesh::with_computed_smooth_normals]
     // - [Mesh::compute_area_weighted_normals]
     // - [Mesh::with_computed_area_weighted_normals]
-    pub fn try_compute_custom_smooth_normals(
+    pub fn compute_custom_smooth_normals(
         &mut self,
         mut per_triangle: impl FnMut([usize; 3], &[[f32; 3]], &mut [Vec3]),
     ) -> Result<(), MeshAccessError> {
@@ -1445,18 +1683,18 @@ impl Mesh {
             "smooth normals can only be computed on `TriangleList`s"
         );
         assert!(
-            self.try_indices_option()?.is_some(),
+            self.indices_option()?.is_some(),
             "smooth normals can only be computed on indexed meshes"
         );
 
         let positions = self
-            .try_attribute(Mesh::ATTRIBUTE_POSITION)?
+            .attribute(Mesh::ATTRIBUTE_POSITION)?
             .as_float3()
             .expect("`Mesh::ATTRIBUTE_POSITION` vertex attributes should be of type `float3`");
 
         let mut normals = vec![Vec3::ZERO; positions.len()];
 
-        self.try_indices()?
+        self.indices()?
             .iter()
             .collect::<Vec<usize>>()
             .chunks_exact(3)
@@ -1466,24 +1704,7 @@ impl Mesh {
             *normal = normal.try_normalize().unwrap_or(Vec3::ZERO);
         }
 
-        self.try_insert_attribute(Mesh::ATTRIBUTE_NORMAL, normals)
-    }
-
-    /// Consumes the mesh and returns a mesh with calculated [`Mesh::ATTRIBUTE_NORMAL`].
-    /// If the mesh is indexed, this defaults to smooth normals. Otherwise, it defaults to flat
-    /// normals.
-    ///
-    /// (Alternatively, you can use [`Mesh::compute_normals`] to mutate an existing mesh in-place)
-    ///
-    /// # Panics
-    /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
-    /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_with_computed_normals`]
-    #[must_use]
-    pub fn with_computed_normals(self) -> Self {
-        self.try_with_computed_normals()
-            .expect(MESH_EXTRACTED_ERROR)
+        self.insert_attribute(Mesh::ATTRIBUTE_NORMAL, normals)
     }
 
     /// Consumes the mesh and returns a mesh with calculated [`Mesh::ATTRIBUTE_NORMAL`].
@@ -1495,8 +1716,8 @@ impl Mesh {
     /// # Panics
     /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
     /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
-    pub fn try_with_computed_normals(mut self) -> Result<Self, MeshAccessError> {
-        self.try_compute_normals()?;
+    pub fn with_computed_normals(mut self) -> Result<Self, MeshAccessError> {
+        self.compute_normals()?;
         Ok(self)
     }
 
@@ -1508,23 +1729,8 @@ impl Mesh {
     /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
     /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
     /// Panics if the mesh has indices defined
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_with_computed_flat_normals`]
-    pub fn with_computed_flat_normals(mut self) -> Self {
-        self.compute_flat_normals();
-        self
-    }
-
-    /// Consumes the mesh and returns a mesh with calculated [`Mesh::ATTRIBUTE_NORMAL`].
-    ///
-    /// (Alternatively, you can use [`Mesh::compute_flat_normals`] to mutate an existing mesh in-place)
-    ///
-    /// # Panics
-    /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
-    /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
-    /// Panics if the mesh has indices defined
-    pub fn try_with_computed_flat_normals(mut self) -> Result<Self, MeshAccessError> {
-        self.try_compute_flat_normals()?;
+    pub fn with_computed_flat_normals(mut self) -> Result<Self, MeshAccessError> {
+        self.compute_flat_normals()?;
         Ok(self)
     }
 
@@ -1540,26 +1746,8 @@ impl Mesh {
     /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
     /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
     /// Panics if the mesh does not have indices defined.
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_with_computed_smooth_normals`]
-    pub fn with_computed_smooth_normals(mut self) -> Self {
-        self.compute_smooth_normals();
-        self
-    }
-    /// Consumes the mesh and returns a mesh with calculated [`Mesh::ATTRIBUTE_NORMAL`].
-    ///
-    /// (Alternatively, you can use [`Mesh::compute_smooth_normals`] to mutate an existing mesh in-place)
-    ///
-    /// This method weights normals by the angles of triangle corners connected to each vertex. If
-    /// you would rather have the computed normals be weighted by triangle area, see
-    /// [`Mesh::with_computed_area_weighted_normals`] instead.
-    ///
-    /// # Panics
-    /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
-    /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
-    /// Panics if the mesh does not have indices defined.
-    pub fn try_with_computed_smooth_normals(mut self) -> Result<Self, MeshAccessError> {
-        self.try_compute_smooth_normals()?;
+    pub fn with_computed_smooth_normals(mut self) -> Result<Self, MeshAccessError> {
+        self.compute_smooth_normals()?;
         Ok(self)
     }
 
@@ -1576,28 +1764,8 @@ impl Mesh {
     /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
     /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
     /// Panics if the mesh does not have indices defined.
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_with_computed_area_weighted_normals`]
-    pub fn with_computed_area_weighted_normals(mut self) -> Self {
-        self.compute_area_weighted_normals();
-        self
-    }
-
-    /// Consumes the mesh and returns a mesh with calculated [`Mesh::ATTRIBUTE_NORMAL`].
-    ///
-    /// (Alternatively, you can use [`Mesh::compute_area_weighted_normals`] to mutate an existing mesh in-place)
-    ///
-    /// This method weights normals by the area of each triangle containing the vertex. Thus,
-    /// larger triangles will skew the normals of their vertices towards their own normal more
-    /// than smaller triangles will. If you would rather have the computed normals be influenced
-    /// only by the angles of connected edges, see [`Mesh::with_computed_smooth_normals`] instead.
-    ///
-    /// # Panics
-    /// Panics if [`Mesh::ATTRIBUTE_POSITION`] is not of type `float3`.
-    /// Panics if the mesh has any other topology than [`PrimitiveTopology::TriangleList`].
-    /// Panics if the mesh does not have indices defined.
-    pub fn try_with_computed_area_weighted_normals(mut self) -> Result<Self, MeshAccessError> {
-        self.try_compute_area_weighted_normals()?;
+    pub fn with_computed_area_weighted_normals(mut self) -> Result<Self, MeshAccessError> {
+        self.compute_area_weighted_normals()?;
         Ok(self)
     }
 
@@ -1608,7 +1776,7 @@ impl Mesh {
     #[cfg(feature = "bevy_mikktspace")]
     pub fn generate_tangents(&mut self) -> Result<(), super::GenerateTangentsError> {
         let tangents = super::generate_tangents_for_mesh(self)?;
-        self.try_insert_attribute(Mesh::ATTRIBUTE_TANGENT, tangents)?;
+        self.insert_attribute(Mesh::ATTRIBUTE_TANGENT, tangents)?;
         Ok(())
     }
 
@@ -1657,8 +1825,8 @@ impl Mesh {
         let index_offset = self.count_vertices();
 
         // Extend attributes of `self` with attributes of `other`.
-        for (attribute, values) in self.try_attributes_mut()? {
-            if let Some(other_values) = other.try_attribute_option(attribute.id)? {
+        for (attribute, values) in self.attributes_mut()? {
+            if let Some(other_values) = other.attribute_option(attribute.id)? {
                 #[expect(
                     clippy::match_same_arms,
                     reason = "Although the bindings on some match arms may have different types, each variant has different semantics; thus it's not guaranteed that they will use the same type forever."
@@ -1696,7 +1864,7 @@ impl Mesh {
                         return Err(MeshMergeError::IncompatibleVertexAttributes {
                             self_attribute: *attribute,
                             other_attribute: other
-                                .try_attribute_data(attribute.id)?
+                                .attribute_data(attribute.id)?
                                 .map(|data| data.attribute),
                         })
                     }
@@ -1706,7 +1874,7 @@ impl Mesh {
 
         // Extend indices of `self` with indices of `other`.
         if let (Some(indices), Some(other_indices)) =
-            (self.try_indices_mut_option()?, other.try_indices_option()?)
+            (self.indices_mut_option()?, other.indices_option()?)
         {
             indices.extend(other_indices.iter().map(|i| (i + index_offset) as u32));
         }
@@ -1716,39 +1884,15 @@ impl Mesh {
     /// Transforms the vertex positions, normals, and tangents of the mesh by the given [`Transform`].
     ///
     /// `Aabb` of entities with modified mesh are not updated automatically.
-    ///
-    /// # Panics
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_transformed_by`]
-    pub fn transformed_by(mut self, transform: Transform) -> Self {
-        self.transform_by(transform);
-        self
-    }
-
-    /// Transforms the vertex positions, normals, and tangents of the mesh by the given [`Transform`].
-    ///
-    /// `Aabb` of entities with modified mesh are not updated automatically.
-    pub fn try_transformed_by(mut self, transform: Transform) -> Result<Self, MeshAccessError> {
-        self.try_transform_by(transform)?;
+    pub fn transformed_by(mut self, transform: Transform) -> Result<Self, MeshAccessError> {
+        self.transform_by(transform)?;
         Ok(self)
     }
 
     /// Transforms the vertex positions, normals, and tangents of the mesh in place by the given [`Transform`].
     ///
     /// `Aabb` of entities with modified mesh are not updated automatically.
-    ///
-    /// # Panics
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_transform_by`]
-    pub fn transform_by(&mut self, transform: Transform) {
-        self.try_transform_by(transform)
-            .expect(MESH_EXTRACTED_ERROR);
-    }
-
-    /// Transforms the vertex positions, normals, and tangents of the mesh in place by the given [`Transform`].
-    ///
-    /// `Aabb` of entities with modified mesh are not updated automatically.
-    pub fn try_transform_by(&mut self, transform: Transform) -> Result<(), MeshAccessError> {
+    pub fn transform_by(&mut self, transform: Transform) -> Result<(), MeshAccessError> {
         // Needed when transforming normals and tangents
         let scale_recip = 1. / transform.scale;
         debug_assert!(
@@ -1757,7 +1901,7 @@ impl Mesh {
         );
 
         if let Some(VertexAttributeValues::Float32x3(positions)) =
-            self.try_attribute_mut_option(Mesh::ATTRIBUTE_POSITION)?
+            self.attribute_mut_option(Mesh::ATTRIBUTE_POSITION)?
         {
             // Apply scale, rotation, and translation to vertex positions
             positions
@@ -1774,7 +1918,7 @@ impl Mesh {
         }
 
         if let Some(VertexAttributeValues::Float32x3(normals)) =
-            self.try_attribute_mut_option(Mesh::ATTRIBUTE_NORMAL)?
+            self.attribute_mut_option(Mesh::ATTRIBUTE_NORMAL)?
         {
             // Transform normals, taking into account non-uniform scaling and rotation
             normals.iter_mut().for_each(|normal| {
@@ -1785,7 +1929,7 @@ impl Mesh {
         }
 
         if let Some(VertexAttributeValues::Float32x4(tangents)) =
-            self.try_attribute_mut_option(Mesh::ATTRIBUTE_TANGENT)?
+            self.attribute_mut_option(Mesh::ATTRIBUTE_TANGENT)?
         {
             // Transform tangents, taking into account non-uniform scaling and rotation
             tangents.iter_mut().for_each(|tangent| {
@@ -1803,45 +1947,21 @@ impl Mesh {
     /// Translates the vertex positions of the mesh by the given [`Vec3`].
     ///
     /// `Aabb` of entities with modified mesh are not updated automatically.
-    ///
-    /// # Panics
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_translated_by`]
-    pub fn translated_by(mut self, translation: Vec3) -> Self {
-        self.translate_by(translation);
-        self
-    }
-
-    /// Translates the vertex positions of the mesh by the given [`Vec3`].
-    ///
-    /// `Aabb` of entities with modified mesh are not updated automatically.
-    pub fn try_translated_by(mut self, translation: Vec3) -> Result<Self, MeshAccessError> {
-        self.try_translate_by(translation)?;
+    pub fn translated_by(mut self, translation: Vec3) -> Result<Self, MeshAccessError> {
+        self.translate_by(translation)?;
         Ok(self)
     }
 
     /// Translates the vertex positions of the mesh in place by the given [`Vec3`].
     ///
     /// `Aabb` of entities with modified mesh are not updated automatically.
-    ///
-    /// # Panics
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_translate_by`]
-    pub fn translate_by(&mut self, translation: Vec3) {
-        self.try_translate_by(translation)
-            .expect(MESH_EXTRACTED_ERROR);
-    }
-
-    /// Translates the vertex positions of the mesh in place by the given [`Vec3`].
-    ///
-    /// `Aabb` of entities with modified mesh are not updated automatically.
-    pub fn try_translate_by(&mut self, translation: Vec3) -> Result<(), MeshAccessError> {
+    pub fn translate_by(&mut self, translation: Vec3) -> Result<(), MeshAccessError> {
         if translation == Vec3::ZERO {
             return Ok(());
         }
 
         if let Some(VertexAttributeValues::Float32x3(positions)) =
-            self.try_attribute_mut_option(Mesh::ATTRIBUTE_POSITION)?
+            self.attribute_mut_option(Mesh::ATTRIBUTE_POSITION)?
         {
             // Apply translation to vertex positions
             positions
@@ -1855,40 +1975,17 @@ impl Mesh {
     /// Rotates the vertex positions, normals, and tangents of the mesh by the given [`Quat`].
     ///
     /// `Aabb` of entities with modified mesh are not updated automatically.
-    ///
-    /// # Panics
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_rotated_by`]
-    pub fn rotated_by(mut self, rotation: Quat) -> Self {
-        self.try_rotate_by(rotation).expect(MESH_EXTRACTED_ERROR);
-        self
-    }
-
-    /// Rotates the vertex positions, normals, and tangents of the mesh by the given [`Quat`].
-    ///
-    /// `Aabb` of entities with modified mesh are not updated automatically.
-    pub fn try_rotated_by(mut self, rotation: Quat) -> Result<Self, MeshAccessError> {
-        self.try_rotate_by(rotation)?;
+    pub fn rotated_by(mut self, rotation: Quat) -> Result<Self, MeshAccessError> {
+        self.rotate_by(rotation)?;
         Ok(self)
     }
 
     /// Rotates the vertex positions, normals, and tangents of the mesh in place by the given [`Quat`].
     ///
     /// `Aabb` of entities with modified mesh are not updated automatically.
-    ///
-    /// # Panics
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_rotate_by`]
-    pub fn rotate_by(&mut self, rotation: Quat) {
-        self.try_rotate_by(rotation).expect(MESH_EXTRACTED_ERROR);
-    }
-
-    /// Rotates the vertex positions, normals, and tangents of the mesh in place by the given [`Quat`].
-    ///
-    /// `Aabb` of entities with modified mesh are not updated automatically.
-    pub fn try_rotate_by(&mut self, rotation: Quat) -> Result<(), MeshAccessError> {
+    pub fn rotate_by(&mut self, rotation: Quat) -> Result<(), MeshAccessError> {
         if let Some(VertexAttributeValues::Float32x3(positions)) =
-            self.try_attribute_mut_option(Mesh::ATTRIBUTE_POSITION)?
+            self.attribute_mut_option(Mesh::ATTRIBUTE_POSITION)?
         {
             // Apply rotation to vertex positions
             positions
@@ -1902,7 +1999,7 @@ impl Mesh {
         }
 
         if let Some(VertexAttributeValues::Float32x3(normals)) =
-            self.try_attribute_mut_option(Mesh::ATTRIBUTE_NORMAL)?
+            self.attribute_mut_option(Mesh::ATTRIBUTE_NORMAL)?
         {
             // Transform normals
             normals.iter_mut().for_each(|normal| {
@@ -1911,7 +2008,7 @@ impl Mesh {
         }
 
         if let Some(VertexAttributeValues::Float32x4(tangents)) =
-            self.try_attribute_mut_option(Mesh::ATTRIBUTE_TANGENT)?
+            self.attribute_mut_option(Mesh::ATTRIBUTE_TANGENT)?
         {
             // Transform tangents
             tangents.iter_mut().for_each(|tangent| {
@@ -1928,38 +2025,15 @@ impl Mesh {
     /// Scales the vertex positions, normals, and tangents of the mesh by the given [`Vec3`].
     ///
     /// `Aabb` of entities with modified mesh are not updated automatically.
-    ///
-    /// # Panics
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_scaled_by`]
-    pub fn scaled_by(mut self, scale: Vec3) -> Self {
-        self.scale_by(scale);
-        self
-    }
-
-    /// Scales the vertex positions, normals, and tangents of the mesh by the given [`Vec3`].
-    ///
-    /// `Aabb` of entities with modified mesh are not updated automatically.
-    pub fn try_scaled_by(mut self, scale: Vec3) -> Result<Self, MeshAccessError> {
-        self.try_scale_by(scale)?;
+    pub fn scaled_by(mut self, scale: Vec3) -> Result<Self, MeshAccessError> {
+        self.scale_by(scale)?;
         Ok(self)
     }
 
     /// Scales the vertex positions, normals, and tangents of the mesh in place by the given [`Vec3`].
     ///
     /// `Aabb` of entities with modified mesh are not updated automatically.
-    ///
-    /// # Panics
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_scale_by`]
-    pub fn scale_by(&mut self, scale: Vec3) {
-        self.try_scale_by(scale).expect(MESH_EXTRACTED_ERROR);
-    }
-
-    /// Scales the vertex positions, normals, and tangents of the mesh in place by the given [`Vec3`].
-    ///
-    /// `Aabb` of entities with modified mesh are not updated automatically.
-    pub fn try_scale_by(&mut self, scale: Vec3) -> Result<(), MeshAccessError> {
+    pub fn scale_by(&mut self, scale: Vec3) -> Result<(), MeshAccessError> {
         // Needed when transforming normals and tangents
         let scale_recip = 1. / scale;
         debug_assert!(
@@ -1968,7 +2042,7 @@ impl Mesh {
         );
 
         if let Some(VertexAttributeValues::Float32x3(positions)) =
-            self.try_attribute_mut_option(Mesh::ATTRIBUTE_POSITION)?
+            self.attribute_mut_option(Mesh::ATTRIBUTE_POSITION)?
         {
             // Apply scale to vertex positions
             positions
@@ -1982,7 +2056,7 @@ impl Mesh {
         }
 
         if let Some(VertexAttributeValues::Float32x3(normals)) =
-            self.try_attribute_mut_option(Mesh::ATTRIBUTE_NORMAL)?
+            self.attribute_mut_option(Mesh::ATTRIBUTE_NORMAL)?
         {
             // Transform normals, taking into account non-uniform scaling
             normals.iter_mut().for_each(|normal| {
@@ -1991,7 +2065,7 @@ impl Mesh {
         }
 
         if let Some(VertexAttributeValues::Float32x4(tangents)) =
-            self.try_attribute_mut_option(Mesh::ATTRIBUTE_TANGENT)?
+            self.attribute_mut_option(Mesh::ATTRIBUTE_TANGENT)?
         {
             // Transform tangents, taking into account non-uniform scaling
             tangents.iter_mut().for_each(|tangent| {
@@ -2008,19 +2082,9 @@ impl Mesh {
     }
 
     /// Normalize joint weights so they sum to 1.
-    ///
-    /// # Panics
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_normalize_joint_weights`]
-    pub fn normalize_joint_weights(&mut self) {
-        self.try_normalize_joint_weights()
-            .expect(MESH_EXTRACTED_ERROR);
-    }
-
-    /// Normalize joint weights so they sum to 1.
-    pub fn try_normalize_joint_weights(&mut self) -> Result<(), MeshAccessError> {
+    pub fn normalize_joint_weights(&mut self) -> Result<(), MeshAccessError> {
         if let Some(VertexAttributeValues::Float32x4(joints)) =
-            self.try_attribute_mut_option(Self::ATTRIBUTE_JOINT_WEIGHT)?
+            self.attribute_mut_option(Self::ATTRIBUTE_JOINT_WEIGHT)?
         {
             for weights in joints.iter_mut() {
                 // force negative weights to zero
@@ -2052,13 +2116,13 @@ impl Mesh {
     /// [primitive topology]: PrimitiveTopology
     /// [triangles]: Triangle3d
     pub fn triangles(&self) -> Result<impl Iterator<Item = Triangle3d> + '_, MeshTrianglesError> {
-        let position_data = self.try_attribute(Mesh::ATTRIBUTE_POSITION)?;
+        let position_data = self.attribute(Mesh::ATTRIBUTE_POSITION)?;
 
         let Some(vertices) = position_data.as_float3() else {
             return Err(MeshTrianglesError::PositionsFormat);
         };
 
-        let indices = self.try_indices()?;
+        let indices = self.indices()?;
 
         match self.primitive_topology {
             PrimitiveTopology::TriangleList => {
@@ -2183,35 +2247,22 @@ impl Mesh {
 #[cfg(feature = "morph")]
 impl Mesh {
     /// Whether this mesh has morph targets.
-    ///
-    /// # Panics
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_has_morph_targets`]
-    pub fn has_morph_targets(&self) -> bool {
-        self.try_has_morph_targets().expect(MESH_EXTRACTED_ERROR)
-    }
-
-    /// Whether this mesh has morph targets.
-    pub fn try_has_morph_targets(&self) -> Result<bool, MeshAccessError> {
+    pub fn has_morph_targets(&self) -> Result<bool, MeshAccessError> {
         Ok(self.morph_targets.as_ref_option()?.is_some())
     }
 
-    /// Set [morph targets] image for this mesh. This requires a "morph target image". See [`MorphTargetImage`](crate::morph::MorphTargetImage) for info.
-    ///
-    /// [morph targets]: https://en.wikipedia.org/wiki/Morph_target_animation
+    /// Retrieve the morph targets for this mesh, or None if there are no morph targets.
     ///
-    /// # Panics
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_set_morph_targets`]
-    pub fn set_morph_targets(&mut self, morph_targets: Handle<Image>) {
-        self.try_set_morph_targets(morph_targets)
-            .expect(MESH_EXTRACTED_ERROR);
+    /// Returns an error if the mesh data has been extracted to `RenderWorld`or
+    /// if the morph targets do not exist.
+    pub fn morph_targets(&self) -> Result<&Handle<Image>, MeshAccessError> {
+        self.morph_targets.as_ref()
     }
 
     /// Set [morph targets] image for this mesh. This requires a "morph target image". See [`MorphTargetImage`](crate::morph::MorphTargetImage) for info.
     ///
     /// [morph targets]: https://en.wikipedia.org/wiki/Morph_target_animation
-    pub fn try_set_morph_targets(
+    pub fn set_morph_targets(
         &mut self,
         morph_targets: Handle<Image>,
     ) -> Result<(), MeshAccessError> {
@@ -2219,41 +2270,6 @@ impl Mesh {
         Ok(())
     }
 
-    /// Retrieve the morph targets for this mesh, or None if there are no morph targets.
-    /// # Panics
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_morph_targets`]
-    pub fn morph_targets(&self) -> Option<&Handle<Image>> {
-        self.morph_targets
-            .as_ref_option()
-            .expect(MESH_EXTRACTED_ERROR)
-    }
-
-    /// Retrieve the morph targets for this mesh, or None if there are no morph targets.
-    ///
-    /// Returns an error if the mesh data has been extracted to `RenderWorld`or
-    /// if the morph targets do not exist.
-    pub fn try_morph_targets(&self) -> Result<&Handle<Image>, MeshAccessError> {
-        self.morph_targets.as_ref()
-    }
-
-    /// Consumes the mesh and returns a mesh with the given [morph targets].
-    ///
-    /// This requires a "morph target image". See [`MorphTargetImage`](crate::morph::MorphTargetImage) for info.
-    ///
-    /// (Alternatively, you can use [`Mesh::set_morph_targets`] to mutate an existing mesh in-place)
-    ///
-    /// [morph targets]: https://en.wikipedia.org/wiki/Morph_target_animation
-    ///
-    /// # Panics
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_with_morph_targets`]
-    #[must_use]
-    pub fn with_morph_targets(mut self, morph_targets: Handle<Image>) -> Self {
-        self.set_morph_targets(morph_targets);
-        self
-    }
-
     /// Consumes the mesh and returns a mesh with the given [morph targets].
     ///
     /// This requires a "morph target image". See [`MorphTargetImage`](crate::morph::MorphTargetImage) for info.
@@ -2263,77 +2279,38 @@ impl Mesh {
     /// [morph targets]: https://en.wikipedia.org/wiki/Morph_target_animation
     ///
     /// Returns an error if the mesh data has been extracted to `RenderWorld`.
-    pub fn try_with_morph_targets(
+    pub fn with_morph_targets(
         mut self,
         morph_targets: Handle<Image>,
     ) -> Result<Self, MeshAccessError> {
-        self.try_set_morph_targets(morph_targets)?;
+        self.set_morph_targets(morph_targets)?;
         Ok(self)
     }
 
-    /// Sets the names of each morph target. This should correspond to the order of the morph targets in `set_morph_targets`.
-    ///
-    /// # Panics
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_set_morph_target_names`]
-    pub fn set_morph_target_names(&mut self, names: Vec<String>) {
-        self.try_set_morph_target_names(names)
-            .expect(MESH_EXTRACTED_ERROR);
-    }
-
     /// Sets the names of each morph target. This should correspond to the order of the morph targets in `set_morph_targets`.
     ///
     /// Returns an error if the mesh data has been extracted to `RenderWorld`.
-    pub fn try_set_morph_target_names(
-        &mut self,
-        names: Vec<String>,
-    ) -> Result<(), MeshAccessError> {
+    pub fn set_morph_target_names(&mut self, names: Vec<String>) -> Result<(), MeshAccessError> {
         self.morph_target_names.replace(Some(names))?;
         Ok(())
     }
 
-    /// Consumes the mesh and returns a mesh with morph target names.
-    /// Names should correspond to the order of the morph targets in `set_morph_targets`.
-    ///
-    /// (Alternatively, you can use [`Mesh::set_morph_target_names`] to mutate an existing mesh in-place)
-    ///
-    /// # Panics
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_set_morph_target_names`]
-    #[must_use]
-    pub fn with_morph_target_names(self, names: Vec<String>) -> Self {
-        self.try_with_morph_target_names(names)
-            .expect(MESH_EXTRACTED_ERROR)
-    }
-
     /// Consumes the mesh and returns a mesh with morph target names.
     /// Names should correspond to the order of the morph targets in `set_morph_targets`.
     ///
     /// (Alternatively, you can use [`Mesh::set_morph_target_names`] to mutate an existing mesh in-place)
     ///
     /// Returns an error if the mesh data has been extracted to `RenderWorld`.
-    pub fn try_with_morph_target_names(
-        mut self,
-        names: Vec<String>,
-    ) -> Result<Self, MeshAccessError> {
-        self.try_set_morph_target_names(names)?;
+    pub fn with_morph_target_names(mut self, names: Vec<String>) -> Result<Self, MeshAccessError> {
+        self.set_morph_target_names(names)?;
         Ok(self)
     }
 
-    /// Gets a list of all morph target names, if they exist.
-    ///
-    /// # Panics
-    /// Panics when the mesh data has already been extracted to `RenderWorld`. To handle
-    /// this as an error use [`Mesh::try_morph_target_names`]
-    pub fn morph_target_names(&self) -> Option<&[String]> {
-        self.try_morph_target_names().expect(MESH_EXTRACTED_ERROR)
-    }
-
     /// Gets a list of all morph target names, if they exist.
     ///
     /// Returns an error if the mesh data has been extracted to `RenderWorld`or
     /// if the morph targets do not exist.
-    pub fn try_morph_target_names(&self) -> Result<Option<&[String]>, MeshAccessError> {
+    pub fn morph_target_names(&self) -> Result<Option<&[String]>, MeshAccessError> {
         Ok(self
             .morph_target_names
             .as_ref_option()?
@@ -2360,7 +2337,7 @@ impl core::ops::Mul<Mesh> for Transform {
     type Output = Mesh;
 
     fn mul(self, rhs: Mesh) -> Self::Output {
-        rhs.transformed_by(self)
+        rhs.transformed_by(self).expect(MESH_EXTRACTED_ERROR)
     }
 }
 
@@ -2517,9 +2494,9 @@ pub enum MeshMergeError {
 
 #[cfg(test)]
 mod tests {
-    use super::Mesh;
     #[cfg(feature = "serialize")]
     use super::SerializedMesh;
+    use super::{InfallibleMesh, Mesh};
     use crate::mesh::{Indices, MeshWindingInvertError, VertexAttributeValues};
     use crate::PrimitiveTopology;
     use bevy_asset::RenderAssetUsages;
@@ -2539,7 +2516,7 @@ mod tests {
 
     #[test]
     fn transform_mesh() {
-        let mesh = Mesh::new(
+        let mesh = InfallibleMesh::new(
             PrimitiveTopology::TriangleList,
             RenderAssetUsages::default(),
         )
@@ -2591,7 +2568,7 @@ mod tests {
 
     #[test]
     fn point_list_mesh_invert_winding() {
-        let mesh = Mesh::new(PrimitiveTopology::PointList, RenderAssetUsages::default())
+        let mesh = InfallibleMesh::new(PrimitiveTopology::PointList, RenderAssetUsages::default())
             .with_inserted_indices(Indices::U32(vec![]));
         assert!(matches!(
             mesh.with_inverted_winding(),
@@ -2601,7 +2578,7 @@ mod tests {
 
     #[test]
     fn line_list_mesh_invert_winding() {
-        let mesh = Mesh::new(PrimitiveTopology::LineList, RenderAssetUsages::default())
+        let mesh = InfallibleMesh::new(PrimitiveTopology::LineList, RenderAssetUsages::default())
             .with_inserted_indices(Indices::U32(vec![0, 1, 1, 2, 2, 3]));
         let mesh = mesh.with_inverted_winding().unwrap();
         assert_eq!(
@@ -2612,7 +2589,7 @@ mod tests {
 
     #[test]
     fn line_list_mesh_invert_winding_fail() {
-        let mesh = Mesh::new(PrimitiveTopology::LineList, RenderAssetUsages::default())
+        let mesh = InfallibleMesh::new(PrimitiveTopology::LineList, RenderAssetUsages::default())
             .with_inserted_indices(Indices::U32(vec![0, 1, 1]));
         assert!(matches!(
             mesh.with_inverted_winding(),
@@ -2622,7 +2599,7 @@ mod tests {
 
     #[test]
     fn line_strip_mesh_invert_winding() {
-        let mesh = Mesh::new(PrimitiveTopology::LineStrip, RenderAssetUsages::default())
+        let mesh = InfallibleMesh::new(PrimitiveTopology::LineStrip, RenderAssetUsages::default())
             .with_inserted_indices(Indices::U32(vec![0, 1, 2, 3]));
         let mesh = mesh.with_inverted_winding().unwrap();
         assert_eq!(
@@ -2633,7 +2610,7 @@ mod tests {
 
     #[test]
     fn triangle_list_mesh_invert_winding() {
-        let mesh = Mesh::new(
+        let mesh = InfallibleMesh::new(
             PrimitiveTopology::TriangleList,
             RenderAssetUsages::default(),
         )
@@ -2653,7 +2630,7 @@ mod tests {
 
     #[test]
     fn triangle_list_mesh_invert_winding_fail() {
-        let mesh = Mesh::new(
+        let mesh = InfallibleMesh::new(
             PrimitiveTopology::TriangleList,
             RenderAssetUsages::default(),
         )
@@ -2666,7 +2643,7 @@ mod tests {
 
     #[test]
     fn triangle_strip_mesh_invert_winding() {
-        let mesh = Mesh::new(
+        let mesh = InfallibleMesh::new(
             PrimitiveTopology::TriangleStrip,
             RenderAssetUsages::default(),
         )
@@ -2680,7 +2657,7 @@ mod tests {
 
     #[test]
     fn compute_area_weighted_normals() {
-        let mut mesh = Mesh::new(
+        let mut mesh = InfallibleMesh::new(
             PrimitiveTopology::TriangleList,
             RenderAssetUsages::default(),
         );
@@ -2715,7 +2692,7 @@ mod tests {
 
     #[test]
     fn compute_area_weighted_normals_proportionate() {
-        let mut mesh = Mesh::new(
+        let mut mesh = InfallibleMesh::new(
             PrimitiveTopology::TriangleList,
             RenderAssetUsages::default(),
         );
@@ -2777,7 +2754,7 @@ mod tests {
             4, 5, 1, 1, 0, 4, // top
             3, 2, 6, 6, 7, 3, // bottom
         ]);
-        let mut mesh = Mesh::new(
+        let mut mesh = InfallibleMesh::new(
             PrimitiveTopology::TriangleList,
             RenderAssetUsages::default(),
         );
@@ -2803,7 +2780,7 @@ mod tests {
 
     #[test]
     fn triangles_from_triangle_list() {
-        let mut mesh = Mesh::new(
+        let mut mesh = InfallibleMesh::new(
             PrimitiveTopology::TriangleList,
             RenderAssetUsages::default(),
         );
@@ -2835,7 +2812,7 @@ mod tests {
 
     #[test]
     fn triangles_from_triangle_strip() {
-        let mut mesh = Mesh::new(
+        let mut mesh = InfallibleMesh::new(
             PrimitiveTopology::TriangleStrip,
             RenderAssetUsages::default(),
         );
@@ -2881,7 +2858,7 @@ mod tests {
     #[cfg(feature = "serialize")]
     #[test]
     fn serialize_deserialize_mesh() {
-        let mut mesh = Mesh::new(
+        let mut mesh = InfallibleMesh::new(
             PrimitiveTopology::TriangleList,
             RenderAssetUsages::default(),
         );
@@ -2892,6 +2869,8 @@ mod tests {
         );
         mesh.insert_indices(Indices::U16(vec![0, 1, 2, 0, 2, 3]));
 
+        let mesh = mesh.into_mesh();
+
         let serialized_mesh = SerializedMesh::from_mesh(mesh.clone());
         let serialized_string = serde_json::to_string(&serialized_mesh).unwrap();
         let serialized_mesh_from_string: SerializedMesh =
diff --git a/crates/bevy_mesh/src/mikktspace.rs b/crates/bevy_mesh/src/mikktspace.rs
index 36b24353c7c13..528b5d076aa00 100644
--- a/crates/bevy_mesh/src/mikktspace.rs
+++ b/crates/bevy_mesh/src/mikktspace.rs
@@ -84,7 +84,7 @@ pub(crate) fn generate_tangents_for_mesh(
         other => return Err(GenerateTangentsError::UnsupportedTopology(other)),
     };
 
-    let positions = mesh.try_attribute_option(Mesh::ATTRIBUTE_POSITION)?.ok_or(
+    let positions = mesh.attribute_option(Mesh::ATTRIBUTE_POSITION)?.ok_or(
         GenerateTangentsError::MissingVertexAttribute(Mesh::ATTRIBUTE_POSITION.name),
     )?;
     let VertexAttributeValues::Float32x3(positions) = positions else {
@@ -93,7 +93,7 @@ pub(crate) fn generate_tangents_for_mesh(
             VertexFormat::Float32x3,
         ));
     };
-    let normals = mesh.try_attribute_option(Mesh::ATTRIBUTE_NORMAL)?.ok_or(
+    let normals = mesh.attribute_option(Mesh::ATTRIBUTE_NORMAL)?.ok_or(
         GenerateTangentsError::MissingVertexAttribute(Mesh::ATTRIBUTE_NORMAL.name),
     )?;
     let VertexAttributeValues::Float32x3(normals) = normals else {
@@ -102,7 +102,7 @@ pub(crate) fn generate_tangents_for_mesh(
             VertexFormat::Float32x3,
         ));
     };
-    let uvs = mesh.try_attribute_option(Mesh::ATTRIBUTE_UV_0)?.ok_or(
+    let uvs = mesh.attribute_option(Mesh::ATTRIBUTE_UV_0)?.ok_or(
         GenerateTangentsError::MissingVertexAttribute(Mesh::ATTRIBUTE_UV_0.name),
     )?;
     let VertexAttributeValues::Float32x2(uvs) = uvs else {
@@ -115,7 +115,7 @@ pub(crate) fn generate_tangents_for_mesh(
     let len = positions.len();
     let tangents = vec![[0., 0., 0., 0.]; len];
     let mut mikktspace_mesh = MikktspaceGeometryHelper {
-        indices: mesh.try_indices_option()?,
+        indices: mesh.indices_option()?,
         positions,
         normals,
         uvs,
diff --git a/crates/bevy_mesh/src/primitives/dim2.rs b/crates/bevy_mesh/src/primitives/dim2.rs
index 2a8bb4edf50cf..960bf8b1231c8 100644
--- a/crates/bevy_mesh/src/primitives/dim2.rs
+++ b/crates/bevy_mesh/src/primitives/dim2.rs
@@ -1,6 +1,7 @@
 use core::f32::consts::FRAC_PI_2;
 use core::mem;
 
+use crate::InfallibleMesh;
 use crate::{primitives::dim3::triangle3d, Indices, Mesh, PerimeterSegment, VertexAttributeValues};
 use bevy_asset::RenderAssetUsages;
 
@@ -59,11 +60,11 @@ impl CircleMeshBuilder {
 }
 
 impl MeshBuilder for CircleMeshBuilder {
-    fn build(&self) -> Mesh {
+    fn build_infallible(&self) -> InfallibleMesh {
         Ellipse::new(self.circle.radius, self.circle.radius)
             .mesh()
             .resolution(self.resolution)
-            .build()
+            .build_infallible()
     }
 }
 
@@ -175,7 +176,7 @@ impl CircularSectorMeshBuilder {
 }
 
 impl MeshBuilder for CircularSectorMeshBuilder {
-    fn build(&self) -> Mesh {
+    fn build_infallible(&self) -> InfallibleMesh {
         let resolution = self.resolution as usize;
         let mut indices = Vec::with_capacity((resolution - 1) * 3);
         let mut positions = Vec::with_capacity(resolution + 1);
@@ -210,7 +211,7 @@ impl MeshBuilder for CircularSectorMeshBuilder {
             indices.extend_from_slice(&[0, i, i + 1]);
         }
 
-        Mesh::new(
+        InfallibleMesh::new(
             PrimitiveTopology::TriangleList,
             RenderAssetUsages::default(),
         )
@@ -313,7 +314,7 @@ impl CircularSegmentMeshBuilder {
 }
 
 impl MeshBuilder for CircularSegmentMeshBuilder {
-    fn build(&self) -> Mesh {
+    fn build_infallible(&self) -> InfallibleMesh {
         let resolution = self.resolution as usize;
         let mut indices = Vec::with_capacity((resolution - 1) * 3);
         let mut positions = Vec::with_capacity(resolution + 1);
@@ -357,7 +358,7 @@ impl MeshBuilder for CircularSegmentMeshBuilder {
             indices.extend_from_slice(&[0, i, i + 1]);
         }
 
-        Mesh::new(
+        InfallibleMesh::new(
             PrimitiveTopology::TriangleList,
             RenderAssetUsages::default(),
         )
@@ -427,7 +428,7 @@ impl Meshable for ConvexPolygon {
 }
 
 impl MeshBuilder for ConvexPolygonMeshBuilder {
-    fn build(&self) -> Mesh {
+    fn build_infallible(&self) -> InfallibleMesh {
         let len = self.vertices.len();
         let mut indices = Vec::with_capacity((len - 2) * 3);
         let mut positions = Vec::with_capacity(len);
@@ -438,7 +439,7 @@ impl MeshBuilder for ConvexPolygonMeshBuilder {
         for i in 2..len as u32 {
             indices.extend_from_slice(&[0, i - 1, i]);
         }
-        Mesh::new(
+        InfallibleMesh::new(
             PrimitiveTopology::TriangleList,
             RenderAssetUsages::default(),
         )
@@ -512,12 +513,12 @@ impl Meshable for RegularPolygon {
 }
 
 impl MeshBuilder for RegularPolygonMeshBuilder {
-    fn build(&self) -> Mesh {
+    fn build_infallible(&self) -> InfallibleMesh {
         // The ellipse mesh is just a regular polygon with two radii
         Ellipse::new(self.circumradius, self.circumradius)
             .mesh()
             .resolution(self.sides)
-            .build()
+            .build_infallible()
     }
 }
 
@@ -576,7 +577,7 @@ impl EllipseMeshBuilder {
 }
 
 impl MeshBuilder for EllipseMeshBuilder {
-    fn build(&self) -> Mesh {
+    fn build_infallible(&self) -> InfallibleMesh {
         let resolution = self.resolution as usize;
         let mut indices = Vec::with_capacity((resolution - 2) * 3);
         let mut positions = Vec::with_capacity(resolution);
@@ -602,7 +603,7 @@ impl MeshBuilder for EllipseMeshBuilder {
             indices.extend_from_slice(&[0, i, i + 1]);
         }
 
-        Mesh::new(
+        InfallibleMesh::new(
             PrimitiveTopology::TriangleList,
             RenderAssetUsages::default(),
         )
@@ -655,11 +656,11 @@ impl Segment2dMeshBuilder {
 }
 
 impl MeshBuilder for Segment2dMeshBuilder {
-    fn build(&self) -> Mesh {
+    fn build_infallible(&self) -> InfallibleMesh {
         let positions = self.segment.vertices.map(|v| v.extend(0.0)).to_vec();
         let indices = Indices::U32(vec![0, 1]);
 
-        Mesh::new(PrimitiveTopology::LineList, RenderAssetUsages::default())
+        InfallibleMesh::new(PrimitiveTopology::LineList, RenderAssetUsages::default())
             .with_inserted_attribute(Mesh::ATTRIBUTE_POSITION, positions)
             .with_inserted_indices(indices)
     }
@@ -688,7 +689,7 @@ pub struct Polyline2dMeshBuilder {
 }
 
 impl MeshBuilder for Polyline2dMeshBuilder {
-    fn build(&self) -> Mesh {
+    fn build_infallible(&self) -> InfallibleMesh {
         let positions: Vec<_> = self
             .polyline
             .vertices
@@ -702,7 +703,7 @@ impl MeshBuilder for Polyline2dMeshBuilder {
                 .collect(),
         );
 
-        Mesh::new(PrimitiveTopology::LineList, RenderAssetUsages::default())
+        InfallibleMesh::new(PrimitiveTopology::LineList, RenderAssetUsages::default())
             .with_inserted_indices(indices)
             .with_inserted_attribute(Mesh::ATTRIBUTE_POSITION, positions)
     }
@@ -764,7 +765,7 @@ impl AnnulusMeshBuilder {
 }
 
 impl MeshBuilder for AnnulusMeshBuilder {
-    fn build(&self) -> Mesh {
+    fn build_infallible(&self) -> InfallibleMesh {
         let inner_radius = self.annulus.inner_circle.radius;
         let outer_radius = self.annulus.outer_circle.radius;
 
@@ -811,7 +812,7 @@ impl MeshBuilder for AnnulusMeshBuilder {
             indices.extend_from_slice(&[next_outer, next_inner, inner_vertex]);
         }
 
-        Mesh::new(
+        InfallibleMesh::new(
             PrimitiveTopology::TriangleList,
             RenderAssetUsages::default(),
         )
@@ -896,7 +897,7 @@ impl RhombusMeshBuilder {
 }
 
 impl MeshBuilder for RhombusMeshBuilder {
-    fn build(&self) -> Mesh {
+    fn build_infallible(&self) -> InfallibleMesh {
         let [hhd, vhd] = [self.half_diagonals.x, self.half_diagonals.y];
         let positions = vec![
             [hhd, 0.0, 0.0],
@@ -908,7 +909,7 @@ impl MeshBuilder for RhombusMeshBuilder {
         let uvs = vec![[1.0, 0.5], [0.5, 0.0], [0.0, 0.5], [0.5, 1.0]];
         let indices = Indices::U32(vec![2, 0, 1, 2, 3, 0]);
 
-        Mesh::new(
+        InfallibleMesh::new(
             PrimitiveTopology::TriangleList,
             RenderAssetUsages::default(),
         )
@@ -968,7 +969,7 @@ impl Meshable for Triangle2d {
 }
 
 impl MeshBuilder for Triangle2dMeshBuilder {
-    fn build(&self) -> Mesh {
+    fn build_infallible(&self) -> InfallibleMesh {
         let vertices_3d = self.triangle.vertices.map(|v| v.extend(0.));
 
         let positions: Vec<_> = vertices_3d.into();
@@ -988,7 +989,7 @@ impl MeshBuilder for Triangle2dMeshBuilder {
             Indices::U32(vec![2, 1, 0])
         };
 
-        Mesh::new(
+        InfallibleMesh::new(
             PrimitiveTopology::TriangleList,
             RenderAssetUsages::default(),
         )
@@ -1053,7 +1054,7 @@ impl RectangleMeshBuilder {
 }
 
 impl MeshBuilder for RectangleMeshBuilder {
-    fn build(&self) -> Mesh {
+    fn build_infallible(&self) -> InfallibleMesh {
         let [hw, hh] = [self.half_size.x, self.half_size.y];
         let positions = vec![
             [hw, hh, 0.0],
@@ -1065,7 +1066,7 @@ impl MeshBuilder for RectangleMeshBuilder {
         let uvs = vec![[1.0, 0.0], [0.0, 0.0], [0.0, 1.0], [1.0, 1.0]];
         let indices = Indices::U32(vec![0, 1, 2, 0, 2, 3]);
 
-        Mesh::new(
+        InfallibleMesh::new(
             PrimitiveTopology::TriangleList,
             RenderAssetUsages::default(),
         )
@@ -1143,7 +1144,7 @@ impl Capsule2dMeshBuilder {
 }
 
 impl MeshBuilder for Capsule2dMeshBuilder {
-    fn build(&self) -> Mesh {
+    fn build_infallible(&self) -> InfallibleMesh {
         // The resolution is the number of vertices for one semicircle
         let resolution = self.resolution;
         let vertex_count = 2 * resolution;
@@ -1207,7 +1208,7 @@ impl MeshBuilder for Capsule2dMeshBuilder {
         // Add indices for bottom right triangle of the part between the semicircles
         indices.extend_from_slice(&[resolution, vertex_count - 1, 0]);
 
-        Mesh::new(
+        InfallibleMesh::new(
             PrimitiveTopology::TriangleList,
             RenderAssetUsages::default(),
         )
@@ -1290,7 +1291,7 @@ where
     }
 
     fn get_vertex_attributes(&self) -> Option<RingMeshBuilderVertexAttributes> {
-        fn get_positions(mesh: &mut Mesh) -> Option<&mut Vec<[f32; 3]>> {
+        fn get_positions(mesh: &mut InfallibleMesh) -> Option<&mut Vec<[f32; 3]>> {
             if let VertexAttributeValues::Float32x3(data) =
                 mesh.attribute_mut(Mesh::ATTRIBUTE_POSITION)?
             {
@@ -1300,7 +1301,7 @@ where
             }
         }
 
-        fn get_uvs(mesh: &mut Mesh) -> Option<&mut Vec<[f32; 2]>> {
+        fn get_uvs(mesh: &mut InfallibleMesh) -> Option<&mut Vec<[f32; 2]>> {
             if let VertexAttributeValues::Float32x2(data) =
                 mesh.attribute_mut(Mesh::ATTRIBUTE_UV_0)?
             {
@@ -1310,7 +1311,7 @@ where
             }
         }
 
-        fn get_normals(mesh: &mut Mesh) -> Option<&mut Vec<[f32; 3]>> {
+        fn get_normals(mesh: &mut InfallibleMesh) -> Option<&mut Vec<[f32; 3]>> {
             if let VertexAttributeValues::Float32x3(data) =
                 mesh.attribute_mut(Mesh::ATTRIBUTE_NORMAL)?
             {
@@ -1320,8 +1321,8 @@ where
             }
         }
 
-        let mut outer = self.outer_shape_builder.build();
-        let mut inner = self.inner_shape_builder.build();
+        let mut outer = self.outer_shape_builder.build_infallible();
+        let mut inner = self.inner_shape_builder.build_infallible();
 
         assert_eq!(
             outer.primitive_topology(),
@@ -1371,7 +1372,7 @@ where
     /// It is assumed that the `primitive_topology` of the mesh returned by
     /// the underlying builder is [`PrimitiveTopology::TriangleList`]
     /// and that the mesh has [`Mesh::ATTRIBUTE_POSITION`], [`Mesh::ATTRIBUTE_NORMAL`] and [`Mesh::ATTRIBUTE_UV_0`] attributes.
-    fn build(&self) -> Mesh {
+    fn build_infallible(&self) -> InfallibleMesh {
         if let Some(RingMeshBuilderVertexAttributes {
             outer_uvs,
             inner_uvs,
@@ -1424,7 +1425,7 @@ where
             let mut positions = outer_positions;
             positions.extend_from_slice(&inner_positions);
 
-            Mesh::new(
+            InfallibleMesh::new(
                 PrimitiveTopology::TriangleList,
                 RenderAssetUsages::default(),
             )
@@ -1569,7 +1570,7 @@ mod tests {
 
     #[test]
     fn test_regular_polygon() {
-        let mut mesh = Mesh::from(RegularPolygon::new(7.0, 4));
+        let mut mesh = RegularPolygon::new(7.0, 4).mesh().build_infallible();
 
         let Some(VertexAttributeValues::Float32x3(mut positions)) =
             mesh.remove_attribute(Mesh::ATTRIBUTE_POSITION)
diff --git a/crates/bevy_mesh/src/primitives/dim3/capsule.rs b/crates/bevy_mesh/src/primitives/dim3/capsule.rs
index f46ebce0d15a7..64f5ae86ee6f3 100644
--- a/crates/bevy_mesh/src/primitives/dim3/capsule.rs
+++ b/crates/bevy_mesh/src/primitives/dim3/capsule.rs
@@ -1,4 +1,4 @@
-use crate::{Indices, Mesh, MeshBuilder, Meshable, PrimitiveTopology};
+use crate::{Indices, InfallibleMesh, Mesh, MeshBuilder, Meshable, PrimitiveTopology};
 use bevy_asset::RenderAssetUsages;
 use bevy_math::{ops, primitives::Capsule3d, Vec2, Vec3};
 use bevy_reflect::prelude::*;
@@ -94,7 +94,7 @@ impl Capsule3dMeshBuilder {
 }
 
 impl MeshBuilder for Capsule3dMeshBuilder {
-    fn build(&self) -> Mesh {
+    fn build_infallible(&self) -> InfallibleMesh {
         // code adapted from https://behreajj.medium.com/making-a-capsule-mesh-via-script-in-five-3d-environments-c2214abf02db
         let Capsule3dMeshBuilder {
             capsule,
@@ -407,7 +407,7 @@ impl MeshBuilder for Capsule3dMeshBuilder {
         assert_eq!(vs.len(), vert_len);
         assert_eq!(tris.len(), fs_len as usize);
 
-        Mesh::new(
+        InfallibleMesh::new(
             PrimitiveTopology::TriangleList,
             RenderAssetUsages::default(),
         )
diff --git a/crates/bevy_mesh/src/primitives/dim3/cone.rs b/crates/bevy_mesh/src/primitives/dim3/cone.rs
index d06a57f832ea5..b773f05a71e74 100644
--- a/crates/bevy_mesh/src/primitives/dim3/cone.rs
+++ b/crates/bevy_mesh/src/primitives/dim3/cone.rs
@@ -1,4 +1,4 @@
-use crate::{Indices, Mesh, MeshBuilder, Meshable, PrimitiveTopology};
+use crate::{Indices, InfallibleMesh, Mesh, MeshBuilder, Meshable, PrimitiveTopology};
 use bevy_asset::RenderAssetUsages;
 use bevy_math::{ops, primitives::Cone, Vec3};
 use bevy_reflect::prelude::*;
@@ -69,7 +69,7 @@ impl ConeMeshBuilder {
 }
 
 impl MeshBuilder for ConeMeshBuilder {
-    fn build(&self) -> Mesh {
+    fn build_infallible(&self) -> InfallibleMesh {
         let half_height = self.cone.height / 2.0;
 
         // `resolution` vertices for the base, `resolution` vertices for the bottom of the lateral surface,
@@ -160,7 +160,7 @@ impl MeshBuilder for ConeMeshBuilder {
             ConeAnchor::MidPoint => (),
         };
 
-        Mesh::new(
+        InfallibleMesh::new(
             PrimitiveTopology::TriangleList,
             RenderAssetUsages::default(),
         )
@@ -213,7 +213,7 @@ mod tests {
         }
         .mesh()
         .resolution(4)
-        .build();
+        .build_infallible();
 
         let Some(VertexAttributeValues::Float32x3(mut positions)) =
             mesh.remove_attribute(Mesh::ATTRIBUTE_POSITION)
diff --git a/crates/bevy_mesh/src/primitives/dim3/conical_frustum.rs b/crates/bevy_mesh/src/primitives/dim3/conical_frustum.rs
index 8c69378c01e64..a0ca1fe9519ec 100644
--- a/crates/bevy_mesh/src/primitives/dim3/conical_frustum.rs
+++ b/crates/bevy_mesh/src/primitives/dim3/conical_frustum.rs
@@ -1,4 +1,4 @@
-use crate::{Indices, Mesh, MeshBuilder, Meshable, PrimitiveTopology};
+use crate::{Indices, InfallibleMesh, Mesh, MeshBuilder, Meshable, PrimitiveTopology};
 use bevy_asset::RenderAssetUsages;
 use bevy_math::{ops, primitives::ConicalFrustum, Vec3};
 use bevy_reflect::prelude::*;
@@ -61,7 +61,7 @@ impl ConicalFrustumMeshBuilder {
 }
 
 impl MeshBuilder for ConicalFrustumMeshBuilder {
-    fn build(&self) -> Mesh {
+    fn build_infallible(&self) -> InfallibleMesh {
         debug_assert!(self.resolution > 2);
         debug_assert!(self.segments > 0);
 
@@ -155,7 +155,7 @@ impl MeshBuilder for ConicalFrustumMeshBuilder {
         build_cap(true, radius_top);
         build_cap(false, radius_bottom);
 
-        Mesh::new(
+        InfallibleMesh::new(
             PrimitiveTopology::TriangleList,
             RenderAssetUsages::default(),
         )
diff --git a/crates/bevy_mesh/src/primitives/dim3/cuboid.rs b/crates/bevy_mesh/src/primitives/dim3/cuboid.rs
index 40a7cd45d4433..7edd0c3d71945 100644
--- a/crates/bevy_mesh/src/primitives/dim3/cuboid.rs
+++ b/crates/bevy_mesh/src/primitives/dim3/cuboid.rs
@@ -1,4 +1,4 @@
-use crate::{Indices, Mesh, MeshBuilder, Meshable, PrimitiveTopology};
+use crate::{Indices, InfallibleMesh, Mesh, MeshBuilder, Meshable, PrimitiveTopology};
 use bevy_asset::RenderAssetUsages;
 use bevy_math::{primitives::Cuboid, Vec3};
 use bevy_reflect::prelude::*;
@@ -20,7 +20,7 @@ impl Default for CuboidMeshBuilder {
 }
 
 impl MeshBuilder for CuboidMeshBuilder {
-    fn build(&self) -> Mesh {
+    fn build_infallible(&self) -> InfallibleMesh {
         let min = -self.half_size;
         let max = self.half_size;
 
@@ -71,7 +71,7 @@ impl MeshBuilder for CuboidMeshBuilder {
             20, 21, 22, 22, 23, 20, // bottom
         ]);
 
-        Mesh::new(
+        InfallibleMesh::new(
             PrimitiveTopology::TriangleList,
             RenderAssetUsages::default(),
         )
diff --git a/crates/bevy_mesh/src/primitives/dim3/cylinder.rs b/crates/bevy_mesh/src/primitives/dim3/cylinder.rs
index 7b1b45974ea62..dc8956243f5c5 100644
--- a/crates/bevy_mesh/src/primitives/dim3/cylinder.rs
+++ b/crates/bevy_mesh/src/primitives/dim3/cylinder.rs
@@ -1,4 +1,4 @@
-use crate::{Indices, Mesh, MeshBuilder, Meshable, PrimitiveTopology};
+use crate::{Indices, InfallibleMesh, Mesh, MeshBuilder, Meshable, PrimitiveTopology};
 use bevy_asset::RenderAssetUsages;
 use bevy_math::{ops, primitives::Cylinder};
 use bevy_reflect::prelude::*;
@@ -94,7 +94,7 @@ impl CylinderMeshBuilder {
 }
 
 impl MeshBuilder for CylinderMeshBuilder {
-    fn build(&self) -> Mesh {
+    fn build_infallible(&self) -> InfallibleMesh {
         let resolution = self.resolution;
         let segments = self.segments;
 
@@ -193,7 +193,7 @@ impl MeshBuilder for CylinderMeshBuilder {
             CylinderAnchor::MidPoint => (),
         };
 
-        Mesh::new(
+        InfallibleMesh::new(
             PrimitiveTopology::TriangleList,
             RenderAssetUsages::default(),
         )
diff --git a/crates/bevy_mesh/src/primitives/dim3/plane.rs b/crates/bevy_mesh/src/primitives/dim3/plane.rs
index fd892469be6af..3b174f5bb48f8 100644
--- a/crates/bevy_mesh/src/primitives/dim3/plane.rs
+++ b/crates/bevy_mesh/src/primitives/dim3/plane.rs
@@ -1,4 +1,4 @@
-use crate::{Indices, Mesh, MeshBuilder, Meshable, PrimitiveTopology};
+use crate::{Indices, InfallibleMesh, Mesh, MeshBuilder, Meshable, PrimitiveTopology};
 use bevy_asset::RenderAssetUsages;
 use bevy_math::{primitives::Plane3d, Dir3, Quat, Vec2, Vec3};
 use bevy_reflect::prelude::*;
@@ -94,7 +94,7 @@ impl PlaneMeshBuilder {
 }
 
 impl MeshBuilder for PlaneMeshBuilder {
-    fn build(&self) -> Mesh {
+    fn build_infallible(&self) -> InfallibleMesh {
         let z_vertex_count = self.subdivisions + 2;
         let x_vertex_count = self.subdivisions + 2;
         let num_vertices = (z_vertex_count * x_vertex_count) as usize;
@@ -131,7 +131,7 @@ impl MeshBuilder for PlaneMeshBuilder {
             }
         }
 
-        Mesh::new(
+        InfallibleMesh::new(
             PrimitiveTopology::TriangleList,
             RenderAssetUsages::default(),
         )
diff --git a/crates/bevy_mesh/src/primitives/dim3/polyline3d.rs b/crates/bevy_mesh/src/primitives/dim3/polyline3d.rs
index 4d13112579f09..f0e8ae42b0c54 100644
--- a/crates/bevy_mesh/src/primitives/dim3/polyline3d.rs
+++ b/crates/bevy_mesh/src/primitives/dim3/polyline3d.rs
@@ -1,4 +1,4 @@
-use crate::{Indices, Mesh, MeshBuilder, Meshable, PrimitiveTopology};
+use crate::{Indices, InfallibleMesh, Mesh, MeshBuilder, Meshable, PrimitiveTopology};
 use bevy_asset::RenderAssetUsages;
 use bevy_math::primitives::Polyline3d;
 use bevy_reflect::prelude::*;
@@ -11,7 +11,7 @@ pub struct Polyline3dMeshBuilder {
 }
 
 impl MeshBuilder for Polyline3dMeshBuilder {
-    fn build(&self) -> Mesh {
+    fn build_infallible(&self) -> InfallibleMesh {
         let positions: Vec<_> = self.polyline.vertices.clone();
 
         let indices = Indices::U32(
@@ -20,7 +20,7 @@ impl MeshBuilder for Polyline3dMeshBuilder {
                 .collect(),
         );
 
-        Mesh::new(PrimitiveTopology::LineList, RenderAssetUsages::default())
+        InfallibleMesh::new(PrimitiveTopology::LineList, RenderAssetUsages::default())
             .with_inserted_indices(indices)
             .with_inserted_attribute(Mesh::ATTRIBUTE_POSITION, positions)
     }
diff --git a/crates/bevy_mesh/src/primitives/dim3/segment3d.rs b/crates/bevy_mesh/src/primitives/dim3/segment3d.rs
index d032285283afb..4326955cb2324 100644
--- a/crates/bevy_mesh/src/primitives/dim3/segment3d.rs
+++ b/crates/bevy_mesh/src/primitives/dim3/segment3d.rs
@@ -1,4 +1,4 @@
-use crate::{Indices, Mesh, MeshBuilder, Meshable, PrimitiveTopology};
+use crate::{Indices, InfallibleMesh, Mesh, MeshBuilder, Meshable, PrimitiveTopology};
 use bevy_asset::RenderAssetUsages;
 use bevy_math::primitives::Segment3d;
 use bevy_reflect::prelude::*;
@@ -11,11 +11,11 @@ pub struct Segment3dMeshBuilder {
 }
 
 impl MeshBuilder for Segment3dMeshBuilder {
-    fn build(&self) -> Mesh {
+    fn build_infallible(&self) -> InfallibleMesh {
         let positions: Vec<_> = self.segment.vertices.into();
         let indices = Indices::U32(vec![0, 1]);
 
-        Mesh::new(PrimitiveTopology::LineList, RenderAssetUsages::default())
+        InfallibleMesh::new(PrimitiveTopology::LineList, RenderAssetUsages::default())
             .with_inserted_indices(indices)
             .with_inserted_attribute(Mesh::ATTRIBUTE_POSITION, positions)
     }
diff --git a/crates/bevy_mesh/src/primitives/dim3/sphere.rs b/crates/bevy_mesh/src/primitives/dim3/sphere.rs
index 6ae8eec5ed8bf..946b850430262 100644
--- a/crates/bevy_mesh/src/primitives/dim3/sphere.rs
+++ b/crates/bevy_mesh/src/primitives/dim3/sphere.rs
@@ -1,4 +1,4 @@
-use crate::{Indices, Mesh, MeshBuilder, Meshable, PrimitiveTopology};
+use crate::{Indices, InfallibleMesh, Mesh, MeshBuilder, Meshable, PrimitiveTopology};
 use bevy_asset::RenderAssetUsages;
 use bevy_math::{ops, primitives::Sphere};
 use bevy_reflect::prelude::*;
@@ -81,7 +81,7 @@ impl SphereMeshBuilder {
     /// and an [`IcosphereError`] is returned.
     ///
     /// A good default is `5` subdivisions.
-    pub fn ico(&self, subdivisions: u32) -> Result<Mesh, IcosphereError> {
+    pub fn ico(&self, subdivisions: u32) -> Result<InfallibleMesh, IcosphereError> {
         if subdivisions >= 80 {
             /*
             Number of triangles:
@@ -151,7 +151,7 @@ impl SphereMeshBuilder {
 
         let indices = Indices::U32(indices);
 
-        Ok(Mesh::new(
+        Ok(InfallibleMesh::new(
             PrimitiveTopology::TriangleList,
             RenderAssetUsages::default(),
         )
@@ -165,7 +165,7 @@ impl SphereMeshBuilder {
     /// longitudinal sectors and latitudinal stacks, aka horizontal and vertical resolution.
     ///
     /// A good default is `32` sectors and `18` stacks.
-    pub fn uv(&self, sectors: u32, stacks: u32) -> Mesh {
+    pub fn uv(&self, sectors: u32, stacks: u32) -> InfallibleMesh {
         // Largely inspired from http://www.songho.ca/opengl/gl_sphere.html
 
         let sectors_f32 = sectors as f32;
@@ -220,7 +220,7 @@ impl SphereMeshBuilder {
             }
         }
 
-        Mesh::new(
+        InfallibleMesh::new(
             PrimitiveTopology::TriangleList,
             RenderAssetUsages::default(),
         )
@@ -238,7 +238,7 @@ impl MeshBuilder for SphereMeshBuilder {
     ///
     /// Panics if the sphere is a [`SphereKind::Ico`] with a subdivision count
     /// that is greater than or equal to `80` because there will be too many vertices.
-    fn build(&self) -> Mesh {
+    fn build_infallible(&self) -> InfallibleMesh {
         match self.kind {
             SphereKind::Ico { subdivisions } => self.ico(subdivisions).unwrap(),
             SphereKind::Uv { sectors, stacks } => self.uv(sectors, stacks),
diff --git a/crates/bevy_mesh/src/primitives/dim3/tetrahedron.rs b/crates/bevy_mesh/src/primitives/dim3/tetrahedron.rs
index 529805d9a603f..432aa4337c4a5 100644
--- a/crates/bevy_mesh/src/primitives/dim3/tetrahedron.rs
+++ b/crates/bevy_mesh/src/primitives/dim3/tetrahedron.rs
@@ -1,5 +1,5 @@
 use super::triangle3d;
-use crate::{Indices, Mesh, MeshBuilder, Meshable, PrimitiveTopology};
+use crate::{Indices, InfallibleMesh, Mesh, MeshBuilder, Meshable, PrimitiveTopology};
 use bevy_asset::RenderAssetUsages;
 use bevy_math::primitives::{Tetrahedron, Triangle3d};
 use bevy_reflect::prelude::*;
@@ -12,7 +12,7 @@ pub struct TetrahedronMeshBuilder {
 }
 
 impl MeshBuilder for TetrahedronMeshBuilder {
-    fn build(&self) -> Mesh {
+    fn build_infallible(&self) -> InfallibleMesh {
         let mut faces: Vec<_> = self.tetrahedron.faces().into();
 
         // If the tetrahedron has negative orientation, reverse all the triangles so that
@@ -40,7 +40,7 @@ impl MeshBuilder for TetrahedronMeshBuilder {
         // There are four faces and none of them share vertices.
         let indices = Indices::U32(vec![0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]);
 
-        Mesh::new(
+        InfallibleMesh::new(
             PrimitiveTopology::TriangleList,
             RenderAssetUsages::default(),
         )
diff --git a/crates/bevy_mesh/src/primitives/dim3/torus.rs b/crates/bevy_mesh/src/primitives/dim3/torus.rs
index 6f370c13418ca..d2267774c764a 100644
--- a/crates/bevy_mesh/src/primitives/dim3/torus.rs
+++ b/crates/bevy_mesh/src/primitives/dim3/torus.rs
@@ -1,4 +1,4 @@
-use crate::{Indices, Mesh, MeshBuilder, Meshable, PrimitiveTopology};
+use crate::{Indices, InfallibleMesh, Mesh, MeshBuilder, Meshable, PrimitiveTopology};
 use bevy_asset::RenderAssetUsages;
 use bevy_math::{ops, primitives::Torus, Vec3};
 use bevy_reflect::prelude::*;
@@ -77,7 +77,7 @@ impl TorusMeshBuilder {
 }
 
 impl MeshBuilder for TorusMeshBuilder {
-    fn build(&self) -> Mesh {
+    fn build_infallible(&self) -> InfallibleMesh {
         // code adapted from http://apparat-engine.blogspot.com/2013/04/procedural-meshes-torus.html
 
         let n_vertices = (self.major_resolution + 1) * (self.minor_resolution + 1);
@@ -147,7 +147,7 @@ impl MeshBuilder for TorusMeshBuilder {
             }
         }
 
-        Mesh::new(
+        InfallibleMesh::new(
             PrimitiveTopology::TriangleList,
             RenderAssetUsages::default(),
         )
diff --git a/crates/bevy_mesh/src/primitives/dim3/triangle3d.rs b/crates/bevy_mesh/src/primitives/dim3/triangle3d.rs
index e35f272ab9bb1..2337feb512ecd 100644
--- a/crates/bevy_mesh/src/primitives/dim3/triangle3d.rs
+++ b/crates/bevy_mesh/src/primitives/dim3/triangle3d.rs
@@ -1,4 +1,4 @@
-use crate::{Indices, Mesh, MeshBuilder, Meshable, PrimitiveTopology};
+use crate::{Indices, InfallibleMesh, Mesh, MeshBuilder, Meshable, PrimitiveTopology};
 use bevy_asset::RenderAssetUsages;
 use bevy_math::{primitives::Triangle3d, Vec3};
 use bevy_reflect::prelude::*;
@@ -11,7 +11,7 @@ pub struct Triangle3dMeshBuilder {
 }
 
 impl MeshBuilder for Triangle3dMeshBuilder {
-    fn build(&self) -> Mesh {
+    fn build_infallible(&self) -> InfallibleMesh {
         let positions: Vec<_> = self.triangle.vertices.into();
         let uvs: Vec<_> = uv_coords(&self.triangle).into();
 
@@ -21,7 +21,7 @@ impl MeshBuilder for Triangle3dMeshBuilder {
 
         let indices = Indices::U32(vec![0, 1, 2]);
 
-        Mesh::new(
+        InfallibleMesh::new(
             PrimitiveTopology::TriangleList,
             RenderAssetUsages::default(),
         )
diff --git a/crates/bevy_mesh/src/primitives/extrusion.rs b/crates/bevy_mesh/src/primitives/extrusion.rs
index 091735dc8349c..2670805080904 100644
--- a/crates/bevy_mesh/src/primitives/extrusion.rs
+++ b/crates/bevy_mesh/src/primitives/extrusion.rs
@@ -4,7 +4,7 @@ use bevy_math::{
 };
 
 use super::{MeshBuilder, Meshable};
-use crate::{Indices, Mesh, PrimitiveTopology, VertexAttributeValues};
+use crate::{Indices, InfallibleMesh, Mesh, PrimitiveTopology, VertexAttributeValues};
 
 /// A type representing a segment of the perimeter of an extrudable mesh.
 pub enum PerimeterSegment {
@@ -177,12 +177,12 @@ where
     P: Primitive2d + Meshable,
     P::Output: Extrudable,
 {
-    fn build(&self) -> Mesh {
+    fn build_infallible(&self) -> InfallibleMesh {
         // Create and move the base mesh to the front
-        let mut front_face =
-            self.base_builder
-                .build()
-                .translated_by(Vec3::new(0., 0., self.half_depth));
+        let mut front_face = self
+            .base_builder
+            .build_infallible()
+            .translated_by(Vec3::new(0., 0., self.half_depth));
 
         // Move the uvs of the front face to be between (0., 0.) and (0.5, 0.5)
         if let Some(VertexAttributeValues::Float32x2(uvs)) =
@@ -413,7 +413,7 @@ where
                 }
             }
 
-            Mesh::new(PrimitiveTopology::TriangleList, front_face.asset_usage)
+            InfallibleMesh::new(PrimitiveTopology::TriangleList, front_face.asset_usage)
                 .with_inserted_indices(Indices::U32(indices))
                 .with_inserted_attribute(Mesh::ATTRIBUTE_POSITION, positions)
                 .with_inserted_attribute(Mesh::ATTRIBUTE_NORMAL, normals)
diff --git a/crates/bevy_mesh/src/primitives/mod.rs b/crates/bevy_mesh/src/primitives/mod.rs
index 02aa0f1caf41e..64f0ab16a1242 100644
--- a/crates/bevy_mesh/src/primitives/mod.rs
+++ b/crates/bevy_mesh/src/primitives/mod.rs
@@ -28,6 +28,8 @@ pub use dim3::*;
 mod extrusion;
 pub use extrusion::*;
 
+use crate::InfallibleMesh;
+
 use super::Mesh;
 
 /// A trait for shapes that can be turned into a [`Mesh`].
@@ -41,8 +43,13 @@ pub trait Meshable {
 
 /// A trait used to build [`Mesh`]es from a configuration
 pub trait MeshBuilder {
+    /// Builds an [`InfallibleMesh`] based on the configuration in `self`.
+    fn build_infallible(&self) -> InfallibleMesh;
+
     /// Builds a [`Mesh`] based on the configuration in `self`.
-    fn build(&self) -> Mesh;
+    fn build(&self) -> Mesh {
+        self.build_infallible().into()
+    }
 }
 
 impl<T: MeshBuilder> From<T> for Mesh {
@@ -50,3 +57,9 @@ impl<T: MeshBuilder> From<T> for Mesh {
         builder.build()
     }
 }
+
+impl<T: MeshBuilder> From<T> for InfallibleMesh {
+    fn from(builder: T) -> Self {
+        builder.build_infallible()
+    }
+}
diff --git a/crates/bevy_pbr/src/decal/forward.rs b/crates/bevy_pbr/src/decal/forward.rs
index fa38e084dd7c7..d51263eb621f0 100644
--- a/crates/bevy_pbr/src/decal/forward.rs
+++ b/crates/bevy_pbr/src/decal/forward.rs
@@ -32,7 +32,7 @@ impl Plugin for ForwardDecalPlugin {
         let mesh = app.world_mut().resource_mut::<Assets<Mesh>>().add(
             Rectangle::from_size(Vec2::ONE)
                 .mesh()
-                .build()
+                .build_infallible()
                 .rotated_by(Quat::from_rotation_arc(Vec3::Z, Vec3::Y))
                 .with_generated_tangents()
                 .unwrap(),
diff --git a/crates/bevy_pbr/src/meshlet/from_mesh.rs b/crates/bevy_pbr/src/meshlet/from_mesh.rs
index 23de97909404f..ab4632500b341 100644
--- a/crates/bevy_pbr/src/meshlet/from_mesh.rs
+++ b/crates/bevy_pbr/src/meshlet/from_mesh.rs
@@ -7,7 +7,7 @@ use bevy_math::{
     ops::log2,
     IVec3, Isometry3d, Vec2, Vec3, Vec3A, Vec3Swizzles,
 };
-use bevy_mesh::{Indices, Mesh};
+use bevy_mesh::{Indices, Mesh, MeshAccessError};
 use bevy_platform::collections::HashMap;
 use bevy_render::render_resource::PrimitiveTopology;
 use bevy_tasks::{AsyncComputeTaskPool, ParallelSlice};
@@ -251,19 +251,19 @@ fn validate_input_mesh(mesh: &Mesh) -> Result<Cow<'_, [u32]>, MeshToMeshletMeshC
         return Err(MeshToMeshletMeshConversionError::WrongMeshPrimitiveTopology);
     }
 
-    if mesh.attributes().map(|(attribute, _)| attribute.id).ne([
+    if mesh.attributes()?.map(|(attribute, _)| attribute.id).ne([
         Mesh::ATTRIBUTE_POSITION.id,
         Mesh::ATTRIBUTE_NORMAL.id,
         Mesh::ATTRIBUTE_UV_0.id,
     ]) {
         return Err(MeshToMeshletMeshConversionError::WrongMeshVertexAttributes(
-            mesh.attributes()
+            mesh.attributes()?
                 .map(|(attribute, _)| format!("{attribute:?}"))
                 .collect(),
         ));
     }
 
-    match mesh.indices() {
+    match mesh.indices_option()? {
         Some(Indices::U32(indices)) => Ok(Cow::Borrowed(indices.as_slice())),
         Some(Indices::U16(indices)) => Ok(indices.iter().map(|i| *i as u32).collect()),
         _ => Err(MeshToMeshletMeshConversionError::MeshMissingIndices),
@@ -1088,4 +1088,6 @@ pub enum MeshToMeshletMeshConversionError {
     WrongMeshVertexAttributes(Vec<String>),
     #[error("Mesh has no indices")]
     MeshMissingIndices,
+    #[error("{0}")]
+    MeshAccessError(#[from] MeshAccessError),
 }
diff --git a/crates/bevy_picking/src/mesh_picking/ray_cast/intersections.rs b/crates/bevy_picking/src/mesh_picking/ray_cast/intersections.rs
index 24c6effab046c..8b13ef8994432 100644
--- a/crates/bevy_picking/src/mesh_picking/ray_cast/intersections.rs
+++ b/crates/bevy_picking/src/mesh_picking/ray_cast/intersections.rs
@@ -35,6 +35,8 @@ pub struct RayTriangleHit {
     pub barycentric_coords: (f32, f32),
 }
 
+const MESH_EXTRACTED_ERROR: &str = "Cannot pick on extracted mesh, the mesh `asset_usage` must include `RenderAssetUsages::MAIN_WORLD`";
+
 /// Casts a ray on a mesh, and returns the intersection.
 pub(super) fn ray_intersection_over_mesh(
     mesh: &Mesh,
@@ -46,21 +48,26 @@ pub(super) fn ray_intersection_over_mesh(
         return None; // ray_mesh_intersection assumes vertices are laid out in a triangle list
     }
     // Vertex positions are required
-    let positions = mesh.attribute(Mesh::ATTRIBUTE_POSITION)?.as_float3()?;
+    let positions = mesh
+        .attribute_option(Mesh::ATTRIBUTE_POSITION)
+        .expect(MESH_EXTRACTED_ERROR)?
+        .as_float3()?;
 
     // Normals are optional
     let normals = mesh
-        .attribute(Mesh::ATTRIBUTE_NORMAL)
+        .attribute_option(Mesh::ATTRIBUTE_NORMAL)
+        .expect("")
         .and_then(|normal_values| normal_values.as_float3());
 
     let uvs = mesh
-        .attribute(Mesh::ATTRIBUTE_UV_0)
+        .attribute_option(Mesh::ATTRIBUTE_UV_0)
+        .expect(MESH_EXTRACTED_ERROR)
         .and_then(|uvs| match uvs {
             VertexAttributeValues::Float32x2(uvs) => Some(uvs.as_slice()),
             _ => None,
         });
 
-    match mesh.indices() {
+    match mesh.indices_option().expect(MESH_EXTRACTED_ERROR) {
         Some(Indices::U16(indices)) => {
             ray_mesh_intersection(ray, transform, positions, normals, Some(indices), uvs, cull)
         }
diff --git a/crates/bevy_render/src/mesh/allocator.rs b/crates/bevy_render/src/mesh/allocator.rs
index 654114e758f22..73100f1ec7cd9 100644
--- a/crates/bevy_render/src/mesh/allocator.rs
+++ b/crates/bevy_render/src/mesh/allocator.rs
@@ -1029,7 +1029,10 @@ impl ElementLayout {
     /// Creates the appropriate [`ElementLayout`] for the given mesh's index
     /// data.
     fn index(mesh: &Mesh) -> Option<ElementLayout> {
-        let size = match mesh.indices()? {
+        let size = match mesh
+            .indices_option()
+            .expect("mesh data should always be available in render world")?
+        {
             Indices::U16(_) => 2,
             Indices::U32(_) => 4,
         };
diff --git a/crates/bevy_render/src/mesh/mod.rs b/crates/bevy_render/src/mesh/mod.rs
index fb849cd51b3aa..33bc2a61a9bb8 100644
--- a/crates/bevy_render/src/mesh/mod.rs
+++ b/crates/bevy_render/src/mesh/mod.rs
@@ -144,7 +144,10 @@ impl RenderAsset for RenderMesh {
 
     fn byte_len(mesh: &Self::SourceAsset) -> Option<usize> {
         let mut vertex_size = 0;
-        for attribute_data in mesh.attributes() {
+        for attribute_data in mesh
+            .attributes()
+            .expect("mesh data should always be available in render world")
+        {
             let vertex_format = attribute_data.0.format;
             vertex_size += vertex_format.size() as usize;
         }
@@ -163,21 +166,27 @@ impl RenderAsset for RenderMesh {
     ) -> Result<Self, PrepareAssetError<Self::SourceAsset>> {
         #[cfg(feature = "morph")]
         let morph_targets = match mesh.morph_targets() {
-            Some(mt) => {
+            Ok(mt) => {
                 let Some(target_image) = _images.get(mt) else {
                     return Err(PrepareAssetError::RetryNextUpdate(mesh));
                 };
                 Some(target_image.texture_view.clone())
             }
-            None => None,
+            Err(MeshAccessError::NotFound) => None,
+            Err(MeshAccessError::ExtractedToRenderWorld) => {
+                panic!("mesh data should always be available in render world")
+            }
         };
 
         let buffer_info = match mesh.indices() {
-            Some(indices) => RenderMeshBufferInfo::Indexed {
+            Ok(indices) => RenderMeshBufferInfo::Indexed {
                 count: indices.len() as u32,
                 index_format: indices.into(),
             },
-            None => RenderMeshBufferInfo::NonIndexed,
+            Err(MeshAccessError::NotFound) => RenderMeshBufferInfo::NonIndexed,
+            Err(MeshAccessError::ExtractedToRenderWorld) => {
+                panic!("mesh data should always be available in render world")
+            }
         };
 
         let mesh_vertex_buffer_layout =
@@ -185,7 +194,7 @@ impl RenderAsset for RenderMesh {
 
         let key_bits = BaseMeshPipelineKey::from_primitive_topology(mesh.primitive_topology());
         #[cfg(feature = "morph")]
-        let key_bits = if mesh.morph_targets().is_some() {
+        let key_bits = if mesh.morph_targets().is_ok() {
             key_bits | BaseMeshPipelineKey::MORPH_TARGETS
         } else {
             key_bits
diff --git a/crates/bevy_solari/src/scene/blas.rs b/crates/bevy_solari/src/scene/blas.rs
index 58d6b7fd3abbb..a26078a91025a 100644
--- a/crates/bevy_solari/src/scene/blas.rs
+++ b/crates/bevy_solari/src/scene/blas.rs
@@ -172,12 +172,15 @@ fn allocate_blas(
 
 fn is_mesh_raytracing_compatible(mesh: &Mesh) -> bool {
     let triangle_list = mesh.primitive_topology() == PrimitiveTopology::TriangleList;
-    let vertex_attributes = mesh.attributes().map(|(attribute, _)| attribute.id).eq([
+    let Ok(attributes) = mesh.attributes() else {
+        return false;
+    };
+    let vertex_attributes = attributes.map(|(attribute, _)| attribute.id).eq([
         Mesh::ATTRIBUTE_POSITION.id,
         Mesh::ATTRIBUTE_NORMAL.id,
         Mesh::ATTRIBUTE_UV_0.id,
         Mesh::ATTRIBUTE_TANGENT.id,
     ]);
-    let indexed_32 = matches!(mesh.indices(), Some(Indices::U32(..)));
+    let indexed_32 = matches!(mesh.indices(), Ok(Indices::U32(..)));
     mesh.enable_raytracing && triangle_list && vertex_attributes && indexed_32
 }
diff --git a/examples/2d/mesh2d_manual.rs b/examples/2d/mesh2d_manual.rs
index 79913288767a8..5b45daaca2cb6 100644
--- a/examples/2d/mesh2d_manual.rs
+++ b/examples/2d/mesh2d_manual.rs
@@ -10,7 +10,7 @@ use bevy::{
     color::palettes::basic::YELLOW,
     core_pipeline::core_2d::{Transparent2d, CORE_2D_DEPTH_FORMAT},
     math::{ops, FloatOrd},
-    mesh::{Indices, MeshVertexAttribute, VertexBufferLayout},
+    mesh::{Indices, InfallibleMesh, MeshVertexAttribute, VertexBufferLayout},
     prelude::*,
     render::{
         mesh::RenderMesh,
@@ -58,7 +58,7 @@ fn star(
     // specified. We set `RenderAssetUsages::RENDER_WORLD`, meaning this mesh
     // will not be accessible in future frames from the `meshes` resource, in
     // order to save on memory once it has been uploaded to the GPU.
-    let mut star = Mesh::new(
+    let mut star = InfallibleMesh::new(
         PrimitiveTopology::TriangleList,
         RenderAssetUsages::RENDER_WORLD,
     );
diff --git a/examples/2d/mesh2d_vertex_color_texture.rs b/examples/2d/mesh2d_vertex_color_texture.rs
index bd6e8199ffb6d..fda92be3c97c3 100644
--- a/examples/2d/mesh2d_vertex_color_texture.rs
+++ b/examples/2d/mesh2d_vertex_color_texture.rs
@@ -1,7 +1,7 @@
 //! Shows how to render a polygonal [`Mesh`], generated from a [`Rectangle`] primitive, in a 2D scene.
 //! Adds a texture and colored vertices, giving per-vertex tinting.
 
-use bevy::prelude::*;
+use bevy::{mesh::InfallibleMesh, prelude::*};
 
 fn main() {
     App::new()
@@ -19,7 +19,7 @@ fn setup(
     // Load the Bevy logo as a texture
     let texture_handle = asset_server.load("branding/banner.png");
     // Build a default quad mesh
-    let mut mesh = Mesh::from(Rectangle::default());
+    let mut mesh = InfallibleMesh::from(Rectangle::default().mesh());
     // Build vertex colors for the quad. One entry per vertex (the corners of the quad)
     let vertex_colors: Vec<[f32; 4]> = vec![
         LinearRgba::RED.to_f32_array(),
diff --git a/examples/3d/generate_custom_mesh.rs b/examples/3d/generate_custom_mesh.rs
index 7b4219effbd61..de0452caf7ded 100644
--- a/examples/3d/generate_custom_mesh.rs
+++ b/examples/3d/generate_custom_mesh.rs
@@ -4,7 +4,7 @@
 
 use bevy::{
     asset::RenderAssetUsages,
-    mesh::{Indices, VertexAttributeValues},
+    mesh::{Indices, InfallibleMesh, VertexAttributeValues},
     prelude::*,
     render::render_resource::PrimitiveTopology,
 };
@@ -103,9 +103,9 @@ fn input_handler(
 }
 
 #[rustfmt::skip]
-fn create_cube_mesh() -> Mesh {
+fn create_cube_mesh() -> InfallibleMesh {
     // Keep the mesh data accessible in future frames to be able to mutate it in toggle_texture.
-    Mesh::new(PrimitiveTopology::TriangleList, RenderAssetUsages::MAIN_WORLD | RenderAssetUsages::RENDER_WORLD)
+    InfallibleMesh::new(PrimitiveTopology::TriangleList, RenderAssetUsages::MAIN_WORLD | RenderAssetUsages::RENDER_WORLD)
     .with_inserted_attribute(
         Mesh::ATTRIBUTE_POSITION,
         // Each array is an [x, y, z] coordinate in local space.
diff --git a/examples/3d/lines.rs b/examples/3d/lines.rs
index c29e9fb45c0a8..4c2e3fdf29a49 100644
--- a/examples/3d/lines.rs
+++ b/examples/3d/lines.rs
@@ -2,7 +2,7 @@
 
 use bevy::{
     asset::RenderAssetUsages,
-    mesh::{MeshVertexBufferLayoutRef, PrimitiveTopology},
+    mesh::{InfallibleMesh, MeshVertexBufferLayoutRef, PrimitiveTopology},
     pbr::{MaterialPipeline, MaterialPipelineKey},
     prelude::*,
     reflect::TypePath,
@@ -96,7 +96,7 @@ impl From<LineList> for Mesh {
     fn from(line: LineList) -> Self {
         let vertices: Vec<_> = line.lines.into_iter().flat_map(|(a, b)| [a, b]).collect();
 
-        Mesh::new(
+        InfallibleMesh::new(
             // This tells wgpu that the positions are list of lines
             // where every pair is a start and end point
             PrimitiveTopology::LineList,
@@ -104,6 +104,7 @@ impl From<LineList> for Mesh {
         )
         // Add the vertices positions as an attribute
         .with_inserted_attribute(Mesh::ATTRIBUTE_POSITION, vertices)
+        .into()
     }
 }
 
@@ -115,7 +116,7 @@ struct LineStrip {
 
 impl From<LineStrip> for Mesh {
     fn from(line: LineStrip) -> Self {
-        Mesh::new(
+        InfallibleMesh::new(
             // This tells wgpu that the positions are a list of points
             // where a line will be drawn between each consecutive point
             PrimitiveTopology::LineStrip,
@@ -123,5 +124,6 @@ impl From<LineStrip> for Mesh {
         )
         // Add the point positions as an attribute
         .with_inserted_attribute(Mesh::ATTRIBUTE_POSITION, line.points)
+        .into()
     }
 }
diff --git a/examples/3d/motion_blur.rs b/examples/3d/motion_blur.rs
index ef9349ee7b19d..50b9e9b2faf2c 100644
--- a/examples/3d/motion_blur.rs
+++ b/examples/3d/motion_blur.rs
@@ -4,6 +4,7 @@
 use bevy::{
     image::{ImageAddressMode, ImageFilterMode, ImageSampler, ImageSamplerDescriptor},
     math::ops,
+    mesh::InfallibleMesh,
     post_process::motion_blur::MotionBlur,
     prelude::*,
 };
@@ -82,7 +83,7 @@ fn setup_scene(
         Transform::default().with_scale(Vec3::splat(-4000.0)),
     ));
     // Ground
-    let mut plane: Mesh = Plane3d::default().into();
+    let mut plane: InfallibleMesh = Plane3d::default().mesh().into();
     let uv_size = 4000.0;
     let uvs = vec![[uv_size, 0.0], [0.0, 0.0], [0.0, uv_size], [uv_size; 2]];
     plane.insert_attribute(Mesh::ATTRIBUTE_UV_0, uvs);
diff --git a/examples/3d/solari.rs b/examples/3d/solari.rs
index 6449b40d2bb66..e398332b9d8ca 100644
--- a/examples/3d/solari.rs
+++ b/examples/3d/solari.rs
@@ -179,19 +179,21 @@ fn add_raytracing_meshes_on_scene_load(
 
             // Ensure meshes are Solari compatible
             let mesh = meshes.get_mut(mesh_handle).unwrap();
-            if !mesh.contains_attribute(Mesh::ATTRIBUTE_UV_0) {
+            if !mesh.contains_attribute(Mesh::ATTRIBUTE_UV_0).unwrap() {
                 let vertex_count = mesh.count_vertices();
-                mesh.insert_attribute(Mesh::ATTRIBUTE_UV_0, vec![[0.0, 0.0]; vertex_count]);
+                mesh.insert_attribute(Mesh::ATTRIBUTE_UV_0, vec![[0.0, 0.0]; vertex_count])
+                    .unwrap();
                 mesh.insert_attribute(
                     Mesh::ATTRIBUTE_TANGENT,
                     vec![[0.0, 0.0, 0.0, 0.0]; vertex_count],
-                );
+                )
+                .unwrap();
             }
-            if !mesh.contains_attribute(Mesh::ATTRIBUTE_TANGENT) {
+            if !mesh.contains_attribute(Mesh::ATTRIBUTE_TANGENT).unwrap() {
                 mesh.generate_tangents().unwrap();
             }
-            if mesh.contains_attribute(Mesh::ATTRIBUTE_UV_1) {
-                mesh.remove_attribute(Mesh::ATTRIBUTE_UV_1);
+            if mesh.contains_attribute(Mesh::ATTRIBUTE_UV_1).unwrap() {
+                let _ = mesh.remove_attribute(Mesh::ATTRIBUTE_UV_1);
             }
 
             // Prevent rasterization if using pathtracer
diff --git a/examples/3d/vertex_colors.rs b/examples/3d/vertex_colors.rs
index 3a5c31f94a7bf..c16e0319fbee2 100644
--- a/examples/3d/vertex_colors.rs
+++ b/examples/3d/vertex_colors.rs
@@ -1,6 +1,9 @@
 //! Illustrates the use of vertex colors.
 
-use bevy::{mesh::VertexAttributeValues, prelude::*};
+use bevy::{
+    mesh::{InfallibleMesh, VertexAttributeValues},
+    prelude::*,
+};
 
 fn main() {
     App::new()
@@ -22,7 +25,7 @@ fn setup(
     ));
     // cube
     // Assign vertex colors based on vertex positions
-    let mut colorful_cube = Mesh::from(Cuboid::default());
+    let mut colorful_cube = InfallibleMesh::from(Cuboid::default().mesh());
     if let Some(VertexAttributeValues::Float32x3(positions)) =
         colorful_cube.attribute(Mesh::ATTRIBUTE_POSITION)
     {
diff --git a/examples/animation/custom_skinned_mesh.rs b/examples/animation/custom_skinned_mesh.rs
index e45d21bbc2282..62ca5a7dfadba 100644
--- a/examples/animation/custom_skinned_mesh.rs
+++ b/examples/animation/custom_skinned_mesh.rs
@@ -8,7 +8,7 @@ use bevy::{
     math::ops,
     mesh::{
         skinning::{SkinnedMesh, SkinnedMeshInverseBindposes},
-        Indices, PrimitiveTopology, VertexAttributeValues,
+        Indices, InfallibleMesh, PrimitiveTopology, VertexAttributeValues,
     },
     prelude::*,
 };
@@ -54,7 +54,7 @@ fn setup(
     ]);
 
     // Create a mesh
-    let mesh = Mesh::new(
+    let mesh = InfallibleMesh::new(
         PrimitiveTopology::TriangleList,
         RenderAssetUsages::RENDER_WORLD,
     )
diff --git a/examples/animation/morph_targets.rs b/examples/animation/morph_targets.rs
index ffb468f26592c..675d8605434b2 100644
--- a/examples/animation/morph_targets.rs
+++ b/examples/animation/morph_targets.rs
@@ -86,7 +86,7 @@ fn name_morphs(
         if let AssetEvent::<Mesh>::Added { id } = event
             && let Some(path) = asset_server.get_path(*id)
             && let Some(mesh) = meshes.get(*id)
-            && let Some(names) = mesh.morph_target_names()
+            && let Some(names) = mesh.morph_target_names().unwrap()
         {
             info!("Morph target names for {path:?}:");
 
diff --git a/examples/asset/alter_mesh.rs b/examples/asset/alter_mesh.rs
index d62178e10cbc5..92eb73572597f 100644
--- a/examples/asset/alter_mesh.rs
+++ b/examples/asset/alter_mesh.rs
@@ -188,7 +188,7 @@ fn alter_mesh(
     // `ATTRIBUTE_POSITION` is a constant indicating that we want to know where the vertex is
     // located in space (as opposed to which way its normal is facing, vertex color, or other
     // details).
-    if let Some(VertexAttributeValues::Float32x3(positions)) =
+    if let Ok(VertexAttributeValues::Float32x3(positions)) =
         mesh.attribute_mut(Mesh::ATTRIBUTE_POSITION)
     {
         // Check a Local value (which only this system can make use of) to determine if we're
diff --git a/examples/gltf/query_gltf_primitives.rs b/examples/gltf/query_gltf_primitives.rs
index 892d087e2f24a..7e87811eff414 100644
--- a/examples/gltf/query_gltf_primitives.rs
+++ b/examples/gltf/query_gltf_primitives.rs
@@ -35,7 +35,7 @@ fn find_top_material_and_mesh(
             }
 
             if let Some(mesh) = meshes.get_mut(mesh_handle)
-                && let Some(VertexAttributeValues::Float32x3(positions)) =
+                && let Ok(VertexAttributeValues::Float32x3(positions)) =
                     mesh.attribute_mut(Mesh::ATTRIBUTE_POSITION)
             {
                 for position in positions {
diff --git a/examples/math/custom_primitives.rs b/examples/math/custom_primitives.rs
index ba2976d7a8472..a24f033701000 100644
--- a/examples/math/custom_primitives.rs
+++ b/examples/math/custom_primitives.rs
@@ -17,7 +17,7 @@ use bevy::{
         },
         Isometry2d,
     },
-    mesh::{Extrudable, ExtrusionBuilder, PerimeterSegment},
+    mesh::{Extrudable, ExtrusionBuilder, InfallibleMesh, PerimeterSegment},
     prelude::*,
 };
 
@@ -510,7 +510,7 @@ impl HeartBuilder for ExtrusionBuilder<Heart> {
 
 impl MeshBuilder for HeartMeshBuilder {
     // This is where you should build the actual mesh.
-    fn build(&self) -> Mesh {
+    fn build_infallible(&self) -> InfallibleMesh {
         let radius = self.heart.radius;
         // The curved parts of each wing (half) of the heart have an angle of `PI * 1.25` or 225°
         let wing_angle = PI * 1.25;
@@ -553,7 +553,7 @@ impl MeshBuilder for HeartMeshBuilder {
         }
 
         // Here, the actual `Mesh` is created. We set the indices, vertices, normals and UVs created above and specify the topology of the mesh.
-        Mesh::new(
+        InfallibleMesh::new(
             bevy::mesh::PrimitiveTopology::TriangleList,
             RenderAssetUsages::default(),
         )
diff --git a/examples/math/sampling_primitives.rs b/examples/math/sampling_primitives.rs
index b5b815f416064..75cbc77118d34 100644
--- a/examples/math/sampling_primitives.rs
+++ b/examples/math/sampling_primitives.rs
@@ -6,6 +6,7 @@ use bevy::{
     core_pipeline::tonemapping::Tonemapping,
     input::mouse::{AccumulatedMouseMotion, AccumulatedMouseScroll, MouseButtonInput},
     math::prelude::*,
+    mesh::InfallibleMesh,
     post_process::bloom::Bloom,
     prelude::*,
 };
@@ -206,7 +207,7 @@ impl Meshable for Shape {
 }
 
 impl MeshBuilder for ShapeMeshBuilder {
-    fn build(&self) -> Mesh {
+    fn build_infallible(&self) -> InfallibleMesh {
         match self.shape {
             Shape::Cuboid => CUBOID.mesh().into(),
             Shape::Sphere => SPHERE.mesh().into(),
diff --git a/examples/shader_advanced/custom_vertex_attribute.rs b/examples/shader_advanced/custom_vertex_attribute.rs
index 1741b08e39fea..95a645e389241 100644
--- a/examples/shader_advanced/custom_vertex_attribute.rs
+++ b/examples/shader_advanced/custom_vertex_attribute.rs
@@ -1,7 +1,7 @@
 //! A shader that reads a mesh's custom vertex attribute.
 
 use bevy::{
-    mesh::{MeshVertexAttribute, MeshVertexBufferLayoutRef},
+    mesh::{InfallibleMesh, MeshVertexAttribute, MeshVertexBufferLayoutRef},
     pbr::{MaterialPipeline, MaterialPipelineKey},
     prelude::*,
     reflect::TypePath,
@@ -32,7 +32,7 @@ fn setup(
     mut meshes: ResMut<Assets<Mesh>>,
     mut materials: ResMut<Assets<CustomMaterial>>,
 ) {
-    let mesh = Mesh::from(Cuboid::default())
+    let mesh = InfallibleMesh::from(Cuboid::default().mesh())
         // Sets the custom attribute
         .with_inserted_attribute(
             ATTRIBUTE_BLEND_COLOR,
diff --git a/examples/shader_advanced/specialized_mesh_pipeline.rs b/examples/shader_advanced/specialized_mesh_pipeline.rs
index ee5abdb54d647..35b79d1b3d80e 100644
--- a/examples/shader_advanced/specialized_mesh_pipeline.rs
+++ b/examples/shader_advanced/specialized_mesh_pipeline.rs
@@ -12,7 +12,7 @@ use bevy::{
     core_pipeline::core_3d::{Opaque3d, Opaque3dBatchSetKey, Opaque3dBinKey, CORE_3D_DEPTH_FORMAT},
     ecs::change_detection::Tick,
     math::{vec3, vec4},
-    mesh::{Indices, MeshVertexBufferLayoutRef, PrimitiveTopology},
+    mesh::{Indices, InfallibleMesh, MeshVertexBufferLayoutRef, PrimitiveTopology},
     pbr::{
         DrawMesh, MeshPipeline, MeshPipelineKey, MeshPipelineViewLayoutKey, RenderMeshInstances,
         SetMeshBindGroup, SetMeshViewBindGroup, SetMeshViewEmptyBindGroup,
@@ -53,7 +53,7 @@ fn setup(mut commands: Commands, mut meshes: ResMut<Assets<Mesh>>) {
     // Build a custom triangle mesh with colors
     // We define a custom mesh because the examples only uses a limited
     // set of vertex attributes for simplicity
-    let mesh = Mesh::new(
+    let mesh = InfallibleMesh::new(
         PrimitiveTopology::TriangleList,
         RenderAssetUsages::default(),
     )
diff --git a/examples/tools/scene_viewer/morph_viewer_plugin.rs b/examples/tools/scene_viewer/morph_viewer_plugin.rs
index 404c07d479e32..cc70943dd3f1c 100644
--- a/examples/tools/scene_viewer/morph_viewer_plugin.rs
+++ b/examples/tools/scene_viewer/morph_viewer_plugin.rs
@@ -260,7 +260,7 @@ fn detect_morphs(
         let target_names = weights
             .first_mesh()
             .and_then(|h| meshes.get(h))
-            .and_then(|m| m.morph_target_names());
+            .and_then(|m| m.morph_target_names().unwrap_or_default());
         let targets = Target::new(name, weights.weights(), target_names, entity);
         detected.extend(targets);
     }
diff --git a/tests/3d/test_invalid_skinned_mesh.rs b/tests/3d/test_invalid_skinned_mesh.rs
index f371a06b7130e..a2ba66cda7b6e 100644
--- a/tests/3d/test_invalid_skinned_mesh.rs
+++ b/tests/3d/test_invalid_skinned_mesh.rs
@@ -6,7 +6,7 @@ use bevy::{
     math::ops,
     mesh::{
         skinning::{SkinnedMesh, SkinnedMeshInverseBindposes},
-        Indices, PrimitiveTopology, VertexAttributeValues,
+        Indices, InfallibleMesh, PrimitiveTopology, VertexAttributeValues,
     },
     post_process::motion_blur::MotionBlur,
     prelude::*,
@@ -96,7 +96,7 @@ fn setup_meshes(
     mut inverse_bindposes_assets: ResMut<Assets<SkinnedMeshInverseBindposes>>,
 ) {
     // Create a mesh with two rectangles.
-    let unskinned_mesh = Mesh::new(
+    let unskinned_mesh = InfallibleMesh::new(
         PrimitiveTopology::TriangleList,
         RenderAssetUsages::default(),
     )

From fe6bf7f48216013c009324ebdc529a20f8d5fa2d Mon Sep 17 00:00:00 2001
From: robtfm <50659922+robtfm@users.noreply.github.com>
Date: Sun, 30 Nov 2025 21:28:21 +0000
Subject: [PATCH 130/133] fix doctest

---
 crates/bevy_mesh/src/mesh.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/crates/bevy_mesh/src/mesh.rs b/crates/bevy_mesh/src/mesh.rs
index a1ce73ddeb943..65930d470f27b 100644
--- a/crates/bevy_mesh/src/mesh.rs
+++ b/crates/bevy_mesh/src/mesh.rs
@@ -750,11 +750,11 @@ impl core::ops::Deref for InfallibleMesh {
 /// `StandardMaterial` or `ColorMaterial`:
 ///
 /// ```
-/// # use bevy_mesh::{Mesh, Indices, PrimitiveTopology};
+/// # use bevy_mesh::{Mesh, InfallibleMesh, Indices, PrimitiveTopology};
 /// # use bevy_asset::RenderAssetUsages;
 /// fn create_simple_parallelogram() -> Mesh {
 ///     // Create a new mesh using a triangle list topology, where each set of 3 vertices composes a triangle.
-///     Mesh::new(PrimitiveTopology::TriangleList, RenderAssetUsages::default())
+///     InfallibleMesh::new(PrimitiveTopology::TriangleList, RenderAssetUsages::default())
 ///         // Add 4 vertices, each with its own position attribute (coordinate in
 ///         // 3D space), for each of the corners of the parallelogram.
 ///         .with_inserted_attribute(
@@ -779,6 +779,7 @@ impl core::ops::Deref for InfallibleMesh {
 ///             // Second triangle
 ///             1, 3, 2
 ///         ]))
+///         .into()
 /// }
 /// ```
 ///

From 8c6e6bb857f98e341348324e3a0866eafbff77f1 Mon Sep 17 00:00:00 2001
From: robtfm <50659922+robtfm@users.noreply.github.com>
Date: Sun, 30 Nov 2025 21:28:47 +0000
Subject: [PATCH 131/133] clean up From<Primitives> for Mesh

---
 crates/bevy_math/src/primitives/dim2.rs       |   2 +-
 crates/bevy_mesh/src/primitives/dim2.rs       | 146 +++---------------
 .../bevy_mesh/src/primitives/dim3/capsule.rs  |  10 +-
 crates/bevy_mesh/src/primitives/dim3/cone.rs  |  10 +-
 .../src/primitives/dim3/conical_frustum.rs    |  10 +-
 .../bevy_mesh/src/primitives/dim3/cuboid.rs   |   8 +-
 .../bevy_mesh/src/primitives/dim3/cylinder.rs |  10 +-
 crates/bevy_mesh/src/primitives/dim3/plane.rs |  10 +-
 .../src/primitives/dim3/polyline3d.rs         |  12 +-
 .../src/primitives/dim3/segment3d.rs          |  10 +-
 .../bevy_mesh/src/primitives/dim3/sphere.rs   |  10 +-
 .../src/primitives/dim3/tetrahedron.rs        |  10 +-
 crates/bevy_mesh/src/primitives/dim3/torus.rs |  10 +-
 .../src/primitives/dim3/triangle3d.rs         |  10 +-
 crates/bevy_mesh/src/primitives/extrusion.rs  |  14 +-
 crates/bevy_mesh/src/primitives/mod.rs        |  22 ++-
 examples/math/custom_primitives.rs            |   4 +-
 examples/math/sampling_primitives.rs          |   4 +-
 18 files changed, 70 insertions(+), 242 deletions(-)

diff --git a/crates/bevy_math/src/primitives/dim2.rs b/crates/bevy_math/src/primitives/dim2.rs
index 572ff1473ce97..e0cc8f86da7f6 100644
--- a/crates/bevy_math/src/primitives/dim2.rs
+++ b/crates/bevy_math/src/primitives/dim2.rs
@@ -1956,7 +1956,7 @@ impl From<ConvexPolygon> for Polygon {
 )]
 pub struct ConvexPolygon {
     /// The vertices of the [`ConvexPolygon`].
-    vertices: Vec<Vec2>,
+    pub vertices: Vec<Vec2>,
 }
 
 #[cfg(feature = "alloc")]
diff --git a/crates/bevy_mesh/src/primitives/dim2.rs b/crates/bevy_mesh/src/primitives/dim2.rs
index 960bf8b1231c8..cba9058820b0e 100644
--- a/crates/bevy_mesh/src/primitives/dim2.rs
+++ b/crates/bevy_mesh/src/primitives/dim2.rs
@@ -81,20 +81,14 @@ impl Extrudable for CircleMeshBuilder {
 impl Meshable for Circle {
     type Output = CircleMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         CircleMeshBuilder {
-            circle: *self,
+            circle: self,
             ..Default::default()
         }
     }
 }
 
-impl From<Circle> for Mesh {
-    fn from(circle: Circle) -> Self {
-        circle.mesh().build()
-    }
-}
-
 /// Specifies how to generate UV-mappings for the [`CircularSector`] and [`CircularSegment`] shapes.
 ///
 /// Currently the only variant is `Mask`, which is good for showing a portion of a texture that includes
@@ -243,23 +237,14 @@ impl Extrudable for CircularSectorMeshBuilder {
 impl Meshable for CircularSector {
     type Output = CircularSectorMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         CircularSectorMeshBuilder {
-            sector: *self,
+            sector: self,
             ..Default::default()
         }
     }
 }
 
-impl From<CircularSector> for Mesh {
-    /// Converts this sector into a [`Mesh`] using a default [`CircularSectorMeshBuilder`].
-    ///
-    /// See the documentation of [`CircularSectorMeshBuilder`] for more details.
-    fn from(sector: CircularSector) -> Self {
-        sector.mesh().build()
-    }
-}
-
 /// A builder used for creating a [`Mesh`] with a [`CircularSegment`] shape.
 ///
 /// The resulting mesh will have a UV-map such that the center of the circle is
@@ -390,23 +375,14 @@ impl Extrudable for CircularSegmentMeshBuilder {
 impl Meshable for CircularSegment {
     type Output = CircularSegmentMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         CircularSegmentMeshBuilder {
-            segment: *self,
+            segment: self,
             ..Default::default()
         }
     }
 }
 
-impl From<CircularSegment> for Mesh {
-    /// Converts this sector into a [`Mesh`] using a default [`CircularSegmentMeshBuilder`].
-    ///
-    /// See the documentation of [`CircularSegmentMeshBuilder`] for more details.
-    fn from(segment: CircularSegment) -> Self {
-        segment.mesh().build()
-    }
-}
-
 /// A builder used for creating a [`Mesh`] with a [`ConvexPolygon`] shape.
 ///
 /// You must verify that the `vertices` are not concave when constructing this type. You can
@@ -420,9 +396,9 @@ pub struct ConvexPolygonMeshBuilder {
 impl Meshable for ConvexPolygon {
     type Output = ConvexPolygonMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         Self::Output {
-            vertices: self.vertices().to_vec(),
+            vertices: self.vertices,
         }
     }
 }
@@ -456,12 +432,6 @@ impl Extrudable for ConvexPolygonMeshBuilder {
     }
 }
 
-impl From<ConvexPolygon> for Mesh {
-    fn from(polygon: ConvexPolygon) -> Self {
-        polygon.mesh().build()
-    }
-}
-
 /// A builder used for creating a [`Mesh`] with a [`RegularPolygon`] shape.
 #[derive(Clone, Copy, Debug, Reflect)]
 #[reflect(Default, Debug, Clone)]
@@ -504,7 +474,7 @@ impl RegularPolygonMeshBuilder {
 impl Meshable for RegularPolygon {
     type Output = RegularPolygonMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         Self::Output {
             circumradius: self.circumcircle.radius,
             sides: self.sides,
@@ -530,12 +500,6 @@ impl Extrudable for RegularPolygonMeshBuilder {
     }
 }
 
-impl From<RegularPolygon> for Mesh {
-    fn from(polygon: RegularPolygon) -> Self {
-        polygon.mesh().build()
-    }
-}
-
 /// A builder used for creating a [`Mesh`] with an [`Ellipse`] shape.
 #[derive(Clone, Copy, Debug, Reflect)]
 #[reflect(Default, Debug, Clone)]
@@ -627,20 +591,14 @@ impl Extrudable for EllipseMeshBuilder {
 impl Meshable for Ellipse {
     type Output = EllipseMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         EllipseMeshBuilder {
-            ellipse: *self,
+            ellipse: self,
             ..Default::default()
         }
     }
 }
 
-impl From<Ellipse> for Mesh {
-    fn from(ellipse: Ellipse) -> Self {
-        ellipse.mesh().build()
-    }
-}
-
 /// A builder used for creating a [`Mesh`] with a [`Segment2d`].
 pub struct Segment2dMeshBuilder {
     /// The [`Segment2d`] shape.
@@ -669,15 +627,8 @@ impl MeshBuilder for Segment2dMeshBuilder {
 impl Meshable for Segment2d {
     type Output = Segment2dMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
-        Segment2dMeshBuilder::new(*self)
-    }
-}
-
-impl From<Segment2d> for Mesh {
-    /// Converts this segment into a [`Mesh`] using a default [`Segment2dMeshBuilder`].
-    fn from(segment: Segment2d) -> Self {
-        segment.mesh().build()
+    fn mesh(self) -> Self::Output {
+        Segment2dMeshBuilder::new(self)
     }
 }
 
@@ -712,16 +663,8 @@ impl MeshBuilder for Polyline2dMeshBuilder {
 impl Meshable for Polyline2d {
     type Output = Polyline2dMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
-        Polyline2dMeshBuilder {
-            polyline: self.clone(),
-        }
-    }
-}
-
-impl From<Polyline2d> for Mesh {
-    fn from(polyline: Polyline2d) -> Self {
-        polyline.mesh().build()
+    fn mesh(self) -> Self::Output {
+        Polyline2dMeshBuilder { polyline: self }
     }
 }
 
@@ -844,20 +787,14 @@ impl Extrudable for AnnulusMeshBuilder {
 impl Meshable for Annulus {
     type Output = AnnulusMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         AnnulusMeshBuilder {
-            annulus: *self,
+            annulus: self,
             ..Default::default()
         }
     }
 }
 
-impl From<Annulus> for Mesh {
-    fn from(annulus: Annulus) -> Self {
-        annulus.mesh().build()
-    }
-}
-
 /// A builder for creating a [`Mesh`] with an [`Rhombus`] shape.
 #[derive(Clone, Copy, Debug, Reflect)]
 #[reflect(Default, Debug, Clone)]
@@ -931,19 +868,13 @@ impl Extrudable for RhombusMeshBuilder {
 impl Meshable for Rhombus {
     type Output = RhombusMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         Self::Output {
             half_diagonals: self.half_diagonals,
         }
     }
 }
 
-impl From<Rhombus> for Mesh {
-    fn from(rhombus: Rhombus) -> Self {
-        rhombus.mesh().build()
-    }
-}
-
 /// A builder used for creating a [`Mesh`] with a [`Triangle2d`] shape.
 #[derive(Clone, Copy, Debug, Default, Reflect)]
 #[reflect(Default, Debug, Clone)]
@@ -963,8 +894,8 @@ impl Triangle2dMeshBuilder {
 impl Meshable for Triangle2d {
     type Output = Triangle2dMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
-        Self::Output { triangle: *self }
+    fn mesh(self) -> Self::Output {
+        Self::Output { triangle: self }
     }
 }
 
@@ -1015,12 +946,6 @@ impl Extrudable for Triangle2dMeshBuilder {
     }
 }
 
-impl From<Triangle2d> for Mesh {
-    fn from(triangle: Triangle2d) -> Self {
-        triangle.mesh().build()
-    }
-}
-
 /// A builder used for creating a [`Mesh`] with a [`Rectangle`] shape.
 #[derive(Clone, Copy, Debug, Reflect)]
 #[reflect(Default, Debug, Clone)]
@@ -1088,19 +1013,13 @@ impl Extrudable for RectangleMeshBuilder {
 impl Meshable for Rectangle {
     type Output = RectangleMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         RectangleMeshBuilder {
             half_size: self.half_size,
         }
     }
 }
 
-impl From<Rectangle> for Mesh {
-    fn from(rectangle: Rectangle) -> Self {
-        rectangle.mesh().build()
-    }
-}
-
 /// A builder used for creating a [`Mesh`] with a [`Capsule2d`] shape.
 #[derive(Clone, Copy, Debug, Reflect)]
 #[reflect(Default, Debug, Clone)]
@@ -1248,20 +1167,14 @@ impl Extrudable for Capsule2dMeshBuilder {
 impl Meshable for Capsule2d {
     type Output = Capsule2dMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         Capsule2dMeshBuilder {
-            capsule: *self,
+            capsule: self,
             ..Default::default()
         }
     }
 }
 
-impl From<Capsule2d> for Mesh {
-    fn from(capsule: Capsule2d) -> Self {
-        capsule.mesh().build()
-    }
-}
-
 /// A builder used for creating a [`Mesh`] with a [`Ring`] shape.
 pub struct RingMeshBuilder<P>
 where
@@ -1276,7 +1189,7 @@ where
     P: Primitive2d + Meshable,
 {
     /// Create a new `RingMeshBuilder<P>` from a given `Ring<P>` shape.
-    pub fn new(ring: &Ring<P>) -> Self {
+    pub fn new(ring: Ring<P>) -> Self {
         Self {
             outer_shape_builder: ring.outer_shape.mesh(),
             inner_shape_builder: ring.inner_shape.mesh(),
@@ -1511,20 +1424,11 @@ where
 {
     type Output = RingMeshBuilder<P>;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         RingMeshBuilder::new(self)
     }
 }
 
-impl<P> From<Ring<P>> for Mesh
-where
-    P: Primitive2d + Meshable,
-{
-    fn from(ring: Ring<P>) -> Self {
-        ring.mesh().build()
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use bevy_math::{prelude::Annulus, primitives::RegularPolygon, FloatOrd};
diff --git a/crates/bevy_mesh/src/primitives/dim3/capsule.rs b/crates/bevy_mesh/src/primitives/dim3/capsule.rs
index 64f5ae86ee6f3..13b937f05ca8e 100644
--- a/crates/bevy_mesh/src/primitives/dim3/capsule.rs
+++ b/crates/bevy_mesh/src/primitives/dim3/capsule.rs
@@ -421,16 +421,10 @@ impl MeshBuilder for Capsule3dMeshBuilder {
 impl Meshable for Capsule3d {
     type Output = Capsule3dMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         Capsule3dMeshBuilder {
-            capsule: *self,
+            capsule: self,
             ..Default::default()
         }
     }
 }
-
-impl From<Capsule3d> for Mesh {
-    fn from(capsule: Capsule3d) -> Self {
-        capsule.mesh().build()
-    }
-}
diff --git a/crates/bevy_mesh/src/primitives/dim3/cone.rs b/crates/bevy_mesh/src/primitives/dim3/cone.rs
index b773f05a71e74..7f4551768dd51 100644
--- a/crates/bevy_mesh/src/primitives/dim3/cone.rs
+++ b/crates/bevy_mesh/src/primitives/dim3/cone.rs
@@ -174,20 +174,14 @@ impl MeshBuilder for ConeMeshBuilder {
 impl Meshable for Cone {
     type Output = ConeMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         ConeMeshBuilder {
-            cone: *self,
+            cone: self,
             ..Default::default()
         }
     }
 }
 
-impl From<Cone> for Mesh {
-    fn from(cone: Cone) -> Self {
-        cone.mesh().build()
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use crate::{Mesh, MeshBuilder, Meshable, VertexAttributeValues};
diff --git a/crates/bevy_mesh/src/primitives/dim3/conical_frustum.rs b/crates/bevy_mesh/src/primitives/dim3/conical_frustum.rs
index a0ca1fe9519ec..f6821bf638133 100644
--- a/crates/bevy_mesh/src/primitives/dim3/conical_frustum.rs
+++ b/crates/bevy_mesh/src/primitives/dim3/conical_frustum.rs
@@ -169,16 +169,10 @@ impl MeshBuilder for ConicalFrustumMeshBuilder {
 impl Meshable for ConicalFrustum {
     type Output = ConicalFrustumMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         ConicalFrustumMeshBuilder {
-            frustum: *self,
+            frustum: self,
             ..Default::default()
         }
     }
 }
-
-impl From<ConicalFrustum> for Mesh {
-    fn from(frustum: ConicalFrustum) -> Self {
-        frustum.mesh().build()
-    }
-}
diff --git a/crates/bevy_mesh/src/primitives/dim3/cuboid.rs b/crates/bevy_mesh/src/primitives/dim3/cuboid.rs
index 7edd0c3d71945..de0cc0bcd93f7 100644
--- a/crates/bevy_mesh/src/primitives/dim3/cuboid.rs
+++ b/crates/bevy_mesh/src/primitives/dim3/cuboid.rs
@@ -85,15 +85,9 @@ impl MeshBuilder for CuboidMeshBuilder {
 impl Meshable for Cuboid {
     type Output = CuboidMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         CuboidMeshBuilder {
             half_size: self.half_size,
         }
     }
 }
-
-impl From<Cuboid> for Mesh {
-    fn from(cuboid: Cuboid) -> Self {
-        cuboid.mesh().build()
-    }
-}
diff --git a/crates/bevy_mesh/src/primitives/dim3/cylinder.rs b/crates/bevy_mesh/src/primitives/dim3/cylinder.rs
index dc8956243f5c5..575978ad313c4 100644
--- a/crates/bevy_mesh/src/primitives/dim3/cylinder.rs
+++ b/crates/bevy_mesh/src/primitives/dim3/cylinder.rs
@@ -207,16 +207,10 @@ impl MeshBuilder for CylinderMeshBuilder {
 impl Meshable for Cylinder {
     type Output = CylinderMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         CylinderMeshBuilder {
-            cylinder: *self,
+            cylinder: self,
             ..Default::default()
         }
     }
 }
-
-impl From<Cylinder> for Mesh {
-    fn from(cylinder: Cylinder) -> Self {
-        cylinder.mesh().build()
-    }
-}
diff --git a/crates/bevy_mesh/src/primitives/dim3/plane.rs b/crates/bevy_mesh/src/primitives/dim3/plane.rs
index 3b174f5bb48f8..d696123774344 100644
--- a/crates/bevy_mesh/src/primitives/dim3/plane.rs
+++ b/crates/bevy_mesh/src/primitives/dim3/plane.rs
@@ -145,16 +145,10 @@ impl MeshBuilder for PlaneMeshBuilder {
 impl Meshable for Plane3d {
     type Output = PlaneMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         PlaneMeshBuilder {
-            plane: *self,
+            plane: self,
             subdivisions: 0,
         }
     }
 }
-
-impl From<Plane3d> for Mesh {
-    fn from(plane: Plane3d) -> Self {
-        plane.mesh().build()
-    }
-}
diff --git a/crates/bevy_mesh/src/primitives/dim3/polyline3d.rs b/crates/bevy_mesh/src/primitives/dim3/polyline3d.rs
index f0e8ae42b0c54..7690ce1a9e94e 100644
--- a/crates/bevy_mesh/src/primitives/dim3/polyline3d.rs
+++ b/crates/bevy_mesh/src/primitives/dim3/polyline3d.rs
@@ -29,15 +29,7 @@ impl MeshBuilder for Polyline3dMeshBuilder {
 impl Meshable for Polyline3d {
     type Output = Polyline3dMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
-        Polyline3dMeshBuilder {
-            polyline: self.clone(),
-        }
-    }
-}
-
-impl From<Polyline3d> for Mesh {
-    fn from(polyline: Polyline3d) -> Self {
-        polyline.mesh().build()
+    fn mesh(self) -> Self::Output {
+        Polyline3dMeshBuilder { polyline: self }
     }
 }
diff --git a/crates/bevy_mesh/src/primitives/dim3/segment3d.rs b/crates/bevy_mesh/src/primitives/dim3/segment3d.rs
index 4326955cb2324..60927ba7245b6 100644
--- a/crates/bevy_mesh/src/primitives/dim3/segment3d.rs
+++ b/crates/bevy_mesh/src/primitives/dim3/segment3d.rs
@@ -24,14 +24,8 @@ impl MeshBuilder for Segment3dMeshBuilder {
 impl Meshable for Segment3d {
     type Output = Segment3dMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
-        Segment3dMeshBuilder { segment: *self }
-    }
-}
-
-impl From<Segment3d> for Mesh {
-    fn from(segment: Segment3d) -> Self {
-        segment.mesh().build()
+    fn mesh(self) -> Self::Output {
+        Segment3dMeshBuilder { segment: self }
     }
 }
 
diff --git a/crates/bevy_mesh/src/primitives/dim3/sphere.rs b/crates/bevy_mesh/src/primitives/dim3/sphere.rs
index 946b850430262..3be960c6a0ed9 100644
--- a/crates/bevy_mesh/src/primitives/dim3/sphere.rs
+++ b/crates/bevy_mesh/src/primitives/dim3/sphere.rs
@@ -249,16 +249,10 @@ impl MeshBuilder for SphereMeshBuilder {
 impl Meshable for Sphere {
     type Output = SphereMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         SphereMeshBuilder {
-            sphere: *self,
+            sphere: self,
             ..Default::default()
         }
     }
 }
-
-impl From<Sphere> for Mesh {
-    fn from(sphere: Sphere) -> Self {
-        sphere.mesh().build()
-    }
-}
diff --git a/crates/bevy_mesh/src/primitives/dim3/tetrahedron.rs b/crates/bevy_mesh/src/primitives/dim3/tetrahedron.rs
index 432aa4337c4a5..265223088ab88 100644
--- a/crates/bevy_mesh/src/primitives/dim3/tetrahedron.rs
+++ b/crates/bevy_mesh/src/primitives/dim3/tetrahedron.rs
@@ -54,13 +54,7 @@ impl MeshBuilder for TetrahedronMeshBuilder {
 impl Meshable for Tetrahedron {
     type Output = TetrahedronMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
-        TetrahedronMeshBuilder { tetrahedron: *self }
-    }
-}
-
-impl From<Tetrahedron> for Mesh {
-    fn from(tetrahedron: Tetrahedron) -> Self {
-        tetrahedron.mesh().build()
+    fn mesh(self) -> Self::Output {
+        TetrahedronMeshBuilder { tetrahedron: self }
     }
 }
diff --git a/crates/bevy_mesh/src/primitives/dim3/torus.rs b/crates/bevy_mesh/src/primitives/dim3/torus.rs
index d2267774c764a..8da04cc2b36a5 100644
--- a/crates/bevy_mesh/src/primitives/dim3/torus.rs
+++ b/crates/bevy_mesh/src/primitives/dim3/torus.rs
@@ -161,16 +161,10 @@ impl MeshBuilder for TorusMeshBuilder {
 impl Meshable for Torus {
     type Output = TorusMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         TorusMeshBuilder {
-            torus: *self,
+            torus: self,
             ..Default::default()
         }
     }
 }
-
-impl From<Torus> for Mesh {
-    fn from(torus: Torus) -> Self {
-        torus.mesh().build()
-    }
-}
diff --git a/crates/bevy_mesh/src/primitives/dim3/triangle3d.rs b/crates/bevy_mesh/src/primitives/dim3/triangle3d.rs
index 2337feb512ecd..64c941cb68fdc 100644
--- a/crates/bevy_mesh/src/primitives/dim3/triangle3d.rs
+++ b/crates/bevy_mesh/src/primitives/dim3/triangle3d.rs
@@ -35,8 +35,8 @@ impl MeshBuilder for Triangle3dMeshBuilder {
 impl Meshable for Triangle3d {
     type Output = Triangle3dMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
-        Triangle3dMeshBuilder { triangle: *self }
+    fn mesh(self) -> Self::Output {
+        Triangle3dMeshBuilder { triangle: self }
     }
 }
 
@@ -94,12 +94,6 @@ pub(crate) fn uv_coords(triangle: &Triangle3d) -> [[f32; 2]; 3] {
     }
 }
 
-impl From<Triangle3d> for Mesh {
-    fn from(triangle: Triangle3d) -> Self {
-        triangle.mesh().build()
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::uv_coords;
diff --git a/crates/bevy_mesh/src/primitives/extrusion.rs b/crates/bevy_mesh/src/primitives/extrusion.rs
index 2670805080904..3dc9a4593923e 100644
--- a/crates/bevy_mesh/src/primitives/extrusion.rs
+++ b/crates/bevy_mesh/src/primitives/extrusion.rs
@@ -92,7 +92,7 @@ where
 {
     type Output = ExtrusionBuilder<P>;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         ExtrusionBuilder {
             base_builder: self.base_shape.mesh(),
             half_depth: self.half_depth,
@@ -118,7 +118,7 @@ where
     P::Output: Extrudable,
 {
     /// Create a new `ExtrusionBuilder<P>` from a given `base_shape` and the full `depth` of the extrusion.
-    pub fn new(base_shape: &P, depth: f32) -> Self {
+    pub fn new(base_shape: P, depth: f32) -> Self {
         Self {
             base_builder: base_shape.mesh(),
             half_depth: depth / 2.,
@@ -425,13 +425,3 @@ where
         front_face
     }
 }
-
-impl<P> From<Extrusion<P>> for Mesh
-where
-    P: Primitive2d + Meshable,
-    P::Output: Extrudable,
-{
-    fn from(value: Extrusion<P>) -> Self {
-        value.mesh().build()
-    }
-}
diff --git a/crates/bevy_mesh/src/primitives/mod.rs b/crates/bevy_mesh/src/primitives/mod.rs
index 64f0ab16a1242..74655ae5087bd 100644
--- a/crates/bevy_mesh/src/primitives/mod.rs
+++ b/crates/bevy_mesh/src/primitives/mod.rs
@@ -38,7 +38,7 @@ pub trait Meshable {
     type Output: MeshBuilder;
 
     /// Creates a [`Mesh`] for a shape.
-    fn mesh(&self) -> Self::Output;
+    fn mesh(self) -> Self::Output;
 }
 
 /// A trait used to build [`Mesh`]es from a configuration
@@ -52,14 +52,22 @@ pub trait MeshBuilder {
     }
 }
 
-impl<T: MeshBuilder> From<T> for Mesh {
-    fn from(builder: T) -> Self {
-        builder.build()
+impl<T: MeshBuilder> Meshable for T {
+    type Output = Self;
+
+    fn mesh(self) -> Self::Output {
+        self
+    }
+}
+
+impl<T: Meshable> From<T> for Mesh {
+    fn from(meshable: T) -> Self {
+        meshable.mesh().build()
     }
 }
 
-impl<T: MeshBuilder> From<T> for InfallibleMesh {
-    fn from(builder: T) -> Self {
-        builder.build_infallible()
+impl<T: Meshable> From<T> for InfallibleMesh {
+    fn from(meshable: T) -> Self {
+        meshable.mesh().build_infallible()
     }
 }
diff --git a/examples/math/custom_primitives.rs b/examples/math/custom_primitives.rs
index a24f033701000..2315c054041df 100644
--- a/examples/math/custom_primitives.rs
+++ b/examples/math/custom_primitives.rs
@@ -472,9 +472,9 @@ impl Meshable for Heart {
     // The `MeshBuilder` can be used to create the actual mesh for that primitive.
     type Output = HeartMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
+    fn mesh(self) -> Self::Output {
         Self::Output {
-            heart: *self,
+            heart: self,
             resolution: 32,
         }
     }
diff --git a/examples/math/sampling_primitives.rs b/examples/math/sampling_primitives.rs
index 75cbc77118d34..75bb370a81116 100644
--- a/examples/math/sampling_primitives.rs
+++ b/examples/math/sampling_primitives.rs
@@ -201,8 +201,8 @@ impl ShapeSample for Shape {
 impl Meshable for Shape {
     type Output = ShapeMeshBuilder;
 
-    fn mesh(&self) -> Self::Output {
-        ShapeMeshBuilder { shape: *self }
+    fn mesh(self) -> Self::Output {
+        ShapeMeshBuilder { shape: self }
     }
 }
 

From ab9a52aa63bbb65d3520a9abb790f7de613dd741 Mon Sep 17 00:00:00 2001
From: robtfm <50659922+robtfm@users.noreply.github.com>
Date: Sun, 7 Dec 2025 13:03:06 +0000
Subject: [PATCH 132/133] remove Asset derive

---
 crates/bevy_mesh/src/mesh.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/bevy_mesh/src/mesh.rs b/crates/bevy_mesh/src/mesh.rs
index 65930d470f27b..49937912b3755 100644
--- a/crates/bevy_mesh/src/mesh.rs
+++ b/crates/bevy_mesh/src/mesh.rs
@@ -137,7 +137,7 @@ impl<T> From<Option<T>> for MeshExtractableData<T> {
 /// that can be converted into a normal `Mesh` using `InfallibleMesh::into_mesh`.
 /// Designed for use during cpu-side mesh construction. Methods on this struct whose `Mesh`
 /// counterparts may return `MeshAccessError::ExtractedToRenderWorld` instead return plain values.
-#[derive(Asset, Debug, Clone, Reflect, PartialEq)]
+#[derive(Debug, Clone, Reflect, PartialEq)]
 #[reflect(Clone)]
 pub struct InfallibleMesh(Mesh);
 

From 7d6aae4c885039c18e9ec3ff214d8a795ff18c03 Mon Sep 17 00:00:00 2001
From: robtfm <50659922+robtfm@users.noreply.github.com>
Date: Tue, 16 Dec 2025 00:06:36 +0000
Subject: [PATCH 133/133] fix new example

---
 examples/3d/clustered_decal_maps.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/3d/clustered_decal_maps.rs b/examples/3d/clustered_decal_maps.rs
index 0f88747fd1fd9..31b07d58fb84c 100644
--- a/examples/3d/clustered_decal_maps.rs
+++ b/examples/3d/clustered_decal_maps.rs
@@ -197,7 +197,7 @@ fn spawn_plane_mesh(
             half_size: Vec2::splat(PLANE_HALF_SIZE),
         }
         .mesh()
-        .build()
+        .build_infallible()
         .with_duplicated_vertices()
         .with_computed_flat_normals()
         .with_generated_tangents()