[Bf-blender-cvs] [26bd70e] gooseberry: 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]

Commit: 26bd70ed8cfbf19b95d86e499c438fe1041ec447
Author: Lukas Tönne
Date:   Fri Mar 20 09:52:32 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB26bd70ed8cfbf19b95d86e499c438fe1041ec447

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 f6e1f7a..30b4f7a 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -2157,6 +2157,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) {