archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

remove scene from new compositor classes. only needs RenderData

Browse Source
This commit is contained in:
Campbell Barton
2012-06-22 15:06:52 +00:00
parent 590f5fdbdf
commit 0b0ac3aa9e
21 changed files with 68 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/compositor/operations/COM_TextureOperation.cpp
View File

@@ -32,7 +32,7 @@ TextureBaseOperation::TextureBaseOperation() : NodeOperation()
this->texture = NULL;
this->inputSize = NULL;
this->inputOffset = NULL;
this->scene = NULL;
this->rd = NULL;
}
TextureOperation::TextureOperation() : TextureBaseOperation()
{
@@ -57,8 +57,8 @@ void TextureBaseOperation::deinitExecution()
void TextureBaseOperation::determineResolution(unsigned int resolution[], unsigned int preferredResolution[])
{
if (preferredResolution[0] == 0 || preferredResolution[1] == 0) {
int width = this->scene->r.xsch * this->scene->r.size / 100;
int height = this->scene->r.ysch * this->scene->r.size / 100;
int width = this->rd->xsch * this->rd->size / 100;
int height = this->rd->ysch * this->rd->size / 100;
resolution[0] = width;
resolution[1] = height;
}