[Bf-blender-cvs] [b7e5433890d] master: Cleanup: move operator constants out of DNA
Campbell Barton
noreply at git.blender.org
Sun Apr 14 10:50:27 CEST 2019
Commit: b7e5433890debe629a0677473ba920f743de3342
Author: Campbell Barton
Date: Sun Apr 14 09:58:40 2019 +0200
Branches: master
https://developer.blender.org/rBb7e5433890debe629a0677473ba920f743de3342
Cleanup: move operator constants out of DNA
Also use doxy struct member references.
===================================================================
M source/blender/editors/space_view3d/view3d_edit.c
M source/blender/makesdna/DNA_view3d_types.h
===================================================================
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index 19008ebd122..e74703baf2d 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -4003,6 +4003,13 @@ void VIEW3D_OT_view_camera(wmOperatorType *ot)
* Rotate (orbit) in incremental steps. For interactive orbit see #VIEW3D_OT_rotate.
* \{ */
+enum {
+ V3D_VIEW_STEPLEFT = 1,
+ V3D_VIEW_STEPRIGHT,
+ V3D_VIEW_STEPDOWN,
+ V3D_VIEW_STEPUP,
+};
+
static const EnumPropertyItem prop_view_orbit_items[] = {
{V3D_VIEW_STEPLEFT, "ORBITLEFT", 0, "Orbit Left", "Orbit the view around to the Left"},
{V3D_VIEW_STEPRIGHT, "ORBITRIGHT", 0, "Orbit Right", "Orbit the view around to the Right"},
@@ -4366,6 +4373,13 @@ void VIEW3D_OT_view_roll(wmOperatorType *ot)
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
}
+enum {
+ V3D_VIEW_PANLEFT = 1,
+ V3D_VIEW_PANRIGHT,
+ V3D_VIEW_PANDOWN,
+ V3D_VIEW_PANUP,
+};
+
static const EnumPropertyItem prop_view_pan_items[] = {
{V3D_VIEW_PANLEFT, "PANLEFT", 0, "Pan Left", "Pan the view to the Left"},
{V3D_VIEW_PANRIGHT, "PANRIGHT", 0, "Pan Right", "Pan the view to the Right"},
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index b98d70c865f..e0bf8be7722 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -144,7 +144,7 @@ typedef struct View3DCursor {
char _pad[6];
} View3DCursor;
-/* 3D Viewport Shading settings */
+/** 3D Viewport Shading settings. */
typedef struct View3DShading {
/** Shading type (VIEW3D_SHADE_SOLID, ..). */
char type;
@@ -188,35 +188,35 @@ typedef struct View3DShading {
} View3DShading;
-/* 3D Viewport Overlay settings */
+/** 3D Viewport Overlay settings. */
typedef struct View3DOverlay {
int flag;
- /* Edit mode settings */
+ /** Edit mode settings. */
int edit_flag;
float normals_length;
float backwire_opacity;
- /* Paint mode settings */
+ /** Paint mode settings. */
int paint_flag;
- /* Weight paint mode settings */
+ /** Weight paint mode settings. */
int wpaint_flag;
char _pad2[4];
- /* Alpha for texture, weight, vertex paint overlay */
+ /** Alpha for texture, weight, vertex paint overlay. */
float texture_paint_mode_opacity;
float vertex_paint_mode_opacity;
float weight_paint_mode_opacity;
- /* Armature edit/pose mode settings */
+ /** Armature edit/pose mode settings. */
int _pad3;
float xray_alpha_bone;
- /* Other settings */
+ /** Other settings. */
float wireframe_threshold;
- /* grease pencil settings */
+ /** Grease pencil settings. */
float gpencil_paper_opacity;
float gpencil_grid_opacity;
float gpencil_fade_layer;
@@ -228,7 +228,7 @@ typedef struct View3D_Runtime {
void *properties_storage;
} View3D_Runtime;
-/* 3D ViewPort Struct */
+/** 3D ViewPort Struct. */
typedef struct View3D {
struct SpaceLink *next, *prev;
/** Storage of regions for inactive spaces. */
@@ -294,7 +294,7 @@ typedef struct View3D {
/** Transform gizmo info. */
char gizmo_type_mask;
- /* actually only used to define the opacity of the grease pencil vertex in edit mode */
+ /** Actually only used to define the opacity of the grease pencil vertex in edit mode. */
float vertex_opacity;
/* note, 'fx_settings.dof' is currently _not_ allocated,
@@ -305,7 +305,7 @@ typedef struct View3D {
/** Grease-Pencil Data (annotation layers). */
struct bGPdata *gpd DNA_DEPRECATED;
- /* Stereoscopy settings */
+ /** Stereoscopy settings. */
short stereo3d_flag;
char stereo3d_camera;
char _pad4;
@@ -313,7 +313,7 @@ typedef struct View3D {
float stereo3d_volume_alpha;
float stereo3d_convergence_alpha;
- /* Display settings */
+ /** Display settings. */
short drawtype DNA_DEPRECATED;
char _pad5[6];
@@ -325,12 +325,12 @@ typedef struct View3D {
} View3D;
-/* View3D->stereo_flag (short) */
+/** #View3D.stereo3d_flag */
#define V3D_S3D_DISPCAMERAS (1 << 0)
#define V3D_S3D_DISPPLANE (1 << 1)
#define V3D_S3D_DISPVOLUME (1 << 2)
-/* View3D->flag (short) */
+/** #View3D.flag */
#define V3D_FLAG_UNUSED_0 (1 << 0) /* cleared */
#define V3D_FLAG_UNUSED_1 (1 << 1) /* cleared */
#define V3D_HIDE_HELPLINES (1 << 2)
@@ -342,12 +342,12 @@ typedef struct View3D {
#define V3D_GLOBAL_STATS (1 << 13)
#define V3D_DRAW_CENTERS (1 << 15)
-/* RegionView3d->persp */
+/** #RegionView3D.persp */
#define RV3D_ORTHO 0
#define RV3D_PERSP 1
#define RV3D_CAMOB 2
-/* RegionView3d->rflag */
+/** #RegionView3D.rflag */
#define RV3D_CLIPPING (1 << 2)
#define RV3D_NAVIGATING (1 << 3)
#define RV3D_GPULIGHT_UPDATE (1 << 4)
@@ -358,14 +358,14 @@ typedef struct View3D {
*/
#define RV3D_ZOFFSET_DISABLED 64
-/* RegionView3d->viewlock */
+/** #RegionView3D.viewlock */
#define RV3D_LOCKED (1 << 0)
#define RV3D_BOXVIEW (1 << 1)
#define RV3D_BOXCLIP (1 << 2)
-/* RegionView3d->viewlock_quad */
+/** #RegionView3D.viewlock_quad */
#define RV3D_VIEWLOCK_INIT (1 << 7)
-/* RegionView3d->view */
+/** #RegionView3D.view */
#define RV3D_VIEW_USER 0
#define RV3D_VIEW_FRONT 1
#define RV3D_VIEW_BACK 2
@@ -378,7 +378,7 @@ typedef struct View3D {
#define RV3D_VIEW_IS_AXIS(view) \
(((view) >= RV3D_VIEW_FRONT) && ((view) <= RV3D_VIEW_BOTTOM))
-/* View3d->flag2 (int) */
+/** #View3D.flag2 (int) */
#define V3D_HIDE_OVERLAYS (1 << 2)
#define V3D_FLAG2_UNUSED_3 (1 << 3) /* cleared */
#define V3D_SHOW_ANNOTATION (1 << 4)
@@ -394,7 +394,7 @@ typedef struct View3D {
#define V3D_FLAG2_UNUSED_14 (1 << 14) /* cleared */
#define V3D_FLAG2_UNUSED_15 (1 << 15) /* cleared */
-/* View3d->gp_flag (short) */
+/** #View3D.gp_flag (short) */
#define V3D_GP_SHOW_PAPER (1 << 0) /* Activate paper to cover all viewport */
#define V3D_GP_SHOW_GRID (1 << 1) /* Activate paper grid */
#define V3D_GP_SHOW_EDIT_LINES (1 << 2)
@@ -402,14 +402,14 @@ typedef struct View3D {
#define V3D_GP_SHOW_ONION_SKIN (1 << 4) /* main switch at view level */
#define V3D_GP_FADE_NOACTIVE_LAYERS (1 << 5) /* fade layers not active */
-/* View3DShading->light */
+/** #View3DShading.light */
enum {
V3D_LIGHTING_FLAT = 0,
V3D_LIGHTING_STUDIO = 1,
V3D_LIGHTING_MATCAP = 2,
};
-/* View3DShading->flag */
+/** #View3DShading.flag */
enum {
V3D_SHADING_OBJECT_OUTLINE = (1 << 0),
V3D_SHADING_XRAY = (1 << 1),
@@ -425,7 +425,7 @@ enum {
V3D_SHADING_DEPTH_OF_FIELD = (1 << 11),
};
-/* View3DShading->color_type */
+/** #View3DShading.color_type */
enum {
V3D_SHADING_MATERIAL_COLOR = 0,
V3D_SHADING_RANDOM_COLOR = 1,
@@ -434,21 +434,21 @@ enum {
V3D_SHADING_OBJECT_COLOR = 4,
};
-/* View3DShading->background_type */
+/** #View3DShading.background_type */
enum {
V3D_SHADING_BACKGROUND_THEME = 0,
V3D_SHADING_BACKGROUND_WORLD = 1,
V3D_SHADING_BACKGROUND_VIEWPORT = 2,
};
-/* View3DShading->cavity_type */
+/** #View3DShading.cavity_type */
enum {
V3D_SHADING_CAVITY_SSAO = 0,
V3D_SHADING_CAVITY_CURVATURE = 1,
V3D_SHADING_CAVITY_BOTH = 2,
};
-/* View3DOverlay->flag */
+/** #View3DOverlay.flag */
enum {
V3D_OVERLAY_FACE_ORIENTATION = (1 << 0),
V3D_OVERLAY_HIDE_CURSOR = (1 << 1),
@@ -463,7 +463,7 @@ enum {
V3D_OVERLAY_HIDE_OBJECT_ORIGINS = (1 << 10),
};
-/* View3DOverlay->edit_flag */
+/** #View3DOverlay.edit_flag */
enum {
V3D_OVERLAY_EDIT_VERT_NORMALS = (1 << 0),
V3D_OVERLAY_EDIT_LOOP_NORMALS = (1 << 1),
@@ -496,17 +496,17 @@ enum {
V3D_OVERLAY_EDIT_CU_NORMALS = (1 << 21),
};
-/* View3DOverlay->paint_flag */
+/** #View3DOverlay.paint_flag */
enum {
V3D_OVERLAY_PAINT_WIRE = (1 << 0),
};
-/* View3DOverlay->wpaint_flag */
+/** #View3DOverlay.wpaint_flag */
enum {
V3D_OVERLAY_WPAINT_CONTOURS = (1 << 0),
};
-/* View3D->around */
+/** #View3D.around */
enum {
/* center of the bounding box */
V3D_AROUND_CENTER_BOUNDS = 0,
@@ -520,17 +520,7 @@ enum {
V3D_AROUND_ACTIVE = 4,
};
-/*View3D types (only used in tools, not actually saved)*/
-#define V3D_VIEW_STEPLEFT 1
-#define V3D_VIEW_STEPRIGHT 2
-#define V3D_VIEW_STEPDOWN 3
-#define V3D_VIEW_STEPUP 4
-#define V3D_VIEW_PANLEFT 5
-#define V3D_VIEW_PANRIGHT 6
-#define V3D_VIEW_PANDOWN 7
-#define V3D_VIEW_PANUP 8
-
-/* View3d->gridflag */
+/** #View3d.gridflag */
#define V3D_SHOW_FLOOR (1 << 0)
#define V3D_SHOW_X (1 << 1)
#define V3D_SHOW_Y (1 << 2)
@@ -568,7 +558,7 @@ enum {
#define RV3D_CAMZOOM_MIN -30
#define RV3D_CAMZOOM_MAX 600
-/* #BKE_screen_view3d_zoom_to_fac() values above */
+/** #BKE_screen_view3d_zoom_to_fac() values above */
#define RV3D_CAMZOOM_MIN_FACTOR 0.1657359312880714853f
#define RV3D_CAMZOOM_MAX_FACTOR 44.9852813742385702928f
More information about the Bf-blender-cvs
mailing list