Skip to content

Commit d18f423

Browse files
authored
Merge pull request #6801 from samme/fix/getPipelineName-null
`getPipelineName()` is null if pipeline is null
2 parents 993e0ce + 840ff02 commit d18f423

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/gameobjects/components/Pipeline.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,11 +205,11 @@ var Pipeline = {
205205
* @webglOnly
206206
* @since 3.0.0
207207
*
208-
* @return {string} The string-based name of the pipeline being used by this Game Object.
208+
* @return {?string} The string-based name of the pipeline being used by this Game Object, or null.
209209
*/
210210
getPipelineName: function ()
211211
{
212-
return this.pipeline.name;
212+
return (this.pipeline === null) ? null : this.pipeline.name;
213213
}
214214

215215
};

0 commit comments

Comments
 (0)