[Bf-blender-cvs] [05f900e3466] master: Cleanup: Remove unused UI button definition functions
Hans Goudey
noreply at git.blender.org
Thu Dec 23 18:30:20 CET 2021
Commit: 05f900e3466b45a19e13bea6dd641e4f7b8b46e9
Author: Hans Goudey
Date: Thu Dec 23 11:29:44 2021 -0600
Branches: master
https://developer.blender.org/rB05f900e3466b45a19e13bea6dd641e4f7b8b46e9
Cleanup: Remove unused UI button definition functions
These were part of the older buttons API that shouldn't be used in
more places at this point. Most layouts should be built with the regular
layout system API and RNA properties. This sort of button can still be
created though, since these were just shortcuts anyway.
===================================================================
M source/blender/editors/include/UI_interface.h
M source/blender/editors/interface/interface.c
===================================================================
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index ba9e56256af..5fd176813e6 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -982,21 +982,6 @@ uiBut *uiDefButF(uiBlock *block,
float a1,
float a2,
const char *tip);
-uiBut *uiDefButBitF(uiBlock *block,
- int type,
- int bit,
- int retval,
- const char *str,
- int x,
- int y,
- short width,
- short height,
- float *poin,
- float min,
- float max,
- float a1,
- float a2,
- const char *tip);
uiBut *uiDefButI(uiBlock *block,
int type,
int retval,
@@ -1154,35 +1139,6 @@ uiBut *uiDefIconBut(uiBlock *block,
float a1,
float a2,
const char *tip);
-uiBut *uiDefIconButF(uiBlock *block,
- int type,
- int retval,
- int icon,
- int x,
- int y,
- short width,
- short height,
- float *poin,
- float min,
- float max,
- float a1,
- float a2,
- const char *tip);
-uiBut *uiDefIconButBitF(uiBlock *block,
- int type,
- int bit,
- int retval,
- int icon,
- int x,
- int y,
- short width,
- short height,
- float *poin,
- float min,
- float max,
- float a1,
- float a2,
- const char *tip);
uiBut *uiDefIconButI(uiBlock *block,
int type,
int retval,
@@ -1241,20 +1197,6 @@ uiBut *uiDefIconButBitS(uiBlock *block,
float a1,
float a2,
const char *tip);
-uiBut *uiDefIconButC(uiBlock *block,
- int type,
- int retval,
- int icon,
- int x,
- int y,
- short width,
- short height,
- char *poin,
- float min,
- float max,
- float a1,
- float a2,
- const char *tip);
uiBut *uiDefIconButBitC(uiBlock *block,
int type,
int bit,
@@ -1356,22 +1298,6 @@ uiBut *uiDefIconTextButF(uiBlock *block,
float a1,
float a2,
const char *tip);
-uiBut *uiDefIconTextButBitF(uiBlock *block,
- int type,
- int bit,
- int retval,
- int icon,
- const char *str,
- int x,
- int y,
- short width,
- short height,
- float *poin,
- float min,
- float max,
- float a1,
- float a2,
- const char *tip);
uiBut *uiDefIconTextButI(uiBlock *block,
int type,
int retval,
@@ -1387,84 +1313,6 @@ uiBut *uiDefIconTextButI(uiBlock *block,
float a1,
float a2,
const char *tip);
-uiBut *uiDefIconTextButBitI(uiBlock *block,
- int type,
- int bit,
- int retval,
- int icon,
- const char *str,
- int x,
- int y,
- short width,
- short height,
- int *poin,
- float min,
- float max,
- float a1,
- float a2,
- const char *tip);
-uiBut *uiDefIconTextButS(uiBlock *block,
- int type,
- int retval,
- int icon,
- const char *str,
- int x,
- int y,
- short width,
- short height,
- short *poin,
- float min,
- float max,
- float a1,
- float a2,
- const char *tip);
-uiBut *uiDefIconTextButBitS(uiBlock *block,
- int type,
- int bit,
- int retval,
- int icon,
- const char *str,
- int x,
- int y,
- short width,
- short height,
- short *poin,
- float min,
- float max,
- float a1,
- float a2,
- const char *tip);
-uiBut *uiDefIconTextButC(uiBlock *block,
- int type,
- int retval,
- int icon,
- const char *str,
- int x,
- int y,
- short width,
- short height,
- char *poin,
- float min,
- float max,
- float a1,
- float a2,
- const char *tip);
-uiBut *uiDefIconTextButBitC(uiBlock *block,
- int type,
- int bit,
- int retval,
- int icon,
- const char *str,
- int x,
- int y,
- short width,
- short height,
- char *poin,
- float min,
- float max,
- float a1,
- float a2,
- const char *tip);
uiBut *uiDefIconTextButR(uiBlock *block,
int type,
int retval,
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index df508b87ce4..01d7ccdc3ea 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -4943,38 +4943,6 @@ uiBut *uiDefButF(uiBlock *block,
a2,
tip);
}
-uiBut *uiDefButBitF(uiBlock *block,
- int type,
- int bit,
- int retval,
- const char *str,
- int x,
- int y,
- short width,
- short height,
- float *poin,
- float min,
- float max,
- float a1,
- float a2,
- const char *tip)
-{
- return uiDefButBit(block,
- type | UI_BUT_POIN_FLOAT,
- bit,
- retval,
- str,
- x,
- y,
- width,
- height,
- (void *)poin,
- min,
- max,
- a1,
- a2,
- tip);
-}
uiBut *uiDefButI(uiBlock *block,
int type,
int retval,
@@ -5295,68 +5263,6 @@ static uiBut *uiDefIconButBit(uiBlock *block,
tip);
}
-uiBut *uiDefIconButF(uiBlock *block,
- int type,
- int retval,
- int icon,
- int x,
- int y,
- short width,
- short height,
- float *poin,
- float min,
- float max,
- float a1,
- float a2,
- const char *tip)
-{
- return uiDefIconBut(block,
- type | UI_BUT_POIN_FLOAT,
- retval,
- icon,
- x,
- y,
- width,
- height,
- (void *)poin,
- min,
- max,
- a1,
- a2,
- tip);
-}
-uiBut *uiDefIconButBitF(uiBlock *block,
- int type,
- int bit,
- int retval,
- int icon,
- int x,
- int y,
- short width,
- short height,
- float *poin,
- float min,
- float max,
- float a1,
- float a2,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list