Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <j.bakker@atmind.nl>2012-06-12 08:23:21 +0400
committerJeroen Bakker <j.bakker@atmind.nl>2012-06-12 08:23:21 +0400
commitac5a735e3fe9fe29e38e3a20c20da87b27feb112 (patch)
tree52059f3dbc9827eb498abe772e763e541b3b3608 /source/blender/compositor/intern/COM_NodeOperation.h
parent7977078227d6da77e294dd860f4685387f0bae56 (diff)
* FIX for
- [#31777] Border Crop gives black - [#31768] Crash when connecting a Math node to a translate node in Tiles comp - [#31638] View node in new node compo system crashes when inside a group * make sure a very fast vignette can be made by using a EliipseMask + Fast Gaussian blur
Diffstat (limited to 'source/blender/compositor/intern/COM_NodeOperation.h')
-rw-r--r--source/blender/compositor/intern/COM_NodeOperation.h14
1 files changed, 13 insertions, 1 deletions
diff --git a/source/blender/compositor/intern/COM_NodeOperation.h b/source/blender/compositor/intern/COM_NodeOperation.h
index 2219907b0c8..db1fdda0bcf 100644
--- a/source/blender/compositor/intern/COM_NodeOperation.h
+++ b/source/blender/compositor/intern/COM_NodeOperation.h
@@ -160,11 +160,22 @@ public:
virtual void deinitExecution();
void deinitMutex();
+ bool isResolutionSet() {
+ return this->width != 0 && height != 0;
+ }
+
/**
* @brief set the resolution
* @param resolution the resolution to set
*/
- void setResolution(unsigned int resolution[]) {this->width = resolution[0];this->height = resolution[1];}
+ void setResolution(unsigned int resolution[]) {
+ if (!isResolutionSet()) {
+ this->width = resolution[0];
+ this->height = resolution[1];
+ }
+ }
+
+
void getConnectedInputSockets(vector<InputSocket*> *sockets);
/**
@@ -221,6 +232,7 @@ public:
bool isOpenCL() { return this->openCL; }
virtual bool isViewerOperation() {return false;}
+ virtual bool isPreviewOperation() {return false;}
protected:
NodeOperation();