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: I2388b8c02e97c0a01755596d0c3489162c045afc