Merge changes Ifb1d366c,I250378ee into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Tue, 30 Jan 2018 15:26:19 +0000 (15:26 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Tue, 30 Jan 2018 15:26:19 +0000 (15:26 +0000)
commitb3898fbb1337f5d33559a4b953ed75483461d7ca
treeb179e757cf7f2be507b93a7ab2d14ffd2773f54e
parent7a22017f2c54691cbc0bf7f4befac7757ec2eea5
parenta0439cfb703d104883ef0dbcbf902093cd1efc38
Merge changes Ifb1d366c,I250378ee into devel/master

* changes:
  Change in texture set requires recreation of uniform map
  Mark uniform map as not having changed when it's ready