hg: openjfx/8/graphics/rt: Fix for RT-28842: When both diffuseMap and diffuseColor are set in PhongMaterial, diffuseMap is not used

[hang.vo at oracle.com]

Changeset: 235cdce126cf
Author:    Chien Yang <chien.yang at orcale.com>
Date:      2013-05-03 11:38 -0700
URL:       http://hg.openjdk.java.net/openjfx/8/graphics/rt/rev/235cdce126cf

Fix for RT-28842: When both diffuseMap and diffuseColor are set in PhongMaterial, diffuseMap is not used
Approved by Kevin

! javafx-sg-prism/src/com/sun/javafx/sg/prism/NGPhongMaterial.java
! javafx-ui-common/src/javafx/scene/paint/PhongMaterial.java
! prism-d3d-native/src/hlsl/Mtl1PS.hlsl
! prism-es2/src/com/sun/prism/es2/ES2PhongShader.java
! prism-es2/src/com/sun/prism/es2/glsl/diffuse_texture.frag