Cleanup: macro hygiene, parenthesize arguments
This commit is contained in:
parent
93806ba82b
commit
9fe0505db0
|
@ -68,21 +68,21 @@ struct bGPdata;
|
|||
|
||||
/* Vertex Color macros. */
|
||||
#define GPENCIL_USE_VERTEX_COLOR(toolsettings) \
|
||||
((toolsettings->gp_paint->mode == GPPAINT_FLAG_USE_VERTEXCOLOR))
|
||||
(((toolsettings)->gp_paint->mode == GPPAINT_FLAG_USE_VERTEXCOLOR))
|
||||
#define GPENCIL_USE_VERTEX_COLOR_STROKE(toolsettings, brush) \
|
||||
((GPENCIL_USE_VERTEX_COLOR(toolsettings) && \
|
||||
((brush->gpencil_settings->vertex_mode == GPPAINT_MODE_STROKE) || \
|
||||
(brush->gpencil_settings->vertex_mode == GPPAINT_MODE_BOTH))))
|
||||
(((brush)->gpencil_settings->vertex_mode == GPPAINT_MODE_STROKE) || \
|
||||
((brush)->gpencil_settings->vertex_mode == GPPAINT_MODE_BOTH))))
|
||||
#define GPENCIL_USE_VERTEX_COLOR_FILL(toolsettings, brush) \
|
||||
((GPENCIL_USE_VERTEX_COLOR(toolsettings) && \
|
||||
((brush->gpencil_settings->vertex_mode == GPPAINT_MODE_FILL) || \
|
||||
(brush->gpencil_settings->vertex_mode == GPPAINT_MODE_BOTH))))
|
||||
(((brush)->gpencil_settings->vertex_mode == GPPAINT_MODE_FILL) || \
|
||||
((brush)->gpencil_settings->vertex_mode == GPPAINT_MODE_BOTH))))
|
||||
#define GPENCIL_TINT_VERTEX_COLOR_STROKE(brush) \
|
||||
((brush->gpencil_settings->vertex_mode == GPPAINT_MODE_STROKE) || \
|
||||
(brush->gpencil_settings->vertex_mode == GPPAINT_MODE_BOTH))
|
||||
(((brush)->gpencil_settings->vertex_mode == GPPAINT_MODE_STROKE) || \
|
||||
((brush)->gpencil_settings->vertex_mode == GPPAINT_MODE_BOTH))
|
||||
#define GPENCIL_TINT_VERTEX_COLOR_FILL(brush) \
|
||||
((brush->gpencil_settings->vertex_mode == GPPAINT_MODE_FILL) || \
|
||||
(brush->gpencil_settings->vertex_mode == GPPAINT_MODE_BOTH))
|
||||
(((brush)->gpencil_settings->vertex_mode == GPPAINT_MODE_FILL) || \
|
||||
((brush)->gpencil_settings->vertex_mode == GPPAINT_MODE_BOTH))
|
||||
|
||||
/* ------------ Grease-Pencil API ------------------ */
|
||||
|
||||
|
|
|
@ -225,11 +225,11 @@ int set_listbasepointers(struct Main *main, struct ListBase *lb[MAX_LIBARRAY]);
|
|||
|
||||
#define MAIN_VERSION_ATLEAST(main, ver, subver) \
|
||||
((main)->versionfile > (ver) || \
|
||||
(main->versionfile == (ver) && (main)->subversionfile >= (subver)))
|
||||
((main)->versionfile == (ver) && (main)->subversionfile >= (subver)))
|
||||
|
||||
#define MAIN_VERSION_OLDER(main, ver, subver) \
|
||||
((main)->versionfile < (ver) || \
|
||||
(main->versionfile == (ver) && (main)->subversionfile < (subver)))
|
||||
((main)->versionfile == (ver) && (main)->subversionfile < (subver)))
|
||||
|
||||
#define BLEN_THUMB_SIZE 128
|
||||
|
||||
|
|
|
@ -238,10 +238,10 @@ void BKE_mask_clipboard_paste_to_layer(struct Main *bmain, struct MaskLayer *mas
|
|||
#define MASKPOINT_ISSEL_KNOT(p) (((p)->bezt.f2 & SELECT) != 0)
|
||||
|
||||
#define MASKPOINT_ISSEL_HANDLE(point, which_handle) \
|
||||
(((which_handle == MASK_WHICH_HANDLE_STICK) ? \
|
||||
((((which_handle) == MASK_WHICH_HANDLE_STICK) ? \
|
||||
((((point)->bezt.f1 | (point)->bezt.f3) & SELECT)) : \
|
||||
((which_handle == MASK_WHICH_HANDLE_LEFT) ? ((point)->bezt.f1 & SELECT) : \
|
||||
((point)->bezt.f3 & SELECT))) != 0)
|
||||
(((which_handle) == MASK_WHICH_HANDLE_LEFT) ? ((point)->bezt.f1 & SELECT) : \
|
||||
((point)->bezt.f3 & SELECT))) != 0)
|
||||
|
||||
#define MASKPOINT_SEL_ALL(p) \
|
||||
{ \
|
||||
|
|
|
@ -121,16 +121,16 @@ void BKE_rigidbody_remove_constraint(struct Main *bmain,
|
|||
|
||||
/* get mass of Rigid Body Object to supply to RigidBody simulators */
|
||||
#define RBO_GET_MASS(rbo) \
|
||||
((rbo && ((rbo->type == RBO_TYPE_PASSIVE) || (rbo->flag & RBO_FLAG_KINEMATIC) || \
|
||||
(rbo->flag & RBO_FLAG_DISABLED))) ? \
|
||||
(((rbo) && (((rbo)->type == RBO_TYPE_PASSIVE) || ((rbo)->flag & RBO_FLAG_KINEMATIC) || \
|
||||
((rbo)->flag & RBO_FLAG_DISABLED))) ? \
|
||||
(0.0f) : \
|
||||
(rbo->mass))
|
||||
((rbo)->mass))
|
||||
/* Get collision margin for Rigid Body Object, triangle mesh and cone shapes cannot embed margin,
|
||||
* convex hull always uses custom margin. */
|
||||
#define RBO_GET_MARGIN(rbo) \
|
||||
((rbo->flag & RBO_FLAG_USE_MARGIN || rbo->shape == RB_SHAPE_CONVEXH || \
|
||||
rbo->shape == RB_SHAPE_TRIMESH || rbo->shape == RB_SHAPE_CONE) ? \
|
||||
(rbo->margin) : \
|
||||
(((rbo)->flag & RBO_FLAG_USE_MARGIN || (rbo)->shape == RB_SHAPE_CONVEXH || \
|
||||
(rbo)->shape == RB_SHAPE_TRIMESH || (rbo)->shape == RB_SHAPE_CONE) ? \
|
||||
((rbo)->margin) : \
|
||||
(0.04f))
|
||||
|
||||
/* -------------- */
|
||||
|
|
|
@ -35,9 +35,9 @@ struct Object;
|
|||
struct ShaderFxData;
|
||||
|
||||
#define SHADER_FX_ACTIVE(_fx, _is_render) \
|
||||
(((_fx->mode & eShaderFxMode_Realtime) && (_is_render == false)) || \
|
||||
((_fx->mode & eShaderFxMode_Render) && (_is_render == true)))
|
||||
#define SHADER_FX_EDIT(_fx, _is_edit) (((_fx->mode & eShaderFxMode_Editmode) == 0) && (_is_edit))
|
||||
((((_fx)->mode & eShaderFxMode_Realtime) && (_is_render == false)) || \
|
||||
(((_fx)->mode & eShaderFxMode_Render) && (_is_render == true)))
|
||||
#define SHADER_FX_EDIT(_fx, _is_edit) ((((_fx)->mode & eShaderFxMode_Editmode) == 0) && (_is_edit))
|
||||
|
||||
typedef enum {
|
||||
/* Should not be used, only for None type */
|
||||
|
|
|
@ -462,7 +462,7 @@ void BKE_tracking_get_rna_path_prefix_for_plane_track(
|
|||
|
||||
#define MARKER_VISIBLE(sc, track, marker) \
|
||||
(((marker)->flag & MARKER_DISABLED) == 0 || ((sc)->flag & SC_HIDE_DISABLED) == 0 || \
|
||||
(sc->clip->tracking.act_track == track))
|
||||
((sc)->clip->tracking.act_track == track))
|
||||
|
||||
#define TRACK_CLEAR_UPTO 0
|
||||
#define TRACK_CLEAR_REMAINED 1
|
||||
|
|
|
@ -61,7 +61,7 @@
|
|||
#define BLI_LINKS_FREE(list) \
|
||||
{ \
|
||||
while (list) { \
|
||||
void *next = list->next; \
|
||||
void *next = (list)->next; \
|
||||
MEM_freeN(list); \
|
||||
list = next; \
|
||||
} \
|
||||
|
|
|
@ -78,7 +78,7 @@ bool BM_edgeloop_overlap_check(struct BMEdgeLoopStore *el_store_a,
|
|||
|
||||
#define BM_EDGELINK_NEXT(el_store, elink) \
|
||||
(elink)->next ? \
|
||||
elink->next : \
|
||||
(elink)->next : \
|
||||
(BM_edgeloop_is_closed(el_store) ? BM_edgeloop_verts_get(el_store)->first : NULL)
|
||||
|
||||
#define BM_EDGELOOP_NEXT(el_store) \
|
||||
|
|
|
@ -337,17 +337,17 @@ typedef enum eAnimFilter_Flags {
|
|||
/* 'Object' channels */
|
||||
#define SEL_OBJC(base) (CHECK_TYPE_INLINE(base, Base *), ((base->flag & SELECT)))
|
||||
#define EXPANDED_OBJC(ob) \
|
||||
(CHECK_TYPE_INLINE(ob, Object *), ((ob->nlaflag & OB_ADS_COLLAPSED) == 0))
|
||||
(CHECK_TYPE_INLINE(ob, Object *), (((ob)->nlaflag & OB_ADS_COLLAPSED) == 0))
|
||||
/* 'Sub-object' channels (flags stored in Data block) */
|
||||
#define FILTER_SKE_OBJD(key) (CHECK_TYPE_INLINE(key, Key *), ((key->flag & KEY_DS_EXPAND)))
|
||||
#define FILTER_MAT_OBJD(ma) (CHECK_TYPE_INLINE(ma, Material *), ((ma->flag & MA_DS_EXPAND)))
|
||||
#define FILTER_LAM_OBJD(la) (CHECK_TYPE_INLINE(la, Light *), ((la->flag & LA_DS_EXPAND)))
|
||||
#define FILTER_CAM_OBJD(ca) (CHECK_TYPE_INLINE(ca, Camera *), ((ca->flag & CAM_DS_EXPAND)))
|
||||
#define FILTER_CACHEFILE_OBJD(cf) \
|
||||
(CHECK_TYPE_INLINE(cf, CacheFile *), ((cf->flag & CACHEFILE_DS_EXPAND)))
|
||||
(CHECK_TYPE_INLINE(cf, CacheFile *), (((cf)->flag & CACHEFILE_DS_EXPAND)))
|
||||
#define FILTER_CUR_OBJD(cu) (CHECK_TYPE_INLINE(cu, Curve *), ((cu->flag & CU_DS_EXPAND)))
|
||||
#define FILTER_PART_OBJD(part) \
|
||||
(CHECK_TYPE_INLINE(part, ParticleSettings *), ((part->flag & PART_DS_EXPAND)))
|
||||
(CHECK_TYPE_INLINE(part, ParticleSettings *), (((part)->flag & PART_DS_EXPAND)))
|
||||
#define FILTER_MBALL_OBJD(mb) (CHECK_TYPE_INLINE(mb, MetaBall *), ((mb->flag2 & MB_DS_EXPAND)))
|
||||
#define FILTER_ARM_OBJD(arm) (CHECK_TYPE_INLINE(arm, bArmature *), ((arm->flag & ARM_DS_EXPAND)))
|
||||
#define FILTER_MESH_OBJD(me) (CHECK_TYPE_INLINE(me, Mesh *), ((me->flag & ME_DS_EXPAND)))
|
||||
|
@ -358,7 +358,7 @@ typedef enum eAnimFilter_Flags {
|
|||
#define FILTER_VOLUME_OBJD(vo) (CHECK_TYPE_INLINE(vo, Volume *), ((vo->flag & VO_DS_EXPAND)))
|
||||
/* Variable use expanders */
|
||||
#define FILTER_NTREE_DATA(ntree) \
|
||||
(CHECK_TYPE_INLINE(ntree, bNodeTree *), ((ntree->flag & NTREE_DS_EXPAND)))
|
||||
(CHECK_TYPE_INLINE(ntree, bNodeTree *), (((ntree)->flag & NTREE_DS_EXPAND)))
|
||||
#define FILTER_TEX_DATA(tex) (CHECK_TYPE_INLINE(tex, Tex *), ((tex->flag & TEX_DS_EXPAND)))
|
||||
|
||||
/* 'Sub-object/Action' channels (flags stored in Action) */
|
||||
|
@ -369,11 +369,11 @@ typedef enum eAnimFilter_Flags {
|
|||
|
||||
/* Actions (also used for Dopesheet) */
|
||||
/* Action Channel Group */
|
||||
#define EDITABLE_AGRP(agrp) ((agrp->flag & AGRP_PROTECTED) == 0)
|
||||
#define EDITABLE_AGRP(agrp) (((agrp)->flag & AGRP_PROTECTED) == 0)
|
||||
#define EXPANDED_AGRP(ac, agrp) \
|
||||
(((!(ac) || ((ac)->spacetype != SPACE_GRAPH)) && (agrp->flag & AGRP_EXPANDED)) || \
|
||||
(((ac) && ((ac)->spacetype == SPACE_GRAPH)) && (agrp->flag & AGRP_EXPANDED_G)))
|
||||
#define SEL_AGRP(agrp) ((agrp->flag & AGRP_SELECTED) || (agrp->flag & AGRP_ACTIVE))
|
||||
(((!(ac) || ((ac)->spacetype != SPACE_GRAPH)) && ((agrp)->flag & AGRP_EXPANDED)) || \
|
||||
(((ac) && ((ac)->spacetype == SPACE_GRAPH)) && ((agrp)->flag & AGRP_EXPANDED_G)))
|
||||
#define SEL_AGRP(agrp) (((agrp)->flag & AGRP_SELECTED) || ((agrp)->flag & AGRP_ACTIVE))
|
||||
/* F-Curve Channels */
|
||||
#define EDITABLE_FCU(fcu) ((fcu->flag & FCURVE_PROTECTED) == 0)
|
||||
#define SEL_FCU(fcu) (fcu->flag & FCURVE_SELECTED)
|
||||
|
@ -433,7 +433,8 @@ typedef enum eAnimFilter_Flags {
|
|||
#define NLACHANNEL_FIRST_TOP(ac) \
|
||||
(UI_view2d_scale_get_y(&(ac)->region->v2d) * -UI_TIME_SCRUB_MARGIN_Y - NLACHANNEL_SKIP)
|
||||
#define NLACHANNEL_HEIGHT(snla) \
|
||||
((snla && (snla->flag & SNLA_NOSTRIPCURVES)) ? (0.8f * U.widget_unit) : (1.2f * U.widget_unit))
|
||||
(((snla) && ((snla)->flag & SNLA_NOSTRIPCURVES)) ? (0.8f * U.widget_unit) : \
|
||||
(1.2f * U.widget_unit))
|
||||
#define NLACHANNEL_SKIP (0.1f * U.widget_unit)
|
||||
#define NLACHANNEL_STEP(snla) (NLACHANNEL_HEIGHT(snla) + NLACHANNEL_SKIP)
|
||||
/* Additional offset to give some room at the end. */
|
||||
|
|
|
@ -134,7 +134,7 @@ typedef struct EditBone {
|
|||
(((arm)->layer & (ebone)->layer) && !((ebone)->flag & BONE_HIDDEN_A)))
|
||||
|
||||
#define EBONE_SELECTABLE(arm, ebone) \
|
||||
(EBONE_VISIBLE(arm, ebone) && !(ebone->flag & BONE_UNSELECTABLE))
|
||||
(EBONE_VISIBLE(arm, ebone) && !((ebone)->flag & BONE_UNSELECTABLE))
|
||||
|
||||
#define EBONE_EDITABLE(ebone) \
|
||||
(CHECK_TYPE_INLINE(ebone, EditBone *), \
|
||||
|
|
|
@ -430,14 +430,14 @@ void ANIM_copy_as_driver(struct ID *target_id, const char *target_path, const ch
|
|||
/* Auto-Keying macros for use by various tools */
|
||||
/* check if auto-keyframing is enabled (per scene takes precedence) */
|
||||
#define IS_AUTOKEY_ON(scene) \
|
||||
((scene) ? (scene->toolsettings->autokey_mode & AUTOKEY_ON) : (U.autokey_mode & AUTOKEY_ON))
|
||||
((scene) ? ((scene)->toolsettings->autokey_mode & AUTOKEY_ON) : (U.autokey_mode & AUTOKEY_ON))
|
||||
/* check the mode for auto-keyframing (per scene takes precedence) */
|
||||
#define IS_AUTOKEY_MODE(scene, mode) \
|
||||
((scene) ? (scene->toolsettings->autokey_mode == AUTOKEY_MODE_##mode) : \
|
||||
((scene) ? ((scene)->toolsettings->autokey_mode == AUTOKEY_MODE_##mode) : \
|
||||
(U.autokey_mode == AUTOKEY_MODE_##mode))
|
||||
/* check if a flag is set for auto-keyframing (per scene takes precedence) */
|
||||
#define IS_AUTOKEY_FLAG(scene, flag) \
|
||||
((scene) ? ((scene->toolsettings->autokey_flag & AUTOKEY_FLAG_##flag) || \
|
||||
((scene) ? (((scene)->toolsettings->autokey_flag & AUTOKEY_FLAG_##flag) || \
|
||||
(U.autokey_flag & AUTOKEY_FLAG_##flag)) : \
|
||||
(U.autokey_flag & AUTOKEY_FLAG_##flag))
|
||||
|
||||
|
|
|
@ -215,7 +215,7 @@ ScrArea *ED_screen_areas_iter_next(const bScreen *screen, const ScrArea *area);
|
|||
#define ED_screen_verts_iter(win, screen, vert_name) \
|
||||
for (ScrVert *vert_name = (win)->global_areas.vertbase.first ? \
|
||||
(win)->global_areas.vertbase.first : \
|
||||
screen->vertbase.first; \
|
||||
(screen)->vertbase.first; \
|
||||
vert_name != NULL; \
|
||||
vert_name = (vert_name == (win)->global_areas.vertbase.last) ? (screen)->vertbase.first : \
|
||||
vert_name->next)
|
||||
|
|
|
@ -193,7 +193,8 @@ typedef enum {
|
|||
|
||||
/* is the current element open? if so we also show children */
|
||||
#define TSELEM_OPEN(telm, sv) \
|
||||
((telm->flag & TSE_CLOSED) == 0 || (SEARCHING_OUTLINER(sv) && (telm->flag & TSE_CHILDSEARCH)))
|
||||
(((telm)->flag & TSE_CLOSED) == 0 || \
|
||||
(SEARCHING_OUTLINER(sv) && ((telm)->flag & TSE_CHILDSEARCH)))
|
||||
|
||||
/**
|
||||
* Container to avoid passing around these variables to many functions.
|
||||
|
|
|
@ -48,13 +48,13 @@ void text_update_cursor_moved(struct bContext *C);
|
|||
#define TXT_NUMCOL_PAD 1.0f
|
||||
/* Total width of the optional line numbers column. */
|
||||
#define TXT_NUMCOL_WIDTH(st) \
|
||||
(st->runtime.cwidth_px * (st->runtime.line_number_display_digits + (2 * TXT_NUMCOL_PAD)))
|
||||
((st)->runtime.cwidth_px * ((st)->runtime.line_number_display_digits + (2 * TXT_NUMCOL_PAD)))
|
||||
|
||||
/* Padding on left of body text in character units. */
|
||||
#define TXT_BODY_LPAD 1.0f
|
||||
/* Left position of body text. */
|
||||
#define TXT_BODY_LEFT(st) \
|
||||
(st->showlinenrs ? TXT_NUMCOL_WIDTH(st) : 0) + (TXT_BODY_LPAD * st->runtime.cwidth_px)
|
||||
((st)->showlinenrs ? TXT_NUMCOL_WIDTH(st) : 0) + (TXT_BODY_LPAD * (st)->runtime.cwidth_px)
|
||||
|
||||
#define TXT_SCROLL_WIDTH U.widget_unit
|
||||
#define TXT_SCROLL_SPACE ((int)(0.1f * U.widget_unit))
|
||||
|
|
|
@ -967,14 +967,14 @@ bool checkUseAxisMatrix(TransInfo *t);
|
|||
(BLI_assert((t)->data_container_len == 1), (&(t)->data_container[0]))
|
||||
|
||||
#define FOREACH_TRANS_DATA_CONTAINER(t, th) \
|
||||
for (TransDataContainer *tc = t->data_container, \
|
||||
*tc_end = t->data_container + t->data_container_len; \
|
||||
for (TransDataContainer *tc = (t)->data_container, \
|
||||
*tc_end = (t)->data_container + (t)->data_container_len; \
|
||||
th != tc_end; \
|
||||
th++)
|
||||
|
||||
#define FOREACH_TRANS_DATA_CONTAINER_INDEX(t, th, i) \
|
||||
for (TransDataContainer *tc = ((i = 0), t->data_container), \
|
||||
*tc_end = t->data_container + t->data_container_len; \
|
||||
for (TransDataContainer *tc = ((i = 0), (t)->data_container), \
|
||||
*tc_end = (t)->data_container + (t)->data_container_len; \
|
||||
th != tc_end; \
|
||||
th++, i++)
|
||||
|
||||
|
|
|
@ -702,31 +702,32 @@ typedef enum eGP_DrawMode {
|
|||
/* Check if 'multiedit sessions' is enabled */
|
||||
#define GPENCIL_MULTIEDIT_SESSIONS_ON(gpd) \
|
||||
((gpd) && \
|
||||
(gpd->flag & (GP_DATA_STROKE_EDITMODE | GP_DATA_STROKE_SCULPTMODE | \
|
||||
GP_DATA_STROKE_WEIGHTMODE | GP_DATA_STROKE_VERTEXMODE)) && \
|
||||
(gpd->flag & GP_DATA_STROKE_MULTIEDIT))
|
||||
((gpd)->flag & (GP_DATA_STROKE_EDITMODE | GP_DATA_STROKE_SCULPTMODE | \
|
||||
GP_DATA_STROKE_WEIGHTMODE | GP_DATA_STROKE_VERTEXMODE)) && \
|
||||
((gpd)->flag & GP_DATA_STROKE_MULTIEDIT))
|
||||
|
||||
/* Macros to check grease pencil modes */
|
||||
#define GPENCIL_ANY_MODE(gpd) \
|
||||
((gpd) && \
|
||||
(gpd->flag & (GP_DATA_STROKE_PAINTMODE | GP_DATA_STROKE_EDITMODE | GP_DATA_STROKE_SCULPTMODE | \
|
||||
GP_DATA_STROKE_WEIGHTMODE | GP_DATA_STROKE_VERTEXMODE)))
|
||||
((gpd) && ((gpd)->flag & \
|
||||
(GP_DATA_STROKE_PAINTMODE | GP_DATA_STROKE_EDITMODE | GP_DATA_STROKE_SCULPTMODE | \
|
||||
GP_DATA_STROKE_WEIGHTMODE | GP_DATA_STROKE_VERTEXMODE)))
|
||||
#define GPENCIL_EDIT_MODE(gpd) ((gpd) && ((gpd)->flag & GP_DATA_STROKE_EDITMODE))
|
||||
#define GPENCIL_ANY_EDIT_MODE(gpd) \
|
||||
((gpd) && (gpd->flag & \
|
||||
((gpd) && ((gpd)->flag & \
|
||||
(GP_DATA_STROKE_EDITMODE | GP_DATA_STROKE_SCULPTMODE | GP_DATA_STROKE_WEIGHTMODE)))
|
||||
#define GPENCIL_PAINT_MODE(gpd) ((gpd) && (gpd->flag & (GP_DATA_STROKE_PAINTMODE)))
|
||||
#define GPENCIL_SCULPT_MODE(gpd) ((gpd) && (gpd->flag & GP_DATA_STROKE_SCULPTMODE))
|
||||
#define GPENCIL_WEIGHT_MODE(gpd) ((gpd) && (gpd->flag & GP_DATA_STROKE_WEIGHTMODE))
|
||||
#define GPENCIL_VERTEX_MODE(gpd) ((gpd) && (gpd->flag & (GP_DATA_STROKE_VERTEXMODE)))
|
||||
#define GPENCIL_SCULPT_OR_WEIGHT_MODE(gpd) \
|
||||
((gpd) && (gpd->flag & (GP_DATA_STROKE_SCULPTMODE | GP_DATA_STROKE_WEIGHTMODE)))
|
||||
((gpd) && ((gpd)->flag & (GP_DATA_STROKE_SCULPTMODE | GP_DATA_STROKE_WEIGHTMODE)))
|
||||
#define GPENCIL_NONE_EDIT_MODE(gpd) \
|
||||
((gpd) && ((gpd->flag & (GP_DATA_STROKE_EDITMODE | GP_DATA_STROKE_SCULPTMODE | \
|
||||
GP_DATA_STROKE_WEIGHTMODE | GP_DATA_STROKE_VERTEXMODE)) == 0))
|
||||
((gpd) && (((gpd)->flag & (GP_DATA_STROKE_EDITMODE | GP_DATA_STROKE_SCULPTMODE | \
|
||||
GP_DATA_STROKE_WEIGHTMODE | GP_DATA_STROKE_VERTEXMODE)) == 0))
|
||||
#define GPENCIL_LAZY_MODE(brush, shift) \
|
||||
(((brush) && ((brush->gpencil_settings->flag & GP_BRUSH_STABILIZE_MOUSE) && (shift == 0))) || \
|
||||
(((brush->gpencil_settings->flag & GP_BRUSH_STABILIZE_MOUSE) == 0) && (shift == 1)))
|
||||
(((brush) && \
|
||||
(((brush)->gpencil_settings->flag & GP_BRUSH_STABILIZE_MOUSE) && ((shift) == 0))) || \
|
||||
((((brush)->gpencil_settings->flag & GP_BRUSH_STABILIZE_MOUSE) == 0) && ((shift) == 1)))
|
||||
|
||||
#define GPENCIL_ANY_SCULPT_MASK(flag) \
|
||||
((flag & (GP_SCULPT_MASK_SELECTMODE_POINT | GP_SCULPT_MASK_SELECTMODE_STROKE | \
|
||||
|
|
|
@ -248,9 +248,9 @@ enum {
|
|||
/* we cant have both flags enabled at once,
|
||||
* flags defined in DNA_scene_types.h */
|
||||
#define ME_EDIT_PAINT_SEL_MODE(_me) \
|
||||
((_me->editflag & ME_EDIT_PAINT_FACE_SEL) ? \
|
||||
(((_me)->editflag & ME_EDIT_PAINT_FACE_SEL) ? \
|
||||
SCE_SELECT_FACE : \
|
||||
(_me->editflag & ME_EDIT_PAINT_VERT_SEL) ? SCE_SELECT_VERTEX : 0)
|
||||
((_me)->editflag & ME_EDIT_PAINT_VERT_SEL) ? SCE_SELECT_VERTEX : 0)
|
||||
|
||||
/* me->flag */
|
||||
enum {
|
||||
|
|
|
@ -421,8 +421,8 @@ enum {
|
|||
};
|
||||
|
||||
#define RV3D_CLIPPING_ENABLED(v3d, rv3d) \
|
||||
(rv3d && v3d && (rv3d->rflag & RV3D_CLIPPING) && ELEM(v3d->shading.type, OB_WIRE, OB_SOLID) && \
|
||||
rv3d->clipbb)
|
||||
((rv3d) && (v3d) && ((rv3d)->rflag & RV3D_CLIPPING) && \
|
||||
ELEM((v3d)->shading.type, OB_WIRE, OB_SOLID) && (rv3d)->clipbb)
|
||||
|
||||
/** #View3D.flag2 (int) */
|
||||
#define V3D_HIDE_OVERLAYS (1 << 2)
|
||||
|
|
Loading…
Reference in New Issue