Merge branch 'master' into blender2.8

2 files changed, 22 insertions, 12 deletions

diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index cee1c9147b5..d195ce6fa0c 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -172,8 +172,9 @@ void psys_reset(ParticleSystem *psys, int mode)
 	}
 	else if (mode == PSYS_RESET_CACHE_MISS) {
 		/* set all particles to be skipped */
-		LOOP_PARTICLES
+		LOOP_PARTICLES {
 			pa->flag |= PARS_NO_DISP;
+		}
 	}
 
 	/* reset children */
@@ -276,8 +277,9 @@ static void realloc_particles(ParticleSimulationData *sim, int new_totpart)
 		psys->totpart=totpart;
 
 		if (newboids) {
-			LOOP_PARTICLES
+			LOOP_PARTICLES {
 				pa->boid = newboids++;
+			}
 		}
 	}
 
@@ -4143,14 +4145,16 @@ void psys_check_boid_data(ParticleSystem *psys)
 			if (!pa->boid) {
 				bpa = MEM_callocN(psys->totpart * sizeof(BoidParticle), "Boid Data");
 
-				LOOP_PARTICLES
+				LOOP_PARTICLES {
 					pa->boid = bpa++;
+				}
 			}
 		}
 		else if (pa->boid) {
 			MEM_freeN(pa->boid);
-			LOOP_PARTICLES
+			LOOP_PARTICLES {
 				pa->boid = NULL;
+			}
 		}
 }
 
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c
index 40a7c65385c..cb781dc2447 100644
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -1344,25 +1344,29 @@ static void PE_update_selection(Depsgraph *depsgraph, Scene *scene, Object *ob,
 
 	/* flag all particles to be updated if not using flag */
 	if (!useflag)
-		LOOP_POINTS
-		point->flag |= PEP_EDIT_RECALC;
+		LOOP_POINTS {
+			point->flag |= PEP_EDIT_RECALC;
+		}
 
 	/* flush edit key flag to hair key flag to preserve selection
 	 * on save */
-	if (edit->psys) LOOP_POINTS {
+	if (edit->psys) {
+		LOOP_POINTS {
 			hkey = edit->psys->particles[p].hair;
 			LOOP_KEYS {
 				hkey->editflag = key->flag;
 				hkey++;
 			}
 		}
+	}
 
 	psys_cache_edit_paths(depsgraph, scene, ob, edit, CFRA, G.is_rendering);
 
 
 	/* disable update flag */
-	LOOP_POINTS
+	LOOP_POINTS {
 		point->flag &= ~PEP_EDIT_RECALC;
+	}
 
 	DEG_id_tag_update(&ob->id, DEG_TAG_SELECT_UPDATE);
 }
@@ -2097,8 +2101,9 @@ static int hide_exec(bContext *C, wmOperator *op)
 			point->flag |= PEP_HIDE;
 			point->flag |= PEP_EDIT_RECALC;
 
-			LOOP_KEYS
-			key->flag &= ~PEK_SELECT;
+			LOOP_KEYS {
+				key->flag &= ~PEK_SELECT;
+			}
 		}
 	}
 	else {
@@ -2106,8 +2111,9 @@ static int hide_exec(bContext *C, wmOperator *op)
 			point->flag |= PEP_HIDE;
 			point->flag |= PEP_EDIT_RECALC;
 
-			LOOP_KEYS
-			key->flag &= ~PEK_SELECT;
+			LOOP_KEYS {
+				key->flag &= ~PEK_SELECT;
+			}
 		}
 	}