diff options
| author | Hans Goudey <h.goudey@me.com> | 2020-09-09 19:15:58 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2020-09-09 19:15:58 +0300 |
| commit | 27ce07a010bea94027bfbff37551ba6ab3dc7cc8 (patch) | |
| tree | f0d4f5f7cb3cec78210324e1202ced7af68759d5 /source/blender/editors/space_buttons/buttons_context.c | |
| parent | 27f3f3d8a723627a8f8091aab3484fccd7ca2b3a (diff) | |
| parent | 0cff2c944f9c2cd3ac873fe826c4399fc2f32159 (diff) | |
Merge branch 'master' into properties-pin-operator
Diffstat (limited to 'source/blender/editors/space_buttons/buttons_context.c')
| -rw-r--r-- | source/blender/editors/space_buttons/buttons_context.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index cfb94673bbb..b8c94049b2a 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -333,6 +333,9 @@ static bool buttons_context_path_material(ButsContextPath *path) if (ob && OB_TYPE_SUPPORT_MATERIAL(ob->type)) { ma = BKE_object_material_get(ob, ob->actcol); + if (ma == NULL) { + return false; + } RNA_id_pointer_create(&ma->id, &path->ptr[path->len]); path->len++; return true; |