[Bf-blender-cvs] [5cbad89637c] blender2.8: Cleanup: unused defines

Campbell Barton noreply at git.blender.org
Thu May 31 10:16:14 CEST 2018


Commit: 5cbad89637c0f3c28b2d4896ca3d8b03542d507e
Author: Campbell Barton
Date:   Thu May 31 10:15:48 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB5cbad89637c0f3c28b2d4896ca3d8b03542d507e

Cleanup: unused defines

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

M	source/blender/editors/space_buttons/buttons_intern.h
M	source/blender/makesdna/DNA_space_types.h

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

diff --git a/source/blender/editors/space_buttons/buttons_intern.h b/source/blender/editors/space_buttons/buttons_intern.h
index 84c935dd737..facbfe4a784 100644
--- a/source/blender/editors/space_buttons/buttons_intern.h
+++ b/source/blender/editors/space_buttons/buttons_intern.h
@@ -45,19 +45,6 @@ struct bNodeTree;
 struct uiLayout;
 struct wmOperatorType;
 
-/* buts->scaflag */		
-#define BUTS_SENS_SEL       1
-#define BUTS_SENS_ACT       2
-#define BUTS_SENS_LINK      4
-#define BUTS_CONT_SEL       8
-#define BUTS_CONT_ACT       16
-#define BUTS_CONT_LINK      32
-#define BUTS_ACT_SEL        64
-#define BUTS_ACT_ACT        128
-#define BUTS_ACT_LINK       256
-#define BUTS_SENS_STATE     512
-#define BUTS_ACT_STATE      1024
-
 /* context data */
 
 typedef struct ButsContextPath {
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index efeb2871ae1..cd92418d17d 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -155,7 +155,7 @@ typedef struct SpaceButs {
 #define CONTEXT_SHADING 3
 #define CONTEXT_EDITING 4
 // #define CONTEXT_SCRIPT  5
-#define CONTEXT_LOGIC   6
+// #define CONTEXT_LOGIC   6
 
 /* SpaceButs.mainb old (deprecated) */
 // #define BUTS_VIEW           0
@@ -215,21 +215,6 @@ typedef enum eSpaceButtons_Align {
 	BUT_AUTO = 3,
 } eSpaceButtons_Align;
 
-/* SpaceButs.scaflag */
-#define BUTS_SENS_SEL           1
-#define BUTS_SENS_ACT           2
-#define BUTS_SENS_LINK          4
-#define BUTS_CONT_SEL           8
-#define BUTS_CONT_ACT           16
-#define BUTS_CONT_LINK          32
-#define BUTS_ACT_SEL            64
-#define BUTS_ACT_ACT            128
-#define BUTS_ACT_LINK           256
-#define BUTS_SENS_STATE         512
-#define BUTS_ACT_STATE          1024
-#define BUTS_CONT_INIT_STATE    2048
-
-
 /** \} */
 
 /* -------------------------------------------------------------------- */



More information about the Bf-blender-cvs mailing list