[Bf-blender-cvs] [41dde55] master: Fix T39081: Crash duplicating objects
Campbell Barton
noreply at git.blender.org
Tue Mar 11 07:48:55 CET 2014
Commit: 41dde55325cd2c0fe876637e2f2b6e599d4e201e
Author: Campbell Barton
Date: Tue Mar 11 17:46:11 2014 +1100
https://developer.blender.org/rB41dde55325cd2c0fe876637e2f2b6e599d4e201e
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;
}
}
More information about the Bf-blender-cvs
mailing list