Skip to content

Commit

Permalink
Merge hot fix back into master
Browse files Browse the repository at this point in the history
  • Loading branch information
daredevildave committed Jan 12, 2015
2 parents 32f20e0 + 835e865 commit edcf5c3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# PlayCanvas Engine Changes

### v0.163.3
* [FIX] Hotfix - Cannot read property 'PIXELFORMAT_RGBA32F' of undefined

### v0.163.2
* GPU cubemap prefiltering.
* Support for loading RGBA32F DDS textures.
Expand Down
2 changes: 1 addition & 1 deletion src/scene/scene_phongmaterial.js
Original file line number Diff line number Diff line change
Expand Up @@ -809,7 +809,7 @@ pc.extend(pc, function () {

hdrReflection: prefilteredCubeMap? prefilteredCubeMap128.rgbm || prefilteredCubeMap128.format===pc.PIXELFORMAT_RGBA32F
: (this.cubeMap? this.cubeMap.rgbm || this.cubeMap.format===pc.PIXELFORMAT_RGBA32F
: (this.sphereMap? this.sphereMap.rgbm || this.sphereMap.format===pc.pc.PIXELFORMAT_RGBA32F : false)),
: (this.sphereMap? this.sphereMap.rgbm || this.sphereMap.format===pc.PIXELFORMAT_RGBA32F : false)),

fixSeams: prefilteredCubeMap? prefilteredCubeMap128.fixCubemapSeams : (this.cubeMap? this.cubeMap.fixCubemapSeams : false),
prefilteredCubemap: prefilteredCubeMap,
Expand Down

0 comments on commit edcf5c3

Please sign in to comment.