Skip to content

[pull] dev from mrdoob:dev #1058

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
Jan 5, 2026
Merged

[pull] dev from mrdoob:dev #1058

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
cc8b010
Line2NodeMaterial: Rename `useColor` property to `vertexColors` (#32670)
sunag Jan 5, 2026
a8d2789
Inspector: Store parameters object+key (#32507)
marwie Jan 5, 2026
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
16 changes: 16 additions & 0 deletions examples/jsm/inspector/tabs/Parameters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ class ParametersGroup {

this.paramList = new Item( name );

this.objects = [];

}

close() {
Expand Down Expand Up @@ -93,6 +95,15 @@ class ParametersGroup {

};


this._registerParameter( object, property, editor, subItem );

}

_registerParameter( object, property, editor, subItem ) {

this.objects.push( { object: object, key: property, editor: editor, subItem: subItem } );

}

addFolder( name ) {
Expand Down Expand Up @@ -291,6 +302,8 @@ class ParametersGroup {

};

this._registerParameter( object, property, editor, subItem );

return editor;

}
Expand All @@ -315,13 +328,16 @@ class Parameters extends Tab {

this.paramList = paramList;

this.groups = [];

}

createGroup( name ) {

const group = new ParametersGroup( this, name );

this.paramList.add( group.paramList );
this.groups.push( group );

return group;

Expand Down
6 changes: 3 additions & 3 deletions src/materials/nodes/Line2NodeMaterial.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class Line2NodeMaterial extends NodeMaterial {
* @type {boolean}
* @default false
*/
this.useColor = parameters.vertexColors;
this.vertexColors = parameters.vertexColors;

/**
* The dash offset.
Expand Down Expand Up @@ -133,7 +133,7 @@ class Line2NodeMaterial extends NodeMaterial {
const { renderer } = builder;

const useAlphaToCoverage = this._useAlphaToCoverage;
const useColor = this.useColor;
const vertexColors = this.vertexColors;
const useDash = this._useDash;
const useWorldUnits = this._useWorldUnits;

Expand Down Expand Up @@ -434,7 +434,7 @@ class Line2NodeMaterial extends NodeMaterial {

} else {

if ( useColor ) {
if ( vertexColors ) {

const instanceColorStart = attribute( 'instanceColorStart' );
const instanceColorEnd = attribute( 'instanceColorEnd' );
Expand Down