[Bf-blender-cvs] [eaa35b27e0a] master: Fix T91311: incorrect batch generation for instances

Jacques Lucke noreply at git.blender.org
Mon Sep 13 10:43:05 CEST 2021


Commit: eaa35b27e0af9547ed947d672bea660df3d688a0
Author: Jacques Lucke
Date:   Mon Sep 13 10:42:54 2021 +0200
Branches: master
https://developer.blender.org/rBeaa35b27e0af9547ed947d672bea660df3d688a0

Fix T91311: incorrect batch generation for instances

This was a mistake in {rB5a9a16334c573c4566dc9b2a314cf0d0ccdcb54f}.

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

M	source/blender/draw/intern/draw_manager.c

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

diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index aca645acc09..47adc0acc60 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -695,7 +695,7 @@ static void duplidata_value_free(void *val)
 static void duplidata_key_free(void *key)
 {
   DupliKey *dupli_key = (DupliKey *)key;
-  if (dupli_key->ob_data == NULL) {
+  if (dupli_key->ob_data == dupli_key->ob->data) {
     drw_batch_cache_generate_requested(dupli_key->ob);
   }
   else {



More information about the Bf-blender-cvs mailing list