[Bf-blender-cvs] [b2966b70fe9] blender2.8: EEVEE: Volumes - get current frame from depsgraph

Dalai Felinto noreply at git.blender.org
Tue Aug 14 21:08:12 CEST 2018


Commit: b2966b70fe9f3cf76af52800e88fbb9395b44077
Author: Dalai Felinto
Date:   Tue Aug 14 15:58:16 2018 -0300
Branches: blender2.8
https://developer.blender.org/rBb2966b70fe9f3cf76af52800e88fbb9395b44077

EEVEE: Volumes - get current frame from depsgraph

The value from scene is not up to date at all times.

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

M	source/blender/draw/engines/eevee/eevee_volumes.c

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

diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c
index f8bb8c6f1cf..b729c53628f 100644
--- a/source/blender/draw/engines/eevee/eevee_volumes.c
+++ b/source/blender/draw/engines/eevee/eevee_volumes.c
@@ -458,6 +458,8 @@ void EEVEE_volumes_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
 
 void EEVEE_volumes_cache_object_add(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata, Scene *scene, Object *ob)
 {
+	const DRWContextState *draw_ctx = DRW_context_state_get();
+
 	float *texcoloc = NULL;
 	float *texcosize = NULL;
 	struct ModifierData *md = NULL;
@@ -501,7 +503,7 @@ void EEVEE_volumes_cache_object_add(EEVEE_ViewLayerData *sldata, EEVEE_Data *ved
 		SmokeModifierData *smd = (SmokeModifierData *)md;
 		SmokeDomainSettings *sds = smd->domain;
 		/* Don't show smoke before simulation starts, this could be made an option in the future. */
-		const bool show_smoke = (CFRA >= sds->point_cache[0]->startframe);
+		const bool show_smoke = ((int)DEG_get_ctime(draw_ctx->depsgraph) >= sds->point_cache[0]->startframe);
 
 		if (sds->fluid && show_smoke) {
 			if (!sds->wt || !(sds->viewsettings & MOD_SMOKE_VIEW_SHOWBIG)) {



More information about the Bf-blender-cvs mailing list