Skip to content

[pull] dev from mrdoob:dev #1040

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Dec 28, 2025
Merged

[pull] dev from mrdoob:dev #1040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e85cce9
LensflareMesh: Fix DPR usage. (#32625)
Mugen87 Dec 28, 2025
a254a38
Update KeyframeTrack.js
Mugen87 Dec 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/jsm/objects/LensflareMesh.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ class LensflareMesh extends Mesh {

renderer.getViewport( viewport );

viewport.multiplyScalar( window.devicePixelRatio );
viewport.multiplyScalar( renderer.getPixelRatio() ).floor();

const renderTarget = renderer.getRenderTarget();
const type = ( renderTarget !== null ) ? renderTarget.texture.type : UnsignedByteType;
Expand Down
2 changes: 1 addition & 1 deletion src/animation/KeyframeTrack.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import * as AnimationUtils from './AnimationUtils.js';
import { warn, error } from '../utils.js';

/**
* Represents s a timed sequence of keyframes, which are composed of lists of
* Represents a timed sequence of keyframes, which are composed of lists of
* times and related values, and which are used to animate a specific property
* of an object.
*/
Expand Down