[Bf-blender-cvs] [f77d75e] alembic_pointcache: Fully reset the OB_FROM_DUPLI flag for each dupli instance, in case later duplis can not be found in the cache.

Lukas Tönne noreply at git.blender.org
Fri Mar 20 10:43:15 CET 2015


Commit: f77d75ed65ee532cf25f29d84f3d4297c8712c52
Author: Lukas Tönne
Date:   Fri Mar 20 09:52:32 2015 +0100
Branches: alembic_pointcache
https://developer.blender.org/rBf77d75ed65ee532cf25f29d84f3d4297c8712c52

Fully reset the OB_FROM_DUPLI flag for each dupli instance, in case
later duplis can not be found in the cache.

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

M	source/blender/editors/space_view3d/view3d_draw.c

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

diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index a6d6cef..689d190 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -2096,6 +2096,7 @@ static void draw_dupli_objects_color(
 		
 		/* override final DM */
 		bb_tmp = NULL;
+		tbase.flag &= ~OB_FROMCACHE;
 		if (base->object->dup_cache) {
 			DupliObjectData *dob_data = BKE_dupli_cache_find_data(base->object->dup_cache, tbase.object);
 			if (dob_data->cache_dm) {




More information about the Bf-blender-cvs mailing list