[Bf-blender-cvs] [3a5cd5f] alembic: Fix for crash on dupli drawing, due to check of ob.transflag after it is already restored.

Lukas Tönne noreply at git.blender.org
Mon Mar 30 18:35:48 CEST 2015


Commit: 3a5cd5f4d435b2937cd0711d876779981ab55f5a
Author: Lukas Tönne
Date:   Mon Mar 30 18:34:10 2015 +0200
Branches: alembic
https://developer.blender.org/rB3a5cd5f4d435b2937cd0711d876779981ab55f5a

Fix for crash on dupli drawing, due to check of ob.transflag after it
is already restored.

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

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 a2923dc..b4fee27 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -2194,11 +2194,6 @@ static void draw_dupli_objects_color(
 			}
 		}
 		
-		tbase.object->dt = dt;
-		tbase.object->dtx = dtx;
-		tbase.object->transflag = transflag;
-		tbase.object->currentlod = savedlod;
-		
 		/* restore final DM */
 		if (tbase.object->transflag & OB_IS_DUPLI_CACHE) {
 			DerivedMesh *cur = tbase.object->derivedFinal;
@@ -2214,6 +2209,11 @@ static void draw_dupli_objects_color(
 			tbase.object->transflag &= ~OB_IS_DUPLI_CACHE;
 			tbase.object->derivedFinal = store_final_dm;
 		}
+		
+		tbase.object->dt = dt;
+		tbase.object->dtx = dtx;
+		tbase.object->transflag = transflag;
+		tbase.object->currentlod = savedlod;
 	}
 
 	if (apply_data) {




More information about the Bf-blender-cvs mailing list