Ken Martin authored Feb 13, 2015 and Ben Boeckel committed Feb 24, 2015

Fix the case where a polydata is passed to CompositePolyDataMapper2
instead of a CompositeDataSet. Also fix a failure with scalar coloring
when not using texture maps.

Change-Id: I9fc88464994fc41f439fe1288a78c7f898805b1c