[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56914] tags/blender-2.67a-release/blender : svn merge ^/trunk/blender -c56867

[Campbell Barton]

Revision: 56914
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56914
Author:   campbellbarton
Date:     2013-05-19 13:35:19 +0000 (Sun, 19 May 2013)
Log Message:
-----------
svn merge ^/trunk/blender -c56867

Modified Paths:
--------------
    tags/blender-2.67a-release/blender/source/blender/freestyle/intern/python/BPy_Nature.cpp

Property Changed:
----------------
    tags/blender-2.67a-release/blender/


Property changes on: tags/blender-2.67a-release/blender
___________________________________________________________________
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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender:56529-56532,56534,56537-56539,56572,56577,56581,56601,56605-56606,56620,56639,56643,56647-56648,56650-56651,56653-56654,56661-56663,56668,56670-56674,56676,56678-56680,56682,56688-56689,56698,56700,56707,56711,56735,56745,56747-56749,56755-56756,56759-56760,56763,56766-56767,56773,56778,56783-56785,56790-56791,56793,56800,56806-56807,56809,56815-56816,56820,56823,56826,56828,56830,56833-56834,56836,56839,56851,56857,56863,56865,56868,56871-56873,56879-56882,56885,56890,56892,56894,56896-56898,56901-56902,56905-56908,56912
   + /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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender:56529-56532,56534,56537-56539,56572,56577,56581,56601,56605-56606,56620,56639,56643,56647-56648,56650-56651,56653-56654,56661-56663,56668,56670-56674,56676,56678-56680,56682,56688-56689,56698,56700,56707,56711,56735,56745,56747-56749,56755-56756,56759-56760,56763,56766-56767,56773,56778,56783-56785,56790-56791,56793,56800,56806-56807,56809,56815-56816,56820,56823,56826,56828,56830,56833-56834,56836,56839,56851,56857,56863,56865,56867-56868,56871-56873,56879-56882,56885,56890,56892,56894,56896-56898,56901-56902,56905-56908,56912

Modified: tags/blender-2.67a-release/blender/source/blender/freestyle/intern/python/BPy_Nature.cpp
===================================================================
--- tags/blender-2.67a-release/blender/source/blender/freestyle/intern/python/BPy_Nature.cpp	2013-05-19 12:26:20 UTC (rev 56913)
+++ tags/blender-2.67a-release/blender/source/blender/freestyle/intern/python/BPy_Nature.cpp	2013-05-19 13:35:19 UTC (rev 56914)
@@ -263,41 +263,34 @@
 static PyObject *BPy_Nature_bitwise(PyObject *a, int op, PyObject *b)
 {
 	BPy_Nature *result;
+	long op1, op2;
 
 	if (!BPy_Nature_Check(a) || !BPy_Nature_Check(b)) {
 		PyErr_SetString(PyExc_TypeError, "operands must be a Nature object");
 		return NULL;
 	}
-	if (Py_SIZE(a) != 1) {
-		stringstream msg;
-		msg << "operand 1: unexpected Nature byte length: " << Py_SIZE(a);
-		PyErr_SetString(PyExc_TypeError, msg.str().c_str());
+	op1 = PyLong_AsLong(a);
+	if (PyErr_Occurred()) {
+		PyErr_SetString(PyExc_ValueError, "operand 1: unexpected Nature value");
 		return NULL;
 	}
-	if (Py_SIZE(b) != 1) {
-		stringstream msg;
-		msg << "operand 2: unexpected Nature byte length: " << Py_SIZE(b);
-		PyErr_SetString(PyExc_TypeError, msg.str().c_str());
+	op2 = PyLong_AsLong(b);
+	if (PyErr_Occurred()) {
+		PyErr_SetString(PyExc_ValueError, "operand 2: unexpected Nature value");
 		return NULL;
 	}
 	result = PyObject_NewVar(BPy_Nature, &Nature_Type, 1);
 	if (!result)
 		return NULL;
-	if (Py_SIZE(result) != 1) {
-		stringstream msg;
-		msg << "unexpected Nature byte length: " << Py_SIZE(result);
-		PyErr_SetString(PyExc_TypeError, msg.str().c_str());
-		return NULL;
-	}
 	switch (op) {
 	case '&':
-		result->i.ob_digit[0] = (((PyLongObject *)a)->ob_digit[0]) & (((PyLongObject *)b)->ob_digit)[0];
+		result->i.ob_digit[0] = op1 & op2;
 		break;
 	case '^':
-		result->i.ob_digit[0] = (((PyLongObject *)a)->ob_digit[0]) ^ (((PyLongObject *)b)->ob_digit)[0];
+		result->i.ob_digit[0] = op1 ^ op2;
 		break;
 	case '|':
-		result->i.ob_digit[0] = (((PyLongObject *)a)->ob_digit[0]) | (((PyLongObject *)b)->ob_digit)[0];
+		result->i.ob_digit[0] = op1 | op2;
 		break;
 	}
 	return (PyObject *)result;