Commit 10e17aae authored by David E. DeMarle's avatar David E. DeMarle

Reset session would crash with at least some state files.

Cause was deleted raw pointers responding to callbacks.
At the same time add some much needed documentation for the class.
parent c5c9de13
......@@ -22,6 +22,7 @@
#include "vtkSMParaViewPipelineController.h"
#include "vtkSMProperty.h"
#include "vtkStdString.h"
#include "vtkWeakPointer.h"
#include "vtkPVConfig.h"
......@@ -80,9 +81,9 @@ public:
}
#endif
}
vtkSMMaterialDomain* Owner;
vtkWeakPointer<vtkSMMaterialDomain> Owner;
#ifdef PARAVIEW_USE_OSPRAY
vtkOSPRayMaterialLibrary* Watchee;
vtkWeakPointer<vtkOSPRayMaterialLibrary> Watchee;
#endif
};
......
......@@ -14,9 +14,15 @@
=========================================================================*/
/**
* @class vtkSMMaterialDomain
* @brief ...
* @brief Manages the list of OSPRay materials choosable to draw with.
*
* ...
* This class is a link between the global MaterialLibrary and the choices
* available on the display section of the Property Panel. When ParaView
* has no materials loaded, the list is simply "None" and not useable.
* When materials are loaded, the list lets the user pick None, any one for
* whole actor colors, or 'Value Indexed' which says that each block and
* cell gets to make its own choice via the indexed lookup table annotation
* names.
*/
#ifndef vtkSMMaterialDomain_h
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment