Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 21:33:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge branch 'resolve-conflicting-merges' into 'master'

Browse Source 
Resolve conflicting merges

Merge request !445 (Camera enhancements) and merge request !448
(Consolidate background color) had conflicting changes in View.h.
Although git did not pick up on the conflict because each merge modified a
different portion of View.h, the final merge with both of these resulted
in a compile error.

Basically what happened was `Consolidate background color` changed all
the View constructors to reflect changes. `Camera enhancements` added a
new constructor to View using the old construction method. The new
constructor with the old construction method caused an error.

See merge request !451
This commit is contained in:
Kenneth Moreland 2016-06-13 13:03:03 -04:00
commit dfc160a155
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vtkm/rendering/View.h
View File

@ -45,10 +45,9 @@ public:
vtkm::rendering::Color(0,0,0,1))
: Scene(scene),
MapperPointer(new MapperType(mapper)),
CanvasPointer(new CanvasType(canvas)),
BackgroundColor(backgroundColor)
CanvasPointer(new CanvasType(canvas))
{
this->MapperPointer->SetBackgroundColor(this->BackgroundColor);
this->CanvasPointer->SetBackgroundColor(backgroundColor);
this->WorldAnnotatorPointer = this->CanvasPointer->CreateWorldAnnotator();
vtkm::Bounds spatialBounds = this->Scene.GetSpatialBounds();