[Bf-blender-cvs] [a44112a] gooseberry: Don't draw motion paths for armatures in edit mode. Results in nice crashes

Antony Riakiotakis noreply at git.blender.org
Thu Feb 19 19:00:59 CET 2015


Commit: a44112a5527ebfd35268f80af084df3bba0e8077
Author: Antony Riakiotakis
Date:   Thu Feb 19 18:56:38 2015 +0100
Branches: gooseberry
https://developer.blender.org/rBa44112a5527ebfd35268f80af084df3bba0e8077

Don't draw motion paths for armatures in edit mode. Results in nice
crashes

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

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

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

diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 4627d28..161369b 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -29,6 +29,7 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "DNA_armature_types.h"
 #include "DNA_camera_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_constraint_types.h"  /* for drawing constraint */
@@ -8041,7 +8042,9 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short
 				}
 				/* draw motion paths if forced */
 				if (show_motionpaths && !(dflag & DRAW_SCENESET)) {
-					ED_view3d_after_add(&v3d->afterdraw_nodepth, base, 0);
+					bArmature *arm = ob->data;
+					if (!arm->edbo)
+						ED_view3d_after_add(&v3d->afterdraw_nodepth, base, 0);
 				}
 				break;
 			default:




More information about the Bf-blender-cvs mailing list