Merged changes in the trunk up to revision 55546.

Conflicts resolved:
source/blenderplayer/bad_level_call_stubs/SConscript

Partly reverted changes to intern/cycles/blender/addon/ui.py in revision 52899
to make it easier to merge trunk changes.

1 files changed, 4 insertions, 4 deletions

diff --git a/source/blender/modifiers/intern/MOD_mirror.c b/source/blender/modifiers/intern/MOD_mirror.c
index 83c678db7b3..2b29f2afb9a 100644
--- a/source/blender/modifiers/intern/MOD_mirror.c
+++ b/source/blender/modifiers/intern/MOD_mirror.c
@@ -111,7 +111,7 @@ static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd,
 	MLoop *ml;
 	MPoly *mp;
 	float mtx[4][4];
-	int i, j;
+	int i;
 	int a, totshape;
 	int *vtargetmap = NULL, *vtmap_a = NULL, *vtmap_b = NULL;
 
@@ -221,7 +221,7 @@ static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd,
 	ml = CDDM_get_loops(result);
 	for (i = 0; i < maxPolys; i++, mp++) {
 		MLoop *ml2;
-		int e;
+		int j, e;
 
 		/* reverse the loop, but we keep the first vertex in the face the same,
 		 * to ensure that quads are split the same way as on the other side */
@@ -249,8 +249,8 @@ static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd,
 	/* handle uvs,
 	 * let tessface recalc handle updating the MTFace data */
 	if (mmd->flag & (MOD_MIR_MIRROR_U | MOD_MIR_MIRROR_V)) {
-		const int do_mirr_u = (mmd->flag & MOD_MIR_MIRROR_U) != 0;
-		const int do_mirr_v = (mmd->flag & MOD_MIR_MIRROR_V) != 0;
+		const bool do_mirr_u = (mmd->flag & MOD_MIR_MIRROR_U) != 0;
+		const bool do_mirr_v = (mmd->flag & MOD_MIR_MIRROR_V) != 0;
 
 		const int totuv = CustomData_number_of_layers(&result->loopData, CD_MLOOPUV);