[Bf-blender-cvs] [0f0e7239f02] master: Fix T80651: Material tab disappears

[Sebastian Parborg]

Commit: 0f0e7239f02720a4077ee10dea0e3de6e605417d
Author: Sebastian Parborg
Date:   Thu Sep 10 14:49:47 2020 +0200
Branches: master
https://developer.blender.org/rB0f0e7239f02720a4077ee10dea0e3de6e605417d

Fix T80651: Material tab disappears

Always return true if the object can have materials. Even if there are
not currently any materials assigned to the object.

===================================================================

M	source/blender/editors/space_buttons/buttons_context.c

===================================================================

diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c
index 2cfda8644df..e0a5158e510 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;
     }
   }