kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cleanup: unused defines

Browse Source
This commit is contained in:
Campbell Barton 2015-11-12 18:52:58 +11:00
parent 60505728d9
commit 6cbccdd31c
15 changed files with 25 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
source/blender/blenkernel/BKE_node.h
View File

@ -220,18 +220,6 @@ typedef struct bNodeType {
ExtensionRNA ext;
} bNodeType;
/* node->exec, now in use for composites (#define for break is same as ready yes) */
#define NODE_PROCESSING 1
#define NODE_READY 2
#define NODE_BREAK 2
#define NODE_FINISHED 4
#define NODE_FREEBUFS 8
#define NODE_SKIPPED 16
/* sim_exec return value */
#define NODE_EXEC_FINISHED 0
#define NODE_EXEC_SUSPEND 1
/* nodetype->nclass, for add-menu and themes */
#define NODE_CLASS_INPUT 0
#define NODE_CLASS_OUTPUT 1
@ -239,22 +227,22 @@ typedef struct bNodeType {
#define NODE_CLASS_OP_VECTOR 4
#define NODE_CLASS_OP_FILTER 5
#define NODE_CLASS_GROUP 6
#define NODE_CLASS_FILE 7
// #define NODE_CLASS_FILE 7
#define NODE_CLASS_CONVERTOR 8
#define NODE_CLASS_MATTE 9
#define NODE_CLASS_DISTORT 10
#define NODE_CLASS_OP_DYNAMIC 11 /* deprecated */
// #define NODE_CLASS_OP_DYNAMIC 11 /* deprecated */
#define NODE_CLASS_PATTERN 12
#define NODE_CLASS_TEXTURE 13
#define NODE_CLASS_EXECUTION 14
#define NODE_CLASS_GETDATA 15
#define NODE_CLASS_SETDATA 16
#define NODE_CLASS_MATH 17
#define NODE_CLASS_MATH_VECTOR 18
#define NODE_CLASS_MATH_ROTATION 19
#define NODE_CLASS_PARTICLES 25
#define NODE_CLASS_TRANSFORM 30
#define NODE_CLASS_COMBINE 31
// #define NODE_CLASS_EXECUTION 14
// #define NODE_CLASS_GETDATA 15
// #define NODE_CLASS_SETDATA 16
// #define NODE_CLASS_MATH 17
// #define NODE_CLASS_MATH_VECTOR 18
// #define NODE_CLASS_MATH_ROTATION 19
// #define NODE_CLASS_PARTICLES 25
// #define NODE_CLASS_TRANSFORM 30
// #define NODE_CLASS_COMBINE 31
#define NODE_CLASS_SCRIPT 32
#define NODE_CLASS_INTERFACE 33
#define NODE_CLASS_SHADER 40
@ -624,8 +612,8 @@ bool BKE_node_is_connected_to_output(struct bNodeTree *ntree, struct bNode *node
#define NODE_UNDEFINED -2 /* node type is not registered */
#define NODE_CUSTOM -1 /* for dynamically registered custom types */
#define NODE_GROUP 2
#define __NODE_FORLOOP 3 /* deprecated */
#define __NODE_WHILELOOP 4 /* deprecated */
// #define NODE_FORLOOP 3 /* deprecated */
// #define NODE_WHILELOOP 4 /* deprecated */
#define NODE_FRAME 5
#define NODE_REROUTE 6
#define NODE_GROUP_INPUT 7
@ -802,15 +790,6 @@ struct ShadeResult;
#define SH_NODE_MAT_DIFF 1
#define SH_NODE_MAT_SPEC 2
#define SH_NODE_MAT_NEG 4
/* custom defines: states for Script node. These are bit indices */
#define NODE_DYNAMIC_READY 0 /* 1 */
#define NODE_DYNAMIC_LOADED 1 /* 2 */
#define NODE_DYNAMIC_NEW 2 /* 4 */
#define NODE_DYNAMIC_UPDATED 3 /* 8 */
#define NODE_DYNAMIC_ADDEXIST 4 /* 16 */
#define NODE_DYNAMIC_ERROR 5 /* 32 */
#define NODE_DYNAMIC_REPARSE 6 /* 64 */
#define NODE_DYNAMIC_SET 15 /* sign */
/* API */
@ -906,7 +885,7 @@ void ntreeGPUMaterialNodes(struct bNodeTree *ntree, struct GPUMateria
#define CMP_NODE_CHANNEL_MATTE 238
#define CMP_NODE_FLIP 239
#define CMP_NODE_SPLITVIEWER 240
#define CMP_NODE_INDEX_MASK 241
// #define CMP_NODE_INDEX_MASK 241
#define CMP_NODE_MAP_UV 242
#define CMP_NODE_ID_MASK 243
#define CMP_NODE_DEFOCUS 244
@ -961,9 +940,6 @@ void ntreeGPUMaterialNodes(struct bNodeTree *ntree, struct GPUMateria
/* channel toggles */
#define CMP_CHAN_RGB 1
#define CMP_CHAN_A 2
#define CMP_CHAN_R 4
#define CMP_CHAN_G 8
#define CMP_CHAN_B 16
/* filter types */
#define CMP_FILT_SOFT 0

5
source/blender/blenkernel/BKE_ocean.h
View File

@ -69,11 +69,6 @@ typedef struct OceanCache {
int baked;
} OceanCache;
#define OCEAN_NOT_CACHED 0
#define OCEAN_CACHING 1
#define OCEAN_CACHED 2
struct Ocean *BKE_ocean_add(void);
void BKE_ocean_free_data(struct Ocean *oc);
void BKE_ocean_free(struct Ocean *oc);

2
source/blender/blenkernel/intern/mesh.c
View File

@ -34,7 +34,7 @@
#include "DNA_object_types.h"
#include "DNA_key_types.h"
#include "DNA_mesh_types.h"
#include "DNA_ipo_types.h"
#include "DNA_curve_types.h"
#include "BLI_utildefines.h"
#include "BLI_math.h"

1
source/blender/editors/include/ED_transform.h
View File

@ -94,7 +94,6 @@ enum TfmMode {
#define CTX_NO_PET (1 << 2)
#define CTX_NO_MIRROR (1 << 3)
#define CTX_AUTOCONFIRM (1 << 4)
#define CTX_NDOF (1 << 5)
#define CTX_MOVIECLIP (1 << 6)
#define CTX_MASK (1 << 7)
#define CTX_PAINT_CURVE (1 << 8)

3
source/blender/editors/include/UI_interface.h
View File

@ -629,8 +629,7 @@ void UI_but_string_info_get(struct bContext *C, uiBut *but, ...) ATTR_SENTINEL(0
#define UI_ID_AUTO_NAME (1 << 7)
#define UI_ID_FAKE_USER (1 << 8)
#define UI_ID_PIN (1 << 9)
#define UI_ID_BROWSE_RENDER (1 << 10)
#define UI_ID_PREVIEWS (1 << 11)
#define UI_ID_PREVIEWS (1 << 10)
#define UI_ID_FULL (UI_ID_RENAME | UI_ID_BROWSE | UI_ID_ADD_NEW | UI_ID_OPEN | UI_ID_ALONE | UI_ID_DELETE | UI_ID_LOCAL)
int UI_icon_from_id(struct ID *id);

3
source/blender/makesdna/DNA_ipo_types.h
View File

@ -46,9 +46,6 @@
/* -------------------------- Type Defines --------------------------- */
/* sometimes used - mainly for GE/Ketsji */
typedef short IPO_Channel;
/* --- IPO Curve Driver --- */

4
source/blender/makesdna/DNA_object_force.h
View File

@ -253,10 +253,10 @@ typedef struct BulletSoftBody {
/* BulletSoftBody.flag */
#define OB_BSB_SHAPE_MATCHING 2
#define OB_BSB_UNUSED 4
// #define OB_BSB_UNUSED 4
#define OB_BSB_BENDING_CONSTRAINTS 8
#define OB_BSB_AERO_VPOINT 16 /* aero model, Vertex normals are oriented toward velocity*/
#define OB_BSB_AERO_VTWOSIDE 32 /* aero model, Vertex normals are flipped to match velocity */
// #define OB_BSB_AERO_VTWOSIDE 32 /* aero model, Vertex normals are flipped to match velocity */
/* BulletSoftBody.collisionflags */
#define OB_BSB_COL_SDF_RS 2 /* SDF based rigid vs soft */

1
source/blender/makesdna/DNA_screen_types.h
View File

@ -290,7 +290,6 @@ enum {
#define AREAGRID 4
#define AREAMINX 32
#define HEADERY 26
#define AREAMINY (HEADERY+EDGEWIDTH)
#define HEADERDOWN 1
#define HEADERTOP 2

2
source/blender/makesdna/DNA_sensor_types.h
View File

@ -303,8 +303,6 @@ typedef struct bJoystickSensor {
#define SENS_JOY_ANY_EVENT 1
#define SENS_JOY_BUTTON 0 /* axis type */
#define SENS_JOY_BUTTON_PRESSED 0
#define SENS_JOY_BUTTON_RELEASED 1
#define SENS_JOY_AXIS 1 /* axis type */
#define SENS_JOY_X_AXIS 0

8
source/blender/makesdna/DNA_space_types.h
View File

@ -147,7 +147,8 @@ typedef struct SpaceButs {
#define CONTEXT_LOGIC 6
/* sbuts->mainb old (deprecated) */
#define BUTS_VIEW 0
#ifdef DNA_DEPRECATED_ALLOW
// #define BUTS_VIEW 0
#define BUTS_LAMP 1
#define BUTS_MAT 2
#define BUTS_TEX 3
@ -159,9 +160,10 @@ typedef struct SpaceButs {
#define BUTS_FPAINT 9
#define BUTS_RADIO 10
#define BUTS_SCRIPT 11
#define BUTS_SOUND 12
// #define BUTS_SOUND 12
#define BUTS_CONSTRAINT 13
#define BUTS_EFFECTS 14
// #define BUTS_EFFECTS 14
#endif
/* buts->mainb new */
typedef enum eSpaceButtons_Context {

2
source/blender/makesdna/DNA_texture_types.h
View File

@ -368,12 +368,14 @@ typedef struct ColorMapping {
#define TXF_AREA 3
/* imaflag unused, only for version check */
#ifdef DNA_DEPRECATED_ALLOW
#define TEX_FIELDS_ 8
#define TEX_ANIMCYCLIC_ 64
#define TEX_ANIM5_ 128
#define TEX_ANTIALI_ 256
#define TEX_ANTISCALE_ 512
#define TEX_STD_FIELD_ 1024
#endif
/* flag */
#define TEX_COLORBAND 1

1
source/blender/nodes/texture/node_texture_util.h
View File

@ -39,7 +39,6 @@
#include "MEM_guardedalloc.h"
#include "DNA_color_types.h"
#include "DNA_ipo_types.h"
#include "DNA_ID.h"
#include "DNA_image_types.h"
#include "DNA_material_types.h"

3
source/blender/windowmanager/wm_cursors.h
View File

@ -108,9 +108,6 @@ enum {
BC_YELLOW
};
#define SMALL_CURSOR 0
#define BIG_CURSOR 1
struct wmWindow;
struct wmEvent;

1
source/gameengine/Converter/BL_ModifierDeformer.cpp
View File

@ -46,7 +46,6 @@
#include "DNA_key_types.h"
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_ipo_types.h"
#include "DNA_curve_types.h"
#include "DNA_modifier_types.h"
#include "DNA_scene_types.h"

1
source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
View File

@ -35,7 +35,6 @@
#include <cstring>
extern "C" {
#include "DNA_ipo_types.h"
#include "DNA_action_types.h"
#include "DNA_anim_types.h"
#include "BKE_fcurve.h"