Revision: 48284
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48284
Author: campbellbarton
Date: 2012-06-25 18:03:19 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r48276:48283
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48276
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ScaleOperation.cpp
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-48276
+
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-48283
Modified:
branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.cpp
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.cpp
2012-06-25 18:01:01 UTC (rev 48283)
+++
branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.cpp
2012-06-25 18:03:19 UTC (rev 48284)
@@ -254,7 +254,7 @@
gpudevices.push_back(clDevice);
}
}
- delete cldevices;
+ delete[] cldevices;
}
}
delete[] platforms;
Modified:
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
2012-06-25 18:01:01 UTC (rev 48283)
+++
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
2012-06-25 18:03:19 UTC (rev 48284)
@@ -36,10 +36,12 @@
void *GaussianAlphaXBlurOperation::initializeTileData(rcti *rect, MemoryBuffer
**memoryBuffers)
{
+ lockMutex();
if (!this->sizeavailable) {
updateGauss(memoryBuffers);
}
void *buffer = getInputOperation(0)->initializeTileData(NULL,
memoryBuffers);
+ unlockMutex();
return buffer;
}
@@ -47,6 +49,8 @@
{
/* BlurBaseOperation::initExecution(); */ /* until we suppoer size
input - comment this */
+ initMutex();
+
if (this->sizeavailable) {
float rad = size * this->data->sizex;
if (rad < 1)
@@ -154,6 +158,8 @@
this->gausstab = NULL;
delete [] this->distbuf_inv;
this->distbuf_inv = NULL;
+
+ deinitMutex();
}
bool GaussianAlphaXBlurOperation::determineDependingAreaOfInterest(rcti
*input, ReadBufferOperation *readOperation, rcti *output)
Modified:
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
2012-06-25 18:01:01 UTC (rev 48283)
+++
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
2012-06-25 18:03:19 UTC (rev 48284)
@@ -36,10 +36,12 @@
void *GaussianAlphaYBlurOperation::initializeTileData(rcti *rect, MemoryBuffer
**memoryBuffers)
{
+ lockMutex();
if (!this->sizeavailable) {
updateGauss(memoryBuffers);
}
void *buffer = getInputOperation(0)->initializeTileData(NULL,
memoryBuffers);
+ unlockMutex();
return buffer;
}
@@ -47,6 +49,8 @@
{
/* BlurBaseOperation::initExecution(); */ /* until we suppoer size
input - comment this */
+ initMutex();
+
if (this->sizeavailable) {
float rad = size * this->data->sizey;
if (rad < 1)
@@ -65,7 +69,7 @@
float rad = size * this->data->sizey;
if (rad < 1)
rad = 1;
-
+
this->rad = rad;
this->gausstab = BlurBaseOperation::make_gausstab(rad);
}
@@ -154,6 +158,8 @@
this->gausstab = NULL;
delete [] this->distbuf_inv;
this->distbuf_inv = NULL;
+
+ deinitMutex();
}
bool GaussianAlphaYBlurOperation::determineDependingAreaOfInterest(rcti
*input, ReadBufferOperation *readOperation, rcti *output)
Modified:
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
2012-06-25 18:01:01 UTC (rev 48283)
+++
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
2012-06-25 18:03:19 UTC (rev 48284)
@@ -34,10 +34,12 @@
void *GaussianBokehBlurOperation::initializeTileData(rcti *rect, MemoryBuffer
**memoryBuffers)
{
+ lockMutex();
if (!sizeavailable) {
updateGauss(memoryBuffers);
}
void *buffer = getInputOperation(0)->initializeTileData(NULL,
memoryBuffers);
+ unlockMutex();
return buffer;
}
@@ -45,6 +47,8 @@
{
BlurBaseOperation::initExecution();
+ initMutex();
+
if (this->sizeavailable) {
updateGauss(NULL);
}
@@ -154,6 +158,8 @@
BlurBaseOperation::deinitExecution();
delete [] this->gausstab;
this->gausstab = NULL;
+
+ deinitMutex();
}
bool GaussianBokehBlurOperation::determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation, rcti *output)
Modified:
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
2012-06-25 18:01:01 UTC (rev 48283)
+++
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
2012-06-25 18:03:19 UTC (rev 48284)
@@ -31,15 +31,16 @@
{
this->gausstab = NULL;
this->rad = 0;
-
}
void *GaussianXBlurOperation::initializeTileData(rcti *rect, MemoryBuffer
**memoryBuffers)
{
+ lockMutex();
if (!this->sizeavailable) {
updateGauss(memoryBuffers);
}
void *buffer = getInputOperation(0)->initializeTileData(NULL,
memoryBuffers);
+ unlockMutex();
return buffer;
}
@@ -47,6 +48,8 @@
{
BlurBaseOperation::initExecution();
+ initMutex();
+
if (this->sizeavailable) {
float rad = size * this->data->sizex;
if (rad < 1)
@@ -66,8 +69,8 @@
rad = 1;
this->rad = rad;
- this->gausstab = BlurBaseOperation::make_gausstab(rad);
- }
+ this->gausstab = BlurBaseOperation::make_gausstab(rad);
+ }
}
void GaussianXBlurOperation::executePixel(float *color, int x, int y,
MemoryBuffer *inputBuffers[], void *data)
@@ -108,6 +111,8 @@
BlurBaseOperation::deinitExecution();
delete [] this->gausstab;
this->gausstab = NULL;
+
+ deinitMutex();
}
bool GaussianXBlurOperation::determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation, rcti *output)
Modified:
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
2012-06-25 18:01:01 UTC (rev 48283)
+++
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
2012-06-25 18:03:19 UTC (rev 48284)
@@ -35,15 +35,21 @@
void *GaussianYBlurOperation::initializeTileData(rcti *rect, MemoryBuffer
**memoryBuffers)
{
+ lockMutex();
if (!this->sizeavailable) {
updateGauss(memoryBuffers);
}
void *buffer = getInputOperation(0)->initializeTileData(NULL,
memoryBuffers);
+ unlockMutex();
return buffer;
}
void GaussianYBlurOperation::initExecution()
{
+ BlurBaseOperation::initExecution();
+
+ initMutex();
+
if (this->sizeavailable) {
float rad = size * this->data->sizey;
if (rad < 1)
@@ -61,7 +67,7 @@
float rad = size * this->data->sizey;
if (rad < 1)
rad = 1;
-
+
this->rad = rad;
this->gausstab = BlurBaseOperation::make_gausstab(rad);
}
@@ -86,8 +92,8 @@
maxy = min(maxy, inputBuffer->getRect()->ymax);
maxx = min(maxx, inputBuffer->getRect()->xmax);
+ int index;
int step = getStep();
- int index;
for (int ny = miny; ny < maxy; ny += step) {
index = (ny - y) + this->rad;
int bufferindex = ((minx - bufferstartx) * 4) + ((ny -
bufferstarty) * 4 * bufferwidth);
@@ -103,6 +109,8 @@
BlurBaseOperation::deinitExecution();
delete [] this->gausstab;
this->gausstab = NULL;
+
+ deinitMutex();
}
bool GaussianYBlurOperation::determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation, rcti *output)
Modified:
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingBlurOperation.cpp
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingBlurOperation.cpp
2012-06-25 18:01:01 UTC (rev 48283)
+++
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingBlurOperation.cpp
2012-06-25 18:03:19 UTC (rev 48284)
@@ -34,7 +34,7 @@
this->addOutputSocket(COM_DT_VALUE);
this->size = 0;
- this->axis = 0;
+ this->axis = BLUR_AXIS_X;
this->setComplex(true);
}
@@ -92,7 +92,7 @@
{
rcti newInput;
- if (this->axis == 0) {
+ if (this->axis == BLUR_AXIS_X) {
newInput.xmin = input->xmin - this->size;
newInput.ymin = input->ymin;
newInput.xmax = input->xmax + this->size;
Modified:
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ScaleOperation.cpp
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ScaleOperation.cpp
2012-06-25 18:01:01 UTC (rev 48283)
+++
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ScaleOperation.cpp
2012-06-25 18:03:19 UTC (rev 48284)
@@ -180,7 +180,7 @@
// Absolute fixed siez
ScaleFixedSizeOperation::ScaleFixedSizeOperation() : NodeOperation()
{
- this->addInputSocket(COM_DT_COLOR);
+ this->addInputSocket(COM_DT_COLOR, COM_SC_NO_RESIZE);
this->addOutputSocket(COM_DT_COLOR);
this->setResolutionInputSocketIndex(0);
this->inputOperation = NULL;
Property changes on:
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
