diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-02-03 06:01:45 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-03 06:59:11 +0300 |
commit | 744f6339865fa8ed00b2e98aa5812b94d67a8604 (patch) | |
tree | ac31a849b46a8214baf16b87e104841a5fa85b11 /source/blender/makesrna/intern/rna_scene.c | |
parent | 141c6073ca39f0d59c67ebef89b094395b903a4a (diff) |
Cleanup: trailing commas
Needed for clan-format not to wrap onto one line.
Diffstat (limited to 'source/blender/makesrna/intern/rna_scene.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 159 |
1 files changed, 82 insertions, 77 deletions
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 2e530389056..cfec2c66273 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -89,7 +89,7 @@ const EnumPropertyItem rna_enum_exr_codec_items[] = { {R_IMF_EXR_CODEC_DWAA, "DWAA", 0, "DWAA (lossy)", ""}, /* NOTE: Commented out for until new OpenEXR is released, see T50673. */ /* {R_IMF_EXR_CODEC_DWAB, "DWAB", 0, "DWAB (lossy)", ""}, */ - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -97,7 +97,7 @@ const EnumPropertyItem rna_enum_exr_codec_items[] = { static const EnumPropertyItem uv_sculpt_relaxation_items[] = { {UV_SCULPT_TOOL_RELAX_LAPLACIAN, "LAPLACIAN", 0, "Laplacian", "Use Laplacian method for relaxation"}, {UV_SCULPT_TOOL_RELAX_HC, "HC", 0, "HC", "Use HC method for relaxation"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -105,7 +105,7 @@ const EnumPropertyItem rna_enum_uv_sculpt_tool_items[] = { {UV_SCULPT_TOOL_PINCH, "PINCH", 0, "Pinch", "Pinch UVs"}, {UV_SCULPT_TOOL_RELAX, "RELAX", 0, "Relax", "Relax UVs"}, {UV_SCULPT_TOOL_GRAB, "GRAB", 0, "Grab", "Grab UVs"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; @@ -114,7 +114,7 @@ const EnumPropertyItem rna_enum_snap_target_items[] = { {SCE_SNAP_TARGET_CENTER, "CENTER", 0, "Center", "Snap transformation center onto target"}, {SCE_SNAP_TARGET_MEDIAN, "MEDIAN", 0, "Median", "Snap median onto target"}, {SCE_SNAP_TARGET_ACTIVE, "ACTIVE", 0, "Active", "Snap active onto target"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_proportional_falloff_items[] = { @@ -126,7 +126,7 @@ const EnumPropertyItem rna_enum_proportional_falloff_items[] = { {PROP_LIN, "LINEAR", ICON_LINCURVE, "Linear", "Linear falloff"}, {PROP_CONST, "CONSTANT", ICON_NOCURVE, "Constant", "Constant falloff"}, {PROP_RANDOM, "RANDOM", ICON_RNDCURVE, "Random", "Random falloff"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* subset of the enum - only curves, missing random and const */ @@ -137,7 +137,7 @@ const EnumPropertyItem rna_enum_proportional_falloff_curve_only_items[] = { {PROP_INVSQUARE, "INVERSE_SQUARE", ICON_ROOTCURVE, "Inverse Square", "Inverse Square falloff"}, {PROP_SHARP, "SHARP", ICON_SHARPCURVE, "Sharp", "Sharp falloff"}, {PROP_LIN, "LINEAR", ICON_LINCURVE, "Linear", "Linear falloff"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; @@ -148,7 +148,7 @@ const EnumPropertyItem rna_enum_proportional_editing_items[] = { "Proportional Editing using screen space locations"}, {PROP_EDIT_CONNECTED, "CONNECTED", ICON_PROP_CON, "Connected", "Proportional Editing using connected geometry only"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* keep for operators, not used here */ @@ -156,7 +156,7 @@ const EnumPropertyItem rna_enum_mesh_select_mode_items[] = { {SCE_SELECT_VERTEX, "VERTEX", ICON_VERTEXSEL, "Vertex", "Vertex selection mode"}, {SCE_SELECT_EDGE, "EDGE", ICON_EDGESEL, "Edge", "Edge selection mode"}, {SCE_SELECT_FACE, "FACE", ICON_FACESEL, "Face", "Face selection mode"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_mesh_select_mode_uv_items[] = { @@ -164,7 +164,7 @@ const EnumPropertyItem rna_enum_mesh_select_mode_uv_items[] = { {UV_SELECT_EDGE, "EDGE", ICON_UV_EDGESEL, "Edge", "Edge selection mode"}, {UV_SELECT_FACE, "FACE", ICON_UV_FACESEL, "Face", "Face selection mode"}, {UV_SELECT_ISLAND, "ISLAND", ICON_UV_ISLANDSEL, "Island", "Island selection mode"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_snap_element_items[] = { @@ -173,7 +173,7 @@ const EnumPropertyItem rna_enum_snap_element_items[] = { {SCE_SNAP_MODE_EDGE, "EDGE", ICON_SNAP_EDGE, "Edge", "Snap to edges"}, {SCE_SNAP_MODE_FACE, "FACE", ICON_SNAP_FACE, "Face", "Snap to faces"}, {SCE_SNAP_MODE_VOLUME, "VOLUME", ICON_SNAP_VOLUME, "Volume", "Snap to volume"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_snap_node_element_items[] = { @@ -181,21 +181,22 @@ const EnumPropertyItem rna_enum_snap_node_element_items[] = { {SCE_SNAP_MODE_NODE_X, "NODE_X", ICON_NODE_SIDE, "Node X", "Snap to left/right node border"}, {SCE_SNAP_MODE_NODE_Y, "NODE_Y", ICON_NODE_TOP, "Node Y", "Snap to top/bottom node border"}, {SCE_SNAP_MODE_NODE_X | SCE_SNAP_MODE_NODE_Y, "NODE_XY", ICON_NODE_CORNER, "Node X / Y", "Snap to any node border"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifndef RNA_RUNTIME static const EnumPropertyItem snap_uv_element_items[] = { {SCE_SNAP_MODE_INCREMENT, "INCREMENT", ICON_SNAP_INCREMENT, "Increment", "Snap to increments of grid"}, {SCE_SNAP_MODE_VERTEX, "VERTEX", ICON_SNAP_VERTEX, "Vertex", "Snap to vertices"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif const EnumPropertyItem rna_enum_curve_fit_method_items[] = { {CURVE_PAINT_FIT_METHOD_REFIT, "REFIT", 0, "Refit", "Incrementally re-fit the curve (high quality)"}, {CURVE_PAINT_FIT_METHOD_SPLIT, "SPLIT", 0, "Split", "Split the curve until the tolerance is met (fast)"}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL}, +}; /* workaround for duplicate enums, * have each enum line as a define then conditionally set it or not @@ -281,7 +282,7 @@ static const EnumPropertyItem image_only_type_items[] = { IMAGE_TYPE_ITEMS_IMAGE_ONLY - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -296,14 +297,14 @@ const EnumPropertyItem rna_enum_image_type_items[] = { #ifdef WITH_FFMPEG {R_IMF_IMTYPE_FFMPEG, "FFMPEG", ICON_FILE_MOVIE, "FFmpeg video", "The most versatile way to output video files"}, #endif - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_image_color_mode_items[] = { {R_IMF_PLANES_BW, "BW", 0, "BW", "Images get saved in 8 bits grayscale (only PNG, JPEG, TGA, TIF)"}, {R_IMF_PLANES_RGB, "RGB", 0, "RGB", "Images are saved with RGB (color) data"}, {R_IMF_PLANES_RGBA, "RGBA", 0, "RGBA", "Images are saved with RGB and Alpha data (if supported)"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifdef RNA_RUNTIME @@ -320,13 +321,13 @@ const EnumPropertyItem rna_enum_image_color_depth_items[] = { {R_IMF_CHAN_DEPTH_16, "16", 0, "16", "16 bit color channels"}, /* 24 not used */ {R_IMF_CHAN_DEPTH_32, "32", 0, "32", "32 bit color channels"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_normal_space_items[] = { {R_BAKE_SPACE_OBJECT, "OBJECT", 0, "Object", "Bake the normals in object space"}, {R_BAKE_SPACE_TANGENT, "TANGENT", 0, "Tangent", "Bake the normals in tangent space"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_normal_swizzle_items[] = { @@ -336,13 +337,13 @@ const EnumPropertyItem rna_enum_normal_swizzle_items[] = { {R_BAKE_NEGX, "NEG_X", 0, "-X", ""}, {R_BAKE_NEGY, "NEG_Y", 0, "-Y", ""}, {R_BAKE_NEGZ, "NEG_Z", 0, "-Z", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_bake_save_mode_items[] = { {R_BAKE_SAVE_INTERNAL, "INTERNAL", 0, "Internal", "Save the baking map in an internal image data-block"}, {R_BAKE_SAVE_EXTERNAL, "EXTERNAL", 0, "External", "Save the baking map in an external file"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #define R_IMF_VIEWS_ENUM_IND {R_IMF_VIEWS_INDIVIDUAL, "INDIVIDUAL", 0, "Individual", \ @@ -354,20 +355,20 @@ const EnumPropertyItem rna_enum_bake_save_mode_items[] = { const EnumPropertyItem rna_enum_views_format_items[] = { R_IMF_VIEWS_ENUM_IND R_IMF_VIEWS_ENUM_S3D - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_views_format_multilayer_items[] = { R_IMF_VIEWS_ENUM_IND R_IMF_VIEWS_ENUM_MV - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_views_format_multiview_items[] = { R_IMF_VIEWS_ENUM_IND R_IMF_VIEWS_ENUM_S3D R_IMF_VIEWS_ENUM_MV - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #undef R_IMF_VIEWS_ENUM_IND @@ -384,21 +385,21 @@ const EnumPropertyItem rna_enum_stereo3d_display_items[] = { "Render alternate eyes (also known as page flip, quad buffer support in the graphic card is required)"}, {S3D_DISPLAY_SIDEBYSIDE, "SIDEBYSIDE", 0, "Side-by-Side", "Render views for left and right eyes side-by-side"}, {S3D_DISPLAY_TOPBOTTOM, "TOPBOTTOM", 0, "Top-Bottom", "Render views for left and right eyes one above another"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_stereo3d_anaglyph_type_items[] = { {S3D_ANAGLYPH_REDCYAN, "RED_CYAN", 0, "Red-Cyan", ""}, {S3D_ANAGLYPH_GREENMAGENTA, "GREEN_MAGENTA", 0, "Green-Magenta", ""}, {S3D_ANAGLYPH_YELLOWBLUE, "YELLOW_BLUE", 0, "Yellow-Blue", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_stereo3d_interlace_type_items[] = { {S3D_INTERLACE_ROW, "ROW_INTERLEAVED", 0, "Row Interleaved", ""}, {S3D_INTERLACE_COLUMN, "COLUMN_INTERLEAVED", 0, "Column Interleaved", ""}, {S3D_INTERLACE_CHECKERBOARD, "CHECKERBOARD_INTERLEAVED", 0, "Checkerboard Interleaved", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_bake_pass_filter_type_items[] = { @@ -412,14 +413,14 @@ const EnumPropertyItem rna_enum_bake_pass_filter_type_items[] = { {R_BAKE_PASS_FILTER_GLOSSY, "GLOSSY", 0, "Glossy", ""}, {R_BAKE_PASS_FILTER_TRANSM, "TRANSMISSION", 0, "Transmission", ""}, {R_BAKE_PASS_FILTER_SUBSURFACE, "SUBSURFACE", 0, "Subsurface", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem rna_enum_gizmo_items[] = { {SCE_GIZMO_SHOW_TRANSLATE, "TRANSLATE", 0, "Move", ""}, {SCE_GIZMO_SHOW_ROTATE, "ROTATE", 0, "Rotate", ""}, {SCE_GIZMO_SHOW_SCALE, "SCALE", 0, "Scale", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifndef RNA_RUNTIME @@ -444,7 +445,7 @@ static const EnumPropertyItem rna_enum_gpencil_interpolation_mode_items[] = { {GP_IPO_BOUNCE, "BOUNCE", ICON_IPO_BOUNCE, "Bounce", "Exponentially decaying parabolic bounce, like when objects collide"}, {GP_IPO_ELASTIC, "ELASTIC", ICON_IPO_ELASTIC, "Elastic", "Exponentially decaying sine wave, like an elastic band"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -458,7 +459,7 @@ const EnumPropertyItem rna_enum_transform_pivot_items_full[] = { {V3D_AROUND_CENTER_MEDIAN, "MEDIAN_POINT", ICON_PIVOT_MEDIAN, "Median Point", "Pivot around the median point of selected objects"}, {V3D_AROUND_ACTIVE, "ACTIVE_ELEMENT", ICON_PIVOT_ACTIVE, "Active Element", "Pivot around active object"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* Icons could be made a consistent set of images. */ @@ -472,7 +473,7 @@ const EnumPropertyItem rna_enum_transform_orientation_items[] = { {V3D_MANIP_VIEW, "VIEW", ICON_ORIENTATION_VIEW, "View", "Align the transformation axes to the window"}, {V3D_MANIP_CURSOR, "CURSOR", ICON_PIVOT_CURSOR, "Cursor", "Align the transformation axes to the 3D cursor"}, // {V3D_MANIP_CUSTOM, "CUSTOM", 0, "Custom", "Use a custom transform orientation"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifdef RNA_RUNTIME @@ -2329,7 +2330,7 @@ static void rna_def_tool_settings(BlenderRNA *brna) static const EnumPropertyItem auto_key_items[] = { {AUTOKEY_MODE_NORMAL & ~AUTOKEY_ON, "ADD_REPLACE_KEYS", 0, "Add & Replace", ""}, {AUTOKEY_MODE_EDITKEYS & ~AUTOKEY_ON, "REPLACE_KEYS", 0, "Replace", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem edge_tag_items[] = { @@ -2339,7 +2340,7 @@ static void rna_def_tool_settings(BlenderRNA *brna) {EDGE_MODE_TAG_CREASE, "CREASE", 0, "Tag Crease", ""}, {EDGE_MODE_TAG_BEVEL, "BEVEL", 0, "Tag Bevel", ""}, {EDGE_MODE_TAG_FREESTYLE, "FREESTYLE", 0, "Tag Freestyle Edge Mark", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static EnumPropertyItem mod_weighted_strength[] = { @@ -2353,14 +2354,14 @@ static void rna_def_tool_settings(BlenderRNA *brna) {OB_DRAW_GROUPUSER_NONE, "NONE", 0, "None", ""}, {OB_DRAW_GROUPUSER_ACTIVE, "ACTIVE", 0, "Active", "Show vertices with no weights in the active group"}, {OB_DRAW_GROUPUSER_ALL, "ALL", 0, "All", "Show vertices with no weights in any group"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem vertex_group_select_items[] = { {WT_VGROUP_ALL, "ALL", 0, "All", "All Vertex Groups"}, {WT_VGROUP_BONE_DEFORM, "BONE_DEFORM", 0, "Deform", "Vertex Groups assigned to Deform Bones"}, {WT_VGROUP_BONE_DEFORM_OFF, "OTHER_DEFORM", 0, "Other", "Vertex Groups assigned to non Deform Bones"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem gpencil_stroke_placement_items[] = { @@ -2368,14 +2369,14 @@ static void rna_def_tool_settings(BlenderRNA *brna) {GP_PROJECT_VIEWSPACE | GP_PROJECT_CURSOR, "CURSOR", ICON_PIVOT_CURSOR, "3D Cursor", "Draw stroke at 3D cursor location" }, {GP_PROJECT_VIEWSPACE | GP_PROJECT_DEPTH_VIEW, "SURFACE", ICON_SNAP_FACE, "Surface", "Stick stroke to surfaces"}, {GP_PROJECT_VIEWSPACE | GP_PROJECT_DEPTH_STROKE, "STROKE", ICON_STROKE, "Stroke", "Stick stroke to other strokes"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem gpencil_stroke_snap_items[] = { {0, "NONE", 0, "All points", "No snap"}, {GP_PROJECT_DEPTH_STROKE_ENDPOINTS, "ENDS", 0, "End points", "Snap to first and last points and interpolate" }, {GP_PROJECT_DEPTH_STROKE_FIRST, "FIRST", 0, "First point", "Snap to first point" }, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem gpencil_selectmode_items[] = { @@ -2383,14 +2384,14 @@ static void rna_def_tool_settings(BlenderRNA *brna) {GP_SELECTMODE_STROKE, "STROKE", ICON_GP_SELECT_STROKES, "Stroke", "Select all stroke points" }, /* GPXX need better icon for segment */ {GP_SELECTMODE_SEGMENT, "SEGMENT", ICON_SHADERFX, "Segment", "Select all stroke points between other strokes" }, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem annotation_stroke_placement_items[] = { {GP_PROJECT_VIEWSPACE | GP_PROJECT_CURSOR, "CURSOR", ICON_PIVOT_CURSOR, "3D Cursor", "Draw stroke at 3D cursor location" }, {0, "VIEW", ICON_RESTRICT_VIEW_ON, "View", "Stick stroke to the view "}, /* weird, GP_PROJECT_VIEWALIGN is inverted */ {GP_PROJECT_VIEWSPACE | GP_PROJECT_DEPTH_VIEW, "SURFACE", ICON_FACESEL, "Surface", "Stick stroke to surfaces"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; @@ -2958,7 +2959,8 @@ static void rna_def_curve_paint_settings(BlenderRNA *brna) static const EnumPropertyItem curve_type_items[] = { {CU_POLY, "POLY", 0, "Poly", ""}, {CU_BEZIER, "BEZIER", 0, "Bezier", ""}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL}, + }; prop = RNA_def_property(srna, "curve_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "curve_type"); @@ -3025,7 +3027,8 @@ static void rna_def_curve_paint_settings(BlenderRNA *brna) static const EnumPropertyItem depth_mode_items[] = { {CURVE_PAINT_PROJECT_CURSOR, "CURSOR", 0, "Cursor", ""}, {CURVE_PAINT_PROJECT_SURFACE, "SURFACE", 0, "Surface", ""}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL}, + }; prop = RNA_def_property(srna, "depth_mode", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "depth_mode"); @@ -3036,7 +3039,7 @@ static void rna_def_curve_paint_settings(BlenderRNA *brna) {CURVE_PAINT_SURFACE_PLANE_NORMAL_VIEW, "NORMAL_VIEW", 0, "Normal/View", "Display perpendicular to the surface"}, {CURVE_PAINT_SURFACE_PLANE_NORMAL_SURFACE, "NORMAL_SURFACE", 0, "Normal/Surface", "Display aligned to the surface"}, {CURVE_PAINT_SURFACE_PLANE_VIEW, "VIEW", 0, "View", "Display aligned to the viewport"}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL},}; prop = RNA_def_property(srna, "surface_plane", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "surface_plane"); @@ -3055,7 +3058,8 @@ static void rna_def_statvis(BlenderRNA *brna) {SCE_STATVIS_INTERSECT, "INTERSECT", 0, "Intersect", ""}, {SCE_STATVIS_DISTORT, "DISTORT", 0, "Distortion", ""}, {SCE_STATVIS_SHARP, "SHARP", 0, "Sharp", ""}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL}, + }; srna = RNA_def_struct(brna, "MeshStatVis", NULL); RNA_def_struct_path_func(srna, "rna_MeshStatVis_path"); @@ -3169,13 +3173,13 @@ static void rna_def_unit_settings(BlenderRNA *brna) {USER_UNIT_NONE, "NONE", 0, "None", ""}, {USER_UNIT_METRIC, "METRIC", 0, "Metric", ""}, {USER_UNIT_IMPERIAL, "IMPERIAL", 0, "Imperial", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem rotation_units[] = { {0, "DEGREES", 0, "Degrees", "Use degrees for measuring angles and rotations"}, {USER_UNIT_ROT_RADIANS, "RADIANS", 0, "Radians", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "UnitSettings", NULL); @@ -3542,35 +3546,35 @@ void rna_def_freestyle_settings(BlenderRNA *brna) {0, "INCLUSIVE", 0, "Inclusive", "Select feature edges satisfying the given edge type conditions"}, {FREESTYLE_LINESET_FE_NOT, "EXCLUSIVE", 0, "Exclusive", "Select feature edges not satisfying the given edge type conditions"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem edge_type_combination_items[] = { {0, "OR", 0, "Logical OR", "Select feature edges satisfying at least one of edge type conditions"}, {FREESTYLE_LINESET_FE_AND, "AND", 0, "Logical AND", "Select feature edges satisfying all edge type conditions"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem collection_negation_items[] = { {0, "INCLUSIVE", 0, "Inclusive", "Select feature edges belonging to some object in the group"}, {FREESTYLE_LINESET_GR_NOT, "EXCLUSIVE", 0, "Exclusive", "Select feature edges not belonging to any object in the group"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem face_mark_negation_items[] = { {0, "INCLUSIVE", 0, "Inclusive", "Select feature edges satisfying the given face mark conditions"}, {FREESTYLE_LINESET_FM_NOT, "EXCLUSIVE", 0, "Exclusive", "Select feature edges not satisfying the given face mark conditions"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem face_mark_condition_items[] = { {0, "ONE", 0, "One Face", "Select a feature edge if either of its adjacent faces is marked"}, {FREESTYLE_LINESET_FM_BOTH, "BOTH", 0, "Both Faces", "Select a feature edge if both of its adjacent faces are marked"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem freestyle_ui_mode_items[] = { @@ -3578,7 +3582,7 @@ void rna_def_freestyle_settings(BlenderRNA *brna) "Advanced mode for using style modules written in Python"}, {FREESTYLE_CONTROL_EDITOR_MODE, "EDITOR", 0, "Parameter Editor Mode", "Basic mode for interactive style parameter editing"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem visibility_items[] = { @@ -3586,7 +3590,7 @@ void rna_def_freestyle_settings(BlenderRNA *brna) {FREESTYLE_QI_HIDDEN, "HIDDEN", 0, "Hidden", "Select hidden feature edges"}, {FREESTYLE_QI_RANGE, "RANGE", 0, "QI Range", "Select feature edges within a range of quantitative invisibility (QI) values"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* FreestyleLineSet */ @@ -4312,7 +4316,7 @@ static void rna_def_image_format_stereo3d_format(BlenderRNA *brna) "Render views for left and right eyes interlaced in a single image (3D-ready monitor is required)"}, {S3D_DISPLAY_SIDEBYSIDE, "SIDEBYSIDE", 0, "Side-by-Side", "Render views for left and right eyes side-by-side"}, {S3D_DISPLAY_TOPBOTTOM, "TOPBOTTOM", 0, "Top-Bottom", "Render views for left and right eyes one above another"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "Stereo3dFormat", NULL); @@ -4364,7 +4368,7 @@ static void rna_def_scene_image_format_data(BlenderRNA *brna) static const EnumPropertyItem jp2_codec_items[] = { {R_IMF_JP2_CODEC_JP2, "JP2", 0, "JP2", ""}, {R_IMF_JP2_CODEC_J2K, "J2K", 0, "J2K", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -4374,7 +4378,7 @@ static void rna_def_scene_image_format_data(BlenderRNA *brna) {R_IMF_TIFF_CODEC_DEFLATE, "DEFLATE", 0, "Deflate", ""}, {R_IMF_TIFF_CODEC_LZW, "LZW", 0, "LZW", ""}, {R_IMF_TIFF_CODEC_PACKBITS, "PACKBITS", 0, "Pack Bits", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -4554,7 +4558,7 @@ static void rna_def_scene_ffmpeg_settings(BlenderRNA *brna) {FFMPEG_OGG, "OGG", 0, "Ogg", ""}, {FFMPEG_MKV, "MKV", 0, "Matroska", ""}, {FFMPEG_FLV, "FLASH", 0, "Flash", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem ffmpeg_codec_items[] = { @@ -4572,7 +4576,7 @@ static void rna_def_scene_ffmpeg_settings(BlenderRNA *brna) {AV_CODEC_ID_QTRLE, "QTRLE", 0, "QT rle / QT Animation", ""}, {AV_CODEC_ID_THEORA, "THEORA", 0, "Theora", ""}, {AV_CODEC_ID_VP9, "WEBM", 0, "WEBM / VP9", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* Recommendations come from the FFmpeg wiki, https://trac.ffmpeg.org/wiki/Encode/VP9. @@ -4583,7 +4587,7 @@ static void rna_def_scene_ffmpeg_settings(BlenderRNA *brna) "Recommended if you have lots of time and want the best compression efficiency"}, {FFM_PRESET_GOOD, "GOOD", 0, "Good", "The default and recommended for most applications"}, {FFM_PRESET_REALTIME, "REALTIME", 0, "Realtime", "Recommended for fast encoding"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem ffmpeg_crf_items[] = { @@ -4596,7 +4600,7 @@ static void rna_def_scene_ffmpeg_settings(BlenderRNA *brna) {FFM_CRF_LOW, "LOW", 0, "Low quality", ""}, {FFM_CRF_VERYLOW, "VERYLOW", 0, "Very low quality", ""}, {FFM_CRF_LOWEST, "LOWEST", 0, "Lowest quality", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem ffmpeg_audio_codec_items[] = { @@ -4608,7 +4612,7 @@ static void rna_def_scene_ffmpeg_settings(BlenderRNA *brna) {AV_CODEC_ID_MP3, "MP3", 0, "MP3", ""}, {AV_CODEC_ID_PCM_S16LE, "PCM", 0, "PCM", ""}, {AV_CODEC_ID_VORBIS, "VORBIS", 0, "Vorbis", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -4618,7 +4622,7 @@ static void rna_def_scene_ffmpeg_settings(BlenderRNA *brna) {FFM_CHANNELS_SURROUND4, "SURROUND4", 0, "4 Channels", "Set audio channels to 4 channels"}, {FFM_CHANNELS_SURROUND51, "SURROUND51", 0, "5.1 Surround", "Set audio channels to 5.1 surround sound"}, {FFM_CHANNELS_SURROUND71, "SURROUND71", 0, "7.1 Surround", "Set audio channels to 7.1 surround sound"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "FFmpegSettings", NULL); @@ -4783,7 +4787,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna) static const EnumPropertyItem alpha_mode_items[] = { {R_ADDSKY, "SKY", 0, "Sky", "Transparent pixels are filled with sky color"}, {R_ALPHAPREMUL, "TRANSPARENT", 0, "Transparent", "World background is transparent with premultiplied alpha"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem display_mode_items[] = { @@ -4791,7 +4795,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna) {R_OUTPUT_AREA, "AREA", 0, "Image Editor", "Images are rendered in an Image Editor"}, {R_OUTPUT_WINDOW, "WINDOW", 0, "New Window", "Images are rendered in a new window"}, {R_OUTPUT_NONE, "NONE", 0, "Keep User Interface", "Images are rendered without changing the user interface"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* Bake */ @@ -4799,7 +4803,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna) //{RE_BAKE_AO, "AO", 0, "Ambient Occlusion", "Bake ambient occlusion"}, {RE_BAKE_NORMALS, "NORMALS", 0, "Normals", "Bake normals"}, {RE_BAKE_DISPLACEMENT, "DISPLACEMENT", 0, "Displacement", "Bake displacement"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem pixel_size_items[] = { @@ -4808,7 +4812,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna) {2, "2", 0, "2x", "Render at 50% resolution"}, {4, "4", 0, "4x", "Render at 25% resolution"}, {8, "8", 0, "8x", "Render at 12.5% resolution"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem fixed_oversample_items[] = { @@ -4816,18 +4820,18 @@ static void rna_def_scene_render_data(BlenderRNA *brna) {8, "8", 0, "8", ""}, {11, "11", 0, "11", ""}, {16, "16", 0, "16", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem threads_mode_items[] = { {0, "AUTO", 0, "Auto-detect", "Automatically determine the number of threads, based on CPUs"}, {R_FIXED_THREADS, "FIXED", 0, "Fixed", "Manually determine the number of threads"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem engine_items[] = { {0, "BLENDER_EEVEE", 0, "Eevee", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem freestyle_thickness_items[] = { @@ -4835,20 +4839,21 @@ static void rna_def_scene_render_data(BlenderRNA *brna) {R_LINE_THICKNESS_RELATIVE, "RELATIVE", 0, "Relative", "Unit line thickness is scaled by the proportion of the present vertical image " "resolution to 480 pixels"}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL}, + }; static const EnumPropertyItem views_format_items[] = { {SCE_VIEWS_FORMAT_STEREO_3D, "STEREO_3D", 0, "Stereo 3D", "Single stereo camera system, adjust the stereo settings in the camera panel"}, {SCE_VIEWS_FORMAT_MULTIVIEW, "MULTIVIEW", 0, "Multi-View", "Multi camera system, adjust the cameras individually"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem hair_shape_type_items[] = { {SCE_HAIR_SHAPE_STRAND, "STRAND", 0, "Strand", ""}, {SCE_HAIR_SHAPE_STRIP, "STRIP", 0, "Strip", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; rna_def_scene_ffmpeg_settings(brna); @@ -5809,7 +5814,7 @@ static void rna_def_scene_eevee(BlenderRNA *brna) static const EnumPropertyItem eevee_shadow_method_items[] = { {SHADOW_ESM, "ESM", 0, "ESM", "Exponential Shadow Mapping"}, {SHADOW_VSM, "VSM", 0, "VSM", "Variance Shadow Mapping"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem eevee_shadow_size_items[] = { @@ -5820,7 +5825,7 @@ static void rna_def_scene_eevee(BlenderRNA *brna) {1024, "1024", 0, "1024px", ""}, {2048, "2048", 0, "2048px", ""}, {4096, "4096", 0, "4096px", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem eevee_gi_visibility_size_items[] = { @@ -5828,7 +5833,7 @@ static void rna_def_scene_eevee(BlenderRNA *brna) {16, "16", 0, "16px", ""}, {32, "32", 0, "32px", ""}, {64, "64", 0, "64px", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem eevee_volumetric_tile_size_items[] = { @@ -5836,7 +5841,7 @@ static void rna_def_scene_eevee(BlenderRNA *brna) {4, "4", 0, "4px", ""}, {8, "8", 0, "8px", ""}, {16, "16", 0, "16px", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static float default_bloom_color[3] = {1.0f, 1.0f, 1.0f}; @@ -6280,14 +6285,14 @@ void RNA_def_scene(BlenderRNA *brna) {4, "LINEAR_CLAMPED", 0, "Linear Clamped", "Linear distance model with clamping"}, {5, "EXPONENT", 0, "Exponent", "Exponent distance model"}, {6, "EXPONENT_CLAMPED", 0, "Exponent Clamped", "Exponent distance model with clamping"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem sync_mode_items[] = { {0, "NONE", 0, "No Sync", "Do not sync, play every frame"}, {SCE_FRAME_DROP, "FRAME_DROP", 0, "Frame Dropping", "Drop frames if playback is too slow"}, {AUDIO_SYNC, "AUDIO_SYNC", 0, "AV-sync", "Sync to audio playback, dropping frames"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* Struct definition */ |