Revision: 49532
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49532
Author: campbellbarton
Date: 2012-08-03 13:29:33 +0000 (Fri, 03 Aug 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r49520:49531
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49520
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/compositor/COM_compositor.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionGroup.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystem.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryBuffer.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_NodeOperation.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_OpenCLDevice.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_OpenCLDevice.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_compositor.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_BokehBlurOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ChannelMatteOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ChromaMatteOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorMatteOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DilateErodeOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_OpenCLKernels.cl.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_WriteBufferOperation.h
branches/soc-2011-tomato/source/blender/editors/object/object_relations.c
branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_draw.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_vfont.c
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-49520
+
/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-49531
Modified: branches/soc-2011-tomato/source/blender/compositor/COM_compositor.h
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/COM_compositor.h
2012-08-03 13:27:58 UTC (rev 49531)
+++ branches/soc-2011-tomato/source/blender/compositor/COM_compositor.h
2012-08-03 13:29:33 UTC (rev 49532)
@@ -297,7 +297,7 @@
* - output nodes can have different priorities in the WorkScheduler.
* This is implemented in the COM_execute function.
*/
-void COM_execute(RenderData* rd, bNodeTree *editingtree, int rendering);
+void COM_execute(RenderData *rd, bNodeTree *editingtree, int rendering);
/**
* @brief Return a list of highlighted bnodes pointers.
@@ -310,7 +310,7 @@
* @param bnode
* @return
*/
-int COM_isHighlightedbNode(bNode* bnode);
+int COM_isHighlightedbNode(bNode *bnode);
#ifdef __cplusplus
}
Modified:
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionGroup.h
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionGroup.h
2012-08-03 13:27:58 UTC (rev 49531)
+++
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionGroup.h
2012-08-03 13:29:33 UTC (rev 49532)
@@ -316,7 +316,7 @@
* @brief get all inputbuffers needed to calculate an chunk
* @note all inputbuffers must be executed
* @param chunkNumber the chunk to be calculated
- * @return MemoryBuffer** the inputbuffers
+ * @return (MemoryBuffer **) the inputbuffers
*/
MemoryBuffer **getInputBuffersCPU();
@@ -324,7 +324,7 @@
* @brief get all inputbuffers needed to calculate an chunk
* @note all inputbuffers must be executed
* @param chunkNumber the chunk to be calculated
- * @return MemoryBuffer** the inputbuffers
+ * @return (MemoryBuffer **) the inputbuffers
*/
MemoryBuffer **getInputBuffersOpenCL(int chunkNumber);
Modified:
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystem.h
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystem.h
2012-08-03 13:27:58 UTC (rev 49531)
+++
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystem.h
2012-08-03 13:29:33 UTC (rev 49532)
@@ -153,7 +153,7 @@
* @brief Create a new ExecutionSystem and initialize it with the
* editingtree.
*
- * @param editingtree [bNodeTree*]
+ * @param editingtree [bNodeTree *]
* @param rendering [true false]
*/
ExecutionSystem(RenderData *rd, bNodeTree *editingtree, bool rendering,
bool fastcalculation);
Modified:
branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryBuffer.cpp
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryBuffer.cpp
2012-08-03 13:27:58 UTC (rev 49531)
+++
branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryBuffer.cpp
2012-08-03 13:29:33 UTC (rev 49532)
@@ -248,7 +248,7 @@
*b = sqrtf(F2 / d);
*ecc = *a / *b;
}
- // incr theta by 0.5*pi (angle of major axis)
+ /* incr theta by 0.5 * pi (angle of major axis) */
*th = 0.5f * (atan2f(B, AmC) + (float)M_PI);
}
}
Modified:
branches/soc-2011-tomato/source/blender/compositor/intern/COM_NodeOperation.h
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/intern/COM_NodeOperation.h
2012-08-03 13:27:58 UTC (rev 49531)
+++
branches/soc-2011-tomato/source/blender/compositor/intern/COM_NodeOperation.h
2012-08-03 13:29:33 UTC (rev 49532)
@@ -148,7 +148,7 @@
* @param memoryBuffers all input MemoryBuffer's needed
* @param outputBuffer the outputbuffer to write to
*/
- virtual void executeOpenCLRegion(OpenCLDevice* device, rcti *rect,
+ virtual void executeOpenCLRegion(OpenCLDevice *device, rcti *rect,
unsigned int chunkNumber, MemoryBuffer
**memoryBuffers, MemoryBuffer *outputBuffer) {}
/**
@@ -163,7 +163,7 @@
* @param clMemToCleanUp all created cl_mem references must be added to
this list. Framework will clean this after execution
* @param clKernelsToCleanUp all created cl_kernel references must be
added to this list. Framework will clean this after execution
*/
- virtual void executeOpenCL(OpenCLDevice* device, MemoryBuffer
*outputMemoryBuffer, cl_mem clOutputBuffer, MemoryBuffer **inputMemoryBuffers,
list<cl_mem> *clMemToCleanUp, list<cl_kernel> *clKernelsToCleanUp) {}
+ virtual void executeOpenCL(OpenCLDevice *device, MemoryBuffer
*outputMemoryBuffer, cl_mem clOutputBuffer, MemoryBuffer **inputMemoryBuffers,
list<cl_mem> *clMemToCleanUp, list<cl_kernel> *clKernelsToCleanUp) {}
virtual void deinitExecution();
bool isResolutionSet() {
Modified:
branches/soc-2011-tomato/source/blender/compositor/intern/COM_OpenCLDevice.cpp
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/intern/COM_OpenCLDevice.cpp
2012-08-03 13:27:58 UTC (rev 49531)
+++
branches/soc-2011-tomato/source/blender/compositor/intern/COM_OpenCLDevice.cpp
2012-08-03 13:29:33 UTC (rev 49532)
@@ -67,7 +67,7 @@
}
cl_mem OpenCLDevice::COM_clAttachMemoryBufferToKernelParameter(cl_kernel
kernel, int parameterIndex, int offsetIndex, list<cl_mem> *cleanup,
MemoryBuffer **inputMemoryBuffers, SocketReader *reader)
{
- return COM_clAttachMemoryBufferToKernelParameter(kernel,
parameterIndex, offsetIndex, cleanup, inputMemoryBuffers,
(ReadBufferOperation*)reader);
+ return COM_clAttachMemoryBufferToKernelParameter(kernel,
parameterIndex, offsetIndex, cleanup, inputMemoryBuffers, (ReadBufferOperation
*)reader);
}
cl_mem OpenCLDevice::COM_clAttachMemoryBufferToKernelParameter(cl_kernel
kernel, int parameterIndex, int offsetIndex, list<cl_mem> *cleanup,
MemoryBuffer **inputMemoryBuffers, ReadBufferOperation *reader)
@@ -106,7 +106,7 @@
}
}
-void OpenCLDevice::COM_clAttachSizeToKernelParameter(cl_kernel kernel, int
offsetIndex, NodeOperation* operation)
+void OpenCLDevice::COM_clAttachSizeToKernelParameter(cl_kernel kernel, int
offsetIndex, NodeOperation *operation)
{
if (offsetIndex != -1) {
cl_int error;
@@ -133,7 +133,7 @@
if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error,
clewErrorString(error)); }
}
-void OpenCLDevice::COM_clEnqueueRange(cl_kernel kernel, MemoryBuffer
*outputMemoryBuffer, int offsetIndex, NodeOperation* operation)
+void OpenCLDevice::COM_clEnqueueRange(cl_kernel kernel, MemoryBuffer
*outputMemoryBuffer, int offsetIndex, NodeOperation *operation)
{
cl_int error;
const int width = outputMemoryBuffer->getWidth();
Modified:
branches/soc-2011-tomato/source/blender/compositor/intern/COM_OpenCLDevice.h
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/intern/COM_OpenCLDevice.h
2012-08-03 13:27:58 UTC (rev 49531)
+++
branches/soc-2011-tomato/source/blender/compositor/intern/COM_OpenCLDevice.h
2012-08-03 13:29:33 UTC (rev 49532)
@@ -100,9 +100,9 @@
cl_mem COM_clAttachMemoryBufferToKernelParameter(cl_kernel kernel, int
parameterIndex, int offsetIndex, list<cl_mem> *cleanup, MemoryBuffer
**inputMemoryBuffers, ReadBufferOperation *reader);
void COM_clAttachMemoryBufferOffsetToKernelParameter(cl_kernel kernel,
int offsetIndex, MemoryBuffer *memoryBuffers);
void COM_clAttachOutputMemoryBufferToKernelParameter(cl_kernel kernel,
int parameterIndex, cl_mem clOutputMemoryBuffer);
- void COM_clAttachSizeToKernelParameter(cl_kernel kernel, int
offsetIndex, NodeOperation* operation);
+ void COM_clAttachSizeToKernelParameter(cl_kernel kernel, int
offsetIndex, NodeOperation *operation);
void COM_clEnqueueRange(cl_kernel kernel, MemoryBuffer
*outputMemoryBuffer);
- void COM_clEnqueueRange(cl_kernel kernel, MemoryBuffer
*outputMemoryBuffer, int offsetIndex, NodeOperation* operation);
+ void COM_clEnqueueRange(cl_kernel kernel, MemoryBuffer
*outputMemoryBuffer, int offsetIndex, NodeOperation *operation);
cl_kernel COM_clCreateKernel(const char *kernelname, list<cl_kernel>
*clKernelsToCleanUp);
};
Modified:
branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.cpp
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.cpp
2012-08-03 13:27:58 UTC (rev 49531)
+++
branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.cpp
2012-08-03 13:29:33 UTC (rev 49532)
@@ -77,20 +77,20 @@
#define HIGHLIGHT(wp) \
{ \
- ExecutionGroup* group = wp->getExecutionGroup(); \
+ ExecutionGroup *group = wp->getExecutionGroup(); \
if (group->isComplex()) { \
- NodeOperation* operation = group->getOutputNodeOperation(); \
- if (operation->isWriteBufferOperation()) {\
- WriteBufferOperation *writeOperation =
(WriteBufferOperation*)operation;\
+ NodeOperation *operation = group->getOutputNodeOperation(); \
+ if (operation->isWriteBufferOperation()) { \
+ WriteBufferOperation *writeOperation =
(WriteBufferOperation *)operation; \
NodeOperation *complexOperation =
writeOperation->getInput(); \
bNode *node = complexOperation->getbNode(); \
if (node) { \
if (node->original) { \
- node = node->original;\
- }\
- if (g_highlightIndex < MAX_HIGHLIGHT) {\
- g_highlightedNodes[g_highlightIndex++]
= node;\
- }\
+ node = node->original; \
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
