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)
* changes:
  Change in texture set requires recreation of uniform map
  Mark uniform map as not having changed when it's ready


Trivial merge