pep8 edits and avoid naming conflicts with python builtins

5 files changed, 10 insertions, 6 deletions

diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 2bb70ce20b5..c5e59959ddd 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1666,7 +1666,8 @@ static void write_customdata(WriteData *wd, ID *id, int count, CustomData *data,
 				writestruct(wd, DATA, structname, datasize, layer->data);
 			}
 			else
-				printf("error: this CustomDataLayer must not be written to file\n");
+				printf("%s error: layer '%s':%d - can't be written to file\n",
+				       __func__, structname, layer->type);
 		}
 	}
 
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index 4488442815d..01afc0e24eb 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -31,8 +31,11 @@ set(INC
 	../imbuf
 	../makesdna
 	../makesrna
-	../nodes        # For node muting stuff...
-	../nodes/intern # For node muting stuff...
+
+	# For node muting stuff...
+	../nodes
+	../nodes/intern
+
 	../../../intern/guardedalloc
 	../../../intern/smoke/extern
 )
diff --git a/source/blender/python/mathutils/mathutils_Euler.c b/source/blender/python/mathutils/mathutils_Euler.c
index a1e18432b4b..9bf6687fb5e 100644
--- a/source/blender/python/mathutils/mathutils_Euler.c
+++ b/source/blender/python/mathutils/mathutils_Euler.c
@@ -241,7 +241,7 @@ static PyObject *Euler_rotate(EulerObject * self, PyObject *value)
 		return NULL;
 
 	eulO_to_mat3(self_rmat, self->eul, self->order);
-	mul_m3_m3m3(rmat, self_rmat, other_rmat);
+	mul_m3_m3m3(rmat, other_rmat, self_rmat);
 
 	mat3_to_compatible_eulO(self->eul, self->eul, self->order, rmat);
 
diff --git a/source/blender/python/mathutils/mathutils_Matrix.c b/source/blender/python/mathutils/mathutils_Matrix.c
index f5e1218aaa3..2f62f7141cf 100644
--- a/source/blender/python/mathutils/mathutils_Matrix.c
+++ b/source/blender/python/mathutils/mathutils_Matrix.c
@@ -1041,7 +1041,7 @@ static PyObject *Matrix_rotate(MatrixObject *self, PyObject *value)
 	}
 
 	matrix_as_3x3(self_rmat, self);
-	mul_m3_m3m3(rmat, self_rmat, other_rmat);
+	mul_m3_m3m3(rmat, other_rmat, self_rmat);
 
 	copy_m3_m3((float (*)[3])(self->contigPtr), rmat);
 
diff --git a/source/blender/python/mathutils/mathutils_Quaternion.c b/source/blender/python/mathutils/mathutils_Quaternion.c
index 0b24db708e2..44cd28a7c3d 100644
--- a/source/blender/python/mathutils/mathutils_Quaternion.c
+++ b/source/blender/python/mathutils/mathutils_Quaternion.c
@@ -312,7 +312,7 @@ static PyObject *Quaternion_rotate(QuaternionObject *self, PyObject *value)
 
 	length= normalize_qt_qt(tquat, self->quat);
 	quat_to_mat3(self_rmat, tquat);
-	mul_m3_m3m3(rmat, self_rmat, other_rmat);
+	mul_m3_m3m3(rmat, other_rmat, self_rmat);
 
 	mat3_to_quat(self->quat, rmat);
 	mul_qt_fl(self->quat, length); /* maintain length after rotating */