Fix a memory leak that occures when Uniform Variables are updated

The Merge method called when some uniforms are added or changed
on a shader used to leak at each call. Fix that.

Change-Id: I46879903c2891cdf1dd94247d089621464a6f8db
Fix a few issues with parallel passes in VTK

Fixes a number of runtime failures in OpenGL2 with these
parallel passes.  Added a simple test to verify the code runs.

Change-Id: I2bcd998ab013412f7ee89c5ee122e9a1108954c6
Add data_index to Exodus driver

data_index[0] represents the time step (t_index) if HasModeShapes=0
or ModeShape otherwise. This commit also removes an unused variable.

Change-Id: I08716d6c904aa18eb5b6163a6d394e3c47bcb138
FIX: remove warning declaration of ‘’ shadows a previous local

Change-Id: Iea6e6b0b30a21dfc532d5c89f193696d60f182a1
This fixes the c2039 error in VS2013.

Apparently VS2013 requires the header <algorithm> so that
std::min and std::max are found.

Change-Id: I49811081e2388dc4661febbd3cf8eefcee91dfc1
Signed-off-by: Andrew Maclean <andrew.amaclean@gmail.com>
Merge topic 'fix_min_max_errors' into master

c81b6219 This fixes the c2039 error in VS2013.
Merge topic 'parallel_passes' into master

dd3801a1 Fix a few issues with parallel passes in VTK
remove some leftover debugging code

Change-Id: I1158eb47492db9b362e693086f231ae1bb0f1d80
Merge topic 'remove_dubugging_code' into master

dda7a189 remove some leftover debugging code
Merge topic 'exodus-15127' into master

d3ba9c77 FIX: remove warning declaration of ‘’ shadows a previous local
9c7135b9 Add data_index to Exodus driver
Merge topic 'fix_uniform_variables_leak' into master

6a6f0f12 Fix a memory leak that occures when Uniform Variables are updated