Commit: b761641c966e016aca43884dd0bb22e0d201432b
Author: Campbell Barton
Date: Tue Mar 11 17:46:11 2014 +1100
https://developer.blender.org/rBb761641c966e016aca43884dd0bb22e0d201432b
Fix T39081: Crash duplicating objects
===================================================================
M source/blender/editors/space_image/space_image.c
===================================================================
diff --git a/source/blender/editors/space_image/space_image.c
b/source/blender/editors/space_image/space_image.c
index 5c9fd23..14fd486 100644
--- a/source/blender/editors/space_image/space_image.c
+++ b/source/blender/editors/space_image/space_image.c
@@ -512,18 +512,21 @@ static void image_listener(bScreen *sc, ScrArea *sa,
wmNotifier *wmn)
}
case NC_OBJECT:
{
- Object *ob = OBACT;
switch (wmn->data) {
case ND_TRANSFORM:
case ND_MODIFIER:
- if (ob == (Object *)wmn->reference &&
(ob->mode & OB_MODE_EDIT)) {
+ {
+ Object *ob = OBACT;
+ if (ob && (ob == wmn->reference) &&
(ob->mode & OB_MODE_EDIT)) {
if (sima->lock && (sima->flag &
SI_DRAWSHADOW)) {
ED_area_tag_refresh(sa);
ED_area_tag_redraw(sa);
}
}
break;
+ }
}
+
break;
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs