[Bf-blender-cvs] [6d53c218de7] lanpr-under-gp: Merge remote-tracking branch 'origin/master' into lanpr-under-gp

[YimingWu]

Commit: 6d53c218de766ec67f92cdaf2ff1af767a407d8b
Author: YimingWu
Date:   Sat Oct 3 10:57:52 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rB6d53c218de766ec67f92cdaf2ff1af767a407d8b

Merge remote-tracking branch 'origin/master' into lanpr-under-gp

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



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

diff --cc source/blender/editors/space_buttons/buttons_context.c
index 4486e767db9,fabccecd533..b3a5b39ce7a
--- a/source/blender/editors/space_buttons/buttons_context.c
+++ b/source/blender/editors/space_buttons/buttons_context.c
@@@ -842,15 -814,11 +844,15 @@@ int /*eContextResult*/ buttons_context(
    }
    if (CTX_data_equals(member, "world")) {
      set_pointer_type(path, result, &RNA_World);
-     return 1;
+     return CTX_RESULT_OK;
    }
 +  if (CTX_data_equals(member, "collection")) {
 +    set_pointer_type(path, result, &RNA_Collection);
 +    return 1;
 +  }
    if (CTX_data_equals(member, "object")) {
      set_pointer_type(path, result, &RNA_Object);
-     return 1;
+     return CTX_RESULT_OK;
    }
    if (CTX_data_equals(member, "mesh")) {
      set_pointer_type(path, result, &RNA_Mesh);