[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48195] trunk/blender/source/blender: remove scene from new compositor classes.
Campbell Barton
ideasman42 at gmail.com
Fri Jun 22 17:06:59 CEST 2012
Revision: 48195
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48195
Author: campbellbarton
Date: 2012-06-22 15:06:52 +0000 (Fri, 22 Jun 2012)
Log Message:
-----------
remove scene from new compositor classes. only needs RenderData
Modified Paths:
--------------
trunk/blender/source/blender/compositor/intern/COM_CompositorContext.cpp
trunk/blender/source/blender/compositor/intern/COM_CompositorContext.h
trunk/blender/source/blender/compositor/intern/COM_ExecutionSystem.cpp
trunk/blender/source/blender/compositor/intern/COM_ExecutionSystem.h
trunk/blender/source/blender/compositor/intern/COM_compositor.cpp
trunk/blender/source/blender/compositor/nodes/COM_CompositorNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_IDMaskNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_MaskNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_OutputFileNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_ScaleNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_TextureNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_ViewerNode.cpp
trunk/blender/source/blender/compositor/operations/COM_CompositorOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_CompositorOperation.h
trunk/blender/source/blender/compositor/operations/COM_OutputFileOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_OutputFileOperation.h
trunk/blender/source/blender/compositor/operations/COM_TextureOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_TextureOperation.h
trunk/blender/source/blender/render/extern/include/RE_pipeline.h
trunk/blender/source/blender/render/intern/source/pipeline.c
Modified: trunk/blender/source/blender/compositor/intern/COM_CompositorContext.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_CompositorContext.cpp 2012-06-22 14:43:25 UTC (rev 48194)
+++ trunk/blender/source/blender/compositor/intern/COM_CompositorContext.cpp 2012-06-22 15:06:52 UTC (rev 48195)
@@ -26,7 +26,7 @@
CompositorContext::CompositorContext()
{
- this->scene = NULL;
+ this->rd = NULL;
this->quality = COM_QUALITY_HIGH;
this->hasActiveOpenCLDevices = false;
this->activegNode = NULL;
@@ -34,8 +34,8 @@
const int CompositorContext::getFramenumber() const
{
- if (this->scene) {
- return this->scene->r.cfra;
+ if (this->rd) {
+ return this->rd->cfra;
}
else {
return -1; /* this should never happen */
@@ -44,8 +44,8 @@
const int CompositorContext::isColorManaged() const
{
- if (this->scene) {
- return this->scene->r.color_mgt_flag & R_COLOR_MANAGEMENT;
+ if (this->rd) {
+ return this->rd->color_mgt_flag & R_COLOR_MANAGEMENT;
}
else {
return 0; /* this should never happen */
Modified: trunk/blender/source/blender/compositor/intern/COM_CompositorContext.h
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_CompositorContext.h 2012-06-22 14:43:25 UTC (rev 48194)
+++ trunk/blender/source/blender/compositor/intern/COM_CompositorContext.h 2012-06-22 15:06:52 UTC (rev 48195)
@@ -51,11 +51,11 @@
CompositorQuality quality;
/**
- * @brief Reference to the scene that is being composited.
+ * @brief Reference to the render data that is being composited.
* This field is initialized in ExecutionSystem and must only be read from that point on.
* @see ExecutionSystem
*/
- Scene *scene;
+ RenderData *rd;
/**
* @brief reference to the bNodeTree
@@ -93,7 +93,7 @@
/**
* @brief set the scene of the context
*/
- void setScene(Scene *scene) { this->scene = scene; }
+ void setRenderData(RenderData *rd) { this->rd = rd; }
/**
* @brief set the bnodetree of the context
@@ -118,7 +118,7 @@
/**
* @brief get the scene of the context
*/
- const Scene *getScene() const { return this->scene; }
+ const RenderData *getRenderData() const { return this->rd; }
/**
* @brief set the quality
Modified: trunk/blender/source/blender/compositor/intern/COM_ExecutionSystem.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_ExecutionSystem.cpp 2012-06-22 14:43:25 UTC (rev 48194)
+++ trunk/blender/source/blender/compositor/intern/COM_ExecutionSystem.cpp 2012-06-22 15:06:52 UTC (rev 48195)
@@ -41,7 +41,7 @@
#include "BKE_global.h"
-ExecutionSystem::ExecutionSystem(Scene *scene, bNodeTree *editingtree, bool rendering)
+ExecutionSystem::ExecutionSystem(RenderData *rd, bNodeTree *editingtree, bool rendering)
{
context.setbNodeTree(editingtree);
bNode *gnode;
@@ -64,7 +64,7 @@
ExecutionSystemHelper::addbNodeTree(*this, 0, editingtree, NULL);
- context.setScene(scene);
+ context.setRenderData(rd);
this->convertToOperations();
this->groupOperations(); /* group operations in ExecutionGroups */
unsigned int index;
Modified: trunk/blender/source/blender/compositor/intern/COM_ExecutionSystem.h
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_ExecutionSystem.h 2012-06-22 14:43:25 UTC (rev 48194)
+++ trunk/blender/source/blender/compositor/intern/COM_ExecutionSystem.h 2012-06-22 15:06:52 UTC (rev 48195)
@@ -156,7 +156,7 @@
* @param editingtree [bNodeTree*]
* @param rendering [true false]
*/
- ExecutionSystem(Scene *scene, bNodeTree *editingtree, bool rendering);
+ ExecutionSystem(RenderData *rd, bNodeTree *editingtree, bool rendering);
/**
* Destructor
Modified: trunk/blender/source/blender/compositor/intern/COM_compositor.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_compositor.cpp 2012-06-22 14:43:25 UTC (rev 48194)
+++ trunk/blender/source/blender/compositor/intern/COM_compositor.cpp 2012-06-22 15:06:52 UTC (rev 48195)
@@ -56,15 +56,9 @@
editingtree->progress(editingtree->prh, 0.0);
/* initialize execution system */
- Scene *scene;
- for (scene = (Scene*)G.main->scene.first; scene != NULL ; scene = (Scene*)scene->id.next) {
- if (&scene->r == rd) {
- ExecutionSystem *system = new ExecutionSystem(scene, editingtree, rendering);
- system->execute();
- delete system;
- break;
- }
- }
+ ExecutionSystem *system = new ExecutionSystem(rd, editingtree, rendering);
+ system->execute();
+ delete system;
BLI_mutex_unlock(compositorMutex);
}
Modified: trunk/blender/source/blender/compositor/nodes/COM_CompositorNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_CompositorNode.cpp 2012-06-22 14:43:25 UTC (rev 48194)
+++ trunk/blender/source/blender/compositor/nodes/COM_CompositorNode.cpp 2012-06-22 15:06:52 UTC (rev 48195)
@@ -35,7 +35,7 @@
InputSocket *alphaSocket = this->getInputSocket(1);
if (imageSocket->isConnected()) {
CompositorOperation *colourAlphaProg = new CompositorOperation();
- colourAlphaProg->setScene(context->getScene());
+ colourAlphaProg->setRenderData(context->getRenderData());
colourAlphaProg->setbNodeTree(context->getbNodeTree());
imageSocket->relinkConnections(colourAlphaProg->getInputSocket(0));
alphaSocket->relinkConnections(colourAlphaProg->getInputSocket(1));
Modified: trunk/blender/source/blender/compositor/nodes/COM_IDMaskNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_IDMaskNode.cpp 2012-06-22 14:43:25 UTC (rev 48194)
+++ trunk/blender/source/blender/compositor/nodes/COM_IDMaskNode.cpp 2012-06-22 15:06:52 UTC (rev 48195)
@@ -38,7 +38,7 @@
operation->setObjectIndex(bnode->custom1);
this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
- if (bnode->custom2 == 0 || context->getScene()->r.scemode & R_FULL_SAMPLE) {
+ if (bnode->custom2 == 0 || context->getRenderData()->scemode & R_FULL_SAMPLE) {
this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
}
else {
Modified: trunk/blender/source/blender/compositor/nodes/COM_MaskNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_MaskNode.cpp 2012-06-22 14:43:25 UTC (rev 48194)
+++ trunk/blender/source/blender/compositor/nodes/COM_MaskNode.cpp 2012-06-22 15:06:52 UTC (rev 48195)
@@ -36,7 +36,7 @@
void MaskNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
{
- const RenderData *data = &context->getScene()->r;
+ const RenderData *data = context->getRenderData();
OutputSocket *outputMask = this->getOutputSocket(0);
Modified: trunk/blender/source/blender/compositor/nodes/COM_OutputFileNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_OutputFileNode.cpp 2012-06-22 14:43:25 UTC (rev 48194)
+++ trunk/blender/source/blender/compositor/nodes/COM_OutputFileNode.cpp 2012-06-22 15:06:52 UTC (rev 48195)
@@ -47,7 +47,7 @@
if (storage->format.imtype == R_IMF_IMTYPE_MULTILAYER) {
/* single output operation for the multilayer file */
OutputOpenExrMultiLayerOperation *outputOperation = new OutputOpenExrMultiLayerOperation(
- context->getScene(), context->getbNodeTree(), storage->base_path, storage->format.exr_codec);
+ context->getRenderData(), context->getbNodeTree(), storage->base_path, storage->format.exr_codec);
int num_inputs = getNumberOfInputSockets();
bool hasConnections = false;
@@ -80,7 +80,7 @@
BLI_join_dirfile(path, FILE_MAX, storage->base_path, sockdata->path);
OutputSingleLayerOperation *outputOperation = new OutputSingleLayerOperation(
- context->getScene(), context->getbNodeTree(), input->getDataType(), format, path);
+ context->getRenderData(), context->getbNodeTree(), input->getDataType(), format, path);
input->relinkConnections(outputOperation->getInputSocket(0));
graph->addOperation(outputOperation);
if (!previewAdded) {
Modified: trunk/blender/source/blender/compositor/nodes/COM_ScaleNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_ScaleNode.cpp 2012-06-22 14:43:25 UTC (rev 48194)
+++ trunk/blender/source/blender/compositor/nodes/COM_ScaleNode.cpp 2012-06-22 15:06:52 UTC (rev 48195)
@@ -52,7 +52,7 @@
break;
case CMP_SCALE_SCENEPERCENT: {
SetValueOperation *scaleFactorOperation = new SetValueOperation();
- scaleFactorOperation->setValue(context->getScene()->r.size / 100.0f);
+ scaleFactorOperation->setValue(context->getRenderData()->size / 100.0f);
ScaleOperation *operation = new ScaleOperation();
inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph);
addLink(graph, scaleFactorOperation->getOutputSocket(), operation->getInputSocket(1));
@@ -64,7 +64,7 @@
break;
case CMP_SCALE_RENDERPERCENT: {
- const RenderData *data = &context->getScene()->r;
+ const RenderData *data = context->getRenderData();
ScaleFixedSizeOperation *operation = new ScaleFixedSizeOperation();
/* framing options */
Modified: trunk/blender/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_SplitViewerNode.cpp 2012-06-22 14:43:25 UTC (rev 48194)
+++ trunk/blender/source/blender/compositor/nodes/COM_SplitViewerNode.cpp 2012-06-22 15:06:52 UTC (rev 48195)
@@ -39,8 +39,8 @@
ImageUser *imageUser = (ImageUser *) this->getbNode()->storage;
if (image1Socket->isConnected() && image2Socket->isConnected()) {
SplitViewerOperation *splitViewerOperation = new SplitViewerOperation();
- splitViewerOperation->setColorManagement(context->getScene()->r.color_mgt_flag & R_COLOR_MANAGEMENT);
- splitViewerOperation->setColorPredivide(context->getScene()->r.color_mgt_flag & R_COLOR_MANAGEMENT_PREDIVIDE);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list