[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49891] branches/soc-2011-tomato: svn merge ^/trunk/blender -r49886:49890

[Campbell Barton]

Revision: 49891
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49891
Author:   campbellbarton
Date:     2012-08-14 12:18:58 +0000 (Tue, 14 Aug 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r49886:49890

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

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/blenkernel/intern/material.c
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_SetColorOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_SetColorOperation.h

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-49886
   + /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-49890

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/material.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/material.c	2012-08-14 12:17:06 UTC (rev 49890)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/material.c	2012-08-14 12:18:58 UTC (rev 49891)
@@ -808,7 +808,7 @@
 	}
 
 	// Determine the object/mesh linking
-	if (assign_type == BKE_MAT_ASSIGN_USERPREF && ob->actcol) {
+	if (assign_type == BKE_MAT_ASSIGN_USERPREF && ob->totcol && ob->actcol) {
 		/* copy from previous material */
 		bit = ob->matbits[ob->actcol - 1];
 	}

Modified: branches/soc-2011-tomato/source/blender/compositor/operations/COM_SetColorOperation.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/operations/COM_SetColorOperation.cpp	2012-08-14 12:17:06 UTC (rev 49890)
+++ branches/soc-2011-tomato/source/blender/compositor/operations/COM_SetColorOperation.cpp	2012-08-14 12:18:58 UTC (rev 49891)
@@ -29,10 +29,7 @@
 
 void SetColorOperation::executePixel(float output[4], float x, float y, PixelSampler sampler)
 {
-	output[0] = this->m_channel1;
-	output[1] = this->m_channel2;
-	output[2] = this->m_channel3;
-	output[3] = this->m_channel4;
+	copy_v4_v4(output, this->m_color);
 }
 
 void SetColorOperation::determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2])

Modified: branches/soc-2011-tomato/source/blender/compositor/operations/COM_SetColorOperation.h
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/operations/COM_SetColorOperation.h	2012-08-14 12:17:06 UTC (rev 49890)
+++ branches/soc-2011-tomato/source/blender/compositor/operations/COM_SetColorOperation.h	2012-08-14 12:18:58 UTC (rev 49891)
@@ -31,10 +31,7 @@
  */
 class SetColorOperation : public NodeOperation {
 private:
-	float m_channel1;
-	float m_channel2;
-	float m_channel3;
-	float m_channel4;
+	float m_color[4];
 
 public:
 	/**
@@ -42,20 +39,17 @@
 	 */
 	SetColorOperation();
 
-	const float getChannel1() { return this->m_channel1; }
-	void setChannel1(float value) { this->m_channel1 = value; }
-	const float getChannel2() { return this->m_channel2; }
-	void setChannel2(float value) { this->m_channel2 = value; }
-	const float getChannel3() { return this->m_channel3; }
-	void setChannel3(float value) { this->m_channel3 = value; }
-	const float getChannel4() { return this->m_channel4; }
-	void setChannel4(const float value) { this->m_channel4 = value; }
+	const float getChannel1() { return this->m_color[0]; }
+	void setChannel1(float value) { this->m_color[0] = value; }
+	const float getChannel2() { return this->m_color[1]; }
+	void setChannel2(float value) { this->m_color[1] = value; }
+	const float getChannel3() { return this->m_color[2]; }
+	void setChannel3(float value) { this->m_color[2] = value; }
+	const float getChannel4() { return this->m_color[3]; }
+	void setChannel4(const float value) { this->m_color[3] = value; }
 	void setChannels(const float value[4])
 	{
-		this->m_channel1 = value[0];
-		this->m_channel2 = value[1];
-		this->m_channel3 = value[2];
-		this->m_channel4 = value[3];
+		copy_v4_v4(this->m_color, value);
 	}
 
 	/**


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-49886
   + /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-49890


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-49886
   + /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-49890