Additional changes to work with Simon's pull request.

-Remove unneeded glFinish() call in GLWidget.
-Remove unneeded AMD_OS_WIN preprocessor in several projects.
-Define NVIDIA in all projects that use the NvidiaRelease build and depend on OpenCL.
This commit is contained in:
mfeemster
2015-01-29 18:22:15 -08:00
parent 301b6ee452
commit b1d5db261b
9 changed files with 27 additions and 13 deletions

View File

@ -44,6 +44,10 @@ public:
Init();
}
/// <summary>
/// Copy constructor to copy an Ember object of the same type.
/// </summary>
/// <param name="ember">The Ember object to copy</param>
Ember(const Ember<T>& ember)
: m_Edits(nullptr)
{
@ -69,8 +73,12 @@ public:
ClearEdit();
}
//For some reason the compiler requires Xform to define two assignment operators,
//however it gets confused when Ember has two.
/// <summary>
/// Assignment operator to copy an Ember object of the same type.
/// For some reason the compiler requires Xform to define two assignment operators,
/// however it gets confused when Ember has two.
/// </summary>
/// <param name="ember">The Ember object to copy</param>
Ember<T>& operator = (const Ember<T>& ember)
{
if (this != &ember)