diff options
author | Jeroen Bakker <j.bakker@atmind.nl> | 2012-05-22 13:54:08 +0400 |
---|---|---|
committer | Jeroen Bakker <j.bakker@atmind.nl> | 2012-05-22 13:54:08 +0400 |
commit | dbd70c05f799afb4d8a3584eae58af384ee14353 (patch) | |
tree | cd2edf5b6920cedc3d6311680509cffc9b165404 /source/blender/compositor/operations/COM_TextureOperation.cpp | |
parent | e7647e15859f524c1989847656e4ea228507d71b (diff) |
* Composite result is updated when editing (preview were already
calculated, now the final result is also updated in the image space
* default texture size when not connected to any resolution depended
operation defaults to render size
Diffstat (limited to 'source/blender/compositor/operations/COM_TextureOperation.cpp')
-rw-r--r-- | source/blender/compositor/operations/COM_TextureOperation.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/compositor/operations/COM_TextureOperation.cpp b/source/blender/compositor/operations/COM_TextureOperation.cpp index f7edd922376..0d85f71c691 100644 --- a/source/blender/compositor/operations/COM_TextureOperation.cpp +++ b/source/blender/compositor/operations/COM_TextureOperation.cpp @@ -32,6 +32,7 @@ TextureBaseOperation::TextureBaseOperation(): NodeOperation() this->texture = NULL; this->inputSize = NULL; this->inputOffset = NULL; + this->scene = NULL; } TextureOperation::TextureOperation() : TextureBaseOperation() { @@ -56,8 +57,10 @@ void TextureBaseOperation::deinitExecution() void TextureBaseOperation::determineResolution(unsigned int resolution[], unsigned int preferredResolution[]) { if (preferredResolution[0] == 0 || preferredResolution[1] == 0) { - resolution[0] = COM_DEFAULT_RESOLUTION_WIDTH; - resolution[1] = COM_DEFAULT_RESOLUTION_HEIGHT; + int width = this->scene->r.xsch*this->scene->r.size/100; + int height = this->scene->r.ysch*this->scene->r.size/100; + resolution[0] = width; + resolution[1] = height; } else { resolution[0] = preferredResolution[0]; |