tree 1dd5731e63de3d7488e43e5c4350c95bee3ea2c7
parent af622e1e30eb71e4fb6e03909419c8c290012640
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> 1270698669 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> 1270698669 +0000

Resolve conflict between default cube map and 2D textures in texture map.

TRAC #11625

Signed-off-by: Nicolas Capens
Signed-off-by: Daniel Koch

Author:    Andrew Lewycky

git-svn-id: http://angleproject.googlecode.com/svn/trunk@106 736b8ea6-26fd-11df-bfd4-992fa37f6226