tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

remove/comment unused defines.

This commit is contained in:
Campbell Barton 2011-01-15 16:14:57 +00:00
parent f66912a335
commit 86bbab7de5
48 changed files with 124 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenkernel/BKE_global.h
View File

@ -125,17 +125,17 @@ typedef struct Global {
#define G_FILE_ENABLE_ALL_FRAMES (1 << 3) /* deprecated */
#define G_FILE_SHOW_DEBUG_PROPS (1 << 4) /* deprecated */
#define G_FILE_SHOW_FRAMERATE (1 << 5) /* deprecated */
#define G_FILE_SHOW_PROFILE (1 << 6) /* deprecated */
/* #define G_FILE_SHOW_PROFILE (1 << 6) */ /* deprecated */
#define G_FILE_LOCK (1 << 7)
#define G_FILE_SIGN (1 << 8)
#define G_FIle_PUBLISH (1 << 9)
/* #define G_FILE_PUBLISH (1 << 9) */ /* deprecated */
#define G_FILE_NO_UI (1 << 10)
#define G_FILE_GAME_TO_IPO (1 << 11) /* deprecated */
/* #define G_FILE_GAME_TO_IPO (1 << 11) */ /* deprecated */
#define G_FILE_GAME_MAT (1 << 12) /* deprecated */
#define G_FILE_DISPLAY_LISTS (1 << 13) /* deprecated */
/* #define G_FILE_DISPLAY_LISTS (1 << 13) */ /* deprecated */
#define G_FILE_SHOW_PHYSICS (1 << 14) /* deprecated */
#define G_FILE_GAME_MAT_GLSL (1 << 15) /* deprecated */
#define G_FILE_GLSL_NO_LIGHTS (1 << 16) /* deprecated */
/* #define G_FILE_GLSL_NO_LIGHTS (1 << 16) */ /* deprecated */
#define G_FILE_GLSL_NO_SHADERS (1 << 17) /* deprecated */
#define G_FILE_GLSL_NO_SHADOWS (1 << 18) /* deprecated */
#define G_FILE_GLSL_NO_RAMPS (1 << 19) /* deprecated */

4
source/blender/blenkernel/BKE_image.h
View File

@ -94,10 +94,6 @@ struct RenderResult;
/* reload only frees, doesn't read until image_get_ibuf() called */
#define IMA_SIGNAL_RELOAD 0
#define IMA_SIGNAL_FREE 1
/* pack signals are executed */
#define IMA_SIGNAL_PACK 2
#define IMA_SIGNAL_REPACK 3
#define IMA_SIGNAL_UNPACK 4
/* source changes, from image to sequence or movie, etc */
#define IMA_SIGNAL_SRC_CHANGE 5
/* image-user gets a new image, check settings */

1
source/blender/blenkernel/BKE_utildefines.h
View File

@ -61,7 +61,6 @@
#define DATA MAKE_ID('D','A','T','A')
#define GLOB MAKE_ID('G','L','O','B')
#define IMAG MAKE_ID('I','M','A','G')
#define DNA1 MAKE_ID('D','N','A','1')
#define TEST MAKE_ID('T','E','S','T') /* used as preview between 'REND' and 'GLOB' */

6
source/blender/blenlib/BLI_math.h
View File

@ -25,8 +25,8 @@
* ***** END GPL LICENSE BLOCK *****
* */
#ifndef BLI_MATH
#define BLI_MATH
#ifndef BLI_MATH_H
#define BLI_MATH_H
/* Abbreviations:
*
@ -60,5 +60,5 @@
#include "BLI_math_vector.h"
#include "BLI_math_geom.h"
#endif /* BLI_MATH */
#endif /* BLI_MATH_H */

8
source/blender/blenlib/BLI_math_base.h
View File

@ -25,8 +25,8 @@
* ***** END GPL LICENSE BLOCK *****
* */
#ifndef BLI_MATH_BASE
#define BLI_MATH_BASE
#ifndef BLI_MATH_BASE_H
#define BLI_MATH_BASE_H
#ifdef __cplusplus
extern "C" {
@ -140,7 +140,7 @@ extern "C" {
#define CLAMP(a, b, c) if((a)<(b)) (a)=(b); else if((a)>(c)) (a)=(c)
#endif
#ifdef BLI_MATH_INLINE
#ifdef BLI_MATH_INLINE_H
#include "intern/math_base_inline.c"
#endif
@ -173,5 +173,5 @@ double double_round(double x, int ndigits);
}
#endif
#endif /* BLI_MATH_BASE */
#endif /* BLI_MATH_BASE_H */

6
source/blender/blenlib/BLI_math_color.h
View File

@ -25,8 +25,8 @@
* ***** END GPL LICENSE BLOCK *****
* */
#ifndef BLI_MATH_COLOR
#define BLI_MATH_COLOR
#ifndef BLI_MATH_COLOR_H
#define BLI_MATH_COLOR_H
#ifdef __cplusplus
extern "C" {
@ -102,5 +102,5 @@ void rgb_float_to_byte(const float *in, unsigned char *out);
}
#endif
#endif /* BLI_MATH_COLOR */
#endif /* BLI_MATH_COLOR_H */

8
source/blender/blenlib/BLI_math_geom.h
View File

@ -25,8 +25,8 @@
* ***** END GPL LICENSE BLOCK *****
* */
#ifndef BLI_MATH_GEOM
#define BLI_MATH_GEOM
#ifndef BLI_MATH_GEOM_H
#define BLI_MATH_GEOM_H
#ifdef __cplusplus
extern "C" {
@ -34,7 +34,7 @@ extern "C" {
#include "BLI_math_inline.h"
#ifdef BLI_MATH_INLINE
#ifdef BLI_MATH_INLINE_H
#include "intern/math_geom_inline.c"
#endif
@ -208,5 +208,5 @@ float form_factor_hemi_poly(float p[3], float n[3],
}
#endif
#endif /* BLI_MATH_GEOM */
#endif /* BLI_MATH_GEOM_H */

4
source/blender/blenlib/BLI_math_inline.h
View File

@ -33,9 +33,9 @@ extern "C" {
#endif
/* add platform/compiler checks here if it is not supported */
#define BLI_MATH_INLINE
#define BLI_MATH_INLINE_H
#ifdef BLI_MATH_INLINE
#ifdef BLI_MATH_INLINE_H
#ifdef _MSC_VER
#define MINLINE static __forceinline
#define MALWAYS_INLINE MINLINE

6
source/blender/blenlib/BLI_math_matrix.h
View File

@ -25,8 +25,8 @@
* ***** END GPL LICENSE BLOCK *****
* */
#ifndef BLI_MATH_MATRIX
#define BLI_MATH_MATRIX
#ifndef BLI_MATH_MATRIX_H
#define BLI_MATH_MATRIX_H
#ifdef __cplusplus
extern "C" {
@ -172,5 +172,5 @@ void print_m4(const char *str, float M[3][4]);
}
#endif
#endif /* BLI_MATH_MATRIX */
#endif /* BLI_MATH_MATRIX_H */

6
source/blender/blenlib/BLI_math_rotation.h
View File

@ -25,8 +25,8 @@
* ***** END GPL LICENSE BLOCK *****
* */
#ifndef BLI_MATH_ROTATION
#define BLI_MATH_ROTATION
#ifndef BLI_MATH_ROTATION_H
#define BLI_MATH_ROTATION_H
#ifdef __cplusplus
extern "C" {
@ -180,5 +180,5 @@ float angle_to_lens(float angle);
}
#endif
#endif /* BLI_MATH_ROTATION */
#endif /* BLI_MATH_ROTATION_H */

8
source/blender/blenlib/BLI_math_vector.h
View File

@ -25,8 +25,8 @@
* ***** END GPL LICENSE BLOCK *****
* */
#ifndef BLI_MATH_VECTOR
#define BLI_MATH_VECTOR
#ifndef BLI_MATH_VECTOR_H
#define BLI_MATH_VECTOR_H
#ifdef __cplusplus
extern "C" {
@ -34,7 +34,7 @@ extern "C" {
#include "BLI_math_inline.h"
#ifdef BLI_MATH_INLINE
#ifdef BLI_MATH_INLINE_H
#include "intern/math_vector_inline.c"
#endif
@ -184,5 +184,5 @@ void fill_vn(float *array_tar, const int size, const float val);
}
#endif
#endif /* BLI_MATH_VECTOR */
#endif /* BLI_MATH_VECTOR_H */

8
source/blender/blenlib/BLI_storage_types.h
View File

@ -67,14 +67,6 @@ struct direntry{
struct ImBuf *image;
};
#define SELECT 1
#define HIDDEN 1
#define FIRST 1
#define DESELECT 0
#define NOT_YET 0
#define VISIBLE 0
#define LAST 0
struct dirlink
{
struct dirlink *next,*prev;

6
source/blender/blenlib/intern/math_base_inline.c
View File

@ -32,8 +32,8 @@
#include "BLI_math.h"
#ifndef BLI_MATH_BASE_INLINE
#define BLI_MATH_BASE_INLINE
#ifndef BLI_MATH_BASE_INLINE_H
#define BLI_MATH_BASE_INLINE_H
/* A few small defines. Keep'em local! */
#define SMALL_NUMBER 1.e-8
@ -127,5 +127,5 @@ MINLINE float signf(float f)
return (f < 0.f)? -1.f: 1.f;
}
#endif /* BLI_MATH_BASE_INLINE */
#endif /* BLI_MATH_BASE_INLINE_H */

6
source/blender/blenlib/intern/math_geom_inline.c
View File

@ -27,8 +27,8 @@
#include "BLI_math.h"
#ifndef BLI_MATH_GEOM_INLINE
#define BLI_MATH_GEOM_INLINE
#ifndef BLI_MATH_GEOM_INLINE_H
#define BLI_MATH_GEOM_INLINE_H
/****************************** Spherical Harmonics **************************/
@ -134,5 +134,5 @@ MINLINE void madd_sh_shfl(float r[9], float sh[3], float f)
add_sh_shsh(r, r, tmp);
}
#endif /* BLI_MATH_GEOM_INLINE */
#endif /* BLI_MATH_GEOM_INLINE_H */

6
source/blender/blenlib/intern/math_vector_inline.c
View File

@ -27,8 +27,8 @@
#include "BLI_math.h"
#ifndef BLI_MATH_VECTOR_INLINE
#define BLI_MATH_VECTOR_INLINE
#ifndef BLI_MATH_VECTOR_INLINE_H
#define BLI_MATH_VECTOR_INLINE_H
/********************************** Init *************************************/
@ -482,5 +482,5 @@ MINLINE float line_point_side_v2(const float *l1, const float *l2, const float *
((l2[0]-pt[0]) * (l1[1]-pt[1]));
}
#endif /* BLI_MATH_VECTOR_INLINE */
#endif /* BLI_MATH_VECTOR_INLINE_H */

2
source/blender/editors/animation/anim_markers.c
View File

@ -692,7 +692,7 @@ static int ed_marker_move_modal(bContext *C, wmOperator *op, wmEvent *evt)
if (ELEM(mm->slink->spacetype, SPACE_TIME, SPACE_SOUND))
apply_keyb_grid(evt->shift, evt->ctrl, &fac, 0.0, FPS, 0.1*FPS, 0);
else
apply_keyb_grid(evt->shift, evt->ctrl, &fac, 0.0, 1.0, 0.1, U.flag & USER_AUTOGRABGRID);
apply_keyb_grid(evt->shift, evt->ctrl, &fac, 0.0, 1.0, 0.1, 0 /*was: U.flag & USER_AUTOGRABGRID*/);
offs= (int)fac;
RNA_int_set(op->ptr, "frames", offs);

2
source/blender/editors/include/ED_render.h
View File

@ -43,8 +43,6 @@ void ED_render_id_flush_update(struct Main *bmain, struct ID *id);
/* render_preview.c */
#define _RENDERSIZE 140
/* stores rendered preview - is also used for icons */
typedef struct RenderInfo {
int pr_rectx;

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

@ -95,9 +95,9 @@ typedef struct uiLayout uiLayout;
#define UI_BLOCK_REDRAW 2
#define UI_BLOCK_RET_1 4 /* XXX 2.5 not implemented */
#define UI_BLOCK_NUMSELECT 8
#define UI_BLOCK_ENTER_OK 16
#define UI_BLOCK_NOSHADOW 32
#define UI_BLOCK_UNUSED 64
/*#define UI_BLOCK_ENTER_OK 16*/ /*UNUSED*/
/*#define UI_BLOCK_NOSHADOW 32*/ /*UNUSED*/
/*#define UI_BLOCK_UNUSED 64*/ /*UNUSED*/
#define UI_BLOCK_MOVEMOUSE_QUIT 128
#define UI_BLOCK_KEEP_OPEN 256
#define UI_BLOCK_POPUP 512
@ -114,13 +114,8 @@ typedef struct uiLayout uiLayout;
/* block->flag bits 12-15 are identical to but->flag bits */
/* panel controls */
#define UI_PNL_TRANSP 1
#define UI_PNL_SOLID 2
#define UI_PNL_CLOSE 32
#define UI_PNL_STOW 64
#define UI_PNL_TO_MOUSE 128
#define UI_PNL_UNSTOW 256
#define UI_PNL_SCALE 512
/* warning the first 6 flags are internal */
@ -172,7 +167,7 @@ typedef struct uiLayout uiLayout;
#define SHO 64
#define INT 96
#define FLO 128
#define FUN 192
/*#define FUN 192*/ /*UNUSED*/
#define BIT 256
#define BUTPOIN (128+64+32)

5
source/blender/editors/interface/interface_intern.h
View File

@ -96,7 +96,6 @@ typedef enum {
#define UI_MAX_DRAW_STR 400
#define UI_MAX_NAME_STR 128
#define UI_ARRAY 29
/* panel limits */
#define UI_PANEL_MINX 100
@ -104,7 +103,7 @@ typedef enum {
/* uiBut->flag */
#define UI_SELECT 1 /* use when the button is pressed */
#define UI_MOUSE_OVER 2
/*#define UI_MOUSE_OVER 2*/ /*UNUSED, free flag*/
#define UI_ACTIVE 4
#define UI_HAS_ICON 8
#define UI_TEXTINPUT 16
@ -120,7 +119,7 @@ typedef enum {
#define PNL_CLOSEDX 2
#define PNL_CLOSEDY 4
#define PNL_CLOSED 6
#define PNL_TABBED 8
/*#define PNL_TABBED 8*/ /*UNUSED*/
#define PNL_OVERLAP 16
/* Button text selection:

6
source/blender/editors/mesh/mesh_intern.h
View File

@ -36,9 +36,6 @@ struct bContext;
struct wmOperatorType;
struct wmOperator;
#define UVCOPY(t, s) memcpy(t, s, 2 * sizeof(float));
/* ******************** editface.c */
int edgetag_context_check(Scene *scene, EditEdge *eed);
@ -136,9 +133,6 @@ extern int EM_view3d_poll(struct bContext *C);
/* ******************* editmesh_loop.c */
#define LOOP_SELECT 1
#define LOOP_CUT 2
void MESH_OT_knife_cut(struct wmOperatorType *ot);
/* ******************* editmesh_mods.c */

2
source/blender/editors/space_sequencer/sequencer_add.c
View File

@ -78,6 +78,8 @@
#define SEQPROP_FILES (1<<2)
#define SEQPROP_NOPATHS (1<<3)
#define SELECT 1
static void sequencer_generic_props__internal(wmOperatorType *ot, int flag)
{
if(flag & SEQPROP_STARTFRAME)

6
source/blender/editors/space_view3d/view3d_intern.h
View File

@ -54,12 +54,6 @@ struct bMotionPath;
#define DRAW_CONSTCOLOR 2
#define DRAW_SCENESET 4
#define V3D_XRAY 1
#define V3D_TRANSP 2
#define V3D_XRAYTRANSP 4
#define V3D_SELECT_MOUSE 1
/* view3d_header.c */
void view3d_header_buttons(const struct bContext *C, struct ARegion *ar);
void VIEW3D_OT_layers(struct wmOperatorType *ot);

4
source/blender/editors/transform/transform.h
View File

@ -424,7 +424,7 @@ typedef struct TransInfo {
#define TD_USEQUAT (1 << 3)
#define TD_NOTCONNECTED (1 << 4)
#define TD_SINGLESIZE (1 << 5) /* used for scaling of MetaElem->rad */
#define TD_TIMEONLY (1 << 8)
/*#define TD_TIMEONLY (1 << 8) */ /*UNUSED*/
#define TD_NOCENTER (1 << 9)
#define TD_NO_EXT (1 << 10) /* ext abused for particle key timing */
#define TD_SKIP (1 << 11) /* don't transform this data */
@ -660,8 +660,6 @@ TransDataCurveHandleFlags *initTransDataCurveHandes(TransData *td, struct BezTri
/* DRAWLINE options flags */
#define DRAWLIGHT 1
#define DRAWDASHED 2
#define DRAWBOLD 4
void applyTransObjects(TransInfo *t);
void restoreTransObjects(TransInfo *t);

3
source/blender/editors/uvedit/uvedit_intern.h
View File

@ -37,9 +37,6 @@ struct Image;
struct Object;
struct wmOperatorType;
#define UV_SELECT_ALL 1
#define UV_SELECT_PINNED 2
/* id can be from 0 to 3 */
#define TF_PIN_MASK(id) (TF_PIN1 << id)
#define TF_SEL_MASK(id) (TF_SEL1 << id)

15
source/blender/imbuf/intern/IMB_anim.h
View File

@ -110,19 +110,14 @@
#define LITTLE_LONG ENDIAN_NOP
#endif
/****/
#define ANIM_NONE (0)
#define ANIM_SEQUENCE (1 << 0)
#define ANIM_DIR (1 << 1)
#define ANIM_DEPRECATED (1 << 2)
#define ANIM_TGA (1 << 3)
/* anim.curtype, runtime only */
#define ANIM_NONE 0
#define ANIM_SEQUENCE (1 << 0)
#define ANIM_MOVIE (1 << 4)
#define ANIM_MDEC (1 << 5)
#define ANIM_AVI (1 << 6)
#define ANIM_QTIME (1 << 7)
#define ANIM_FFMPEG (1 << 8)
#define ANIM_REDCODE (1 << 9)
#define ANIM_FFMPEG (1 << 8)
#define ANIM_REDCODE (1 << 9)
#define MAXNUMSTREAMS 50

3
source/blender/imbuf/intern/openexr/openexr_api.h
View File

@ -33,9 +33,6 @@
#ifdef __cplusplus
extern "C" {
#endif
#define OPENEXR_FLOATRGB 0x1
#define OPENEXR_ZBUF 0x2
#include <stdio.h>

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

@ -78,7 +78,7 @@ typedef struct Camera {
#define CAM_PANORAMA 128
/* yafray: dof sampling switch */
#define CAM_YF_NO_QMC 512
/* #define CAM_YF_NO_QMC 512 */ /* depreceated */
#ifdef __cplusplus

7
source/blender/makesdna/DNA_object_types.h
View File

@ -321,8 +321,7 @@ extern Object workob;
/* (short) transflag */
#define OB_OFFS_LOCAL 1
// XXX OB_QUAT was never used, but is now depreceated in favour of standard rotation handling...
#define OB_QUAT 2
/* #define OB_QUAT 2 */ /* never used, free flag */
#define OB_NEG_SCALE 4
#define OB_DUPLI (8+16+256+512+2048)
#define OB_DUPLIFRAMES 8
@ -401,7 +400,7 @@ extern Object workob;
#define OB_BOUND_CONE 3
#define OB_BOUND_POLYH 4
#define OB_BOUND_POLYT 5
#define OB_BOUND_DYN_MESH 6
/* #define OB_BOUND_DYN_MESH 6 */ /*UNUSED*/
#define OB_BOUND_CAPSULE 7
@ -476,7 +475,7 @@ extern Object workob;
#define OB_LOCK_RIGID_BODY_Y_ROT_AXIS 64
#define OB_LOCK_RIGID_BODY_Z_ROT_AXIS 128
#define OB_LIFE (OB_PROP|OB_DYNAMIC|OB_ACTOR|OB_MAINACTOR|OB_CHILD)
/* #define OB_LIFE (OB_PROP|OB_DYNAMIC|OB_ACTOR|OB_MAINACTOR|OB_CHILD) */
/* ob->body_type */
#define OB_BODY_TYPE_NO_COLLISION 0

23
source/blender/makesdna/DNA_scene_types.h
View File

@ -832,12 +832,6 @@ typedef struct Scene {
/* **************** RENDERDATA ********************* */
/* bufflag */
#define R_BACKBUF 1
#define R_BACKBUFANIM 2
#define R_FRONTBUF 4
#define R_FRONTBUFANIM 8
/* flag */
/* use preview range */
#define SCER_PRV_RANGE (1<<0)
@ -855,7 +849,7 @@ typedef struct Scene {
#define R_BORDER 0x0200
#define R_PANORAMA 0x0400 /* deprecated as scene option, still used in renderer */
#define R_CROP 0x0800
#define R_COSMO 0x1000
/*#define R_COSMO 0x1000 deprecated */
#define R_ODDFIELD 0x2000
#define R_MBLUR 0x4000
/* unified was here */
@ -863,7 +857,7 @@ typedef struct Scene {
/* R_GAUSS is obsolete, but used to retrieve setting from old files */
#define R_GAUSS 0x20000
/* fbuf obsolete... */
#define R_FBUF 0x40000
/*#define R_FBUF 0x40000*/
/* threads obsolete... is there for old files, now use for autodetect threads */
#define R_THREADS 0x80000
/* Use the same flag for autothreads */
@ -884,7 +878,7 @@ typedef struct Scene {
#define R_OUTPUT_SCREEN 0
#define R_OUTPUT_AREA 1
#define R_OUTPUT_WINDOW 2
#define R_OUTPUT_FORKED 3
/*#define R_OUTPUT_FORKED 3*/
/* filtertype */
#define R_FILTER_BOX 0
@ -928,10 +922,10 @@ typedef struct Scene {
#define R_COMP_FREE 0x0800
#define R_NO_IMAGE_LOAD 0x1000
#define R_NO_TEX 0x2000
#define R_STAMP_INFO 0x4000 /* deprecated */
/*#define R_STAMP_INFO 0x4000 deprecated */
#define R_FULL_SAMPLE 0x8000
#define R_DEPRECATED 0x10000
#define R_RECURS_PROTECTION 0x20000
/* #define R_DEPRECATED 0x10000 */
/* #define R_RECURS_PROTECTION 0x20000 */
#define R_TEXNODE_PREVIEW 0x40000
/* r->stamp */
@ -968,7 +962,7 @@ typedef struct Scene {
/* #define R_HAMX 2 */ /* hamx is nomore */
/* #define R_FTYPE 3 */ /* ftype is nomore */
#define R_JPEG90 4
#define R_MOVIE 5
/*#define R_MOVIE 5*/ /* movie is nomore */
#define R_IRIZ 7
#define R_RAWTGA 14
#define R_AVIRAW 15
@ -1054,7 +1048,6 @@ typedef struct Scene {
#define ID_NEW_US2(a) if( ((ID *)a)->newid) {(a)= ((ID *)a)->newid; ((ID *)a)->us++;}
#define CFRA (scene->r.cfra)
#define SUBFRA (scene->r.subframe)
#define F_CFRA ((float)(scene->r.cfra))
#define SFRA (scene->r.sfra)
#define EFRA (scene->r.efra)
#define PRVRANGEON (scene->r.flag & SCER_PRV_RANGE)
@ -1206,7 +1199,7 @@ typedef enum SculptFlags {
#define PE_DEFLECT_EMITTER 4
#define PE_INTERPOLATE_ADDED 8
#define PE_DRAW_PART 16
#define PE_X_MIRROR 64 /* deprecated */
/* #define PE_X_MIRROR 64 */ /* deprecated */
#define PE_FADE_TIME 128
#define PE_AUTO_VELOCITY 256

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

@ -196,12 +196,12 @@ typedef struct ARegion {
/* Panel->snap - for snapping to screen edges */
#define PNL_SNAP_NONE 0
#define PNL_SNAP_TOP 1
#define PNL_SNAP_RIGHT 2
/* #define PNL_SNAP_TOP 1 */
/* #define PNL_SNAP_RIGHT 2 */
#define PNL_SNAP_BOTTOM 4
#define PNL_SNAP_LEFT 8
/* #define PNL_SNAP_LEFT 8 */
#define PNL_SNAP_DIST 9.0
/* #define PNL_SNAP_DIST 9.0 */
/* paneltype flag */
#define PNL_DEFAULT_CLOSED 1

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

@ -232,6 +232,8 @@ typedef struct SpeedControlVars {
int lastValidFrame;
} SpeedControlVars;
#define SELECT 1
/* Editor->over_flag */
#define SEQ_EDIT_OVERLAY_SHOW 1
#define SEQ_EDIT_OVERLAY_ABS 2

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

@ -340,9 +340,6 @@ typedef struct Script {
char scriptarg[256];
} Script;
#define SCRIPT_SET_NULL(_script) _script->py_draw = _script->py_event = _script->py_button = _script->py_browsercallback = _script->py_globaldict = NULL; _script->flags = 0;
#define SCRIPT_RUNNING 0x01
#define SCRIPT_GUI 0x02
#define SCRIPT_FILESEL 0x04
typedef struct SpaceScript {
SpaceLink *next, *prev;

26
source/blender/makesdna/DNA_userdef_types.h
View File

@ -49,7 +49,7 @@ struct ColorBand;
/* default uifont_id offered by Blender */
#define UIFONT_DEFAULT 0
#define UIFONT_BITMAP 1
/*#define UIFONT_BITMAP 1*/ /*UNUSED*/
/* free slots */
#define UIFONT_CUSTOM1 2
#define UIFONT_CUSTOM2 3
@ -405,16 +405,16 @@ extern UserDef U; /* from blenkernel blender.c */
/* flag */
#define USER_AUTOSAVE (1 << 0)
#define USER_AUTOGRABGRID (1 << 1) /* deprecated */
#define USER_AUTOROTGRID (1 << 2) /* deprecated */
#define USER_AUTOSIZEGRID (1 << 3) /* deprecated */
/*#define USER_AUTOGRABGRID (1 << 1) deprecated */
/*#define USER_AUTOROTGRID (1 << 2) deprecated */
/*#define USER_AUTOSIZEGRID (1 << 3) deprecated */
#define USER_SCENEGLOBAL (1 << 4)
#define USER_TRACKBALL (1 << 5)
#define USER_DUPLILINK (1 << 6)
#define USER_FSCOLLUM (1 << 7)
/*#define USER_DUPLILINK (1 << 6) deprecated */
/*#define USER_FSCOLLUM (1 << 7) deprecated */
#define USER_MAT_ON_OB (1 << 8)
/*#define USER_NO_CAPSLOCK (1 << 9)*/ /* not used anywhere */
#define USER_VIEWMOVE (1 << 10)
/*#define USER_VIEWMOVE (1 << 10)*/ /* not used anywhere */
#define USER_TOOLTIPS (1 << 11)
#define USER_TWOBUTTONMOUSE (1 << 12)
#define USER_NONUMPAD (1 << 13)
@ -452,10 +452,10 @@ extern UserDef U; /* from blenkernel blender.c */
#define USER_DRAWVIEWINFO (1 << 4)
#define USER_PLAINMENUS (1 << 5) // old EVTTOCONSOLE print ghost events, here for tuhopuu compat. --phase
// old flag for hide pulldown was here
#define USER_FLIPFULLSCREEN (1 << 7)
/*#define USER_FLIPFULLSCREEN (1 << 7)*/ /* deprecated */
#define USER_ALLWINCODECS (1 << 8)
#define USER_MENUOPENAUTO (1 << 9)
#define USER_PANELPINNED (1 << 10) /* deprecated */
/*#define USER_PANELPINNED (1 << 10) deprecated */
#define USER_AUTOPERSP (1 << 11)
#define USER_LOCKAROUND (1 << 12)
#define USER_GLOBALUNDO (1 << 13)
@ -501,11 +501,11 @@ extern UserDef U; /* from blenkernel blender.c */
#define USER_TR_TOOLTIPS (1 << 0)
#define USER_TR_BUTTONS (1 << 1)
#define USER_TR_MENUS (1 << 2)
#define USER_TR_FILESELECT (1 << 3)
#define USER_TR_TEXTEDIT (1 << 4)
/*#define USER_TR_FILESELECT (1 << 3) deprecated*/
/*#define USER_TR_TEXTEDIT (1 << 4) deprecated*/
#define USER_DOTRANSLATE (1 << 5)
#define USER_USETEXTUREFONT (1 << 6)
#define CONVERT_TO_UTF8 (1 << 7)
/*#define CONVERT_TO_UTF8 (1 << 7) deprecated*/
/* dupflag */
#define USER_DUP_MESH (1 << 0)
@ -522,7 +522,7 @@ extern UserDef U; /* from blenkernel blender.c */
#define USER_DUP_PSYS (1 << 11)
/* gameflags */
#define USER_DEPRECATED_FLAG 1
// #define USER_DEPRECATED_FLAG 1
// #define USER_DISABLE_SOUND 2 deprecated, don't use without checking for
// backwards compatibilty in do_versions!
#define USER_DISABLE_MIPMAP 4

11
source/blender/makesdna/DNA_view3d_types.h
View File

@ -208,16 +208,7 @@ typedef struct View3D {
#define V3D_DISPBGPICS 2
#define V3D_HIDE_HELPLINES 4
#define V3D_INVALID_BACKBUF 8
/* deprecated */
/*
#define V3D_MODE (16+32+64+128+256+512)
#define V3D_EDITMODE 16
#define V3D_VERTEXPAINT 32
#define V3D_FACESELECT 64
#define V3D_POSEMODE 128
#define V3D_TEXTUREPAINT 256
#define V3D_WEIGHTPAINT 512
*/
#define V3D_ALIGN 1024
#define V3D_SELECT_OUTLINE 2048
#define V3D_ZBUF_SELECT 4096

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

@ -140,7 +140,7 @@ typedef struct World {
/* mode */
#define WO_MIST 1
#define WO_STARS 2
#define WO_DOF 4
/*#define WO_DOF 4*/
#define WO_ACTIVITY_CULLING 8
#define WO_ENV_LIGHT 16
#define WO_DBVT_CULLING 32

7
source/blender/makesrna/RNA_access.h
View File

@ -22,8 +22,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef RNA_ACCESS
#define RNA_ACCESS
#ifndef RNA_ACCESS_H
#define RNA_ACCESS_H
#include <stdarg.h>
@ -951,5 +951,4 @@ StructRNA *ID_code_to_RNA_type(short idcode);
}
#endif
#endif /* RNA_ACCESS */
#endif /* RNA_ACCESS_H */

9
source/blender/makesrna/RNA_enum_types.h
View File

@ -22,8 +22,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef RNA_ENUM_TYPES
#define RNA_ENUM_TYPES
#ifndef RNA_ENUM_TYPES_H
#define RNA_ENUM_TYPES_H
#include "RNA_types.h"
@ -113,7 +113,4 @@ EnumPropertyItem *RNA_image_local_itemf(struct bContext *C, struct PointerRNA *p
EnumPropertyItem *RNA_scene_itemf(struct bContext *C, struct PointerRNA *ptr, int *free);
EnumPropertyItem *RNA_scene_local_itemf(struct bContext *C, struct PointerRNA *ptr, int *free);
#endif /* RNA_ENUM_TYPES */
#endif /* RNA_ENUM_TYPES_H */

8
source/blender/makesrna/RNA_types.h
View File

@ -24,8 +24,8 @@
#include "BLO_sys_types.h"
#ifndef RNA_TYPES
#define RNA_TYPES
#ifndef RNA_TYPES_H
#define RNA_TYPES_H
#ifdef __cplusplus
extern "C" {
@ -374,6 +374,4 @@ typedef struct ExtensionRNA {
}
#endif
#endif /* RNA_TYPES */
#endif /* RNA_TYPES_H */

7
source/blender/makesrna/intern/rna_internal_types.h
View File

@ -22,8 +22,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef RNA_INTERNAL_TYPES
#define RNA_INTERNAL_TYPES
#ifndef RNA_INTERNAL_TYPES_H
#define RNA_INTERNAL_TYPES_H
#include "DNA_listBase.h"
@ -340,5 +340,4 @@ struct BlenderRNA {
ListBase structs;
};
#endif /* RNA_INTERNAL_TYPES */
#endif /* RNA_INTERNAL_TYPES_H */

5
source/blender/makesrna/intern/rna_scene.c
View File

@ -2687,11 +2687,6 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
RNA_def_property_boolean_funcs(prop, "rna_RenderSettings_full_sample_get", NULL);
RNA_def_property_ui_text(prop, "Full Sample","Save for every anti-aliasing sample the entire RenderLayer results. This solves anti-aliasing issues with compositing");
RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
prop= RNA_def_property(srna, "use_backbuf", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "bufflag", R_BACKBUF);
RNA_def_property_ui_text(prop, "Back Buffer", "Render backbuffer image");
RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
prop= RNA_def_property(srna, "display_mode", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_bitflag_sdna(prop, NULL, "displaymode");

6
source/blender/python/generic/bgl.h
View File

@ -33,8 +33,8 @@
* writers to make OpenGL calls in their Python scripts for Blender. The
* more important original comments are marked with an @ symbol. */
#ifndef EXPP_BGL_H
#define EXPP_BGL_H
#ifndef BGL_H
#define BGL_H
#include <Python.h>
@ -337,4 +337,4 @@ extern PyTypeObject BGL_bufferType;
return NULL;\
}
#endif /* EXPP_BGL_H */
#endif /* BGL_H */

9
source/blender/python/generic/mathutils.h
View File

@ -28,8 +28,8 @@
*/
//Include this file for access to vector, quat, matrix, euler, etc...
#ifndef EXPP_Mathutils_H
#define EXPP_Mathutils_H
#ifndef MATHUTILS_H
#define MATHUTILS_H
#include <Python.h>
@ -66,9 +66,6 @@ PyMODINIT_FUNC BPyInit_mathutils(void);
int EXPP_FloatsAreEqual(float A, float B, int floatSteps);
int EXPP_VectorsAreEqual(float *vecA, float *vecB, int size, int floatSteps);
#define Py_PI 3.14159265358979323846
#define Py_NEW 1
#define Py_WRAP 2
@ -104,4 +101,4 @@ int _BaseMathObject_WriteIndexCallback(BaseMathObject *self, int index);
/* utility func */
int mathutils_array_parse(float *array, int array_min, int array_max, PyObject *value, const char *error_prefix);
#endif /* EXPP_Mathutils_H */
#endif /* MATHUTILS_H */

6
source/blender/python/generic/mathutils_color.h
View File

@ -28,8 +28,8 @@
*
*/
#ifndef EXPP_color_h
#define EXPP_color_h
#ifndef MATHUTILS_COLOR_H
#define MATHUTILS_COLOR_H
#include <Python.h>
@ -49,4 +49,4 @@ blender (stored in blend_data). This is an either/or struct not both*/
PyObject *newColorObject( float *col, int type, PyTypeObject *base_type);
PyObject *newColorObject_cb(PyObject *cb_user, int cb_type, int cb_subtype);
#endif /* EXPP_color_h */
#endif /* MATHUTILS_COLOR_H */

6
source/blender/python/generic/mathutils_euler.h
View File

@ -28,8 +28,8 @@
*
*/
#ifndef EXPP_euler_h
#define EXPP_euler_h
#ifndef MATHUTILS_EULER_H
#define MATHUTILS_EULER_H
#include <Python.h>
@ -54,4 +54,4 @@ PyObject *newEulerObject_cb(PyObject *cb_user, short order, int cb_type, int cb_
short euler_order_from_string(const char *str, const char *error_prefix);
#endif /* EXPP_euler_h */
#endif /* MATHUTILS_EULER_H */

6
source/blender/python/generic/mathutils_geometry.h
View File

@ -28,12 +28,12 @@
*/
/*Include this file for access to vector, quat, matrix, euler, etc...*/
#ifndef EXPP_Geometry_H
#define EXPP_Geometry_H
#ifndef MATHUTILS_GEOMETRY_H
#define MATHUTILS_GEOMETRY_H
#include <Python.h>
#include "mathutils.h"
PyMODINIT_FUNC BPyInit_mathutils_geometry(void);
#endif /* EXPP_Geometry_H */
#endif /* MATHUTILS_GEOMETRY_H */

6
source/blender/python/generic/mathutils_matrix.h
View File

@ -27,8 +27,8 @@
*
*/
#ifndef EXPP_matrix_h
#define EXPP_matrix_h
#ifndef MATHUTILS_MATRIX_H
#define MATHUTILS_MATRIX_H
#include <Python.h>
@ -55,4 +55,4 @@ PyObject *newMatrixObject_cb(PyObject *user, int rowSize, int colSize, int cb_ty
extern int mathutils_matrix_vector_cb_index;
extern struct Mathutils_Callback mathutils_matrix_vector_cb;
#endif /* EXPP_matrix_H */
#endif /* MATHUTILS_MATRIX_H */

6
source/blender/python/generic/mathutils_quat.h
View File

@ -28,8 +28,8 @@
*
*/
#ifndef EXPP_quat_h
#define EXPP_quat_h
#ifndef MATHUTILS_QUAT_H
#define MATHUTILS_QUAT_H
#include <Python.h>
@ -49,4 +49,4 @@ blender (stored in blend_data). This is an either/or struct not both*/
PyObject *newQuaternionObject( float *quat, int type, PyTypeObject *base_type);
PyObject *newQuaternionObject_cb(PyObject *cb_user, int cb_type, int cb_subtype);
#endif /* EXPP_quat_h */
#endif /* MATHUTILS_QUAT_H */

6
source/blender/python/generic/mathutils_vector.h
View File

@ -28,8 +28,8 @@
*
*/
#ifndef EXPP_vector_h
#define EXPP_vector_h
#ifndef MATHUTILS_VECTOR_H
#define MATHUTILS_VECTOR_H
#include <Python.h>
@ -46,4 +46,4 @@ typedef struct {
PyObject *newVectorObject(float *vec, int size, int type, PyTypeObject *base_type);
PyObject *newVectorObject_cb(PyObject *user, int size, int callback_type, int subtype);
#endif /* EXPP_vector_h */
#endif /* MATHUTILS_VECTOR_H */