[Bf-blender-cvs] [37cec42e3db] blender2.8: Clay: Cleanup, reduce indentation level

[Sergey Sharybin]

Commit: 37cec42e3db694e695da72c34c4b8381b07cdd09
Author: Sergey Sharybin
Date:   Wed May 9 16:45:04 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB37cec42e3db694e695da72c34c4b8381b07cdd09

Clay: Cleanup, reduce indentation level

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

M	source/blender/draw/engines/clay/clay_engine.c

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

diff --git a/source/blender/draw/engines/clay/clay_engine.c b/source/blender/draw/engines/clay/clay_engine.c
index a106c55b76f..3eed31b6856 100644
--- a/source/blender/draw/engines/clay/clay_engine.c
+++ b/source/blender/draw/engines/clay/clay_engine.c
@@ -829,25 +829,25 @@ static void clay_cache_populate_particles(void *vedata, Object *ob)
 	CLAY_StorageList *stl = ((CLAY_Data *)vedata)->stl;
 	const DRWContextState *draw_ctx = DRW_context_state_get();
 
-	if (ob != draw_ctx->object_edit) {
-		for (ParticleSystem *psys = ob->particlesystem.first; psys; psys = psys->next) {
-			if (psys_check_enabled(ob, psys, false)) {
-				ParticleSettings *part = psys->part;
-				int draw_as = (part->draw_as == PART_DRAW_REND) ? part->ren_as : part->draw_as;
-
-				if (draw_as == PART_DRAW_PATH && !psys->pathcache && !psys->childcache) {
-					draw_as = PART_DRAW_DOT;
-				}
-
-				static float mat[4][4];
-				unit_m4(mat);
-
-				if (draw_as == PART_DRAW_PATH) {
-					struct Gwn_Batch *geom = DRW_cache_particles_get_hair(psys, NULL);
-					DRWShadingGroup *hair_shgrp = CLAY_hair_shgrp_get(vedata, ob, stl, psl);
-					DRW_shgroup_call_add(hair_shgrp, geom, mat);
-				}
-			}
+	if (ob == draw_ctx->object_edit) {
+		return;
+	}
+
+	for (ParticleSystem *psys = ob->particlesystem.first; psys; psys = psys->next) {
+		if (!psys_check_enabled(ob, psys, false)) {
+			continue;
+		}
+		ParticleSettings *part = psys->part;
+		int draw_as = (part->draw_as == PART_DRAW_REND) ? part->ren_as : part->draw_as;
+
+		if (draw_as == PART_DRAW_PATH && !psys->pathcache && !psys->childcache) {
+			draw_as = PART_DRAW_DOT;
+		}
+
+		if (draw_as == PART_DRAW_PATH) {
+			struct Gwn_Batch *geom = DRW_cache_particles_get_hair(psys, NULL);
+			DRWShadingGroup *hair_shgrp = CLAY_hair_shgrp_get(vedata, ob, stl, psl);
+			DRW_shgroup_call_add(hair_shgrp, geom, NULL);
 		}
 	}
 }