Revision: 49115
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49115
Author: nazgul
Date: 2012-07-22 14:22:07 +0000 (Sun, 22 Jul 2012)
Log Message:
-----------
Fix #32156: Blender crashes on linking armature with custom shape
Crash was caused by using NULL pointer as a wire color for drawing
object selection when drawing flag is set to DRAW_CONSTCOLOR.
Solved by not calling drawObjectSelect when DRAW_CONSTCOLOR flag
is set, which seems reasonable -- rather than adding checks deeper
in all possible functions which are being called there easier to
just not call that functions using a single check.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_view3d/drawobject.c
Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c
2012-07-22 14:19:06 UTC (rev 49114)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c
2012-07-22 14:22:07 UTC (rev 49115)
@@ -6682,8 +6682,7 @@
/* draw outline for selected objects, mesh does itself */
if ((v3d->flag & V3D_SELECT_OUTLINE) && ((v3d->flag2 &
V3D_RENDER_OVERRIDE) == 0) && ob->type != OB_MESH) {
if (dt > OB_WIRE && (ob->mode & OB_MODE_EDIT) == 0 && (dflag &
DRAW_SCENESET) == 0) {
- if (!(ob->dtx & OB_DRAWWIRE) && (ob->flag & SELECT) &&
!(dflag & DRAW_PICKING)) {
-
+ if (!(ob->dtx & OB_DRAWWIRE) && (ob->flag & SELECT) &&
!(dflag & (DRAW_PICKING | DRAW_CONSTCOLOR))) {
drawObjectSelect(scene, v3d, ar, base,
ob_wire_col);
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
