[Bf-blender-cvs] [ed58e3656a4] eevee-motionblur-object: EEVEE: Motion Blur: Use orig_object->data instead of orig_data as key
Clément Foucault
noreply at git.blender.org
Tue Apr 14 19:09:14 CEST 2020
Commit: ed58e3656a40f0fa0a82336da29827d4a8862026
Author: Clément Foucault
Date: Tue Apr 7 00:58:35 2020 +0200
Branches: eevee-motionblur-object
https://developer.blender.org/rBed58e3656a40f0fa0a82336da29827d4a8862026
EEVEE: Motion Blur: Use orig_object->data instead of orig_data as key
This fix issue with some modifier setup
===================================================================
M source/blender/draw/engines/eevee/eevee_data.c
===================================================================
diff --git a/source/blender/draw/engines/eevee/eevee_data.c b/source/blender/draw/engines/eevee/eevee_data.c
index 351a5123776..ad1dad6b61d 100644
--- a/source/blender/draw/engines/eevee/eevee_data.c
+++ b/source/blender/draw/engines/eevee/eevee_data.c
@@ -139,12 +139,12 @@ EEVEE_GeometryMotionData *EEVEE_motion_blur_geometry_data_get(EEVEE_MotionBlurDa
}
/* Use original data as key to ensure matching accross update. */
- ID *id_orig = DEG_get_original_id(ob->data);
+ Object *ob_orig = DEG_get_original_object(ob);
- EEVEE_GeometryMotionData *geom_step = BLI_ghash_lookup(mb->geom, id_orig);
+ EEVEE_GeometryMotionData *geom_step = BLI_ghash_lookup(mb->geom, ob_orig->data);
if (geom_step == NULL) {
geom_step = MEM_callocN(sizeof(EEVEE_GeometryMotionData), __func__);
- BLI_ghash_insert(mb->geom, id_orig, geom_step);
+ BLI_ghash_insert(mb->geom, ob_orig->data, geom_step);
}
return geom_step;
More information about the Bf-blender-cvs
mailing list