[Bf-blender-cvs] [04570e91202] blender2.8: Fix T55484: Border zoom fails in Edit-Mode

Sergey Sharybin noreply at git.blender.org
Tue Jul 10 10:30:31 CEST 2018


Commit: 04570e91202cf0b9af4322adf4d5389b862b593d
Author: Sergey Sharybin
Date:   Tue Jul 10 10:29:24 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB04570e91202cf0b9af4322adf4d5389b862b593d

Fix T55484: Border zoom fails in Edit-Mode

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

M	source/blender/draw/engines/basic/basic_engine.c

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

diff --git a/source/blender/draw/engines/basic/basic_engine.c b/source/blender/draw/engines/basic/basic_engine.c
index 2c771578514..4348f2182a4 100644
--- a/source/blender/draw/engines/basic/basic_engine.c
+++ b/source/blender/draw/engines/basic/basic_engine.c
@@ -146,22 +146,24 @@ static void basic_cache_populate(void *vedata, Object *ob)
 	}
 
 	const DRWContextState *draw_ctx = DRW_context_state_get();
-	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;
-		}
-		if (!DRW_check_psys_visible_within_active_context(ob, psys)) {
-			continue;
-		}
-		ParticleSettings *part = psys->part;
-		const int draw_as = (part->draw_as == PART_DRAW_REND) ? part->ren_as : part->draw_as;
-		if (draw_as == PART_DRAW_PATH) {
-			struct Gwn_Batch *hairs = DRW_cache_particles_get_hair(ob, psys, NULL);
-			DRW_shgroup_call_add(stl->g_data->depth_shgrp, hairs, NULL);
+	if (ob != draw_ctx->object_edit) {
+		for (ParticleSystem *psys = ob->particlesystem.first;
+		     psys != NULL;
+		     psys = psys->next)
+	 	{
+			if (!psys_check_enabled(ob, psys, false)) {
+				continue;
+			}
+			if (!DRW_check_psys_visible_within_active_context(ob, psys)) {
+				continue;
+			}
+			ParticleSettings *part = psys->part;
+			const int draw_as = (part->draw_as == PART_DRAW_REND) ? part->ren_as
+			                                                      : part->draw_as;
+			if (draw_as == PART_DRAW_PATH) {
+				struct Gwn_Batch *hairs = DRW_cache_particles_get_hair(ob, psys, NULL);
+				DRW_shgroup_call_add(stl->g_data->depth_shgrp, hairs, NULL);
+			}
 		}
 	}



More information about the Bf-blender-cvs mailing list