Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2003-07-21 22:11:35 +0400
committerTon Roosendaal <ton@blender.org>2003-07-21 22:11:35 +0400
commit500991178852a6280e53ae6b4ce65513192b8aa2 (patch)
tree4e5f7136f4b9c0c77ea953d75ca73ca17a2fb0c3
parent03ada07a57aaf89b1d124655c36449dc606b8b9a (diff)
- lazy pointer check... foei foei ton!
reported bug: deleting object, with material button visible, crash! fixed now...
-rw-r--r--source/blender/src/buttons.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/src/buttons.c b/source/blender/src/buttons.c
index 6378a536bff..19ca0ec3c41 100644
--- a/source/blender/src/buttons.c
+++ b/source/blender/src/buttons.c
@@ -7465,7 +7465,7 @@ void redraw_test_buttons(Base *new)
if(buts->mainb==BUTS_LAMP) {
// change type automatically
- if(new->object->type!=OB_LAMP) {
+ if(new && new->object->type!=OB_LAMP) {
buts->mainb= BUTS_MAT;
allqueue(REDRAWBUTSMAT, 0);
}
@@ -7474,7 +7474,7 @@ void redraw_test_buttons(Base *new)
}
else if(buts->mainb==BUTS_MAT) {
// change type automatically
- if(new->object->type==OB_LAMP) {
+ if(new && new->object->type==OB_LAMP) {
buts->mainb= BUTS_LAMP;
allqueue(REDRAWBUTSLAMP, 0);
}