Fix names of texture and normal arrays in the OBJ reader

Because the arrays were not named, they did not appear in ParaView.

Change-Id: I76500c1fb037c443ca3bcf2b71e2907061304d7c
Fixes for composite poly data mapper2

Block Opacity was not being taken into account when calling
MapScalars in vtkMapper. Now does a better job copying values
from the mapper to the helpers. Minor cleanup on replace.

Change-Id: I01f708441a0021d9261e265466250826af9a9566
Make sure scale is included in the normal matrix

I had built normal matricies withotu scale thinking to keep
the normals as unit normals. But scale has to be included to
get correct normals and now the normals are always normalized in
the fragment shader anyhow so it is all good.  This change fixes
the failing TestParametricFunctions tests.

Change-Id: Ibc27e631de1c41e38258c9b8c9c76b23ac962f42
Merge topic 'fix_normal_matrix' into master

54d1dc20 Make sure scale is included in the normal matrix
Merge topic 'composite_fix' into master

5cc2de81 Fixes for composite poly data mapper2
Build static hdf5 and build on VS 2003 7.1

Change-Id: I7fbcc5328443557729e2f5f6ea90df9438e8a3df
Merge topic 'fix-static-hdf5' into master

14e8f637 Build static hdf5 and build on VS 2003 7.1
Sync up Cocoa code between OpenGL and OpenGL2

Some changes were made in one but not the other.

Change-Id: Icc19a0f2052335681d8f36f5650bed78d358b864
Merge topic 'objreaderfixes' into master

fb034ce4 Fix names of texture and normal arrays in the OBJ reader
Merge topic 'cocoa-merge' into master

ba2bbac2 Sync up Cocoa code between OpenGL and OpenGL2