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:
authorCampbell Barton <ideasman42@gmail.com>2010-12-07 11:52:12 +0300
committerCampbell Barton <ideasman42@gmail.com>2010-12-07 11:52:12 +0300
commit46990b49045d52278cdc082b9ef577ffcee5619f (patch)
tree701328ec3954d70ee2aa5cd84bcd02fdd2e00908 /source/blender/blenkernel/intern/material.c
parentc5613de2d5664bd37ef0ceb2343050f314d6345a (diff)
fix for own mistake, reported [#25076] Creating new empty crashes Blender
Diffstat (limited to 'source/blender/blenkernel/intern/material.c')
-rw-r--r--source/blender/blenkernel/intern/material.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index 90017ba3d5b..2af7fc3b70a 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -626,7 +626,7 @@ void test_object_materials(ID *id)
Object *ob;
short *totcol;
- if(id || (totcol=give_totcolp_id(id))==NULL) {
+ if(id==NULL || (totcol=give_totcolp_id(id))==NULL) {
return;
}