diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-06-29 14:55:31 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-06-29 14:55:31 +0400 |
| commit | 5eefa4982bd78f3b58f0e1953fa381603ce62710 (patch) | |
| tree | 31ed8074372bd425671d0a566cf128a3f9293a3d | |
| parent | e5d4c789a1245592e2371ae691510e77be8173ab (diff) | |
Bugfix #4534
Added pointer check to newly added code for this bugfix.
| -rw-r--r-- | source/blender/src/buttons_shading.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c index 7875067e781..96a027fdb36 100644 --- a/source/blender/src/buttons_shading.c +++ b/source/blender/src/buttons_shading.c @@ -3190,7 +3190,7 @@ static void material_panel_links(Object *ob, Material *ma) uiBlockSetCol(block, TH_BUT_SETTING2); xco= std_libbuttons(block, 10, 160, 0, NULL, B_MATBROWSE, ID_MA, 0, id, idfrom, &(G.buts->menunr), B_MATALONE, B_MATLOCAL, B_MATDELETE, B_AUTOMATNAME, B_KEEPDATA); - uiSetButLock(ma->id.lib!=NULL, "Can't edit library data"); + if(ma) uiSetButLock(ma->id.lib!=NULL, "Can't edit library data"); if(ma) cp= &ma->use_nodes; else cp= &G.buts->use_nodes; uiDefButC(block, TOG, B_MAT_USENODES, "Nodes", xco+5,160,300-xco-5,20, cp, 0.0f, 0.0f, 0, 0, ""); |