[Bf-blender-cvs] [b841750] master: Cleanup: suspicious use of commas

[Campbell Barton]

Commit: b8417501abefa3332254564078ac7b93b875d7b8
Author: Campbell Barton
Date:   Fri Mar 4 16:38:41 2016 +1100
Branches: master
https://developer.blender.org/rBb8417501abefa3332254564078ac7b93b875d7b8

Cleanup: suspicious use of commas

===================================================================

M	intern/ghost/intern/GHOST_WindowX11.cpp
M	source/blender/editors/interface/interface_handlers.c
M	source/blender/makesrna/intern/rna_define.c
M	source/blender/python/generic/bgl.c

===================================================================

diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp
index 86ea86d..e68e090 100644
--- a/intern/ghost/intern/GHOST_WindowX11.cpp
+++ b/intern/ghost/intern/GHOST_WindowX11.cpp
@@ -1104,7 +1104,7 @@ setOrder(
 			xev.xclient.data.l[3] = 0;
 			xev.xclient.data.l[4] = 0;
 
-			root = RootWindow(m_display, m_visualInfo->screen),
+			root = RootWindow(m_display, m_visualInfo->screen);
 			eventmask = SubstructureRedirectMask | SubstructureNotifyMask;
 
 			XSendEvent(m_display, root, False, eventmask, &xev);
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 2c99c9b..e6af3e3 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -760,7 +760,7 @@ static void ui_apply_but_funcs_after(bContext *C)
 
 		if (after.opptr) {
 			/* free in advance to avoid leak on exit */
-			opptr = *after.opptr,
+			opptr = *after.opptr;
 			MEM_freeN(after.opptr);
 		}
 
diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c
index f4b2c15..36e2b9b 100644
--- a/source/blender/makesrna/intern/rna_define.c
+++ b/source/blender/makesrna/intern/rna_define.c
@@ -3314,7 +3314,7 @@ void RNA_def_property_duplicate_pointers(StructOrFunctionRNA *cont_, PropertyRNA
 			EnumPropertyRNA *eprop = (EnumPropertyRNA *)prop;
 
 			if (eprop->item) {
-				earray = MEM_callocN(sizeof(EnumPropertyItem) * (eprop->totitem + 1), "RNA_def_property_store"),
+				earray = MEM_callocN(sizeof(EnumPropertyItem) * (eprop->totitem + 1), "RNA_def_property_store");
 				memcpy(earray, eprop->item, sizeof(EnumPropertyItem) * (eprop->totitem + 1));
 				eprop->item = earray;
 
diff --git a/source/blender/python/generic/bgl.c b/source/blender/python/generic/bgl.c
index cd6ef3f..4bd2e9d 100644
--- a/source/blender/python/generic/bgl.c
+++ b/source/blender/python/generic/bgl.c
@@ -3681,7 +3681,7 @@ static PyObject *Method_ShaderSource(PyObject *UNUSED(self), PyObject *args)
 
 	glShaderSource(shader, 1, (const char **)&source, NULL);
 
-	return Py_INCREF(Py_None), Py_None;
+	Py_RETURN_NONE;
 }