Commit c641c8c
fix(screenshot): propagate folderOverride to composited and specific-camera paths
Two pre-existing inconsistencies surfaced by CodeRabbit on #1103:
1. CaptureComposited dropped the caller's output_folder by hardcoding
folderOverride: null in PrepareCaptureResult and the camera fallbacks.
Adds the parameter to CaptureComposited's signature and plumbs it
through both fallback paths.
2. The targetCamera and includeImage-in-play paths in ManageScene's
game_view screenshot did not resolve cmd.outputFolder, so a request
that selected a specific camera would always write to the default
folder. Resolve via ScreenshotPreferences.Resolve as the other paths
already do, and gate AssetDatabase.ImportAsset on IsUnderAssets so
non-Assets folders don't trigger a futile import.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>1 parent 642687f commit c641c8c
2 files changed
Lines changed: 17 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
598 | 598 | | |
599 | 599 | | |
600 | 600 | | |
| 601 | + | |
601 | 602 | | |
602 | 603 | | |
603 | | - | |
| 604 | + | |
| 605 | + | |
604 | 606 | | |
605 | | - | |
| 607 | + | |
| 608 | + | |
606 | 609 | | |
607 | 610 | | |
608 | 611 | | |
| |||
611 | 614 | | |
612 | 615 | | |
613 | 616 | | |
| 617 | + | |
614 | 618 | | |
615 | 619 | | |
616 | | - | |
| 620 | + | |
| 621 | + | |
617 | 622 | | |
618 | | - | |
| 623 | + | |
| 624 | + | |
619 | 625 | | |
620 | 626 | | |
621 | 627 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
246 | 246 | | |
247 | 247 | | |
248 | 248 | | |
249 | | - | |
| 249 | + | |
| 250 | + | |
250 | 251 | | |
251 | 252 | | |
252 | 253 | | |
253 | 254 | | |
254 | 255 | | |
255 | | - | |
| 256 | + | |
| 257 | + | |
256 | 258 | | |
257 | 259 | | |
258 | 260 | | |
259 | 261 | | |
260 | | - | |
| 262 | + | |
261 | 263 | | |
262 | 264 | | |
263 | 265 | | |
| |||
270 | 272 | | |
271 | 273 | | |
272 | 274 | | |
273 | | - | |
| 275 | + | |
| 276 | + | |
274 | 277 | | |
275 | 278 | | |
276 | 279 | | |
| |||
0 commit comments