diff options
| author | Hans Goudey <h.goudey@me.com> | 2020-09-10 16:54:46 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2020-09-10 16:54:46 +0300 |
| commit | 1b5f355af8a60347e880da19bd84dfdaea1a2d9e (patch) | |
| tree | 332ca17e59bcf0c4e307fbc0540c96b6e6374a98 /source/blender/editors/space_buttons/buttons_context.c | |
| parent | f3197de26599897e91046b66246a237f02a0362a (diff) | |
| parent | f4c8b815951b995648d657e0211ee74f41cef21d (diff) | |
Merge branch 'property-search-button-label-pointer' into property-search-move-context-to-panel
Diffstat (limited to 'source/blender/editors/space_buttons/buttons_context.c')
| -rw-r--r-- | source/blender/editors/space_buttons/buttons_context.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index 38b22464761..2e10cc94004 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -333,11 +333,10 @@ 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; + if (ma != NULL) { + RNA_id_pointer_create(&ma->id, &path->ptr[path->len]); + path->len++; } - RNA_id_pointer_create(&ma->id, &path->ptr[path->len]); - path->len++; return true; } } |