Sergey Sharybin
1dd7156c4c
This was in fact really nasty bug, caused by multitex_nodes function using global variable R (which is a copy of current renderer). this variable is not initialized to anything meaningful for until first rendering (preview or final) happened. Since multitex_nodes might be used outside of render pipeline, made it so whether CM is on or off as an argument to functions multitex_ext_safe and multitex_ext. Now multitex_nodes() is only shall be used for stuff happening from render pipeline! Also needed to make some changes to other places, so all the usages of texture sampling knows for the fact whether CM is on or off. And one more change is related on behavior of dispalcement, wave, warp, weightvg modifiers and smoke. They'll be always using CM off since texture is used for influence, not for color. It's rather bigger patch, but it's mostly straightforward changes, which we really need to be done. Reviewed by Brecht, thanks!
59 lines
2.5 KiB
C++
59 lines
2.5 KiB
C++
/*
|
|
* Copyright 2011, Blender Foundation.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
* Contributor:
|
|
* Jeroen Bakker
|
|
* Monique Dewanchand
|
|
*/
|
|
|
|
#include "COM_TextureNode.h"
|
|
#include "COM_ExecutionSystem.h"
|
|
#include "COM_TextureOperation.h"
|
|
|
|
TextureNode::TextureNode(bNode *editorNode) : Node(editorNode)
|
|
{
|
|
/* pass */
|
|
}
|
|
|
|
void TextureNode::convertToOperations(ExecutionSystem *system, CompositorContext *context)
|
|
{
|
|
bNode *editorNode = this->getbNode();
|
|
Tex *texture = (Tex *)editorNode->id;
|
|
TextureOperation *operation = new TextureOperation();
|
|
const ColorManagedDisplaySettings *displaySettings = context->getDisplaySettings();
|
|
bool sceneColorManage = strcmp(displaySettings->display_device, "None") != 0;
|
|
this->getOutputSocket(1)->relinkConnections(operation->getOutputSocket());
|
|
this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, system);
|
|
this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, system);
|
|
operation->setTexture(texture);
|
|
operation->setRenderData(context->getRenderData());
|
|
operation->setSceneColorManage(sceneColorManage);
|
|
system->addOperation(operation);
|
|
addPreviewOperation(system, context, operation->getOutputSocket());
|
|
|
|
if (this->getOutputSocket(0)->isConnected()) {
|
|
TextureAlphaOperation *alphaOperation = new TextureAlphaOperation();
|
|
this->getOutputSocket(0)->relinkConnections(alphaOperation->getOutputSocket());
|
|
addLink(system, operation->getInputSocket(0)->getConnection()->getFromSocket(), alphaOperation->getInputSocket(0));
|
|
addLink(system, operation->getInputSocket(1)->getConnection()->getFromSocket(), alphaOperation->getInputSocket(1));
|
|
alphaOperation->setTexture(texture);
|
|
alphaOperation->setRenderData(context->getRenderData());
|
|
alphaOperation->setSceneColorManage(sceneColorManage);
|
|
system->addOperation(alphaOperation);
|
|
}
|
|
}
|