[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48134] branches/soc-2011-tomato: svn merge ^/trunk/blender -r48129:48133

[Campbell Barton]

Revision: 48134
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48134
Author:   campbellbarton
Date:     2012-06-20 17:37:37 +0000 (Wed, 20 Jun 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r48129:48133

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48129

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ReadBufferOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_RotateOperation.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-48129
   + /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-48133

Modified: branches/soc-2011-tomato/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp	2012-06-20 17:35:51 UTC (rev 48133)
+++ branches/soc-2011-tomato/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp	2012-06-20 17:37:37 UTC (rev 48134)
@@ -46,7 +46,7 @@
 		float *buffer = tile->getBuffer();
 		int size = tile->getWidth() * tile->getHeight();
 		int pixels = 0;
-		float sum;
+		float sum = 0.0f;
 		float mean = this->result;
 		for (int i = 0, offset = 0; i < size; i++, offset += 4) {
 			if (buffer[offset + 3] > 0) {

Modified: branches/soc-2011-tomato/source/blender/compositor/operations/COM_ReadBufferOperation.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/operations/COM_ReadBufferOperation.cpp	2012-06-20 17:35:51 UTC (rev 48133)
+++ branches/soc-2011-tomato/source/blender/compositor/operations/COM_ReadBufferOperation.cpp	2012-06-20 17:37:37 UTC (rev 48134)
@@ -76,7 +76,8 @@
 	return false;
 }
 
-void ReadBufferOperation::readResolutionFromWriteBuffer() {
+void ReadBufferOperation::readResolutionFromWriteBuffer()
+{
 	if (this->memoryProxy != NULL) {
 		WriteBufferOperation *operation = memoryProxy->getWriteBufferOperation();
 		this->setWidth(operation->getWidth());

Modified: branches/soc-2011-tomato/source/blender/compositor/operations/COM_RotateOperation.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/operations/COM_RotateOperation.cpp	2012-06-20 17:35:51 UTC (rev 48133)
+++ branches/soc-2011-tomato/source/blender/compositor/operations/COM_RotateOperation.cpp	2012-06-20 17:37:37 UTC (rev 48134)
@@ -48,7 +48,8 @@
 	this->degreeSocket = NULL;
 }
 
-inline void RotateOperation::ensureDegree() {
+inline void RotateOperation::ensureDegree()
+{
 	if (!isDegreeSet) {
 		float degree[4];
 		this->degreeSocket->read(degree, 0, 0, COM_PS_NEAREST, 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
/branches/ge_harmony/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-48129
   + /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-48133


Property changes on: branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-48129
   + /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-48133