[Bf-blender-cvs] [3a34c914486] asset-shelf: Cleanup: Remove unnecessary macro & unnecessary cast

[Julian Eisel]

Commit: 3a34c9144862742e773363628295995531d6f0f8
Author: Julian Eisel
Date:   Tue Jan 31 17:32:05 2023 +0100
Branches: asset-shelf
https://developer.blender.org/rB3a34c9144862742e773363628295995531d6f0f8

Cleanup: Remove unnecessary macro & unnecessary cast

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

M       source/blender/editors/interface/interface.cc
M       source/blender/editors/interface/interface_anim.cc

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

diff --git a/source/blender/editors/interface/interface.cc 
b/source/blender/editors/interface/interface.cc
index 73f2efb6d19..bf1f276d702 100644
--- a/source/blender/editors/interface/interface.cc
+++ b/source/blender/editors/interface/interface.cc
@@ -3982,8 +3982,6 @@ static uiBut *ui_but_new(const eButType type)
 {
   uiBut *but = nullptr;
 
-#define NEW_BUT(type_name) MEM_new<type_name>(#type_name)
-
   switch (type) {
     case UI_BTYPE_NUM:
       but = MEM_new<uiButNumber>("uiButNumber");
@@ -4022,10 +4020,9 @@ static uiBut *ui_but_new(const eButType type)
       but = MEM_new<uiButViewItem>("uiButViewItem");
       break;
     default:
-      but = NEW_BUT(uiBut);
+      but = MEM_new<uiBut>("uiBut");
       break;
   }
-#undef NEW_BUT
 
   but->type = type;
   return but;
diff --git a/source/blender/editors/interface/interface_anim.cc 
b/source/blender/editors/interface/interface_anim.cc
index 78dccbaf1f8..c0b5f1f46f4 100644
--- a/source/blender/editors/interface/interface_anim.cc
+++ b/source/blender/editors/interface/interface_anim.cc
@@ -121,7 +121,7 @@ static uiBut 
*ui_but_anim_decorate_find_attached_button(uiButDecorator *but)
   BLI_assert(but->rnapoin.data && but->rnaprop);
 
   LISTBASE_CIRCULAR_BACKWARD_BEGIN (uiBut *, &but->block->buttons, but_iter, 
but->prev) {
-    if (but_iter != (uiBut *)but &&
+    if (but_iter != but &&
         ui_but_rna_equals_ex(but_iter, &but->rnapoin, but->rnaprop, 
but->rnaindex)) {
       return but_iter;
     }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs