Fixing particle paths to have proper SimulationTime output.

Change-Id: Ifd2517b5a1b1e7a8de4d8e16454abdcb4cc477d7
cmake: use COPYONLY rather than COPY_ONLY

Change-Id: I0e9a53fa64a91c90b4b0c60f96b873dd9acd76e2
vtkWrap: some uses of COPY_ONLY weren't even wrong

These instances are @ONLY, not meant to be COPYONLY which is what
COPY_ONLY might have indicated.

Change-Id: Iff456796cdd780fa9171713a0b286c9dc7036fe3
Add a missing header in vtkCompositePolyDataMapper2

For builds using VS2012, <algorithm> needs to be included in
order to use std::max.

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

2fd3ed6f Merge topic 'faster_edges' into master
fefd1846 Merge topic '14809_fix_title_placement' into master
6b8ef814 Significantly better performance with EdgeVisibilityOn
32a1a2d4 Merge topic 'volume_multi_light' into master
886872ff Merge topic 'fix_bad_memcpy' into master
5cd476f0 Merge topic 'update-kwsys' into master
df6ae15d Merge branch 'upstream-kwsys' into update-kwsys
d9b96c82 KWSys 2014-10-31 (88c8cc7f)
b28fd084 Merge topic 'mask-points-fix' into master
015c6cfa vtkPlotGrid draws grid even when axis is invisible.
9ffb9792 BUG #14809: Use title size when placing title in vtkChartXY.
48e0b994 Merge remote-tracking branch 'pvvtk/pv-master' into HEAD
fb6b47d5 Merge topic 'AdjustFileDescriptorLimit' into master
ab29d100 COMP: A more robust way to check file descriptor leaks
7baf76e2 Adding test for testing light kit and fixed shader issues
3c42ad23 Implementing positional light
...
Merge remote-tracking branch 'pvvtk/pv-master' into HEAD

* pvvtk/pv-master:

Change-Id: I98a4c8e31993c255625f14763cdedd90c92e079d
Merge topic 'fix_missing_header' into master

b0f0948f Add a missing header in vtkCompositePolyDataMapper2
KWSys 2014-11-12 (5843f590)

Extract upstream KWSys using the following shell commands.

$ git archive --prefix=upstream-kwsys/ 5843f590 | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' 88c8cc7f..5843f590
Ben Boeckel (1):
      5843f590 cmake: remove arguments to endfoo and else commands

Ådne Hovda (1):
      2e4a0ff0 SystemInformation: Check for _SC_AIX_REALMEM before using it

Change-Id: I0922a684067ce90e39ab89b5ff79ae57f20d4a0a
Merge branch 'upstream-kwsys' into update-kwsys

Change-Id: I2ec597f8b084fb3cd03f63bd7bcc8cf9ea3f79bd
Fix unnormalized interpolated normals

Interpolated normals are typically not unit length and need to
be renormalized in the fragment shader. This change adds
normalization for normals that are passed through the vertex shader
and therefore interpolated. This change replaces a number of valid images
that were previously added for OpenGL2 due to Phong lighting changes and
it adds a number of new images due to the phong lighting change that
are now showing up. Almost all the cases involve rendering low resolution
spheres and cylinders, both of which come with normals in VTK and for which
phong lighting can make a big difference.

Change-Id: Iab60742b5684f3e7a6575b28ad23e10572c9e67d
Merge topic 'fix_particle_paths' into master

3f86167e Fixing particle paths to have proper SimulationTime output.
Update the Composite Mapper to reflect changing in Edge Rendering

Change-Id: I27a4b2149ed825e4e017a12291b9be875afbba67
Merge topic 'fix-COPYONLY-usage' into master

d7f71542 vtkWrap: some uses of COPY_ONLY weren't even wrong
3bf2fb76 cmake: use COPYONLY rather than COPY_ONLY
Merge topic 'fix_edge_vis_on_composite' into master

15753f92 Update the Composite Mapper to reflect changing in Edge Rendering
Merge topic 'update-kwsys' into master

6aad6bb1 Merge branch 'upstream-kwsys' into update-kwsys
14f6f347 KWSys 2014-11-12 (5843f590)
Merge topic 'fix_normals' into master

34a8a2d2 Fix unnormalized interpolated normals