Revision: 47962
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47962
Author: campbellbarton
Date: 2012-06-15 14:47:34 +0000 (Fri, 15 Jun 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r47958:47961
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47958
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ViewerNode.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerOperation.cpp
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_viewer.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-47958
+
/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-47961
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
2012-06-15 14:45:49 UTC (rev 47961)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
2012-06-15 14:47:34 UTC (rev 47962)
@@ -1425,8 +1425,8 @@
}
#else
(void) distortion;
- (void) width;
- (void) height;
+ (void) calibration_width;
+ (void) calibration_height;
(void) camera;
(void) aspy;
#endif
Modified:
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
2012-06-15 14:45:49 UTC (rev 47961)
+++
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
2012-06-15 14:47:34 UTC (rev 47962)
@@ -26,16 +26,16 @@
#include "COM_SplitViewerOperation.h"
#include "COM_ExecutionSystem.h"
-SplitViewerNode::SplitViewerNode(bNode *editorNode): Node(editorNode)
+SplitViewerNode::SplitViewerNode(bNode *editorNode) : Node(editorNode)
{
}
-void SplitViewerNode::convertToOperations(ExecutionSystem *graph,
CompositorContext * context)
+void SplitViewerNode::convertToOperations(ExecutionSystem *graph,
CompositorContext *context)
{
InputSocket *image1Socket = this->getInputSocket(0);
InputSocket *image2Socket = this->getInputSocket(1);
- Image *image = (Image*)this->getbNode()->id;
- ImageUser * imageUser = (ImageUser*) this->getbNode()->storage;
+ Image *image = (Image *)this->getbNode()->id;
+ 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);
Modified:
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
2012-06-15 14:45:49 UTC (rev 47961)
+++
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
2012-06-15 14:47:34 UTC (rev 47962)
@@ -26,21 +26,21 @@
#include "COM_CalculateMeanOperation.h"
#include "COM_CalculateStandardDeviationOperation.h"
-ViewLevelsNode::ViewLevelsNode(bNode *editorNode): Node(editorNode)
+ViewLevelsNode::ViewLevelsNode(bNode *editorNode) : Node(editorNode)
{
}
-void ViewLevelsNode::convertToOperations(ExecutionSystem *graph,
CompositorContext * context)
+void ViewLevelsNode::convertToOperations(ExecutionSystem *graph,
CompositorContext *context)
{
- InputSocket * input = this->getInputSocket(0);
+ InputSocket *input = this->getInputSocket(0);
bool firstOperationConnected = false;
if (input->isConnected()) {
OutputSocket *inputSocket =
input->getConnection()->getFromSocket();
// add preview to inputSocket;
- OutputSocket * socket = this->getOutputSocket(0);
+ OutputSocket *socket = this->getOutputSocket(0);
if (socket->isConnected()) {
// calculate mean operation
- CalculateMeanOperation * operation = new
CalculateMeanOperation();
+ CalculateMeanOperation *operation = new
CalculateMeanOperation();
input->relinkConnections(operation->getInputSocket(0),
0, graph);
firstOperationConnected = true;
operation->setSetting(this->getbNode()->custom1);
@@ -51,7 +51,7 @@
socket = this->getOutputSocket(1);
if (socket->isConnected()) {
// calculate standard deviation operation
- CalculateStandardDeviationOperation * operation = new
CalculateStandardDeviationOperation();
+ CalculateStandardDeviationOperation *operation = new
CalculateStandardDeviationOperation();
if (firstOperationConnected) {
addLink(graph, inputSocket,
operation->getInputSocket(0));
}
Modified:
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ViewerNode.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ViewerNode.cpp
2012-06-15 14:45:49 UTC (rev 47961)
+++ branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ViewerNode.cpp
2012-06-15 14:47:34 UTC (rev 47962)
@@ -26,16 +26,16 @@
#include "COM_ViewerOperation.h"
#include "COM_ExecutionSystem.h"
-ViewerNode::ViewerNode(bNode *editorNode): Node(editorNode)
+ViewerNode::ViewerNode(bNode *editorNode) : Node(editorNode)
{
}
-void ViewerNode::convertToOperations(ExecutionSystem *graph, CompositorContext
* context)\
+void ViewerNode::convertToOperations(ExecutionSystem *graph, CompositorContext
*context)
{
InputSocket *imageSocket = this->getInputSocket(0);
InputSocket *alphaSocket = this->getInputSocket(1);
- Image *image = (Image*)this->getbNode()->id;
- ImageUser * imageUser = (ImageUser*) this->getbNode()->storage;
+ Image *image = (Image *)this->getbNode()->id;
+ ImageUser *imageUser = (ImageUser *) this->getbNode()->storage;
bNode *editorNode = this->getbNode();
if (imageSocket->isConnected()) {
ViewerOperation *viewerOperation = new ViewerOperation();
Modified:
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
2012-06-15 14:45:49 UTC (rev 47961)
+++
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
2012-06-15 14:47:34 UTC (rev 47962)
@@ -60,7 +60,7 @@
}
-void SplitViewerOperation::executeRegion(rcti *rect, unsigned int tileNumber,
MemoryBuffer** memoryBuffers)
+void SplitViewerOperation::executeRegion(rcti *rect, unsigned int tileNumber,
MemoryBuffer **memoryBuffers)
{
float *buffer = this->outputBuffer;
unsigned char *bufferDisplay = this->outputBufferDisplay;
@@ -70,15 +70,15 @@
int y1 = rect->ymin;
int x2 = rect->xmax;
int y2 = rect->ymax;
- int offset = (y1*this->getWidth() + x1 ) * 4;
+ int offset = (y1 * this->getWidth() + x1) * 4;
int x;
int y;
- int perc =
xSplit?this->splitPercentage*getWidth()/100.0f:this->splitPercentage*getHeight()/100.0f;
- for (y = y1 ; y < y2 ; y++) {
- for (x = x1 ; x < x2 ; x++) {
+ int perc = xSplit ? this->splitPercentage *getWidth() / 100.0f :
this->splitPercentage *getHeight() / 100.0f;
+ for (y = y1; y < y2; y++) {
+ for (x = x1; x < x2; x++) {
bool image1;
float srgb[4];
- image1 = xSplit?x>perc:y>perc;
+ image1 = xSplit ? x > perc : y > perc;
if (image1) {
image1Input->read(&(buffer[offset]), x, y,
COM_PS_NEAREST, memoryBuffers);
}
@@ -88,21 +88,21 @@
/// @todo: linear conversion only when scene color
management is selected, also check predivide.
if (this->doColorManagement) {
if (this->doColorPredivide) {
- linearrgb_to_srgb_predivide_v4(srgb,
buffer+offset);
+ linearrgb_to_srgb_predivide_v4(srgb,
buffer + offset);
}
else {
- linearrgb_to_srgb_v4(srgb,
buffer+offset);
+ linearrgb_to_srgb_v4(srgb, buffer +
offset);
}
}
else {
- copy_v4_v4(srgb, buffer+offset);
+ copy_v4_v4(srgb, buffer + offset);
}
- F4TOCHAR4(srgb, bufferDisplay+offset);
+ rgba_float_to_uchar(bufferDisplay + offset, srgb);
- offset +=4;
+ offset += 4;
}
- offset += (this->getWidth()-(x2-x1))*4;
+ offset += (this->getWidth() - (x2 - x1)) * 4;
}
updateImage(rect);
}
Modified:
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
2012-06-15 14:45:49 UTC (rev 47961)
+++
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
2012-06-15 14:47:34 UTC (rev 47962)
@@ -74,13 +74,13 @@
/* now we combine the input with ibuf */
this->outputBuffer = ibuf->rect_float;
- this->outputBufferDisplay = (unsigned char*)ibuf->rect;
+ this->outputBufferDisplay = (unsigned char *)ibuf->rect;
BKE_image_release_ibuf(this->image, this->lock);
}
void ViewerBaseOperation:: updateImage(rcti *rect)
{
- WM_main_add_notifier(NC_WINDOW|ND_DRAW, NULL);
+ WM_main_add_notifier(NC_WINDOW | ND_DRAW, NULL);
}
void ViewerBaseOperation::deinitExecution()
Modified:
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerOperation.cpp
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerOperation.cpp
2012-06-15 14:45:49 UTC (rev 47961)
+++
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerOperation.cpp
2012-06-15 14:47:34 UTC (rev 47962)
@@ -64,7 +64,7 @@
}
-void ViewerOperation::executeRegion(rcti *rect, unsigned int tileNumber,
MemoryBuffer** memoryBuffers)
+void ViewerOperation::executeRegion(rcti *rect, unsigned int tileNumber,
MemoryBuffer **memoryBuffers)
{
float *buffer = this->outputBuffer;
unsigned char *bufferDisplay = this->outputBufferDisplay;
@@ -73,36 +73,36 @@
const int y1 = rect->ymin;
const int x2 = rect->xmax;
const int y2 = rect->ymax;
- const int offsetadd = (this->getWidth()-(x2-x1))*4;
- int offset = (y1*this->getWidth() + x1 ) * 4;
+ const int offsetadd = (this->getWidth() - (x2 - x1)) * 4;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
