diff options
Diffstat (limited to 'source/blender/makesrna')
60 files changed, 721 insertions, 704 deletions
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c index 6a9d61006ab..db7e2d0e43d 100644 --- a/source/blender/makesrna/intern/makesrna.c +++ b/source/blender/makesrna/intern/makesrna.c @@ -3444,7 +3444,7 @@ static RNAProcessItem PROCESS_ITEMS[] = { {"rna_movieclip.c", NULL, RNA_def_movieclip}, {"rna_tracking.c", NULL, RNA_def_tracking}, {"rna_mask.c", NULL, RNA_def_mask}, - {NULL, NULL} + {NULL, NULL}, }; static void rna_generate(BlenderRNA *brna, FILE *f, const char *filename, const char *api_filename) diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index f41ed8d0399..d287a9ba9b4 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -78,7 +78,7 @@ const EnumPropertyItem rna_enum_id_type_items[] = { {ID_WM, "WINDOWMANAGER", ICON_WINDOW, "Window Manager", ""}, {ID_WO, "WORLD", ICON_WORLD_DATA, "World", ""}, {ID_WS, "WORKSPACE", ICON_WORKSPACE, "Workspace", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifdef RNA_RUNTIME @@ -1062,7 +1062,7 @@ static void rna_def_ID_override_static_property_operation(BlenderRNA *brna) "Insert a new item into collection after the one referenced in subitem_reference_name or _index"}, {IDOVERRIDESTATIC_OP_INSERT_BEFORE, "INSERT_BEFORE", 0, "Insert Before", "Insert a new item into collection after the one referenced in subitem_reference_name or _index (NOT USED)"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem static_override_property_flag_items[] = { @@ -1070,7 +1070,7 @@ static void rna_def_ID_override_static_property_operation(BlenderRNA *brna) "For templates, prevents the user from removing pre-defined operation (NOT USED)"}, {IDOVERRIDESTATIC_FLAG_LOCKED, "LOCKED", 0, "Locked", "Prevents the user from modifying that override operation (NOT USED)"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "IDOverrideStaticPropertyOperation", NULL); @@ -1155,7 +1155,7 @@ static void rna_def_ID(BlenderRNA *brna) {ID_RECALC_TRANSFORM, "OBJECT", 0, "Object", ""}, {ID_RECALC_GEOMETRY, "DATA", 0, "Data", ""}, {ID_RECALC_ANIMATION, "TIME", 0, "Time", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "ID", NULL); diff --git a/source/blender/makesrna/intern/rna_animation.c b/source/blender/makesrna/intern/rna_animation.c index 76f99443b27..71de1ca4da4 100644 --- a/source/blender/makesrna/intern/rna_animation.c +++ b/source/blender/makesrna/intern/rna_animation.c @@ -45,7 +45,7 @@ const EnumPropertyItem rna_enum_keyingset_path_grouping_items[] = { {KSP_GROUP_NAMED, "NAMED", 0, "Named Group", ""}, {KSP_GROUP_NONE, "NONE", 0, "None", ""}, {KSP_GROUP_KSNAME, "KEYINGSET", 0, "Keying Set Name", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* It would be cool to get rid of this 'INSERTKEY_' prefix in 'py strings' values, but it would break existing @@ -59,7 +59,7 @@ const EnumPropertyItem rna_enum_keying_flag_items[] = { {INSERTKEY_XYZ2RGB, "INSERTKEY_XYZ_TO_RGB", 0, "XYZ=RGB Colors", "Color for newly added transformation F-Curves (Location, Rotation, Scale) " "and also Color is based on the transform axis"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifdef RNA_RUNTIME diff --git a/source/blender/makesrna/intern/rna_animviz.c b/source/blender/makesrna/intern/rna_animviz.c index ebea25cf1e3..06584079361 100644 --- a/source/blender/makesrna/intern/rna_animviz.c +++ b/source/blender/makesrna/intern/rna_animviz.c @@ -41,7 +41,7 @@ const EnumPropertyItem rna_enum_motionpath_bake_location_items[] = { {MOTIONPATH_BAKE_HEADS, "HEADS", 0, "Heads", "Calculate bone paths from heads"}, {0, "TAILS", 0, "Tails", "Calculate bone paths from tails"}, //{MOTIONPATH_BAKE_CENTERS, "CENTROID", 0, "Centers", "Calculate bone paths from center of mass"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifdef RNA_RUNTIME @@ -199,7 +199,7 @@ static void rna_def_animviz_ghosts(BlenderRNA *brna) {GHOST_TYPE_ACFRA, "CURRENT_FRAME", 0, "Around Current Frame", "Show ghosts from around the current frame"}, {GHOST_TYPE_RANGE, "RANGE", 0, "In Range", "Show ghosts for the specified frame range"}, {GHOST_TYPE_KEYS, "KEYS", 0, "On Keyframes", "Show ghosts on keyframes"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; @@ -273,7 +273,7 @@ static void rna_def_animviz_paths(BlenderRNA *brna) {MOTIONPATH_TYPE_ACFRA, "CURRENT_FRAME", 0, "Around Frame", "Display Paths of poses within a fixed number of frames around the current frame"}, {MOTIONPATH_TYPE_RANGE, "RANGE", 0, "In Range", "Display Paths of poses within specified range"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "AnimVizMotionPaths", NULL); diff --git a/source/blender/makesrna/intern/rna_armature.c b/source/blender/makesrna/intern/rna_armature.c index 87e1878ec3b..91663a90a90 100644 --- a/source/blender/makesrna/intern/rna_armature.c +++ b/source/blender/makesrna/intern/rna_armature.c @@ -693,7 +693,7 @@ static void rna_def_bone_common(StructRNA *srna, int editbone) {BBONE_HANDLE_ABSOLUTE, "ABSOLUTE", 0, "Absolute", "Use the position of the specified bone to compute the handle"}, {BBONE_HANDLE_RELATIVE, "RELATIVE", 0, "Relative", "Use the offset of the specified bone from rest pose to compute the handle"}, {BBONE_HANDLE_TANGENT, "TANGENT", 0, "Tangent", "Use the orientation of the specified bone to compute the handle, ignoring the location"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; PropertyRNA *prop; @@ -1148,19 +1148,19 @@ static void rna_def_armature(BlenderRNA *brna) {ARM_ENVELOPE, "ENVELOPE", 0, "Envelope", "Display bones as extruded spheres, showing deformation influence volume"}, {ARM_WIRE, "WIRE", 0, "Wire", "Display bones as thin wires, showing subdivision and B-Splines"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_ghost_type_items[] = { {ARM_GHOST_CUR, "CURRENT_FRAME", 0, "Around Frame", "Display Ghosts of poses within a fixed number of frames around the current frame"}, {ARM_GHOST_RANGE, "RANGE", 0, "In Range", "Display Ghosts of poses within specified range"}, {ARM_GHOST_KEYS, "KEYS", 0, "On Keyframes", "Display Ghosts of poses on Keyframes"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_pose_position_items[] = { {0, "POSE", 0, "Pose Position", "Show armature in posed state"}, {ARM_RESTPOS, "REST", 0, "Rest Position", "Show Armature in binding pose state (no posing possible)"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "Armature", "ID"); diff --git a/source/blender/makesrna/intern/rna_boid.c b/source/blender/makesrna/intern/rna_boid.c index cd5e36dcfa8..f22c1de074f 100644 --- a/source/blender/makesrna/intern/rna_boid.c +++ b/source/blender/makesrna/intern/rna_boid.c @@ -59,7 +59,7 @@ const EnumPropertyItem rna_enum_boidrule_type_items[] = { {eBoidRuleType_FollowWall, "FOLLOW_WALL", 0, "Follow Wall", "Move next to a deflector object's in direction of it's tangent"}, #endif - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifndef RNA_RUNTIME @@ -69,7 +69,7 @@ static const EnumPropertyItem boidruleset_type_items[] = { "fuzziness threshold is evaluated)"}, {eBoidRulesetType_Random, "RANDOM", 0, "Random", "A random rule is selected for each boid"}, {eBoidRulesetType_Average, "AVERAGE", 0, "Average", "All rules are averaged"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c index f2b8015b0d7..d3646c149c2 100644 --- a/source/blender/makesrna/intern/rna_brush.c +++ b/source/blender/makesrna/intern/rna_brush.c @@ -42,7 +42,7 @@ static const EnumPropertyItem prop_direction_items[] = { {0, "ADD", ICON_ADD, "Add", "Add effect of brush"}, {BRUSH_DIR_IN, "SUBTRACT", ICON_REMOVE, "Subtract", "Subtract effect of brush"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem sculpt_stroke_method_items[] = { @@ -54,7 +54,7 @@ static const EnumPropertyItem sculpt_stroke_method_items[] = { {BRUSH_LINE, "LINE", 0, "Line", "Draw a line with dabs separated according to spacing"}, {BRUSH_CURVE, "CURVE", 0, "Curve", "Define the stroke curve with a bezier curve (dabs are separated according to spacing)"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; @@ -81,7 +81,7 @@ const EnumPropertyItem rna_enum_brush_sculpt_tool_items[] = { {0, "", 0, NULL, NULL}, {SCULPT_TOOL_MASK, "MASK", ICON_BRUSH_MASK, "Mask", ""}, {SCULPT_TOOL_SIMPLIFY, "SIMPLIFY", ICON_BRUSH_SUBTRACT /* icon TODO */, "Simplify", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_brush_vertex_tool_items[] = { @@ -89,7 +89,7 @@ const EnumPropertyItem rna_enum_brush_vertex_tool_items[] = { {VPAINT_TOOL_BLUR, "BLUR", ICON_BRUSH_BLUR, "Blur", ""}, {VPAINT_TOOL_AVERAGE, "AVERAGE", ICON_BRUSH_BLUR, "Average", ""}, {VPAINT_TOOL_SMEAR, "SMEAR", ICON_BRUSH_BLUR, "Smear", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_brush_weight_tool_items[] = { @@ -97,7 +97,7 @@ const EnumPropertyItem rna_enum_brush_weight_tool_items[] = { {WPAINT_TOOL_BLUR, "BLUR", ICON_BRUSH_BLUR, "Blur", ""}, {WPAINT_TOOL_AVERAGE, "AVERAGE", ICON_BRUSH_BLUR, "Average", ""}, {WPAINT_TOOL_SMEAR, "SMEAR", ICON_BRUSH_BLUR, "Smear", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_brush_image_tool_items[] = { @@ -107,14 +107,14 @@ const EnumPropertyItem rna_enum_brush_image_tool_items[] = { {PAINT_TOOL_CLONE, "CLONE", ICON_BRUSH_CLONE, "Clone", ""}, {PAINT_TOOL_FILL, "FILL", ICON_BRUSH_TEXFILL, "Fill", ""}, {PAINT_TOOL_MASK, "MASK", ICON_BRUSH_TEXMASK, "Mask", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_brush_gpencil_types_items[] = { {GPAINT_TOOL_DRAW, "DRAW", ICON_STROKE, "Draw", "The brush is of type used for drawing strokes"}, {GPAINT_TOOL_FILL, "FILL", ICON_COLOR, "Fill", "The brush is of type used for filling areas"}, {GPAINT_TOOL_ERASE, "ERASE", ICON_PANEL_CLOSE, "Erase", "The brush is used for erasing strokes"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifndef RNA_RUNTIME @@ -122,14 +122,14 @@ static EnumPropertyItem rna_enum_gpencil_brush_eraser_modes_items[] = { {GP_BRUSH_ERASER_SOFT, "SOFT", 0, "Soft", "Use soft eraser"}, {GP_BRUSH_ERASER_HARD, "HARD", 0, "Hard", "Use hard eraser"}, {GP_BRUSH_ERASER_STROKE, "STROKE", 0, "Stroke", "Use stroke eraser"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static EnumPropertyItem rna_enum_gpencil_fill_draw_modes_items[] = { {GP_FILL_DMODE_STROKE, "STROKE", 0, "Strokes", "Use visible strokes as fill boundary limits"}, {GP_FILL_DMODE_CONTROL, "CONTROL", 0, "Control", "Use internal control lines as fill boundary limits"}, {GP_FILL_DMODE_BOTH, "BOTH", 0, "Both", "Use visible strokes and control lines as fill boundary limits"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static EnumPropertyItem rna_enum_gpencil_brush_icons_items[] = { @@ -143,7 +143,7 @@ static EnumPropertyItem rna_enum_gpencil_brush_icons_items[] = { {GP_BRUSH_ICON_ERASE_SOFT, "SOFT", ICON_GPBRUSH_ERASE_SOFT, "Eraser Soft", ""}, {GP_BRUSH_ICON_ERASE_HARD, "HARD", ICON_GPBRUSH_ERASE_HARD, "Eraser Hard", ""}, {GP_BRUSH_ICON_ERASE_STROKE, "STROKE", ICON_GPBRUSH_ERASE_STROKE, "Eraser Stroke", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -564,45 +564,45 @@ static const EnumPropertyItem *rna_Brush_direction_itemf( ePaintMode mode = BKE_paintmode_get_active_from_context(C); static const EnumPropertyItem prop_default_items[] = { - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* sculpt mode */ static const EnumPropertyItem prop_flatten_contrast_items[] = { {BRUSH_DIR_IN, "CONTRAST", ICON_ADD, "Contrast", "Subtract effect of brush"}, {0, "FLATTEN", ICON_REMOVE, "Flatten", "Add effect of brush"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_fill_deepen_items[] = { {0, "FILL", ICON_ADD, "Fill", "Add effect of brush"}, {BRUSH_DIR_IN, "DEEPEN", ICON_REMOVE, "Deepen", "Subtract effect of brush"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_scrape_peaks_items[] = { {0, "SCRAPE", ICON_ADD, "Scrape", "Add effect of brush"}, {BRUSH_DIR_IN, "PEAKS", ICON_REMOVE, "Peaks", "Subtract effect of brush"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_pinch_magnify_items[] = { {BRUSH_DIR_IN, "MAGNIFY", ICON_ADD, "Magnify", "Subtract effect of brush"}, {0, "PINCH", ICON_REMOVE, "Pinch", "Add effect of brush"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_inflate_deflate_items[] = { {0, "INFLATE", ICON_ADD, "Inflate", "Add effect of brush"}, {BRUSH_DIR_IN, "DEFLATE", ICON_REMOVE, "Deflate", "Subtract effect of brush"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* texture paint mode */ static const EnumPropertyItem prop_soften_sharpen_items[] = { {BRUSH_DIR_IN, "SHARPEN", ICON_ADD, "Sharpen", "Sharpen effect of brush"}, {0, "SOFTEN", ICON_REMOVE, "Soften", "Blur effect of brush"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; Brush *me = (Brush *)(ptr->data); @@ -676,7 +676,7 @@ static const EnumPropertyItem *rna_Brush_stroke_itemf( {BRUSH_AIRBRUSH, "AIRBRUSH", 0, "Airbrush", "Keep applying paint effect while holding mouse (spray)"}, {BRUSH_LINE, "LINE", 0, "Line", "Drag a line with dabs separated according to spacing"}, {BRUSH_CURVE, "CURVE", 0, "Curve", "Define the stroke curve with a bezier curve. Dabs are separated according to spacing"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; switch (mode) { @@ -760,7 +760,7 @@ static void rna_def_brush_texture_slot(BlenderRNA *brna) {MTEX_MAP_MODE_3D, "3D", 0, "3D", ""}, {MTEX_MAP_MODE_RANDOM, "RANDOM", 0, "Random", ""}, {MTEX_MAP_MODE_STENCIL, "STENCIL", 0, "Stencil", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_tex_paint_map_mode_items[] = { @@ -769,7 +769,7 @@ static void rna_def_brush_texture_slot(BlenderRNA *brna) {MTEX_MAP_MODE_3D, "3D", 0, "3D", ""}, {MTEX_MAP_MODE_RANDOM, "RANDOM", 0, "Random", ""}, {MTEX_MAP_MODE_STENCIL, "STENCIL", 0, "Stencil", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_mask_paint_map_mode_items[] = { @@ -777,7 +777,7 @@ static void rna_def_brush_texture_slot(BlenderRNA *brna) {MTEX_MAP_MODE_TILED, "TILED", 0, "Tiled", ""}, {MTEX_MAP_MODE_RANDOM, "RANDOM", 0, "Random", ""}, {MTEX_MAP_MODE_STENCIL, "STENCIL", 0, "Stencil", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #define TEXTURE_CAPABILITY(prop_name_, ui_name_) \ @@ -1349,7 +1349,7 @@ static void rna_def_brush(BlenderRNA *brna) {0, "", ICON_NONE, NULL, NULL}, {IMB_BLEND_ERASE_ALPHA, "ERASE_ALPHA", 0, "Erase Alpha", "Erase alpha while painting"}, {IMB_BLEND_ADD_ALPHA, "ADD_ALPHA", 0, "Add Alpha", "Add alpha while painting"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem brush_sculpt_plane_items[] = { @@ -1358,39 +1358,39 @@ static void rna_def_brush(BlenderRNA *brna) {SCULPT_DISP_DIR_X, "X", 0, "X Plane", ""}, {SCULPT_DISP_DIR_Y, "Y", 0, "Y Plane", ""}, {SCULPT_DISP_DIR_Z, "Z", 0, "Z Plane", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem brush_mask_tool_items[] = { {BRUSH_MASK_DRAW, "DRAW", 0, "Draw", ""}, {BRUSH_MASK_SMOOTH, "SMOOTH", 0, "Smooth", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem brush_blur_mode_items[] = { {KERNEL_BOX, "BOX", 0, "Box", ""}, {KERNEL_GAUSSIAN, "GAUSSIAN", 0, "Gaussian", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem brush_gradient_items[] = { {BRUSH_GRADIENT_PRESSURE, "PRESSURE", 0, "Pressure", ""}, {BRUSH_GRADIENT_SPACING_REPEAT, "SPACING_REPEAT", 0, "Repeat", ""}, {BRUSH_GRADIENT_SPACING_CLAMP, "SPACING_CLAMP", 0, "Clamp", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem brush_gradient_fill_items[] = { {BRUSH_GRADIENT_LINEAR, "LINEAR", 0, "Linear", ""}, {BRUSH_GRADIENT_RADIAL, "RADIAL", 0, "Radial", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem brush_mask_pressure_items[] = { {0, "NONE", 0, "Off", ""}, {BRUSH_MASK_PRESSURE_RAMP, "RAMP", ICON_STYLUS_PRESSURE, "Ramp", ""}, {BRUSH_MASK_PRESSURE_CUTOFF, "CUTOFF", ICON_STYLUS_PRESSURE, "Cutoff", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "Brush", "ID"); diff --git a/source/blender/makesrna/intern/rna_camera.c b/source/blender/makesrna/intern/rna_camera.c index 208caf22113..4328aadf1a9 100644 --- a/source/blender/makesrna/intern/rna_camera.c +++ b/source/blender/makesrna/intern/rna_camera.c @@ -140,20 +140,20 @@ static void rna_def_camera_background_image(BlenderRNA *brna) static const EnumPropertyItem bgpic_source_items[] = { {CAM_BGIMG_SOURCE_IMAGE, "IMAGE", 0, "Image", ""}, {CAM_BGIMG_SOURCE_MOVIE, "MOVIE_CLIP", 0, "Movie Clip", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem bgpic_camera_frame_items[] = { {0, "STRETCH", 0, "Stretch", ""}, {CAM_BGIMG_FLAG_CAMERA_ASPECT, "FIT", 0, "Fit", ""}, {CAM_BGIMG_FLAG_CAMERA_ASPECT | CAM_BGIMG_FLAG_CAMERA_CROP, "CROP", 0, "Crop", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem bgpic_display_depth_items[] = { {0, "BACK", 0, "Back", ""}, {CAM_BGIMG_FLAG_FOREGROUND, "FRONT", 0, "Front", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "CameraBackgroundImage", NULL); @@ -296,14 +296,14 @@ static void rna_def_camera_stereo_data(BlenderRNA *brna) {CAM_S3D_OFFAXIS, "OFFAXIS", 0, "Off-Axis", "Off-axis frustums converging in a plane"}, {CAM_S3D_PARALLEL, "PARALLEL", 0, "Parallel", "Parallel cameras with no convergence"}, {CAM_S3D_TOE, "TOE", 0, "Toe-in", "Rotated cameras, looking at the convergence distance"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem pivot_items[] = { {CAM_S3D_PIVOT_LEFT, "LEFT", 0, "Left", ""}, {CAM_S3D_PIVOT_RIGHT, "RIGHT", 0, "Right", ""}, {CAM_S3D_PIVOT_CENTER, "CENTER", 0, "Center", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "CameraStereoData", NULL); @@ -370,7 +370,7 @@ void RNA_def_camera(BlenderRNA *brna) {CAM_PERSP, "PERSP", 0, "Perspective", ""}, {CAM_ORTHO, "ORTHO", 0, "Orthographic", ""}, {CAM_PANO, "PANO", 0, "Panoramic", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_display_type_extra_items[] = { {CAM_DTX_CENTER, "CENTER", 0, "Center", ""}, @@ -381,18 +381,18 @@ void RNA_def_camera(BlenderRNA *brna) {CAM_DTX_GOLDEN_TRI_B, "GOLDEN_TRIANGLE_B", 0, "Golden Triangle B", ""}, {CAM_DTX_HARMONY_TRI_A, "HARMONY_TRIANGLE_A", 0, "Harmonious Triangle A", ""}, {CAM_DTX_HARMONY_TRI_B, "HARMONY_TRIANGLE_B", 0, "Harmonious Triangle B", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_lens_unit_items[] = { {0, "MILLIMETERS", 0, "Millimeters", "Specify the lens in millimeters"}, {CAM_ANGLETOGGLE, "FOV", 0, "Field of View", "Specify the lens as the field of view's angle"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem sensor_fit_items[] = { {CAMERA_SENSOR_FIT_AUTO, "AUTO", 0, "Auto", "Fit to the sensor width or height depending on image resolution"}, {CAMERA_SENSOR_FIT_HOR, "HORIZONTAL", 0, "Horizontal", "Fit to the sensor width"}, {CAMERA_SENSOR_FIT_VERT, "VERTICAL", 0, "Vertical", "Fit to the sensor height"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "Camera", "ID"); diff --git a/source/blender/makesrna/intern/rna_cloth.c b/source/blender/makesrna/intern/rna_cloth.c index 0d831cb8f32..c787ad49078 100644 --- a/source/blender/makesrna/intern/rna_cloth.c +++ b/source/blender/makesrna/intern/rna_cloth.c @@ -375,7 +375,7 @@ static void rna_def_cloth_solver_result(BlenderRNA *brna) {BPH_SOLVER_NUMERICAL_ISSUE, "NUMERICAL_ISSUE", 0, "Numerical Issue", "The provided data did not satisfy the prerequisites"}, {BPH_SOLVER_NO_CONVERGENCE, "NO_CONVERGENCE", 0, "No Convergence", "Iterative procedure did not converge"}, {BPH_SOLVER_INVALID_INPUT, "INVALID_INPUT", 0, "Invalid Input", "The inputs are invalid, or the algorithm has been improperly called"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "ClothSolverResult", NULL); @@ -431,7 +431,7 @@ static void rna_def_cloth_sim_settings(BlenderRNA *brna) static const EnumPropertyItem prop_bending_model_items[] = { {CLOTH_BENDING_ANGULAR, "ANGULAR", 0, "Angular", "Cloth model with angular bending springs"}, {CLOTH_BENDING_LINEAR, "LINEAR", 0, "Linear", "Cloth model with linear bending springs (legacy)"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "ClothSettings", NULL); diff --git a/source/blender/makesrna/intern/rna_color.c b/source/blender/makesrna/intern/rna_color.c index b2f2de4eaaf..a1bccd8a78b 100644 --- a/source/blender/makesrna/intern/rna_color.c +++ b/source/blender/makesrna/intern/rna_color.c @@ -667,7 +667,7 @@ static void rna_def_curvemappoint(BlenderRNA *brna) {0, "AUTO", 0, "Auto Handle", ""}, {CUMA_HANDLE_AUTO_ANIM, "AUTO_CLAMPED", 0, "Auto Clamped Handle", ""}, {CUMA_HANDLE_VECTOR, "VECTOR", 0, "Vector Handle", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "CurveMapPoint", NULL); @@ -725,7 +725,7 @@ static void rna_def_curvemap(BlenderRNA *brna) static const EnumPropertyItem prop_extend_items[] = { {0, "HORIZONTAL", 0, "Horizontal", ""}, {CUMA_EXTEND_EXTRAPOLATE, "EXTRAPOLATED", 0, "Extrapolated", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "CurveMap", NULL); @@ -760,7 +760,7 @@ static void rna_def_curvemapping(BlenderRNA *brna) static const EnumPropertyItem tone_items[] = { {CURVE_TONE_STANDARD, "STANDARD", 0, "Standard", ""}, {CURVE_TONE_FILMLIKE, "FILMLIKE", 0, "Film like", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "CurveMapping", NULL); @@ -904,14 +904,14 @@ static void rna_def_color_ramp(BlenderRNA *brna) {COLBAND_INTERP_LINEAR, "LINEAR", 0, "Linear", ""}, {COLBAND_INTERP_B_SPLINE, "B_SPLINE", 0, "B-Spline", ""}, {COLBAND_INTERP_CONSTANT, "CONSTANT", 0, "Constant", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_mode_items[] = { {COLBAND_BLEND_RGB, "RGB", 0, "RGB", ""}, {COLBAND_BLEND_HSV, "HSV", 0, "HSV", ""}, {COLBAND_BLEND_HSL, "HSL", 0, "HSL", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_hsv_items[] = { @@ -919,7 +919,7 @@ static void rna_def_color_ramp(BlenderRNA *brna) {COLBAND_HUE_FAR, "FAR", 0, "Far", ""}, {COLBAND_HUE_CW, "CW", 0, "Clockwise", ""}, {COLBAND_HUE_CCW, "CCW", 0, "Counter-Clockwise", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "ColorRamp", NULL); @@ -985,7 +985,7 @@ static void rna_def_histogram(BlenderRNA *brna) {HISTO_MODE_G, "G", 0, "G", "Green"}, {HISTO_MODE_B, "B", 0, "B", "Blue"}, {HISTO_MODE_ALPHA, "A", 0, "A", "Alpha"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "Histogram", NULL); @@ -1014,7 +1014,7 @@ static void rna_def_scopes(BlenderRNA *brna) {SCOPES_WAVEFRM_YCC_709, "YCBCR709", ICON_COLOR, "YCbCr (ITU 709)", ""}, {SCOPES_WAVEFRM_YCC_JPEG, "YCBCRJPG", ICON_COLOR, "YCbCr (Jpeg)", ""}, {SCOPES_WAVEFRM_RGB, "RGB", ICON_COLOR, "Red Green Blue", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "Scopes", NULL); @@ -1061,22 +1061,22 @@ static void rna_def_colormanage(BlenderRNA *brna) static const EnumPropertyItem display_device_items[] = { {0, "DEFAULT", 0, "Default", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem look_items[] = { {0, "NONE", 0, "None", "Do not modify image in an artistic manner"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem view_transform_items[] = { {0, "NONE", 0, "None", "Do not perform any color transform on display, use old non-color managed technique for display"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem color_space_items[] = { {0, "NONE", 0, "None", "Do not perform any color transform on load, treat colors as in scene linear space already"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* ** Display Settings ** */ diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c index 4af92a9e5ec..0cb332071f2 100644 --- a/source/blender/makesrna/intern/rna_constraint.c +++ b/source/blender/makesrna/intern/rna_constraint.c @@ -104,7 +104,7 @@ const EnumPropertyItem rna_enum_constraint_type_items[] = { "Restrict movements to surface of target mesh"}, {CONSTRAINT_TYPE_ARMATURE, "ARMATURE", ICON_CONSTRAINT, "Armature", "Apply weight-blended transformation from multiple bones like the Armature modifier"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem target_space_pchan_items[] = { @@ -120,7 +120,7 @@ static const EnumPropertyItem target_space_pchan_items[] = { {CONSTRAINT_SPACE_LOCAL, "LOCAL", 0, "Local Space", "The transformation of the target is evaluated relative to its local " "coordinate system"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem owner_space_pchan_items[] = { @@ -133,7 +133,7 @@ static const EnumPropertyItem owner_space_pchan_items[] = { "with the parent transformation added"}, {CONSTRAINT_SPACE_LOCAL, "LOCAL", 0, "Local Space", "The constraint is applied relative to the local coordinate system of the object"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem track_axis_items[] = { @@ -143,7 +143,7 @@ static const EnumPropertyItem track_axis_items[] = { {TRACK_nX, "TRACK_NEGATIVE_X", 0, "-X", ""}, {TRACK_nY, "TRACK_NEGATIVE_Y", 0, "-Y", ""}, {TRACK_nZ, "TRACK_NEGATIVE_Z", 0, "-Z", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifdef RNA_RUNTIME @@ -153,7 +153,7 @@ static const EnumPropertyItem space_object_items[] = { "The transformation of the target is evaluated relative to the world coordinate system"}, {CONSTRAINT_SPACE_LOCAL, "LOCAL", 0, "Local Space", "The transformation of the target is evaluated relative to its local coordinate system"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #include "DNA_cachefile_types.h" @@ -632,7 +632,7 @@ static const EnumPropertyItem constraint_distance_items[] = { {LIMITDIST_ONSURFACE, "LIMITDIST_ONSURFACE", 0, "On Surface", "The object is constrained on the surface of a virtual sphere around the target object, " "with a radius defined by the limit distance"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; @@ -1035,7 +1035,7 @@ static void rna_def_constraint_track_to(BlenderRNA *brna) {TRACK_X, "UP_X", 0, "X", ""}, {TRACK_Y, "UP_Y", 0, "Y", ""}, {TRACK_Z, "UP_Z", 0, "Z", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "TrackToConstraint", "Constraint"); @@ -1208,7 +1208,7 @@ static void rna_def_constraint_same_volume(BlenderRNA *brna) {SAMEVOL_X, "SAMEVOL_X", 0, "X", ""}, {SAMEVOL_Y, "SAMEVOL_Y", 0, "Y", ""}, {SAMEVOL_Z, "SAMEVOL_Z", 0, "Z", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "MaintainVolumeConstraint", "Constraint"); @@ -1255,7 +1255,7 @@ static void rna_def_constraint_minmax(BlenderRNA *brna) {TRACK_nX, "FLOOR_NEGATIVE_X", 0, "-X", ""}, {TRACK_nY, "FLOOR_NEGATIVE_Y", 0, "-Y", ""}, {TRACK_nZ, "FLOOR_NEGATIVE_Z", 0, "-Z", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "FloorConstraint", "Constraint"); @@ -1301,7 +1301,7 @@ static void rna_def_constraint_action(BlenderRNA *brna) {10, "SCALE_X", 0, "X Scale", ""}, {11, "SCALE_Y", 0, "Y Scale", ""}, {12, "SCALE_Z", 0, "Z Scale", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "ActionConstraint", "Constraint"); @@ -1368,7 +1368,7 @@ static void rna_def_constraint_locked_track(BlenderRNA *brna) {TRACK_X, "LOCK_X", 0, "X", ""}, {TRACK_Y, "LOCK_Y", 0, "Y", ""}, {TRACK_Z, "LOCK_Z", 0, "Z", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "LockedTrackConstraint", "Constraint"); @@ -1406,14 +1406,14 @@ static void rna_def_constraint_follow_path(BlenderRNA *brna) {TRACK_nX, "TRACK_NEGATIVE_X", 0, "-X", ""}, {TRACK_nY, "TRACK_NEGATIVE_Y", 0, "-Y", ""}, {TRACK_nZ, "TRACK_NEGATIVE_Z", 0, "-Z", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem pathup_items[] = { {TRACK_X, "UP_X", 0, "X", ""}, {TRACK_Y, "UP_Y", 0, "Y", ""}, {TRACK_Z, "UP_Z", 0, "Z", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "FollowPathConstraint", "Constraint"); @@ -1479,13 +1479,13 @@ static void rna_def_constraint_stretch_to(BlenderRNA *brna) {VOLUME_X, "VOLUME_X", 0, "X", ""}, {VOLUME_Z, "VOLUME_Z", 0, "Z", ""}, {NO_VOLUME, "NO_VOLUME", 0, "None", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem plane_items[] = { {PLANE_X, "PLANE_X", 0, "X", "Keep X Axis"}, {PLANE_Z, "PLANE_Z", 0, "Z", "Keep Z Axis"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "StretchToConstraint", "Constraint"); @@ -1557,7 +1557,7 @@ static void rna_def_constraint_clamp_to(BlenderRNA *brna) {CLAMPTO_X, "CLAMPTO_X", 0, "X", ""}, {CLAMPTO_Y, "CLAMPTO_Y", 0, "Y", ""}, {CLAMPTO_Z, "CLAMPTO_Z", 0, "Z", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "ClampToConstraint", "Constraint"); @@ -1594,7 +1594,7 @@ static void rna_def_constraint_transform(BlenderRNA *brna) {TRANS_LOCATION, "LOCATION", 0, "Loc", ""}, {TRANS_ROTATION, "ROTATION", 0, "Rot", ""}, {TRANS_SCALE, "SCALE", 0, "Scale", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "TransformConstraint", "Constraint"); @@ -2133,14 +2133,14 @@ static void rna_def_constraint_shrinkwrap(BlenderRNA *brna) {MOD_SHRINKWRAP_TARGET_PROJECT, "TARGET_PROJECT", 0, "Target Normal Project", "Shrink the location to the nearest target surface " "along the interpolated vertex normals of the target"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem shrink_face_cull_items[] = { {0, "OFF", 0, "Off", "No culling"}, {CON_SHRINKWRAP_PROJECT_CULL_FRONTFACE, "FRONT", 0, "Front", "No projection when in front of the face"}, {CON_SHRINKWRAP_PROJECT_CULL_BACKFACE, "BACK", 0, "Back", "No projection when behind the face"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "ShrinkwrapConstraint", "Constraint"); @@ -2259,7 +2259,7 @@ static void rna_def_constraint_spline_ik(BlenderRNA *brna) "Scale of the X and Z axes is the inverse of the Y-Scale"}, {CONSTRAINT_SPLINEIK_XZS_VOLUMETRIC, "VOLUME_PRESERVE", 0, "Volume Preservation", "Scale of the X and Z axes are adjusted to preserve the volume of the bones"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "SplineIKConstraint", "Constraint"); @@ -2376,7 +2376,7 @@ static void rna_def_constraint_pivot(BlenderRNA *brna) {PIVOTCON_AXIS_X, "X", 0, "X Rot", "Use the pivot point in the positive rotation range around the X-axis"}, {PIVOTCON_AXIS_Y, "Y", 0, "Y Rot", "Use the pivot point in the positive rotation range around the Y-axis"}, {PIVOTCON_AXIS_Z, "Z", 0, "Z Rot", "Use the pivot point in the positive rotation range around the Z-axis"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "PivotConstraint", "Constraint"); @@ -2430,7 +2430,7 @@ static void rna_def_constraint_follow_track(BlenderRNA *brna) {FOLLOWTRACK_FRAME_STRETCH, "STRETCH", 0, "Stretch", ""}, {FOLLOWTRACK_FRAME_FIT, "FIT", 0, "Fit", ""}, {FOLLOWTRACK_FRAME_CROP, "CROP", 0, "Crop", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "FollowTrackConstraint", "Constraint"); diff --git a/source/blender/makesrna/intern/rna_context.c b/source/blender/makesrna/intern/rna_context.c index 89ef4726660..0e79b4422f4 100644 --- a/source/blender/makesrna/intern/rna_context.c +++ b/source/blender/makesrna/intern/rna_context.c @@ -51,7 +51,7 @@ const EnumPropertyItem rna_enum_context_mode_items[] = { {CTX_MODE_EDIT_GPENCIL, "EDIT_GPENCIL", 0, "Grease Pencil Edit", "" }, {CTX_MODE_SCULPT_GPENCIL, "SCULPT_GPENCIL", 0, "Grease Pencil Sculpt", "" }, {CTX_MODE_WEIGHT_GPENCIL, "WEIGHT_GPENCIL", 0, "Grease Pencil Weight Paint", "" }, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifdef RNA_RUNTIME diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index f2ca5912c1c..45d0e00c294 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -46,7 +46,7 @@ static const EnumPropertyItem beztriple_handle_type_items[] = { {HD_VECT, "VECTOR", 0, "Vector", ""}, {HD_ALIGN, "ALIGNED", 0, "Aligned", ""}, {HD_AUTO, "AUTO", 0, "Auto", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -56,7 +56,7 @@ const EnumPropertyItem rna_enum_keyframe_handle_type_items[] = { {HD_VECT, "VECTOR", ICON_HANDLETYPE_VECTOR_VEC, "Vector", "Automatic handles that create straight lines"}, {HD_AUTO, "AUTO", ICON_HANDLETYPE_AUTO_VEC, "Automatic", "Automatic handles that create smooth curves"}, {HD_AUTO_ANIM, "AUTO_CLAMPED", ICON_HANDLETYPE_AUTO_CLAMP_VEC, "Auto Clamped", "Automatic handles that create smooth curves which only change direction at keyframes"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_beztriple_interpolation_mode_items[] = { @@ -81,7 +81,7 @@ const EnumPropertyItem rna_enum_beztriple_interpolation_mode_items[] = { {BEZT_IPO_BOUNCE, "BOUNCE", ICON_IPO_BOUNCE, "Bounce", "Exponentially decaying parabolic bounce, like when objects collide"}, {BEZT_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}, }; #ifndef RNA_RUNTIME @@ -91,7 +91,7 @@ static const EnumPropertyItem curve_type_items[] = { {CU_BSPLINE, "BSPLINE", 0, "BSpline", ""}, {CU_CARDINAL, "CARDINAL", 0, "Cardinal", ""}, {CU_NURBS, "NURBS", 0, "Ease", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -100,7 +100,7 @@ static const EnumPropertyItem curve3d_fill_mode_items[] = { {CU_BACK, "BACK", 0, "Back", ""}, {CU_FRONT, "FRONT", 0, "Front", ""}, {CU_FRONT | CU_BACK, "HALF", 0, "Half", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifdef RNA_RUNTIME @@ -109,7 +109,7 @@ static const EnumPropertyItem curve2d_fill_mode_items[] = { {CU_BACK, "BACK", 0, "Back", ""}, {CU_FRONT, "FRONT", 0, "Front", ""}, {CU_FRONT | CU_BACK, "BOTH", 0, "Both", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -956,7 +956,7 @@ static void rna_def_font(BlenderRNA *UNUSED(brna), StructRNA *srna) {CU_ALIGN_X_RIGHT, "RIGHT", ICON_ALIGN_RIGHT, "Right", "Align text to the right"}, {CU_ALIGN_X_JUSTIFY, "JUSTIFY", ICON_ALIGN_JUSTIFY, "Justify", "Align to the left and the right"}, {CU_ALIGN_X_FLUSH, "FLUSH", ICON_ALIGN_FLUSH, "Flush", "Align to the left and the right, with equal character spacing"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_align_y_items[] = { @@ -966,14 +966,14 @@ static void rna_def_font(BlenderRNA *UNUSED(brna), StructRNA *srna) {CU_ALIGN_Y_BOTTOM, "BOTTOM", ICON_ALIGN_BOTTOM, "Bottom", "Align text to the bottom"}, {CU_ALIGN_Y_BOTTOM_BASELINE, "BOTTOM_BASELINE", ICON_ALIGN_BOTTOM, "Bottom Base-Line", "Align text to the bottom but use the base-line of the text"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_overflow_items[] = { {CU_OVERFLOW_NONE, "NONE", 0, "Overflow", "Let the text overflow outside the text boxes"}, {CU_OVERFLOW_SCALE, "SCALE", 0, "Scale to Fit", "Scale down the text to fit inside the text boxes"}, {CU_OVERFLOW_TRUNCATE, "TRUNCATE", 0, "Truncate", "Truncate the text that would go outside the text boxes"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* Enums */ @@ -1358,21 +1358,21 @@ static void rna_def_curve(BlenderRNA *brna) {CU_TWIST_Z_UP, "Z_UP", 0, "Z-Up", "Use Z-Up axis to calculate the curve twist at each point"}, {CU_TWIST_MINIMUM, "MINIMUM", 0, "Minimum", "Use the least twist over the entire curve"}, {CU_TWIST_TANGENT, "TANGENT", 0, "Tangent", "Use the tangent to calculate twist"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem curve_axis_items[] = { {0, "2D", 0, "2D", "Clamp the Z axis of the curve"}, {CU_3D, "3D", 0, "3D", "Allow editing on the Z axis of this curve, also allows tilt and curve radius to be used"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem bevfac_mapping_items[] = { {CU_BEVFAC_MAP_RESOLU, "RESOLUTION", 0, "Resolution", "Map the bevel factor to the number of subdivisions of a spline (U resolution)"}, {CU_BEVFAC_MAP_SEGMENT, "SEGMENTS", 0, "Segments", "Map the bevel factor to the length of a segment and to the number of subdivisions of a segment"}, {CU_BEVFAC_MAP_SPLINE, "SPLINE", 0, "Spline", "Map the bevel factor to the length of a spline"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "Curve", "ID"); @@ -1615,7 +1615,7 @@ static void rna_def_curve_nurb(BlenderRNA *brna) {KEY_CARDINAL, "CARDINAL", 0, "Cardinal", ""}, {KEY_BSPLINE, "BSPLINE", 0, "BSpline", ""}, {KEY_CU_EASE, "EASE", 0, "Ease", ""}, /* todo, define somewhere, not one of BEZT_IPO_* */ - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; StructRNA *srna; diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c index 19f31f888c0..118ea80f28e 100644 --- a/source/blender/makesrna/intern/rna_define.c +++ b/source/blender/makesrna/intern/rna_define.c @@ -423,7 +423,7 @@ static int rna_validate_identifier(const char *identifier, char *error, bool pro "class", "continue", "def", "del", "elif", "else", "except", "finally", "for", "from", "global", "if", "import", "in", "is", "lambda", "nonlocal", "not", "or", "pass", "raise", - "return", "try", "while", "with", "yield", NULL + "return", "try", "while", "with", "yield", NULL, }; @@ -466,7 +466,7 @@ static int rna_validate_identifier(const char *identifier, char *error, bool pro static const char *kwlist_prop[] = { /* not keywords but reserved all the same because py uses */ "keys", "values", "items", "get", - NULL + NULL, }; for (a = 0; kwlist_prop[a]; a++) { @@ -491,7 +491,7 @@ void RNA_identifier_sanitize(char *identifier, int property) "class", "continue", "def", "del", "elif", "else", "except", "finally", "for", "from", "global", "if", "import", "in", "is", "lambda", "nonlocal", "not", "or", "pass", "raise", - "return", "try", "while", "with", "yield", NULL + "return", "try", "while", "with", "yield", NULL, }; @@ -537,7 +537,7 @@ void RNA_identifier_sanitize(char *identifier, int property) static const char *kwlist_prop[] = { /* not keywords but reserved all the same because py uses */ "keys", "values", "items", "get", - NULL + NULL, }; for (a = 0; kwlist_prop[a]; a++) { diff --git a/source/blender/makesrna/intern/rna_depsgraph.c b/source/blender/makesrna/intern/rna_depsgraph.c index 1ecc0fca036..89991d995fe 100644 --- a/source/blender/makesrna/intern/rna_depsgraph.c +++ b/source/blender/makesrna/intern/rna_depsgraph.c @@ -561,7 +561,7 @@ static void rna_def_depsgraph(BlenderRNA *brna) static EnumPropertyItem enum_depsgraph_mode_items[] = { {DAG_EVAL_VIEWPORT, "VIEWPORT", 0, "Viewport", "Viewport non-rendered mode"}, {DAG_EVAL_RENDER, "RENDER", 0, "Render", "Render"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "Depsgraph", NULL); diff --git a/source/blender/makesrna/intern/rna_dynamicpaint.c b/source/blender/makesrna/intern/rna_dynamicpaint.c index 8b6f102098f..f003f8aea77 100644 --- a/source/blender/makesrna/intern/rna_dynamicpaint.c +++ b/source/blender/makesrna/intern/rna_dynamicpaint.c @@ -41,7 +41,7 @@ const EnumPropertyItem rna_enum_prop_dynamicpaint_type_items[] = { {MOD_DYNAMICPAINT_TYPE_CANVAS, "CANVAS", 0, "Canvas", ""}, {MOD_DYNAMICPAINT_TYPE_BRUSH, "BRUSH", 0, "Brush", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; @@ -334,20 +334,20 @@ static void rna_def_canvas_surface(BlenderRNA *brna) /*{MOD_DPAINT_SURFACE_F_PTEX, "PTEX", ICON_TEXTURE_SHADED, "Ptex", ""}, */ {MOD_DPAINT_SURFACE_F_VERTEX, "VERTEX", ICON_OUTLINER_DATA_MESH, "Vertex", ""}, {MOD_DPAINT_SURFACE_F_IMAGESEQ, "IMAGE", ICON_FILE_IMAGE, "Image Sequence", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* Surface type - generated dynamically based on surface format */ static const EnumPropertyItem prop_dynamicpaint_surface_type[] = { {MOD_DPAINT_SURFACE_T_PAINT, "PAINT", 0, "Paint", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* Surface output preview. currently only paint has multiple outputs */ static const EnumPropertyItem prop_dynamicpaint_surface_preview[] = { {MOD_DPAINT_SURFACE_PREV_PAINT, "PAINT", 0, "Paint", ""}, {MOD_DPAINT_SURFACE_PREV_WETMAP, "WETMAP", 0, "Wetmap", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* Initial color setting */ @@ -356,7 +356,7 @@ static void rna_def_canvas_surface(BlenderRNA *brna) {MOD_DPAINT_INITIAL_COLOR, "COLOR", ICON_COLOR, "Color", ""}, {MOD_DPAINT_INITIAL_TEXTURE, "TEXTURE", ICON_TEXTURE, "UV Texture", ""}, {MOD_DPAINT_INITIAL_VERTEXCOLOR, "VERTEX_COLOR", ICON_GROUP_VCOL, "Vertex Color", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* Effect type @@ -365,7 +365,7 @@ static void rna_def_canvas_surface(BlenderRNA *brna) {1, "SPREAD", 0, "Spread", ""}, {2, "DRIP", 0, "Drip", ""}, {3, "SHRINK", 0, "Shrink", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* Displacemap file format */ @@ -374,14 +374,14 @@ static void rna_def_canvas_surface(BlenderRNA *brna) #ifdef WITH_OPENEXR {MOD_DPAINT_IMGFORMAT_OPENEXR, "OPENEXR", 0, "OpenEXR", ""}, #endif - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* Displacemap type */ static const EnumPropertyItem prop_dynamicpaint_displace_type[] = { {MOD_DPAINT_DISP_DISPLACE, "DISPLACE", 0, "Displacement", ""}, {MOD_DPAINT_DISP_DEPTH, "DEPTH", 0, "Depth", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; @@ -778,14 +778,14 @@ static void rna_def_dynamic_paint_brush_settings(BlenderRNA *brna) {MOD_DPAINT_COL_DIST, "DISTANCE", ICON_DRIVER_DISTANCE, "Proximity", ""}, {MOD_DPAINT_COL_VOLDIST, "VOLUME_DISTANCE", ICON_META_CUBE, "Mesh Volume + Proximity", ""}, {MOD_DPAINT_COL_VOLUME, "VOLUME", ICON_MESH_CUBE, "Mesh Volume", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_dynamicpaint_prox_falloff[] = { {MOD_DPAINT_PRFALL_SMOOTH, "SMOOTH", ICON_SPHERECURVE, "Smooth", ""}, {MOD_DPAINT_PRFALL_CONSTANT, "CONSTANT", ICON_NOCURVE, "Constant", ""}, {MOD_DPAINT_PRFALL_RAMP, "RAMP", ICON_COLOR, "Color Ramp", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_dynamicpaint_brush_wave_type[] = { @@ -793,14 +793,14 @@ static void rna_def_dynamic_paint_brush_settings(BlenderRNA *brna) {MOD_DPAINT_WAVEB_DEPTH, "DEPTH", 0, "Obstacle", ""}, {MOD_DPAINT_WAVEB_FORCE, "FORCE", 0, "Force", ""}, {MOD_DPAINT_WAVEB_REFLECT, "REFLECT", 0, "Reflect Only", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_dynamicpaint_brush_ray_dir[] = { {MOD_DPAINT_RAY_CANVAS, "CANVAS", 0, "Canvas Normal", ""}, {MOD_DPAINT_RAY_BRUSH_AVG, "BRUSH", 0, "Brush Normal", ""}, {MOD_DPAINT_RAY_ZPLUS, "Z_AXIS", 0, "Z-Axis", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "DynamicPaintBrushSettings", NULL); diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c index a1319d4cf46..ada32d16d23 100644 --- a/source/blender/makesrna/intern/rna_fcurve.c +++ b/source/blender/makesrna/intern/rna_fcurve.c @@ -61,7 +61,7 @@ const EnumPropertyItem rna_enum_fmodifier_type_items[] = { "Restrict maximum and minimum values of F-Curve"}, {FMODIFIER_TYPE_STEPPED, "STEPPED", 0, "Stepped Interpolation", "Snap values to nearest grid-step - e.g. for a stop-motion look"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_beztriple_keyframe_type_items[] = { @@ -70,7 +70,7 @@ const EnumPropertyItem rna_enum_beztriple_keyframe_type_items[] = { {BEZT_KEYTYPE_MOVEHOLD, "MOVING_HOLD", ICON_KEYTYPE_MOVING_HOLD_VEC, "Moving Hold", "A keyframe that is part of a moving hold"}, {BEZT_KEYTYPE_EXTREME, "EXTREME", ICON_KEYTYPE_EXTREME_VEC, "Extreme", "An 'extreme' pose, or some other purpose as needed"}, {BEZT_KEYTYPE_JITTER, "JITTER", ICON_KEYTYPE_JITTER_VEC, "Jitter", "A filler or baked keyframe for keying on ones, or some other purpose as needed"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_beztriple_interpolation_easing_items[] = { @@ -82,7 +82,7 @@ const EnumPropertyItem rna_enum_beztriple_interpolation_easing_items[] = { {BEZT_IPO_EASE_IN, "EASE_IN", ICON_IPO_EASE_IN, "Ease In", "Only on the end closest to the next keyframe"}, {BEZT_IPO_EASE_OUT, "EASE_OUT", ICON_IPO_EASE_OUT, "Ease Out", "Only on the end closest to the first keyframe"}, {BEZT_IPO_EASE_IN_OUT, "EASE_IN_OUT", ICON_IPO_EASE_IN_OUT, "Ease In and Out", "Segment between both keyframes"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifdef RNA_RUNTIME @@ -954,7 +954,7 @@ static void rna_def_fmodifier_generator(BlenderRNA *brna) static const EnumPropertyItem generator_mode_items[] = { {FCM_GENERATOR_POLYNOMIAL, "POLYNOMIAL", 0, "Expanded Polynomial", ""}, {FCM_GENERATOR_POLYNOMIAL_FACTORISED, "POLYNOMIAL_FACTORISED", 0, "Factorized Polynomial", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "FModifierGenerator", "FModifier"); @@ -1005,7 +1005,7 @@ static void rna_def_fmodifier_function_generator(BlenderRNA *brna) {3, "SQRT", 0, "Square Root", ""}, {4, "LN", 0, "Natural Logarithm", ""}, {5, "SINC", 0, "Normalized Sine", "sin(x) / x"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "FModifierFunctionGenerator", "FModifier"); @@ -1157,7 +1157,7 @@ static void rna_def_fmodifier_cycles(BlenderRNA *brna) "start and end values"}, {FCM_EXTRAPOLATE_MIRROR, "MIRROR", 0, "Repeat Mirrored", "Alternate between forward and reverse playback of keyframe range"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "FModifierCycles", "FModifier"); @@ -1271,7 +1271,7 @@ static void rna_def_fmodifier_noise(BlenderRNA *brna) {FCM_NOISE_MODIF_ADD, "ADD", 0, "Add", ""}, {FCM_NOISE_MODIF_SUBTRACT, "SUBTRACT", 0, "Subtract", ""}, {FCM_NOISE_MODIF_MULTIPLY, "MULTIPLY", 0, "Multiply", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "FModifierNoise", "FModifier"); @@ -1481,7 +1481,7 @@ static void rna_def_drivertarget(BlenderRNA *brna) {DTAR_TRANSCHAN_SCALEX, "SCALE_X", 0, "X Scale", ""}, {DTAR_TRANSCHAN_SCALEY, "SCALE_Y", 0, "Y Scale", ""}, {DTAR_TRANSCHAN_SCALEZ, "SCALE_Z", 0, "Z Scale", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_local_space_items[] = { @@ -1491,7 +1491,7 @@ static void rna_def_drivertarget(BlenderRNA *brna) {DTAR_FLAG_LOCALSPACE | DTAR_FLAG_LOCAL_CONSTS, "LOCAL_SPACE", 0, "Local Space", "Transforms include effects of constraints but not " "parenting/restpose"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "DriverTarget", NULL); @@ -1556,7 +1556,7 @@ static void rna_def_drivervar(BlenderRNA *brna) "Final transformation value of object or bone"}, {DVAR_TYPE_ROT_DIFF, "ROTATION_DIFF", ICON_DRIVER_ROTATIONAL_DIFFERENCE, "Rotational Difference", "Use the angle between two bones"}, {DVAR_TYPE_LOC_DIFF, "LOC_DIFF", ICON_DRIVER_DISTANCE, "Distance", "Distance between two bones or objects"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; @@ -1640,7 +1640,7 @@ static void rna_def_channeldriver(BlenderRNA *brna) {DRIVER_TYPE_PYTHON, "SCRIPTED", 0, "Scripted Expression", ""}, {DRIVER_TYPE_MIN, "MIN", 0, "Minimum Value", ""}, {DRIVER_TYPE_MAX, "MAX", 0, "Maximum Value", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "Driver", NULL); @@ -1868,7 +1868,7 @@ static void rna_def_fcurve_keyframe_points(BlenderRNA *brna, PropertyRNA *cprop) {INSERTKEY_REPLACE, "REPLACE", 0, "Replace", "Don't add any new keyframes, but just replace existing ones"}, {INSERTKEY_NEEDED, "NEEDED", 0, "Needed", "Only adds keyframes that are needed"}, {INSERTKEY_FAST, "FAST", 0, "Fast", "Fast keyframe insertion to avoid recalculating the curve each time"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; RNA_def_property_srna(cprop, "FCurveKeyframePoints"); @@ -1915,7 +1915,7 @@ static void rna_def_fcurve(BlenderRNA *brna) static const EnumPropertyItem prop_mode_extend_items[] = { {FCURVE_EXTRAPOLATE_CONSTANT, "CONSTANT", 0, "Constant", "Hold values of endpoint keyframes"}, {FCURVE_EXTRAPOLATE_LINEAR, "LINEAR", 0, "Linear", "Use slope of curve leading in/out of endpoint keyframes"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_mode_color_items[] = { {FCURVE_COLOR_AUTO_RAINBOW, "AUTO_RAINBOW", 0, "Auto Rainbow", @@ -1926,12 +1926,12 @@ static void rna_def_fcurve(BlenderRNA *brna) "Use axis colors for XYZ parts of transform, and yellow for the 'W' channel"}, {FCURVE_COLOR_CUSTOM, "CUSTOM", 0, "User Defined", "Use custom hand-picked color for F-Curve"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static EnumPropertyItem prop_mode_smoothing_items[] = { {FCURVE_SMOOTH_NONE, "NONE", 0, "None", "Auto handles only take adjacent keys into account (legacy mode)"}, {FCURVE_SMOOTH_CONT_ACCEL, "CONT_ACCEL", 0, "Continuous Acceleration", "Auto handles are placed to avoid jumps in acceleration"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "FCurve", NULL); diff --git a/source/blender/makesrna/intern/rna_fluidsim.c b/source/blender/makesrna/intern/rna_fluidsim.c index aa4991e3d59..5dac7e7bc8e 100644 --- a/source/blender/makesrna/intern/rna_fluidsim.c +++ b/source/blender/makesrna/intern/rna_fluidsim.c @@ -217,7 +217,7 @@ static void rna_def_fluidsim_slip(StructRNA *srna) "Mix between no-slip and free-slip (non moving objects only!)"}, {OB_FSBND_FREESLIP, "FREESLIP", 0, "Free Slip", "Obstacle only causes zero normal velocity (=not sticky, non moving objects only!)"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; prop = RNA_def_property(srna, "slip_type", PROP_ENUM, PROP_NONE); @@ -259,7 +259,7 @@ static void rna_def_fluidsim_domain(BlenderRNA *brna) {OB_FSDOM_GEOM, "GEOMETRY", 0, "Geometry", "Display geometry"}, {OB_FSDOM_PREVIEW, "PREVIEW", 0, "Preview", "Display preview quality results"}, {OB_FSDOM_FINAL, "FINAL", 0, "Final", "Display final quality results"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "DomainFluidSettings", "FluidSettings"); @@ -443,7 +443,7 @@ static void rna_def_fluidsim_volume(StructRNA *srna) {1, "VOLUME", 0, "Volume", "Use only the inner volume of the mesh"}, {2, "SHELL", 0, "Shell", "Use only the outer shell of the mesh"}, {3, "BOTH", 0, "Both", "Use both the inner volume and the outer shell of the mesh"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; prop = RNA_def_property(srna, "volume_initialization", PROP_ENUM, PROP_NONE); @@ -676,7 +676,7 @@ void RNA_def_fluidsim(BlenderRNA *brna) "fluidsim domain object"}, {OB_FLUIDSIM_CONTROL, "CONTROL", 0, "Control", "Object is made a fluid control mesh, which influences the fluid"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c index 56242ccc14d..cbb15364a27 100644 --- a/source/blender/makesrna/intern/rna_gpencil.c +++ b/source/blender/makesrna/intern/rna_gpencil.c @@ -47,7 +47,7 @@ static const EnumPropertyItem parent_type_items[] = { {PAROBJECT, "OBJECT", 0, "Object", "The layer is parented to an object"}, {PARSKEL, "ARMATURE", 0, "Armature", ""}, {PARBONE, "BONE", 0, "Bone", "The layer is parented to a bone"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifndef RNA_RUNTIME @@ -55,20 +55,20 @@ static EnumPropertyItem rna_enum_gpencil_xraymodes_items[] = { {GP_XRAY_FRONT, "FRONT", 0, "Front", "Draw all strokes in front"}, {GP_XRAY_3DSPACE, "3DSPACE", 0, "3D Space", "Draw strokes relative to other objects in 3D space"}, {GP_XRAY_BACK, "BACK", 0, "Back", "Draw all strokes last"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static EnumPropertyItem rna_enum_gpencil_onion_modes_items[] = { {GP_ONION_MODE_ABSOLUTE, "ABSOLUTE", 0, "Frames", "Frames in absolute range of the scene frame"}, {GP_ONION_MODE_RELATIVE, "RELATIVE", 0, "Keyframes", "Frames in relative range of the Grease Pencil keyframes"}, {GP_ONION_MODE_SELECTED, "SELECTED", 0, "Selected", "Only selected keyframes"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem rna_enum_gplayer_move_type_items[] = { {-1, "UP", 0, "Up", ""}, {1, "DOWN", 0, "Down", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem rna_enum_layer_blend_modes_items[] = { @@ -84,7 +84,7 @@ static const EnumPropertyItem rna_enum_layer_blend_modes_items[] = { static EnumPropertyItem rna_enum_gpencil_caps_modes_items[] = { {GP_STROKE_CAP_ROUND, "ROUND", 0, "Rounded", ""}, {GP_STROKE_CAP_FLAT, "FLAT", 0, "Flat", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -916,7 +916,7 @@ static void rna_def_gpencil_stroke(BlenderRNA *brna) {GP_STROKE_3DSPACE, "3DSPACE", 0, "3D Space", "Stroke is in 3D-space"}, {GP_STROKE_2DSPACE, "2DSPACE", 0, "2D Space", "Stroke is in 2D-space"}, {GP_STROKE_2DIMAGE, "2DIMAGE", 0, "2D Image", "Stroke is in 2D-space (but with special 'image' scaling)"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "GPencilStroke", NULL); diff --git a/source/blender/makesrna/intern/rna_gpencil_modifier.c b/source/blender/makesrna/intern/rna_gpencil_modifier.c index 0ae0d0ef7ca..9364b62761e 100644 --- a/source/blender/makesrna/intern/rna_gpencil_modifier.c +++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c @@ -75,7 +75,7 @@ const EnumPropertyItem rna_enum_object_greasepencil_modifier_type_items[] = { {eGpencilModifierType_Color, "GP_COLOR", ICON_MOD_HUE_SATURATION, "Hue/Saturation", "Apply changes to stroke colors"}, {eGpencilModifierType_Opacity, "GP_OPACITY", ICON_MOD_OPACITY, "Opacity", "Opacity of the strokes"}, {eGpencilModifierType_Tint, "GP_TINT", ICON_MOD_TINT, "Tint", "Tint strokes with new color"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifndef RNA_RUNTIME @@ -83,7 +83,7 @@ static const EnumPropertyItem modifier_modify_color_items[] = { {GP_MODIFY_COLOR_BOTH, "BOTH", 0, "Both", "Modify fill and stroke colors"}, {GP_MODIFY_COLOR_STROKE, "STROKE", 0, "Stroke", "Modify stroke color only"}, {GP_MODIFY_COLOR_FILL, "FILL", 0, "Fill", "Modify fill color only"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem modifier_gphook_falloff_items[] = { @@ -96,14 +96,14 @@ static const EnumPropertyItem modifier_gphook_falloff_items[] = { {eGPHook_Falloff_Sharp, "SHARP", ICON_SHARPCURVE, "Sharp", ""}, {eGPHook_Falloff_Linear, "LINEAR", ICON_LINCURVE, "Linear", ""}, {eGPHook_Falloff_Const, "CONSTANT", ICON_NOCURVE, "Constant", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem rna_enum_time_mode_items[] = { {GP_TIME_MODE_NORMAL, "NORMAL", 0, "Normal", "Apply offset in normal animation direction"}, {GP_TIME_MODE_REVERSE, "REVERSE", 0, "Reverse", "Apply offset in reverse animation direction"}, {GP_TIME_MODE_FIX, "FIX", 0, "Fixed Frame", "Keep frame and do not change with time"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -543,7 +543,7 @@ static void rna_def_modifier_gpencilsimplify(BlenderRNA *brna) "Delete alternative vertices in the stroke, except extremes"}, {GP_SIMPLIFY_ADAPTIVE, "ADAPTIVE", ICON_IPO_EASE_IN_OUT, "Adaptive", "Use a RDP algorithm to simplify" }, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "SimplifyGpencilModifier", "GpencilModifier"); @@ -1164,7 +1164,7 @@ static void rna_def_modifier_gpencilbuild(BlenderRNA *brna) "Strokes appear/disappear one after the other, but only a single one changes at a time"}, {GP_BUILD_MODE_CONCURRENT, "CONCURRENT", ICON_PARTICLE_TIP, "Concurrent", "Multiple strokes appear/disappear at once"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static EnumPropertyItem prop_gpencil_build_transition_items[] = { @@ -1177,7 +1177,7 @@ static void rna_def_modifier_gpencilbuild(BlenderRNA *brna) {GP_BUILD_TRANSITION_FADE, "FADE", 0, "Fade", "Hide points in the order they occur in each stroke " "(e.g. for animating ink fading or vanishing after getting drawn)"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static EnumPropertyItem prop_gpencil_build_time_align_items[] = { @@ -1185,7 +1185,7 @@ static void rna_def_modifier_gpencilbuild(BlenderRNA *brna) "All strokes start at same time (i.e. short strokes finish earlier)"}, {GP_BUILD_TIMEALIGN_END, "END", 0, "Align End", "All strokes end at same time (i.e. short strokes start later)"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; StructRNA *srna; diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c index 06fa3cfd1cf..b10c5304d40 100644 --- a/source/blender/makesrna/intern/rna_image.c +++ b/source/blender/makesrna/intern/rna_image.c @@ -42,7 +42,7 @@ const EnumPropertyItem rna_enum_image_generated_type_items[] = { {IMA_GENTYPE_BLANK, "BLANK", 0, "Blank", "Generate a blank image"}, {IMA_GENTYPE_GRID, "UV_GRID", 0, "UV Grid", "Generated grid to test UV mappings"}, {IMA_GENTYPE_GRID_COLOR, "COLOR_GRID", 0, "Color Grid", "Generated improved UV grid to test UV mappings"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem image_source_items[] = { @@ -51,7 +51,7 @@ static const EnumPropertyItem image_source_items[] = { {IMA_SRC_MOVIE, "MOVIE", 0, "Movie", "Movie file"}, {IMA_SRC_GENERATED, "GENERATED", 0, "Generated", "Generated image"}, {IMA_SRC_VIEWER, "VIEWER", 0, "Viewer", "Compositing node viewer"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifdef RNA_RUNTIME @@ -641,12 +641,12 @@ static void rna_def_image(BlenderRNA *brna) {IMA_TYPE_UV_TEST, "UV_TEST", 0, "UV Test", ""}, {IMA_TYPE_R_RESULT, "RENDER_RESULT", 0, "Render Result", ""}, {IMA_TYPE_COMPOSITE, "COMPOSITING", 0, "Compositing", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem alpha_mode_items[] = { {IMA_ALPHA_STRAIGHT, "STRAIGHT", 0, "Straight", "Transparent RGB and alpha pixels are unmodified"}, {IMA_ALPHA_PREMUL, "PREMUL", 0, "Premultiplied", "Transparent RGB pixels are multiplied by the alpha channel"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "Image", "ID"); diff --git a/source/blender/makesrna/intern/rna_key.c b/source/blender/makesrna/intern/rna_key.c index effe93937ba..61eb98da110 100644 --- a/source/blender/makesrna/intern/rna_key.c +++ b/source/blender/makesrna/intern/rna_key.c @@ -755,7 +755,7 @@ const EnumPropertyItem rna_enum_keyblock_type_items[] = { {KEY_CARDINAL, "KEY_CARDINAL", 0, "Cardinal", ""}, {KEY_CATMULL_ROM, "KEY_CATMULL_ROM", 0, "Catmull-Rom", ""}, {KEY_BSPLINE, "KEY_BSPLINE", 0, "BSpline", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const float tilt_limit = DEG2RADF(21600.0f); diff --git a/source/blender/makesrna/intern/rna_lamp.c b/source/blender/makesrna/intern/rna_lamp.c index 55d0a8a856b..ad81396cbf9 100644 --- a/source/blender/makesrna/intern/rna_lamp.c +++ b/source/blender/makesrna/intern/rna_lamp.c @@ -108,7 +108,7 @@ const EnumPropertyItem rna_enum_light_type_items[] = { {LA_SUN, "SUN", 0, "Sun", "Constant direction parallel ray light source"}, {LA_SPOT, "SPOT", 0, "Spot", "Directional cone light source"}, {LA_AREA, "AREA", 0, "Area", "Directional area light source"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static void rna_def_light(BlenderRNA *brna) @@ -198,7 +198,7 @@ static void rna_def_light_falloff(StructRNA *srna) {LA_FALLOFF_INVCOEFFICIENTS, "INVERSE_COEFFICIENTS", 0, "Inverse Coefficients", ""}, {LA_FALLOFF_CURVE, "CUSTOM_CURVE", 0, "Custom Curve", ""}, {LA_FALLOFF_SLIDERS, "LINEAR_QUADRATIC_WEIGHTED", 0, "Lin/Quad Weighted", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; prop = RNA_def_property(srna, "falloff_type", PROP_ENUM, PROP_NONE); @@ -419,7 +419,7 @@ static void rna_def_area_light(BlenderRNA *brna) {LA_AREA_RECT, "RECTANGLE", 0, "Rectangle", ""}, {LA_AREA_DISK, "DISK", 0, "Disk", ""}, {LA_AREA_ELLIPSE, "ELLIPSE", 0, "Ellipse", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "AreaLight", "Light"); diff --git a/source/blender/makesrna/intern/rna_lightprobe.c b/source/blender/makesrna/intern/rna_lightprobe.c index 16730b647ca..2b8d0f3427e 100644 --- a/source/blender/makesrna/intern/rna_lightprobe.c +++ b/source/blender/makesrna/intern/rna_lightprobe.c @@ -51,14 +51,14 @@ static void rna_LightProbe_recalc(Main *UNUSED(bmain), Scene *UNUSED(scene), Poi static EnumPropertyItem parallax_type_items[] = { {LIGHTPROBE_SHAPE_ELIPSOID, "ELIPSOID", ICON_NONE, "Sphere", ""}, {LIGHTPROBE_SHAPE_BOX, "BOX", ICON_NONE, "Box", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static EnumPropertyItem lightprobe_type_items[] = { {LIGHTPROBE_TYPE_CUBE, "CUBEMAP", ICON_LIGHTPROBE_CUBEMAP, "Reflection Cubemap", "Capture reflections"}, {LIGHTPROBE_TYPE_PLANAR, "PLANAR", ICON_LIGHTPROBE_PLANAR, "Reflection Plane", ""}, {LIGHTPROBE_TYPE_GRID, "GRID", ICON_LIGHTPROBE_GRID, "Irradiance Volume", "Volume used for precomputing indirect lighting"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static void rna_def_lightprobe(BlenderRNA *brna) diff --git a/source/blender/makesrna/intern/rna_linestyle.c b/source/blender/makesrna/intern/rna_linestyle.c index 864a911b3a8..ed65ee44d9f 100644 --- a/source/blender/makesrna/intern/rna_linestyle.c +++ b/source/blender/makesrna/intern/rna_linestyle.c @@ -44,7 +44,7 @@ const EnumPropertyItem rna_enum_linestyle_color_modifier_type_items[] = { {LS_MODIFIER_MATERIAL, "MATERIAL", ICON_MODIFIER, "Material", ""}, {LS_MODIFIER_NOISE, "NOISE", ICON_MODIFIER, "Noise", ""}, {LS_MODIFIER_TANGENT, "TANGENT", ICON_MODIFIER, "Tangent", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_linestyle_alpha_modifier_type_items[] = { @@ -56,7 +56,7 @@ const EnumPropertyItem rna_enum_linestyle_alpha_modifier_type_items[] = { {LS_MODIFIER_MATERIAL, "MATERIAL", ICON_MODIFIER, "Material", ""}, {LS_MODIFIER_NOISE, "NOISE", ICON_MODIFIER, "Noise", ""}, {LS_MODIFIER_TANGENT, "TANGENT", ICON_MODIFIER, "Tangent", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_linestyle_thickness_modifier_type_items[] = { @@ -69,7 +69,7 @@ const EnumPropertyItem rna_enum_linestyle_thickness_modifier_type_items[] = { {LS_MODIFIER_MATERIAL, "MATERIAL", ICON_MODIFIER, "Material", ""}, {LS_MODIFIER_NOISE, "NOISE", ICON_MODIFIER, "Noise", ""}, {LS_MODIFIER_TANGENT, "TANGENT", ICON_MODIFIER, "Tangent", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_linestyle_geometry_modifier_type_items[] = { @@ -87,7 +87,7 @@ const EnumPropertyItem rna_enum_linestyle_geometry_modifier_type_items[] = { {LS_MODIFIER_SINUS_DISPLACEMENT, "SINUS_DISPLACEMENT", ICON_MODIFIER, "Sinus Displacement", ""}, {LS_MODIFIER_SPATIAL_NOISE, "SPATIAL_NOISE", ICON_MODIFIER, "Spatial Noise", ""}, {LS_MODIFIER_TIP_REMOVER, "TIP_REMOVER", ICON_MODIFIER, "Tip Remover", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifdef RNA_RUNTIME @@ -475,7 +475,7 @@ static void rna_def_linestyle_mtex(BlenderRNA *brna) {TEXCO_GLOB, "GLOBAL", 0, "Global", "Use global coordinates for the texture coordinates"}, {TEXCO_STROKE, "ALONG_STROKE", 0, "Along stroke", "Use stroke length for texture coordinates"}, {TEXCO_ORCO, "ORCO", 0, "Generated", "Use the original undeformed coordinates of the object"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_mapping_items[] = { @@ -483,7 +483,7 @@ static void rna_def_linestyle_mtex(BlenderRNA *brna) {MTEX_CUBE, "CUBE", 0, "Cube", "Map using the normal vector"}, {MTEX_TUBE, "TUBE", 0, "Tube", "Map with Z as central axis"}, {MTEX_SPHERE, "SPHERE", 0, "Sphere", "Map with Z as central axis"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_x_mapping_items[] = { @@ -491,7 +491,7 @@ static void rna_def_linestyle_mtex(BlenderRNA *brna) {1, "X", 0, "X", ""}, {2, "Y", 0, "Y", ""}, {3, "Z", 0, "Z", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_y_mapping_items[] = { @@ -499,7 +499,7 @@ static void rna_def_linestyle_mtex(BlenderRNA *brna) {1, "X", 0, "X", ""}, {2, "Y", 0, "Y", ""}, {3, "Z", 0, "Z", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_z_mapping_items[] = { @@ -507,7 +507,7 @@ static void rna_def_linestyle_mtex(BlenderRNA *brna) {1, "X", 0, "X", ""}, {2, "Y", 0, "Y", ""}, {3, "Z", 0, "Z", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "LineStyleTextureSlot", "TextureSlot"); @@ -584,7 +584,7 @@ static void rna_def_modifier_type_common( {LS_VALUE_DIFF, "DIFFERENCE", 0, "Difference", ""}, {LS_VALUE_MIN, "MINIMUM", 0, "Minimum", ""}, {LS_VALUE_MAX, "MAXIMUM", 0, "Maximum", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; prop = RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE); @@ -678,7 +678,7 @@ static void rna_def_modifier_curve_common(StructRNA *srna, bool range, bool valu static const EnumPropertyItem mapping_items[] = { {0, "LINEAR", 0, "Linear", "Use linear mapping"}, {LS_MODIFIER_USE_CURVE, "CURVE", 0, "Curve", "Use curve mapping"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; prop = RNA_def_property(srna, "mapping", PROP_ENUM, PROP_NONE); @@ -743,7 +743,7 @@ static void rna_def_modifier_material_common(StructRNA *srna) {LS_MODIFIER_MATERIAL_SPEC_B, "SPEC_B", 0, "Specular Color Blue", ""}, {LS_MODIFIER_MATERIAL_SPEC_HARD, "SPEC_HARD", 0, "Specular Hardness", ""}, {LS_MODIFIER_MATERIAL_ALPHA, "ALPHA", 0, "Alpha Transparency", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; prop = RNA_def_property(srna, "material_attribute", PROP_ENUM, PROP_NONE); @@ -763,7 +763,7 @@ static void rna_def_linestyle_modifiers(BlenderRNA *brna) {LS_MODIFIER_BLUEPRINT_CIRCLES, "CIRCLES", 0, "Circles", "Draw a blueprint using circular contour strokes"}, {LS_MODIFIER_BLUEPRINT_ELLIPSES, "ELLIPSES", 0, "Ellipses", "Draw a blueprint using elliptic contour strokes"}, {LS_MODIFIER_BLUEPRINT_SQUARES, "SQUARES", 0, "Squares", "Draw a blueprint using square contour strokes"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem transform_pivot_items[] = { @@ -772,7 +772,7 @@ static void rna_def_linestyle_modifiers(BlenderRNA *brna) {LS_MODIFIER_2D_TRANSFORM_PIVOT_END, "END", 0, "Stroke End", ""}, {LS_MODIFIER_2D_TRANSFORM_PIVOT_PARAM, "PARAM", 0, "Stroke Point Parameter", ""}, {LS_MODIFIER_2D_TRANSFORM_PIVOT_ABSOLUTE, "ABSOLUTE", 0, "Absolute 2D Point", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "LineStyleModifier", NULL); @@ -1559,37 +1559,37 @@ static void rna_def_linestyle(BlenderRNA *brna) #if 0 /* hidden for now */ {LS_PANEL_MISC, "MISC", 0, "Misc", "Show the panel for miscellaneous options"}, #endif - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem chaining_items[] = { {LS_CHAINING_PLAIN, "PLAIN", 0, "Plain", "Plain chaining"}, {LS_CHAINING_SKETCHY, "SKETCHY", 0, "Sketchy", "Sketchy chaining with a multiple touch"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem cap_items[] = { {LS_CAPS_BUTT, "BUTT", 0, "Butt", "Butt cap (flat)"}, {LS_CAPS_ROUND, "ROUND", 0, "Round", "Round cap (half-circle)"}, {LS_CAPS_SQUARE, "SQUARE", 0, "Square", "Square cap (flat and extended)"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem thickness_position_items[] = { {LS_THICKNESS_CENTER, "CENTER", 0, "Center", "Silhouettes and border edges are centered along stroke geometry"}, {LS_THICKNESS_INSIDE, "INSIDE", 0, "Inside", "Silhouettes and border edges are drawn inside of stroke geometry"}, {LS_THICKNESS_OUTSIDE, "OUTSIDE", 0, "Outside", "Silhouettes and border edges are drawn outside of stroke geometry"}, {LS_THICKNESS_RELATIVE, "RELATIVE", 0, "Relative", "Silhouettes and border edges are shifted by a user-defined ratio"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem sort_key_items[] = { {LS_SORT_KEY_DISTANCE_FROM_CAMERA, "DISTANCE_FROM_CAMERA", 0, "Distance from Camera", "Sort by distance from camera (closer lines lie on top of further lines)"}, {LS_SORT_KEY_2D_LENGTH, "2D_LENGTH", 0, "2D Length", "Sort by curvilinear 2D length (longer lines lie on top of shorter lines)"}, {LS_SORT_KEY_PROJECTED_X, "PROJECTED_X", 0, "Projected X", "Sort by the projected X value in the image coordinate system"}, {LS_SORT_KEY_PROJECTED_Y, "PROJECTED_Y", 0, "Projected Y", "Sort by the projected Y value in the image coordinate system"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem sort_order_items[] = { {0, "DEFAULT", 0, "Default", "Default order of the sort key"}, {LS_REVERSE_ORDER, "REVERSE", 0, "Reverse", "Reverse order"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem integration_type_items[] = { {LS_INTEGRATION_MEAN, "MEAN", 0, "Mean", "The value computed for the chain is the mean of the values obtained for chain vertices"}, @@ -1597,7 +1597,7 @@ static void rna_def_linestyle(BlenderRNA *brna) {LS_INTEGRATION_MAX, "MAX", 0, "Max", "The value computed for the chain is the maximum of the values obtained for chain vertices"}, {LS_INTEGRATION_FIRST, "FIRST", 0, "First", "The value computed for the chain is the value obtained for the first chain vertex"}, {LS_INTEGRATION_LAST, "LAST", 0, "Last", "The value computed for the chain is the value obtained for the last chain vertex"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "FreestyleLineStyle", "ID"); diff --git a/source/blender/makesrna/intern/rna_main.c b/source/blender/makesrna/intern/rna_main.c index 4bba1dd6181..1b90f174aac 100644 --- a/source/blender/makesrna/intern/rna_main.c +++ b/source/blender/makesrna/intern/rna_main.c @@ -611,7 +611,7 @@ void RNA_def_main(BlenderRNA *brna) {"paint_curves", "PaintCurve", "rna_Main_paintcurves_begin", "Paint Curves", "Paint Curves data-blocks", RNA_def_main_paintcurves, "rna_Main_paintcurve_lookup_string"}, {"workspaces", "WorkSpace", "rna_Main_workspaces_begin", "Workspaces", "Workspace data-blocks", RNA_def_main_workspaces, "rna_Main_workspace_lookup_string"}, {"lightprobes", "LightProbe", "rna_Main_lightprobes_begin", "LightProbes", "LightProbe data-blocks", RNA_def_main_lightprobes, "rna_Main_lightprobe_lookup_string"}, - {NULL, NULL, NULL, NULL, NULL, NULL} + {NULL, NULL, NULL, NULL, NULL, NULL}, }; int i; diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c index 75a798abf4f..a4c4acb8006 100644 --- a/source/blender/makesrna/intern/rna_main_api.c +++ b/source/blender/makesrna/intern/rna_main_api.c @@ -826,7 +826,7 @@ void RNA_def_main_node_groups(BlenderRNA *brna, PropertyRNA *cprop) static const EnumPropertyItem dummy_items[] = { {0, "DUMMY", 0, "", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; RNA_def_property_srna(cprop, "BlendDataNodeTrees"); diff --git a/source/blender/makesrna/intern/rna_mask.c b/source/blender/makesrna/intern/rna_mask.c index 402e8e91521..0801c16d933 100644 --- a/source/blender/makesrna/intern/rna_mask.c +++ b/source/blender/makesrna/intern/rna_mask.c @@ -589,12 +589,14 @@ static void rna_def_maskParent(BlenderRNA *brna) static const EnumPropertyItem mask_id_type_items[] = { {ID_MC, "MOVIECLIP", ICON_SEQUENCE, "Movie Clip", ""}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL}, + }; static const EnumPropertyItem parent_type_items[] = { {MASK_PARENT_POINT_TRACK, "POINT_TRACK", 0, "Point Track", ""}, {MASK_PARENT_PLANE_TRACK, "PLANE_TRACK", 0, "Plane Track", ""}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL}, + }; srna = RNA_def_struct(brna, "MaskParent", NULL); RNA_def_struct_ui_text(srna, "Mask Parent", "Parenting settings for masking element"); @@ -677,7 +679,8 @@ static void rna_def_maskSplinePoint(BlenderRNA *brna) {HD_ALIGN, "ALIGNED", 0, "Aligned Single", ""}, {HD_ALIGN_DOUBLESIDE, "ALIGNED_DOUBLESIDE", 0, "Aligned", ""}, {HD_FREE, "FREE", 0, "Free", ""}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL}, + }; rna_def_maskSplinePointUW(brna); @@ -822,13 +825,13 @@ static void rna_def_maskSpline(BlenderRNA *brna) static const EnumPropertyItem spline_interpolation_items[] = { {MASK_SPLINE_INTERP_LINEAR, "LINEAR", 0, "Linear", ""}, {MASK_SPLINE_INTERP_EASE, "EASE", 0, "Ease", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem spline_offset_mode_items[] = { {MASK_SPLINE_OFFSET_EVEN, "EVEN", 0, "Even", "Calculate even feather offset"}, {MASK_SPLINE_OFFSET_SMOOTH, "SMOOTH", 0, "Smooth", "Calculate feather offset as a second curve"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; StructRNA *srna; @@ -893,7 +896,7 @@ static void rna_def_mask_layer(BlenderRNA *brna) {MASK_BLEND_MUL, "MUL", 0, "Multiply", ""}, {MASK_BLEND_REPLACE, "REPLACE", 0, "Replace", ""}, {MASK_BLEND_DIFFERENCE, "DIFFERENCE", 0, "Difference", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; StructRNA *srna; diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c index 481511f511e..40b37e12789 100644 --- a/source/blender/makesrna/intern/rna_material.c +++ b/source/blender/makesrna/intern/rna_material.c @@ -56,7 +56,7 @@ const EnumPropertyItem rna_enum_ramp_blend_items[] = { {MA_RAMP_SAT, "SATURATION", 0, "Saturation", ""}, {MA_RAMP_COLOR, "COLOR", 0, "Color", ""}, {MA_RAMP_VAL, "VALUE", 0, "Value", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifdef RNA_RUNTIME @@ -403,14 +403,14 @@ static void rna_def_material_greasepencil(BlenderRNA *brna) {GP_STYLE_MODE_LINE, "LINE", 0, "Line", "Draw strokes using a continuous line"}, {GP_STYLE_MODE_DOTS, "DOTS", 0, "Dots", "Draw strokes using separated dots"}, {GP_STYLE_MODE_BOX, "BOX", 0, "Boxes", "Draw strokes using separated rectangle boxes"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* stroke styles */ static EnumPropertyItem stroke_style_items[] = { {GP_STYLE_STROKE_STYLE_SOLID, "SOLID", 0, "Solid", "Draw strokes with solid color"}, {GP_STYLE_STROKE_STYLE_TEXTURE, "TEXTURE", 0, "Texture", "Draw strokes using texture"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* fill styles */ @@ -419,13 +419,13 @@ static void rna_def_material_greasepencil(BlenderRNA *brna) {GP_STYLE_FILL_STYLE_GRADIENT, "GRADIENT", 0, "Gradient", "Fill area with gradient color"}, {GP_STYLE_FILL_STYLE_CHESSBOARD, "CHESSBOARD", 0, "Checker Board", "Fill area with chessboard pattern"}, {GP_STYLE_FILL_STYLE_TEXTURE, "TEXTURE", 0, "Texture", "Fill area with image texture"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static EnumPropertyItem fill_gradient_items[] = { {GP_STYLE_GRADIENT_LINEAR, "LINEAR", 0, "Linear", "Fill area with gradient color"}, {GP_STYLE_GRADIENT_RADIAL, "RADIAL", 0, "Radial", "Fill area with radial gradient"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "MaterialGPencilStyle", NULL); @@ -661,7 +661,7 @@ void RNA_def_material(BlenderRNA *brna) {MA_MONKEY, "MONKEY", ICON_MONKEY, "Monkey", "Monkey"}, {MA_HAIR, "HAIR", ICON_HAIR, "Hair", "Hair strands"}, {MA_SPHERE_A, "SPHERE_A", ICON_MAT_SPHERE_SKY, "World Sphere", "Large sphere with sky"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static EnumPropertyItem prop_eevee_blend_items[] = { @@ -671,7 +671,7 @@ void RNA_def_material(BlenderRNA *brna) {MA_BM_CLIP, "CLIP", 0, "Alpha Clip", "Use the alpha threshold to clip the visibility (binary visibility)"}, {MA_BM_HASHED, "HASHED", 0, "Alpha Hashed", "Use noise to dither the binary visibility (works well with multi-samples)"}, {MA_BM_BLEND, "BLEND", 0, "Alpha Blend", "Render polygon transparent, depending on alpha channel of the texture"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static EnumPropertyItem prop_eevee_blend_shadow_items[] = { @@ -679,7 +679,7 @@ void RNA_def_material(BlenderRNA *brna) {MA_BS_SOLID, "OPAQUE", 0, "Opaque", "Material will cast shadows without transparency"}, {MA_BS_CLIP, "CLIP", 0, "Clip", "Use the alpha threshold to clip the visibility (binary visibility)"}, {MA_BS_HASHED, "HASHED", 0, "Hashed", "Use noise to dither the binary visibility and use filtering to reduce the noise"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "Material", "ID"); diff --git a/source/blender/makesrna/intern/rna_meta.c b/source/blender/makesrna/intern/rna_meta.c index f0437397d08..57009a49012 100644 --- a/source/blender/makesrna/intern/rna_meta.c +++ b/source/blender/makesrna/intern/rna_meta.c @@ -296,7 +296,7 @@ static void rna_def_metaball(BlenderRNA *brna) {MB_UPDATE_HALFRES, "HALFRES", 0, "Half", "While editing, update metaball in half resolution"}, {MB_UPDATE_FAST, "FAST", 0, "Fast", "While editing, update metaball without polygonization"}, {MB_UPDATE_NEVER, "NEVER", 0, "Never", "While editing, don't update metaball at all"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "MetaBall", "ID"); diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index 83655b40abe..020ea0a71b5 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -115,7 +115,7 @@ const EnumPropertyItem rna_enum_object_modifier_type_items[] = { {eModifierType_Smoke, "SMOKE", ICON_MOD_SMOKE, "Smoke", ""}, {eModifierType_Softbody, "SOFT_BODY", ICON_MOD_SOFT, "Soft Body", ""}, {eModifierType_Surface, "SURFACE", ICON_MODIFIER, "Surface", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_modifier_triangulate_quad_method_items[] = { @@ -125,13 +125,13 @@ const EnumPropertyItem rna_enum_modifier_triangulate_quad_method_items[] = { "Split the quads on the 2nd and 4th vertices"}, {MOD_TRIANGULATE_QUAD_SHORTEDGE, "SHORTEST_DIAGONAL", 0, "Shortest Diagonal", "Split the quads based on the distance between the vertices"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_modifier_triangulate_ngon_method_items[] = { {MOD_TRIANGULATE_NGON_BEAUTY, "BEAUTY", 0, "Beauty", "Arrange the new triangles evenly (slow)"}, {MOD_TRIANGULATE_NGON_EARCLIP, "CLIP", 0, "Clip", "Split the polygons with an ear clipping algorithm"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_modifier_shrinkwrap_mode_items[] = { @@ -148,7 +148,7 @@ const EnumPropertyItem rna_enum_modifier_shrinkwrap_mode_items[] = { {MOD_SHRINKWRAP_ABOVE_SURFACE, "ABOVE_SURFACE", 0, "Above Surface", "The point is constrained to the surface of the target object, " "with distance offset applied exactly along the target normal"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; @@ -164,7 +164,7 @@ static const EnumPropertyItem modifier_warp_falloff_items[] = { {eWarp_Falloff_Sharp, "SHARP", ICON_SHARPCURVE, "Sharp", ""}, {eWarp_Falloff_Linear, "LINEAR", ICON_LINCURVE, "Linear", ""}, {eWarp_Falloff_Const, "CONSTANT", ICON_NOCURVE, "Constant", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -185,7 +185,7 @@ const EnumPropertyItem rna_enum_dt_method_vertex_items[] = { "Copy from interpolated values of vertices from closest point on closest face"}, {MREMAP_MODE_VERT_POLYINTERP_VNORPROJ, "POLYINTERP_VNORPROJ", 0, "Projected Face Interpolated", "Copy from interpolated values of vertices from point on closest face hit by normal-projection"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_dt_method_edge_items[] = { @@ -199,7 +199,7 @@ const EnumPropertyItem rna_enum_dt_method_edge_items[] = { "Copy from closest edge of closest face (using midpoints)"}, {MREMAP_MODE_EDGE_EDGEINTERP_VNORPROJ, "EDGEINTERP_VNORPROJ", 0, "Projected Edge Interpolated", "Interpolate all source edges hit by the projection of destination one along its own normal (from vertices)"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_dt_method_loop_items[] = { @@ -215,7 +215,7 @@ const EnumPropertyItem rna_enum_dt_method_loop_items[] = { "Copy from interpolated corners of the nearest source polygon"}, {MREMAP_MODE_LOOP_POLYINTERP_LNORPROJ, "POLYINTERP_LNORPROJ", 0, "Projected Face Interpolated", "Copy from interpolated corners of the source polygon hit by corner normal projection"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_dt_method_poly_items[] = { @@ -227,7 +227,7 @@ const EnumPropertyItem rna_enum_dt_method_poly_items[] = { "Copy from source polygon which normal is the closest to destination one"}, {MREMAP_MODE_POLY_POLYINTERP_PNORPROJ, "POLYINTERP_PNORPROJ", 0, "Projected Face Interpolated", "Interpolate all source polygons intersected by the projection of destination one along its own normal"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_dt_mix_mode_items[] = { @@ -246,7 +246,7 @@ const EnumPropertyItem rna_enum_dt_mix_mode_items[] = { {CDT_MIX_MUL, "MUL", 0, "Multiply", "Multiply source value to destination one, using given threshold as factor"}, /* etc. etc. */ - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_dt_layers_select_src_items[] = { @@ -258,7 +258,7 @@ const EnumPropertyItem rna_enum_dt_layers_select_src_items[] = { "Transfer all vertex groups used by selected pose bones"}, {DT_LAYERS_VGROUP_SRC_BONE_DEFORM, "BONE_DEFORM", 0, "Deform Pose Bones", "Transfer all vertex groups used by deform bones"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_dt_layers_select_dst_items[] = { @@ -268,27 +268,27 @@ const EnumPropertyItem rna_enum_dt_layers_select_dst_items[] = { "Match target data layers to affect by name"}, {DT_LAYERS_INDEX_DST, "INDEX", 0, "By Order", "Match target data layers to affect by order (indices)"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_axis_xy_items[] = { {0, "X", 0, "X", ""}, {1, "Y", 0, "Y", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_axis_xyz_items[] = { {0, "X", 0, "X", ""}, {1, "Y", 0, "Y", ""}, {2, "Z", 0, "Z", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_axis_flag_xyz_items[] = { {(1 << 0), "X", 0, "X", ""}, {(1 << 1), "Y", 0, "Y", ""}, {(1 << 2), "Z", 0, "Z", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifdef RNA_RUNTIME @@ -1197,7 +1197,7 @@ static PropertyRNA *rna_def_property_subdivision_common(StructRNA *srna, const c static const EnumPropertyItem prop_subdivision_type_items[] = { {SUBSURF_TYPE_CATMULL_CLARK, "CATMULL_CLARK", 0, "Catmull-Clark", ""}, {SUBSURF_TYPE_SIMPLE, "SIMPLE", 0, "Simple", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_uv_smooth_items[] = { @@ -1217,7 +1217,7 @@ static PropertyRNA *rna_def_property_subdivision_common(StructRNA *srna, const c {SUBSURF_UV_SMOOTH_ALL, "PRESERVE_BOUNDARIES", 0, "Smooth all", "UVs and boundaries are smoothed"}, #endif - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; PropertyRNA *prop; @@ -1284,7 +1284,7 @@ static void rna_def_modifier_generic_map_info(StructRNA *srna) {MOD_DISP_MAP_OBJECT, "OBJECT", 0, "Object", "Use the linked object's local coordinate system for the texture coordinates"}, {MOD_DISP_MAP_UV, "UV", 0, "UV", "Use UV coordinates for the texture coordinates"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; PropertyRNA *prop; @@ -1463,7 +1463,7 @@ static void rna_def_modifier_curve(BlenderRNA *brna) {MOD_CURVE_NEGX, "NEG_X", 0, "-X", ""}, {MOD_CURVE_NEGY, "NEG_Y", 0, "-Y", ""}, {MOD_CURVE_NEGZ, "NEG_Z", 0, "-Z", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "CurveModifier", "Modifier"); @@ -1630,7 +1630,7 @@ static void rna_def_modifier_decimate(BlenderRNA *brna) {MOD_DECIM_MODE_COLLAPSE, "COLLAPSE", 0, "Collapse", "Use edge collapsing"}, {MOD_DECIM_MODE_UNSUBDIV, "UNSUBDIV", 0, "Un-Subdivide", "Use un-subdivide face reduction"}, {MOD_DECIM_MODE_DISSOLVE, "DISSOLVE", 0, "Planar", "Dissolve geometry to form planar polygons"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* Note, keep in sync with operator 'MESH_OT_decimate' */ @@ -2012,7 +2012,7 @@ static void rna_def_modifier_boolean(BlenderRNA *brna) "Keep the part of the mesh that intersects with the other selected object"}, {eBooleanModifierOp_Union, "UNION", 0, "Union", "Combine two meshes in an additive way"}, {eBooleanModifierOp_Difference, "DIFFERENCE", 0, "Difference", "Combine two meshes in a subtractive way"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "BooleanModifier", "Modifier"); @@ -2045,7 +2045,7 @@ static void rna_def_modifier_boolean(BlenderRNA *brna) {eBooleanModifierBMeshFlag_BMesh_Separate, "SEPARATE", 0, "Separate", ""}, {eBooleanModifierBMeshFlag_BMesh_NoDissolve, "NO_DISSOLVE", 0, "No Dissolve", ""}, {eBooleanModifierBMeshFlag_BMesh_NoConnectRegions, "NO_CONNECT_REGIONS", 0, "No Connect Regions", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; prop = RNA_def_property(srna, "debug_options", PROP_ENUM, PROP_NONE); @@ -2066,7 +2066,7 @@ static void rna_def_modifier_array(BlenderRNA *brna) {MOD_ARR_FITLENGTH, "FIT_LENGTH", 0, "Fit Length", "Duplicate the object as many times as fits in a certain length"}, {MOD_ARR_FITCURVE, "FIT_CURVE", 0, "Fit Curve", "Fit the duplicated objects to a curve"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "ArrayModifier", "Modifier"); @@ -2226,13 +2226,13 @@ static void rna_def_modifier_displace(BlenderRNA *brna) "Use the texture's intensity value to displace along the (averaged) custom normal (falls back to vertex)"}, {MOD_DISP_DIR_RGB_XYZ, "RGB_TO_XYZ", 0, "RGB to XYZ", "Use the texture's RGB values to displace the mesh in the XYZ direction"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_space_items[] = { {MOD_DISP_SPACE_LOCAL, "LOCAL", 0, "Local", "Direction is defined in local coordinates"}, {MOD_DISP_SPACE_GLOBAL, "GLOBAL", 0, "Global", "Direction is defined in global coordinates"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "DisplaceModifier", "Modifier"); @@ -2402,7 +2402,7 @@ static void rna_def_modifier_correctivesmooth(BlenderRNA *brna) "Use the average of adjacent edge-vertices"}, {MOD_CORRECTIVESMOOTH_SMOOTH_LENGTH_WEIGHT, "LENGTH_WEIGHTED", 0, "Length Weight", "Use the average of adjacent edge-vertices weighted by their length"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem modifier_rest_source_items[] = { @@ -2410,7 +2410,7 @@ static void rna_def_modifier_correctivesmooth(BlenderRNA *brna) "Use base mesh vert coords as the rest position"}, {MOD_CORRECTIVESMOOTH_RESTSOURCE_BIND, "BIND", 0, "Bind Coords", "Use bind vert coords for rest position"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "CorrectiveSmoothModifier", "Modifier"); @@ -2547,7 +2547,7 @@ static void rna_def_modifier_cast(BlenderRNA *brna) {MOD_CAST_TYPE_SPHERE, "SPHERE", 0, "Sphere", ""}, {MOD_CAST_TYPE_CYLINDER, "CYLINDER", 0, "Cylinder", ""}, {MOD_CAST_TYPE_CUBOID, "CUBOID", 0, "Cuboid", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "CastModifier", "Modifier"); @@ -2629,7 +2629,7 @@ static void rna_def_modifier_meshdeform(BlenderRNA *brna) static const EnumPropertyItem prop_mode_items[] = { {0, "VOLUME", 0, "Volume", "Bind to volume inside cage mesh"}, {1, "SURFACE", 0, "Surface", "Bind to surface of cage mesh"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -2705,7 +2705,7 @@ static void rna_def_modifier_particleinstance(BlenderRNA *brna) static EnumPropertyItem particleinstance_space[] = { {eParticleInstanceSpace_Local, "LOCAL", 0, "Local", "Use offset from the particle object in the instance object"}, {eParticleInstanceSpace_World, "WORLD", 0, "World", "Use world space offset in the instance object"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "ParticleInstanceModifier", "Modifier"); @@ -2940,7 +2940,7 @@ static void rna_def_modifier_smoke(BlenderRNA *brna) {MOD_SMOKE_TYPE_DOMAIN, "DOMAIN", 0, "Domain", ""}, {MOD_SMOKE_TYPE_FLOW, "FLOW", 0, "Flow", "Inflow/Outflow"}, {MOD_SMOKE_TYPE_COLL, "COLLISION", 0, "Collision", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "SmokeModifier", "Modifier"); @@ -3023,7 +3023,7 @@ static void rna_def_modifier_bevel(BlenderRNA *brna) "Use bevel weights to determine how much bevel is applied in edge mode"}, {MOD_BEVEL_VGROUP, "VGROUP", 0, "Vertex Group", "Use vertex group weights to select whether vertex or edge is beveled"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_val_type_items[] = { @@ -3031,7 +3031,7 @@ static void rna_def_modifier_bevel(BlenderRNA *brna) {MOD_BEVEL_AMT_WIDTH, "WIDTH", 0, "Width", "Amount is width of new face"}, {MOD_BEVEL_AMT_DEPTH, "DEPTH", 0, "Depth", "Amount is perpendicular distance from original edge to bevel face"}, {MOD_BEVEL_AMT_PERCENT, "PERCENT", 0, "Percent", "Amount is percent of adjacent edge length"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* TO BE DEPRECATED */ @@ -3039,7 +3039,7 @@ static void rna_def_modifier_bevel(BlenderRNA *brna) {0, "AVERAGE", 0, "Average", ""}, {MOD_BEVEL_EMIN, "SHARPEST", 0, "Sharpest", ""}, {MOD_BEVEL_EMAX, "LARGEST", 0, "Largest", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static EnumPropertyItem prop_harden_normals_items[] = { @@ -3199,14 +3199,14 @@ static void rna_def_modifier_shrinkwrap(BlenderRNA *brna) {MOD_SHRINKWRAP_TARGET_PROJECT, "TARGET_PROJECT", 0, "Target Normal Project", "Shrink the mesh to the nearest target surface " "along the interpolated vertex normals of the target"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem shrink_face_cull_items[] = { {0, "OFF", 0, "Off", "No culling"}, {MOD_SHRINKWRAP_CULL_TARGET_FRONTFACE, "FRONT", 0, "Front", "No projection when in front of the face"}, {MOD_SHRINKWRAP_CULL_TARGET_BACKFACE, "BACK", 0, "Back", "No projection when behind the face"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "ShrinkwrapModifier", "Modifier"); @@ -3338,7 +3338,7 @@ static void rna_def_modifier_mask(BlenderRNA *brna) static const EnumPropertyItem modifier_mask_mode_items[] = { {MOD_MASK_MODE_VGROUP, "VERTEX_GROUP", 0, "Vertex Group", ""}, {MOD_MASK_MODE_ARM, "ARMATURE", 0, "Armature", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "MaskModifier", "Modifier"); @@ -3388,7 +3388,7 @@ static void rna_def_modifier_simpledeform(BlenderRNA *brna) {MOD_SIMPLEDEFORM_MODE_TAPER, "TAPER", 0, "Taper", "Linearly scale along Z axis of the modifier space"}, {MOD_SIMPLEDEFORM_MODE_STRETCH, "STRETCH", 0, "Stretch", "Stretch the object along the Z axis of the modifier space"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "SimpleDeformModifier", "Modifier"); @@ -3759,7 +3759,7 @@ static void rna_def_modifier_weightvg_mask(BlenderRNA *UNUSED(brna), StructRNA * {MOD_DISP_MAP_GLOBAL, "GLOBAL", 0, "Global", "Use global coordinates"}, {MOD_DISP_MAP_OBJECT, "OBJECT", 0, "Object", "Use local generated coordinates of another object"}, {MOD_DISP_MAP_UV, "UV", 0, "UV", "Use coordinates from an UV layer"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem weightvg_mask_tex_used_items[] = { @@ -3771,7 +3771,7 @@ static void rna_def_modifier_weightvg_mask(BlenderRNA *UNUSED(brna), StructRNA * {MOD_WVG_MASK_TEX_USE_SAT, "SAT", 0, "Saturation", ""}, {MOD_WVG_MASK_TEX_USE_VAL, "VAL", 0, "Value", ""}, {MOD_WVG_MASK_TEX_USE_ALPHA, "ALPHA", 0, "Alpha", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; PropertyRNA *prop; @@ -3830,7 +3830,7 @@ static void rna_def_modifier_weightvgedit(BlenderRNA *brna) {MOD_WVG_MAPPING_RANDOM, "RANDOM", ICON_RNDCURVE, "Random", ""}, {MOD_WVG_MAPPING_STEP, "STEP", ICON_NOCURVE /* Would need a better icon... */, "Median Step", "Map all values below 0.5 to 0.0, and all others to 1.0"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; StructRNA *srna; @@ -3909,7 +3909,7 @@ static void rna_def_modifier_weightvgmix(BlenderRNA *brna) {MOD_WVG_MIX_DIV, "DIV", 0, "Divide", "Divide VGroup A's weights by VGroup B's ones"}, {MOD_WVG_MIX_DIF, "DIF", 0, "Difference", "Difference between VGroup A's and VGroup B's weights"}, {MOD_WVG_MIX_AVG, "AVG", 0, "Average", "Average value of VGroup A's and VGroup B's weights"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem weightvg_mix_set_items[] = { @@ -3919,7 +3919,7 @@ static void rna_def_modifier_weightvgmix(BlenderRNA *brna) {MOD_WVG_SET_OR, "OR", 0, "VGroup A or B", "Affect vertices in at least one of both VGroups (might add some to VGroup A)"}, {MOD_WVG_SET_AND, "AND", 0, "VGroup A and B", "Affect vertices in both groups"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; StructRNA *srna; @@ -3981,14 +3981,14 @@ static void rna_def_modifier_weightvgproximity(BlenderRNA *brna) {MOD_WVG_PROXIMITY_GEOMETRY, "GEOMETRY", 0, "Geometry", "Use distance between affected object's vertices and target " "object, or target object's geometry"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem proximity_geometry_items[] = { {MOD_WVG_PROXIMITY_GEOM_VERTS, "VERTEX", 0, "Vertex", "Compute distance to nearest vertex"}, {MOD_WVG_PROXIMITY_GEOM_EDGES, "EDGE", 0, "Edge", "Compute distance to nearest edge"}, {MOD_WVG_PROXIMITY_GEOM_FACES, "FACE", 0, "Face", "Compute distance to nearest face"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem weightvg_proximity_falloff_type_items[] = { @@ -4001,7 +4001,7 @@ static void rna_def_modifier_weightvgproximity(BlenderRNA *brna) {MOD_WVG_MAPPING_RANDOM, "RANDOM", ICON_RNDCURVE, "Random", ""}, {MOD_WVG_MAPPING_STEP, "STEP", ICON_NOCURVE /* Would need a better icon... */, "Median Step", "Map all values below 0.5 to 0.0, and all others to 1.0"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; StructRNA *srna; @@ -4072,7 +4072,7 @@ static void rna_def_modifier_remesh(BlenderRNA *brna) {MOD_REMESH_MASS_POINT, "SMOOTH", 0, "Smooth", "Output a smooth surface with no sharp-features detection"}, {MOD_REMESH_SHARP_FEATURES, "SHARP", 0, "Sharp", "Output a surface that reproduces sharp edges and corners from the input mesh"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; StructRNA *srna; @@ -4142,7 +4142,7 @@ static void rna_def_modifier_ocean(BlenderRNA *brna) {MOD_OCEAN_GEOM_SIM_ONLY, "SIM_ONLY", 0, "Sim Only", "Leaves geometry unchanged, but still runs simulation (to be used from texture)"}, #endif - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "OceanModifier", "Modifier"); @@ -4374,7 +4374,7 @@ static void rna_def_modifier_meshcache(BlenderRNA *brna) static const EnumPropertyItem prop_format_type_items[] = { {MOD_MESHCACHE_TYPE_MDD, "MDD", 0, "MDD ", ""}, {MOD_MESHCACHE_TYPE_PC2, "PC2", 0, "PC2", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_deform_mode_items[] = { @@ -4382,7 +4382,7 @@ static void rna_def_modifier_meshcache(BlenderRNA *brna) "Replace vertex coords with cached values"}, {MOD_MESHCACHE_DEFORM_INTEGRATE, "INTEGRATE", 0, "Integrate", "Integrate deformation from this modifiers input with the mesh-cache coords (useful for shape keys)"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_interpolation_type_items[] = { @@ -4390,7 +4390,7 @@ static void rna_def_modifier_meshcache(BlenderRNA *brna) {MOD_MESHCACHE_INTERP_LINEAR, "LINEAR", 0, "Linear", ""}, /* for cardinal we'd need to read 4x cache's */ // {MOD_MESHCACHE_INTERP_CARDINAL, "CARDINAL", 0, "Cardinal", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_time_type_items[] = { @@ -4401,13 +4401,13 @@ static void rna_def_modifier_meshcache(BlenderRNA *brna) {MOD_MESHCACHE_TIME_SECONDS, "TIME", 0, "Time", "Control playback using time in seconds"}, /* use 'eval_factor' */ {MOD_MESHCACHE_TIME_FACTOR, "FACTOR", 0, "Factor", "Control playback using a value between [0, 1]"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_time_play_items[] = { {MOD_MESHCACHE_PLAY_CFEA, "SCENE", 0, "Scene", "Use the time from the scene"}, {MOD_MESHCACHE_PLAY_EVAL, "CUSTOM", 0, "Custom", "Use the modifier's own time evaluation"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; StructRNA *srna; @@ -4540,7 +4540,7 @@ static void rna_def_modifier_meshseqcache(BlenderRNA *brna) {MOD_MESHSEQ_READ_POLY, "POLY", 0, "Faces", ""}, {MOD_MESHSEQ_READ_UV, "UV", 0, "UV", ""}, {MOD_MESHSEQ_READ_COLOR, "COLOR", 0, "Color", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; prop = RNA_def_property(srna, "read_data", PROP_ENUM, PROP_NONE); @@ -4678,7 +4678,7 @@ static void rna_def_modifier_datatransfer(BlenderRNA *brna) {DT_TYPE_SKIN, "SKIN", 0, "Skin Weight", "Transfer skin weights"}, #endif {DT_TYPE_BWEIGHT_VERT, "BEVEL_WEIGHT_VERT", 0, "Bevel Weight", "Transfer bevel weights"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem DT_layer_edge_items[] = { @@ -4687,20 +4687,20 @@ static void rna_def_modifier_datatransfer(BlenderRNA *brna) {DT_TYPE_CREASE, "CREASE", 0, "Subsurf Crease", "Transfer crease values"}, {DT_TYPE_BWEIGHT_EDGE, "BEVEL_WEIGHT_EDGE", 0, "Bevel Weight", "Transfer bevel weights"}, {DT_TYPE_FREESTYLE_EDGE, "FREESTYLE_EDGE", 0, "Freestyle Mark", "Transfer Freestyle edge mark"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem DT_layer_loop_items[] = { {DT_TYPE_LNOR, "CUSTOM_NORMAL", 0, "Custom Normals", "Transfer custom normals"}, {DT_TYPE_VCOL, "VCOL", 0, "VCol", "Vertex (face corners) colors"}, {DT_TYPE_UV, "UV", 0, "UVs", "Transfer UV layers"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem DT_layer_poly_items[] = { {DT_TYPE_SHARP_FACE, "SMOOTH", 0, "Smooth", "Transfer flat/smooth mark"}, {DT_TYPE_FREESTYLE_FACE, "FREESTYLE_FACE", 0, "Freestyle Mark", "Transfer Freestyle face mark"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "DataTransferModifier", "Modifier"); @@ -4897,7 +4897,7 @@ static void rna_def_modifier_normaledit(BlenderRNA *brna) "From an ellipsoid (shape defined by the boundbox's dimensions, target is optional)"}, {MOD_NORMALEDIT_MODE_DIRECTIONAL, "DIRECTIONAL", 0, "Directional", "Normals 'track' (point to) the target object"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_mix_mode_items[] = { @@ -4905,7 +4905,7 @@ static void rna_def_modifier_normaledit(BlenderRNA *brna) {MOD_NORMALEDIT_MIX_ADD, "ADD", 0, "Add", "Copy sum of new and old normals"}, {MOD_NORMALEDIT_MIX_SUB, "SUB", 0, "Subtract", "Copy new normals minus old normals"}, {MOD_NORMALEDIT_MIX_MUL, "MUL", 0, "Multiply", "Copy product of old and new normals (*not* cross product)"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "NormalEditModifier", "Modifier"); @@ -5008,7 +5008,7 @@ static void rna_def_modifier_weightednormal(BlenderRNA *brna) {MOD_WEIGHTEDNORMAL_MODE_ANGLE, "CORNER_ANGLE", 0, "Corner Angle", "Generate corner angle weighted normals"}, {MOD_WEIGHTEDNORMAL_MODE_FACE_ANGLE, "FACE_AREA_WITH_ANGLE", 0, "Face Area And Angle", "Generated normals weighted by both face area and angle"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "WeightedNormalModifier", "Modifier"); diff --git a/source/blender/makesrna/intern/rna_movieclip.c b/source/blender/makesrna/intern/rna_movieclip.c index 6de503487d9..abed9c0615b 100644 --- a/source/blender/makesrna/intern/rna_movieclip.c +++ b/source/blender/makesrna/intern/rna_movieclip.c @@ -136,7 +136,7 @@ static void rna_def_movieclip_proxy(BlenderRNA *brna) "written by recording device"}, {IMB_TC_RECORD_RUN_NO_GAPS, "FREE_RUN_NO_GAPS", 0, "Free Run No Gaps", "Record run, but ignore timecode, changes in framerate or dropouts"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "MovieClipProxy", NULL); @@ -234,7 +234,7 @@ static void rna_def_moviecliUser(BlenderRNA *brna) {MCLIP_PROXY_RENDER_SIZE_75, "PROXY_75", 0, "75%", ""}, {MCLIP_PROXY_RENDER_SIZE_100, "PROXY_100", 0, "100%", ""}, {MCLIP_PROXY_RENDER_SIZE_FULL, "FULL", 0, "None, full render", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "MovieClipUser", NULL); @@ -280,7 +280,7 @@ static void rna_def_movieclip(BlenderRNA *brna) static const EnumPropertyItem clip_source_items[] = { {MCLIP_SRC_SEQUENCE, "SEQUENCE", 0, "Image Sequence", "Multiple image files, as a sequence"}, {MCLIP_SRC_MOVIE, "MOVIE", 0, "Movie File", "Movie file"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "MovieClip", "ID"); diff --git a/source/blender/makesrna/intern/rna_nla.c b/source/blender/makesrna/intern/rna_nla.c index 0de8d76cf5a..219b30c8d1f 100644 --- a/source/blender/makesrna/intern/rna_nla.c +++ b/source/blender/makesrna/intern/rna_nla.c @@ -492,7 +492,7 @@ const EnumPropertyItem rna_enum_nla_mode_blend_items[] = { "Weighted result of strip is removed from the accumulated results"}, {NLASTRIP_MODE_MULTIPLY, "MULTIPLY", 0, "Multiply", "Weighted result of strip is multiplied with the accumulated results"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_nla_mode_extend_items[] = { @@ -500,7 +500,7 @@ const EnumPropertyItem rna_enum_nla_mode_extend_items[] = { {NLASTRIP_EXTEND_HOLD, "HOLD", 0, "Hold", "Hold the first frame if no previous strips in track, and always hold last frame"}, {NLASTRIP_EXTEND_HOLD_FORWARD, "HOLD_FORWARD", 0, "Hold Forward", "Only hold last frame"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static void rna_def_strip_fcurves(BlenderRNA *brna, PropertyRNA *cprop) @@ -539,7 +539,7 @@ static void rna_def_nlastrip(BlenderRNA *brna) {NLASTRIP_TYPE_TRANSITION, "TRANSITION", 0, "Transition", "NLA Strip 'transitions' between adjacent strips"}, {NLASTRIP_TYPE_META, "META", 0, "Meta", "NLA Strip acts as a container for adjacent strips"}, {NLASTRIP_TYPE_SOUND, "SOUND", 0, "Sound Clip", "NLA Strip representing a sound event for speakers"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* struct definition */ diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index ff13ec08445..20167728425 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -84,14 +84,14 @@ static const EnumPropertyItem node_socket_type_items[] = { {SOCK_STRING, "STRING", 0, "String", ""}, {SOCK_RGBA, "RGBA", 0, "RGBA", ""}, {SOCK_SHADER, "SHADER", 0, "Shader", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem node_quality_items[] = { {NTREE_QUALITY_HIGH, "HIGH", 0, "High", "High quality"}, {NTREE_QUALITY_MEDIUM, "MEDIUM", 0, "Medium", "Medium quality"}, {NTREE_QUALITY_LOW, "LOW", 0, "Low", "Low quality"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem node_chunksize_items[] = { @@ -101,7 +101,7 @@ static const EnumPropertyItem node_chunksize_items[] = { {NTREE_CHUNCKSIZE_256, "256", 0, "256x256", "Chunksize of 256x256"}, {NTREE_CHUNCKSIZE_512, "512", 0, "512x512", "Chunksize of 512x512"}, {NTREE_CHUNCKSIZE_1024, "1024", 0, "1024x1024", "Chunksize of 1024x1024"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -134,7 +134,7 @@ const EnumPropertyItem rna_enum_node_math_items[] = { {NODE_MATH_ACOS, "ARCCOSINE", 0, "Arccosine", ""}, {NODE_MATH_ATAN, "ARCTANGENT", 0, "Arctangent", ""}, {NODE_MATH_ATAN2, "ARCTAN2", 0, "Arctan2", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_node_vec_math_items[] = { @@ -144,7 +144,7 @@ const EnumPropertyItem rna_enum_node_vec_math_items[] = { {3, "DOT_PRODUCT", 0, "Dot Product", ""}, {4, "CROSS_PRODUCT", 0, "Cross Product", ""}, {5, "NORMALIZE", 0, "Normalize", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_node_filter_items[] = { @@ -155,7 +155,7 @@ const EnumPropertyItem rna_enum_node_filter_items[] = { {4, "PREWITT", 0, "Prewitt", ""}, {5, "KIRSCH", 0, "Kirsch", ""}, {6, "SHADOW", 0, "Shadow", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifndef RNA_RUNTIME @@ -163,7 +163,7 @@ static const EnumPropertyItem node_sampler_type_items[] = { {0, "NEAREST", 0, "Nearest", ""}, {1, "BILINEAR", 0, "Bilinear", ""}, {2, "BICUBIC", 0, "Bicubic", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; @@ -171,7 +171,7 @@ static const EnumPropertyItem prop_shader_output_target_items[] = { {SHD_OUTPUT_ALL, "ALL", 0, "All", "Use shaders for all renderers and viewports, unless there exists a more specific output"}, {SHD_OUTPUT_EEVEE, "EEVEE", 0, "Eevee", "Use shaders for Eevee renderer"}, {SHD_OUTPUT_CYCLES, "CYCLES", 0, "Cycles", "Use shaders for Cycles renderer"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -3251,38 +3251,38 @@ void rna_ShaderNodePointDensity_density_minmax(bNode *self, static const EnumPropertyItem prop_image_layer_items[] = { { 0, "PLACEHOLDER", 0, "Placeholder", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_image_view_items[] = { { 0, "ALL", 0, "All", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_view_layer_items[] = { { 0, "PLACEHOLDER", 0, "Placeholder", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_tri_channel_items[] = { { 1, "R", 0, "R", ""}, { 2, "G", 0, "G", ""}, { 3, "B", 0, "B", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem node_flip_items[] = { {0, "X", 0, "Flip X", ""}, {1, "Y", 0, "Flip Y", ""}, {2, "XY", 0, "Flip X & Y", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem node_ycc_items[] = { { 0, "ITUBT601", 0, "ITU 601", ""}, { 1, "ITUBT709", 0, "ITU 709", ""}, { 2, "JFIF", 0, "Jpeg", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem node_glossy_items[] = { @@ -3291,7 +3291,7 @@ static const EnumPropertyItem node_glossy_items[] = { {SHD_GLOSSY_GGX, "GGX", 0, "GGX", ""}, {SHD_GLOSSY_ASHIKHMIN_SHIRLEY, "ASHIKHMIN_SHIRLEY", 0, "Ashikhmin-Shirley", ""}, {SHD_GLOSSY_MULTI_GGX, "MULTI_GGX", 0, "Multiscatter GGX", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem node_anisotropic_items[] = { @@ -3299,7 +3299,7 @@ static const EnumPropertyItem node_anisotropic_items[] = { {SHD_GLOSSY_GGX, "GGX", 0, "GGX", ""}, {SHD_GLOSSY_MULTI_GGX, "MULTI_GGX", 0, "Multiscatter GGX", ""}, {SHD_GLOSSY_ASHIKHMIN_SHIRLEY, "ASHIKHMIN_SHIRLEY", 0, "Ashikhmin-Shirley", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem node_glass_items[] = { @@ -3337,25 +3337,25 @@ static const EnumPropertyItem node_principled_hair_items[] = { "(you can get the concentrations for different types of hair online)"}, {SHD_PRINCIPLED_HAIR_REFLECTANCE, "COLOR", 0, "Direct coloring", "Choose the color of your preference, and the shader will approximate the absorption coefficient to render lookalike hair"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem node_script_mode_items[] = { {NODE_SCRIPT_INTERNAL, "INTERNAL", 0, "Internal", "Use internal text data-block"}, {NODE_SCRIPT_EXTERNAL, "EXTERNAL", 0, "External", "Use external .osl or .oso file"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static EnumPropertyItem node_ies_mode_items[] = { {NODE_IES_INTERNAL, "INTERNAL", 0, "Internal", "Use internal text datablock"}, {NODE_IES_EXTERNAL, "EXTERNAL", 0, "External", "Use external .ies file"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem node_principled_distribution_items[] = { {SHD_GLOSSY_GGX, "GGX", 0, "GGX", ""}, {SHD_GLOSSY_MULTI_GGX, "MULTI_GGX", 0, "Multiscatter GGX", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem node_subsurface_method_items[] = { @@ -3603,7 +3603,7 @@ static void def_sh_mapping(StructRNA *srna) {TEXMAP_TYPE_POINT, "POINT", 0, "Point", "Transform a point"}, {TEXMAP_TYPE_VECTOR, "VECTOR", 0, "Vector", "Transform a direction vector"}, {TEXMAP_TYPE_NORMAL, "NORMAL", 0, "Normal", "Transform a normal vector with unit length"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static float default_1[3] = {1.f, 1.f, 1.f}; @@ -3690,7 +3690,7 @@ static void def_sh_tex_sky(StructRNA *srna) static const EnumPropertyItem prop_sky_type[] = { {SHD_SKY_OLD, "PREETHAM", 0, "Preetham", ""}, {SHD_SKY_NEW, "HOSEK_WILKIE", 0, "Hosek / Wilkie", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static float default_dir[3] = {0.0f, 0.0f, 1.0f}; @@ -3729,7 +3729,7 @@ static const EnumPropertyItem sh_tex_prop_color_space_items[] = { {SHD_COLORSPACE_NONE, "NONE", 0, "Non-Color Data", "Image contains non-color data, for example a displacement or normal map, " "and will not be converted"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem sh_tex_prop_interpolation_items[] = { @@ -3741,7 +3741,7 @@ static const EnumPropertyItem sh_tex_prop_interpolation_items[] = { "Cubic interpolation"}, {SHD_INTERP_SMART, "Smart", 0, "Smart", "Bicubic when magnifying, else bilinear (OSL only)"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static void def_sh_tex_environment(StructRNA *srna) @@ -3751,7 +3751,7 @@ static void def_sh_tex_environment(StructRNA *srna) "Equirectangular or latitude-longitude projection"}, {SHD_PROJ_MIRROR_BALL, "MIRROR_BALL", 0, "Mirror Ball", "Projection from an orthographic photo of a mirror ball"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; PropertyRNA *prop; @@ -3801,14 +3801,14 @@ static void def_sh_tex_image(StructRNA *srna) "Image is projected spherically using the Z axis as central"}, {SHD_PROJ_TUBE, "TUBE", 0, "Tube", "Image is projected from the tube using the Z axis as central"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_image_extension[] = { {SHD_IMAGE_EXTENSION_REPEAT, "REPEAT", 0, "Repeat", "Cause the image to repeat horizontally and vertically"}, {SHD_IMAGE_EXTENSION_EXTEND, "EXTEND", 0, "Extend", "Extend by repeating edge pixels of the image"}, {SHD_IMAGE_EXTENSION_CLIP, "CLIP", 0, "Clip", "Clip to image size and set exterior pixels as transparent"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; PropertyRNA *prop; @@ -3867,7 +3867,7 @@ static void def_sh_tex_gradient(StructRNA *srna) {SHD_BLEND_QUADRATIC_SPHERE, "QUADRATIC_SPHERE", 0, "Quadratic sphere", "Create a quadratic progression in the shape of a sphere"}, {SHD_BLEND_RADIAL, "RADIAL", 0, "Radial", "Create a radial progression"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; PropertyRNA *prop; @@ -3952,7 +3952,7 @@ static void def_sh_tex_musgrave(StructRNA *srna) {SHD_MUSGRAVE_HYBRID_MULTIFRACTAL, "HYBRID_MULTIFRACTAL", 0, "Hybrid Multifractal", ""}, {SHD_MUSGRAVE_FBM, "FBM", 0, "fBM", ""}, {SHD_MUSGRAVE_HETERO_TERRAIN, "HETERO_TERRAIN", 0, "Hetero Terrain", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; PropertyRNA *prop; @@ -3972,7 +3972,7 @@ static void def_sh_tex_voronoi(StructRNA *srna) static const EnumPropertyItem prop_coloring_items[] = { {SHD_VORONOI_INTENSITY, "INTENSITY", 0, "Intensity", "Only calculate intensity"}, {SHD_VORONOI_CELLS, "CELLS", 0, "Cells", "Color cells by position"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static EnumPropertyItem prop_distance_items[] = { @@ -4021,13 +4021,13 @@ static void def_sh_tex_wave(StructRNA *srna) static const EnumPropertyItem prop_wave_type_items[] = { {SHD_WAVE_BANDS, "BANDS", 0, "Bands", "Use standard wave texture in bands"}, {SHD_WAVE_RINGS, "RINGS", 0, "Rings", "Use wave texture in rings"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_wave_profile_items[] = { {SHD_WAVE_PROFILE_SIN, "SIN", 0, "Sine", "Use a standard sine profile"}, {SHD_WAVE_PROFILE_SAW, "SAW", 0, "Saw", "Use a sawtooth profile"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; PropertyRNA *prop; @@ -4071,14 +4071,14 @@ static void def_sh_vect_transform(StructRNA *srna) {SHD_VECT_TRANSFORM_TYPE_POINT, "POINT", 0, "Point", "Transform a point"}, {SHD_VECT_TRANSFORM_TYPE_VECTOR, "VECTOR", 0, "Vector", "Transform a direction vector"}, {SHD_VECT_TRANSFORM_TYPE_NORMAL, "NORMAL", 0, "Normal", "Transform a normal vector with unit length"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_vect_space_items[] = { {SHD_VECT_TRANSFORM_SPACE_WORLD, "WORLD", 0, "World", ""}, {SHD_VECT_TRANSFORM_SPACE_OBJECT, "OBJECT", 0, "Object", ""}, {SHD_VECT_TRANSFORM_SPACE_CAMERA, "CAMERA", 0, "Camera", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; PropertyRNA *prop; @@ -4124,7 +4124,7 @@ static void def_sh_tex_pointdensity(StructRNA *srna) "Generate point density from a particle system"}, {SHD_POINTDENSITY_SOURCE_OBJECT, "OBJECT", 0, "Object Vertices", "Generate point density from an object's vertices"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_interpolation_items[] = { @@ -4134,13 +4134,13 @@ static void def_sh_tex_pointdensity(StructRNA *srna) "Linear interpolation"}, {SHD_INTERP_CUBIC, "Cubic", 0, "Cubic", "Cubic interpolation"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem space_items[] = { {SHD_POINTDENSITY_SPACE_OBJECT, "OBJECT", 0, "Object Space", ""}, {SHD_POINTDENSITY_SPACE_WORLD, "WORLD", 0, "World Space", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem particle_color_source_items[] = { @@ -4150,7 +4150,7 @@ static void def_sh_tex_pointdensity(StructRNA *srna) "Particle speed (absolute magnitude of velocity) mapped as 0.0-1.0 intensity"}, {SHD_POINTDENSITY_COLOR_PARTVEL, "PARTICLE_VELOCITY", 0, "Particle Velocity", "XYZ velocity mapped to RGB colors"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem vertex_color_source_items[] = { @@ -4158,7 +4158,7 @@ static void def_sh_tex_pointdensity(StructRNA *srna) {SHD_POINTDENSITY_COLOR_VERTWEIGHT, "VERTEX_WEIGHT", 0, "Vertex Weight", "Vertex group weight"}, {SHD_POINTDENSITY_COLOR_VERTNOR, "VERTEX_NORMAL", 0, "Vertex Normal", "XYZ normal vector mapped to RGB colors"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; prop = RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE); @@ -4389,7 +4389,7 @@ static void def_sh_normal_map(StructRNA *srna) {SHD_SPACE_WORLD, "WORLD", 0, "World Space", "World space normal mapping"}, {SHD_SPACE_BLENDER_OBJECT, "BLENDER_OBJECT", 0, "Blender Object Space", "Object space normal mapping, compatible with Blender render baking"}, {SHD_SPACE_BLENDER_WORLD, "BLENDER_WORLD", 0, "Blender World Space", "World space normal mapping, compatible with Blender render baking"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; PropertyRNA *prop; @@ -4413,7 +4413,7 @@ static void def_sh_displacement(StructRNA *srna) static const EnumPropertyItem prop_space_items[] = { {SHD_SPACE_OBJECT, "OBJECT", 0, "Object Space", "Displacement is in object space, affected by object scale"}, {SHD_SPACE_WORLD, "WORLD", 0, "World Space", "Displacement is in world space, not affected by object scale"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; PropertyRNA *prop; @@ -4433,7 +4433,7 @@ static void def_sh_vector_displacement(StructRNA *srna) {SHD_SPACE_TANGENT, "TANGENT", 0, "Tangent Space", "Tangent space vector displacement mapping"}, {SHD_SPACE_OBJECT, "OBJECT", 0, "Object Space", "Object space vector displacement mapping"}, {SHD_SPACE_WORLD, "WORLD", 0, "World Space", "World space vector displacement mapping"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; PropertyRNA *prop; @@ -4452,14 +4452,14 @@ static void def_sh_tangent(StructRNA *srna) static const EnumPropertyItem prop_direction_type_items[] = { {SHD_TANGENT_RADIAL, "RADIAL", 0, "Radial", "Radial tangent around the X, Y or Z axis"}, {SHD_TANGENT_UVMAP, "UV_MAP", 0, "UV Map", "Tangent from UV map"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_axis_items[] = { {SHD_TANGENT_AXIS_X, "X", 0, "X", "X axis"}, {SHD_TANGENT_AXIS_Y, "Y", 0, "Y", "Y axis"}, {SHD_TANGENT_AXIS_Z, "Z", 0, "Z", "Z axis"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; PropertyRNA *prop; @@ -4522,7 +4522,7 @@ static void def_sh_subsurface(StructRNA *srna) {SHD_SUBSURFACE_GAUSSIAN, "GAUSSIAN", 0, "Gaussian", "Normal distribution, multiple can be combined to fit more complex profiles"}, {SHD_SUBSURFACE_BURLEY, "BURLEY", 0, "Christensen-Burley", "Approximation to physically based volume scattering"}, {SHD_SUBSURFACE_RANDOM_WALK, "RANDOM_WALK", 0, "Random Walk", "Volumetric approximation to physically based volume scattering"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; PropertyRNA *prop; @@ -4665,14 +4665,14 @@ static void def_cmp_blur(StructRNA *srna) {R_FILTER_FAST_GAUSS, "FAST_GAUSS", 0, "Fast Gaussian", ""}, {R_FILTER_CATROM, "CATROM", 0, "Catrom", ""}, {R_FILTER_MITCH, "MITCH", 0, "Mitch", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem aspect_correction_type_items[] = { {CMP_NODE_BLUR_ASPECT_NONE, "NONE", 0, "None", ""}, {CMP_NODE_BLUR_ASPECT_Y, "Y", 0, "Y", ""}, {CMP_NODE_BLUR_ASPECT_X, "X", 0, "X", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* duplicated in def_cmp_bokehblur */ @@ -4861,7 +4861,7 @@ static void def_cmp_levels(StructRNA *srna) {3, "GREEN", 0, "G", "Green Channel"}, {4, "BLUE", 0, "B", "Blue Channel"}, {5, "LUMINANCE", 0, "L", "Luminance Channel"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; prop = RNA_def_property(srna, "channel", PROP_ENUM, PROP_NONE); @@ -4944,7 +4944,7 @@ static void def_cmp_image(StructRNA *srna) {IMA_SRC_MOVIE, "MOVIE", "Movie", ""}, {IMA_SRC_SEQUENCE, "SEQUENCE", "Sequence", ""}, {IMA_SRC_GENERATED, "GENERATED", "Generated", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -5118,7 +5118,7 @@ static void def_cmp_dilate_erode(StructRNA *srna) {CMP_NODE_DILATEERODE_DISTANCE_THRESH, "THRESHOLD", 0, "Threshold", ""}, {CMP_NODE_DILATEERODE_DISTANCE, "DISTANCE", 0, "Distance", ""}, {CMP_NODE_DILATEERODE_DISTANCE_FEATHER, "FEATHER", 0, "Feather", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; prop = RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE); @@ -5198,7 +5198,7 @@ static void def_cmp_scale(StructRNA *srna) {CMP_SCALE_ABSOLUTE, "ABSOLUTE", 0, "Absolute", ""}, {CMP_SCALE_SCENEPERCENT, "SCENE_SIZE", 0, "Scene Size", ""}, {CMP_SCALE_RENDERPERCENT, "RENDER_SIZE", 0, "Render Size", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* matching bgpic_camera_frame_items[] */ @@ -5206,7 +5206,7 @@ static void def_cmp_scale(StructRNA *srna) {0, "STRETCH", 0, "Stretch", ""}, {CMP_SCALE_RENDERSIZE_FRAME_ASPECT, "FIT", 0, "Fit", ""}, {CMP_SCALE_RENDERSIZE_FRAME_ASPECT | CMP_SCALE_RENDERSIZE_FRAME_CROP, "CROP", 0, "Crop", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; prop = RNA_def_property(srna, "space", PROP_ENUM, PROP_NONE); @@ -5297,7 +5297,7 @@ static void def_cmp_distance_matte(StructRNA *srna) static const EnumPropertyItem color_space_items[] = { {1, "RGB", 0, "RGB", "RGB color space"}, {2, "YCC", 0, "YCC", "YCbCr Suppression"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; RNA_def_struct_sdna_from(srna, "NodeChroma", "storage"); @@ -5332,20 +5332,20 @@ static void def_cmp_color_spill(StructRNA *srna) {1, "R", 0, "R", "Red Spill Suppression"}, {2, "G", 0, "G", "Green Spill Suppression"}, {3, "B", 0, "B", "Blue Spill Suppression"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem limit_channel_items[] = { {0, "R", 0, "R", "Limit by Red"}, {1, "G", 0, "G", "Limit by Green"}, {2, "B", 0, "B", "Limit by Blue"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem algorithm_items[] = { {0, "SIMPLE", 0, "Simple", "Simple Limit Algorithm"}, {1, "AVERAGE", 0, "Average", "Average Limit Algorithm"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; prop = RNA_def_property(srna, "channel", PROP_ENUM, PROP_NONE); @@ -5477,13 +5477,13 @@ static void def_cmp_channel_matte(StructRNA *srna) {CMP_NODE_CHANNEL_MATTE_CS_HSV, "HSV", 0, "HSV", "HSV Color Space"}, {CMP_NODE_CHANNEL_MATTE_CS_YUV, "YUV", 0, "YUV", "YUV Color Space"}, {CMP_NODE_CHANNEL_MATTE_CS_YCC, "YCC", 0, "YCbCr", "YCbCr Color Space"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem algorithm_items[] = { {0, "SINGLE", 0, "Single", "Limit by single channel"}, {1, "MAX", 0, "Max", "Limit by max of other channels "}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; prop = RNA_def_property(srna, "color_space", PROP_ENUM, PROP_NONE); @@ -5580,14 +5580,14 @@ static void def_cmp_double_edge_mask(StructRNA *srna) static const EnumPropertyItem BufEdgeMode_items[] = { {0, "BLEED_OUT", 0, "Bleed Out", "Allow mask pixels to bleed along edges"}, {1, "KEEP_IN", 0, "Keep In", "Restrict mask pixels from touching edges"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem InnerEdgeMode_items[] = { {0, "ALL", 0, "All", "All pixels on inner mask edge are considered during mask calculation"}, {1, "ADJACENT_ONLY", 0, "Adjacent Only", "Only inner mask pixels adjacent to outer mask pixels are considered during mask calculation"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; prop = RNA_def_property(srna, "inner_mode", PROP_ENUM, PROP_NONE); @@ -5626,7 +5626,7 @@ static void def_cmp_defocus(StructRNA *srna) {4, "SQUARE", 0, "Square", "4 sides"}, {3, "TRIANGLE", 0, "Triangular", "3 sides"}, {0, "CIRCLE", 0, "Circular", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; prop = RNA_def_property(srna, "scene", PROP_POINTER, PROP_NONE); @@ -5865,7 +5865,7 @@ static void def_cmp_premul_key(StructRNA *srna) static const EnumPropertyItem type_items[] = { {0, "STRAIGHT_TO_PREMUL", 0, "Straight to Premul", ""}, {1, "PREMUL_TO_STRAIGHT", 0, "Premul to Straight", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; prop = RNA_def_property(srna, "mapping", PROP_ENUM, PROP_NONE); @@ -5885,14 +5885,14 @@ static void def_cmp_glare(StructRNA *srna) {2, "STREAKS", 0, "Streaks", ""}, {1, "FOG_GLOW", 0, "Fog Glow", ""}, {0, "SIMPLE_STAR", 0, "Simple Star", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem quality_items[] = { {0, "HIGH", 0, "High", ""}, {1, "MEDIUM", 0, "Medium", ""}, {2, "LOW", 0, "Low", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; RNA_def_struct_sdna_from(srna, "NodeGlare", "storage"); @@ -5979,7 +5979,7 @@ static void def_cmp_tonemap(StructRNA *srna) static const EnumPropertyItem type_items[] = { {1, "RD_PHOTORECEPTOR", 0, "R/D Photoreceptor", ""}, {0, "RH_SIMPLE", 0, "Rh Simple", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; RNA_def_struct_sdna_from(srna, "NodeTonemap", "storage"); @@ -6066,7 +6066,7 @@ static void def_cmp_colorbalance(StructRNA *srna) static const EnumPropertyItem type_items[] = { {0, "LIFT_GAMMA_GAIN", 0, "Lift/Gamma/Gain", ""}, {1, "OFFSET_POWER_SLOPE", 0, "Offset/Power/Slope (ASC-CDL)", "ASC-CDL standard color correction"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; prop = RNA_def_property(srna, "correction_method", PROP_ENUM, PROP_NONE); @@ -6215,7 +6215,7 @@ static void def_cmp_moviedistortion(StructRNA *srna) static const EnumPropertyItem distortion_type_items[] = { {0, "UNDISTORT", 0, "Undistort", ""}, {1, "DISTORT", 0, "Distort", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; prop = RNA_def_property(srna, "clip", PROP_POINTER, PROP_NONE); @@ -6240,7 +6240,7 @@ static void def_cmp_mask(StructRNA *srna) {0, "SCENE", 0, "Scene Size", ""}, {CMP_NODEFLAG_MASK_FIXED, "FIXED", 0, "Fixed", "Use pixel size for the buffer"}, {CMP_NODEFLAG_MASK_FIXED_SCENE, "FIXED_SCENE", 0, "Fixed/Scene", "Pixel size scaled by scene percentage"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; prop = RNA_def_property(srna, "mask", PROP_POINTER, PROP_NONE); @@ -6310,7 +6310,7 @@ static const EnumPropertyItem node_masktype_items[] = { {1, "SUBTRACT", 0, "Subtract", ""}, {2, "MULTIPLY", 0, "Multiply", ""}, {3, "NOT", 0, "Not", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static void def_cmp_boxmask(StructRNA *srna) @@ -6686,7 +6686,7 @@ static void def_cmp_viewer(StructRNA *srna) {1, "RANDOM", 0, "Random", "Random tiles"}, {2, "BOTTOMUP", 0, "Bottom up", "Expand from bottom"}, {3, "RULE_OF_THIRDS", 0, "Rule of thirds", "Expand from 9 places"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; prop = RNA_def_property(srna, "tile_order", PROP_ENUM, PROP_NONE); @@ -6837,7 +6837,7 @@ static void def_cmp_trackpos(StructRNA *srna) "Relative Frame", "Output position of a marker relative to marker at given frame number"}, {CMP_TRACKPOS_ABSOLUTE_FRAME, "ABSOLUTE_FRAME", 0, "Absolute Frame", "Output absolute position of a marker at given frame number"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; prop = RNA_def_property(srna, "clip", PROP_POINTER, PROP_NONE); @@ -6878,7 +6878,7 @@ static void def_cmp_translate(StructRNA *srna) {CMP_NODE_WRAP_X, "XAXIS", 0, "X Axis", "Wrap all pixels on the X axis"}, {CMP_NODE_WRAP_Y, "YAXIS", 0, "Y Axis", "Wrap all pixels on the Y axis"}, {CMP_NODE_WRAP_XY, "BOTH", 0, "Both Axes", "Wrap all pixels on both axes"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; PropertyRNA *prop; @@ -7857,7 +7857,8 @@ static void rna_def_node(BlenderRNA *brna) static const EnumPropertyItem dummy_static_type_items[] = { {NODE_CUSTOM, "CUSTOM", 0, "Custom", "Custom Node"}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL}, + }; srna = RNA_def_struct(brna, "Node", NULL); RNA_def_struct_ui_text(srna, "Node", "Node in a node tree"); @@ -8309,7 +8310,7 @@ static void rna_def_nodetree(BlenderRNA *brna) {NTREE_SHADER, "SHADER", ICON_MATERIAL, "Shader", "Shader nodes"}, {NTREE_TEXTURE, "TEXTURE", ICON_TEXTURE, "Texture", "Texture nodes"}, {NTREE_COMPOSIT, "COMPOSITING", ICON_RENDERLAYERS, "Compositing", "Compositing nodes"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "NodeTree", "ID"); diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 7c0d9c4bad0..dd9b4206853 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -71,7 +71,7 @@ const EnumPropertyItem rna_enum_object_mode_items[] = { {OB_MODE_SCULPT_GPENCIL, "SCULPT_GPENCIL", ICON_SCULPTMODE_HLT, "Sculpt Mode", "Sculpt Grease Pencil Strokes"}, {OB_MODE_PAINT_GPENCIL, "PAINT_GPENCIL", ICON_GREASEPENCIL, "Draw", "Paint Grease Pencil Strokes"}, {OB_MODE_WEIGHT_GPENCIL, "WEIGHT_GPENCIL", ICON_WPAINT_HLT, "Weight Paint", "Grease Pencil Weight Paint Strokes" }, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* Same as above, but with names that distinguish grease pencil. */ @@ -88,7 +88,7 @@ const EnumPropertyItem rna_enum_workspace_object_mode_items[] = { {OB_MODE_SCULPT_GPENCIL, "SCULPT_GPENCIL", ICON_SCULPTMODE_HLT, "Grease Pencil Sculpt Mode", "Sculpt Grease Pencil Strokes"}, {OB_MODE_PAINT_GPENCIL, "PAINT_GPENCIL", ICON_GREASEPENCIL, "Grease Pencil Draw", "Paint Grease Pencil Strokes"}, {OB_MODE_WEIGHT_GPENCIL, "WEIGHT_GPENCIL", ICON_WPAINT_HLT, "Grease Pencil Weight Paint", "Grease Pencil Weight Paint Strokes" }, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_object_empty_drawtype_items[] = { @@ -100,14 +100,14 @@ const EnumPropertyItem rna_enum_object_empty_drawtype_items[] = { {OB_EMPTY_SPHERE, "SPHERE", ICON_SPHERE, "Sphere", ""}, {OB_EMPTY_CONE, "CONE", ICON_CONE, "Cone", ""}, {OB_EMPTY_IMAGE, "IMAGE", ICON_FILE_IMAGE, "Image", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem rna_enum_object_empty_image_depth_items[] = { {OB_EMPTY_IMAGE_DEPTH_DEFAULT, "DEFAULT", 0, "Default", ""}, {OB_EMPTY_IMAGE_DEPTH_FRONT, "FRONT", 0, "Front", ""}, {OB_EMPTY_IMAGE_DEPTH_BACK, "BACK", 0, "Back", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_object_gpencil_type_items[] = { @@ -124,7 +124,7 @@ static const EnumPropertyItem parent_type_items[] = { {PARVERT1, "VERTEX", 0, "Vertex", "The object is parented to a vertex"}, {PARVERT3, "VERTEX_3", 0, "3 Vertices", ""}, {PARBONE, "BONE", 0, "Bone", "The object is parented to a bone"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #define INSTANCE_ITEMS_SHARED \ @@ -137,12 +137,12 @@ static const EnumPropertyItem parent_type_items[] = { static const EnumPropertyItem instance_items[] = { INSTANCE_ITEMS_SHARED, INSTANCE_ITEM_COLLECTION, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifdef RNA_RUNTIME static EnumPropertyItem instance_items_nogroup[] = { INSTANCE_ITEMS_SHARED, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif #undef INSTANCE_ITEMS_SHARED @@ -154,7 +154,7 @@ const EnumPropertyItem rna_enum_metaelem_type_items[] = { {MB_PLANE, "PLANE", ICON_META_PLANE, "Plane", ""}, {MB_ELIPSOID, "ELLIPSOID", ICON_META_ELLIPSOID, "Ellipsoid", ""}, /* NOTE: typo at original definition! */ {MB_CUBE, "CUBE", ICON_META_CUBE, "Cube", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* used for 2 enums */ @@ -178,14 +178,14 @@ const EnumPropertyItem rna_enum_object_type_items[] = { {OB_LAMP, "LIGHT", 0, "Light", ""}, {OB_SPEAKER, "SPEAKER", 0, "Speaker", ""}, {OB_LIGHTPROBE, "LIGHT_PROBE", 0, "Probe", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_object_type_curve_items[] = { OBTYPE_CU_CURVE, OBTYPE_CU_SURF, OBTYPE_CU_FONT, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_object_rotation_mode_items[] = { @@ -198,7 +198,7 @@ const EnumPropertyItem rna_enum_object_rotation_mode_items[] = { {ROT_MODE_ZYX, "ZYX", 0, "ZYX Euler", "ZYX Rotation Order - prone to Gimbal Lock"}, {ROT_MODE_AXISANGLE, "AXIS_ANGLE", 0, "Axis Angle", "Axis Angle (W+XYZ), defines a rotation around some axis defined by 3D-Vector"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_object_axis_items[] = { @@ -208,7 +208,7 @@ const EnumPropertyItem rna_enum_object_axis_items[] = { {OB_NEGX, "NEG_X", 0, "-X", ""}, {OB_NEGY, "NEG_Y", 0, "-Y", ""}, {OB_NEGZ, "NEG_Z", 0, "-Z", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifdef RNA_RUNTIME @@ -1619,7 +1619,7 @@ static void rna_def_vertex_group(BlenderRNA *brna) {WEIGHT_REPLACE, "REPLACE", 0, "Replace", "Replace"}, {WEIGHT_ADD, "ADD", 0, "Add", "Add"}, {WEIGHT_SUBTRACT, "SUBTRACT", 0, "Subtract", "Subtract"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "VertexGroup", NULL); @@ -1723,7 +1723,7 @@ static void rna_def_material_slot(BlenderRNA *brna) static const EnumPropertyItem link_items[] = { {1, "OBJECT", 0, "Object", ""}, {0, "DATA", 0, "Data", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* NOTE: there is no MaterialSlot equivalent in DNA, so the internal @@ -2099,7 +2099,7 @@ static void rna_def_object(BlenderRNA *brna) {OB_POSX, "X", 0, "X", ""}, {OB_POSY, "Y", 0, "Y", ""}, {OB_POSZ, "Z", 0, "Z", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem drawtype_items[] = { @@ -2108,7 +2108,7 @@ static void rna_def_object(BlenderRNA *brna) {OB_SOLID, "SOLID", 0, "Solid", "Display the object as a solid (if solid drawing is enabled in the viewport)"}, {OB_TEXTURE, "TEXTURED", 0, "Textured", "Display the object with textures (if textures are enabled in the viewport)"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem boundtype_items[] = { @@ -2117,7 +2117,7 @@ static void rna_def_object(BlenderRNA *brna) {OB_BOUND_CYLINDER, "CYLINDER", 0, "Cylinder", "Display bounds as cylinder"}, {OB_BOUND_CONE, "CONE", 0, "Cone", "Display bounds as cone"}, {OB_BOUND_CAPSULE, "CAPSULE", 0, "Capsule", "Display bounds as capsule"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static float default_quat[4] = {1, 0, 0, 0}; /* default quaternion values */ @@ -2508,7 +2508,7 @@ static void rna_def_object(BlenderRNA *brna) {0, "DOUBLE_SIDED", 0, "Both", ""}, {OB_EMPTY_IMAGE_HIDE_BACK, "FRONT", 0, "Front", ""}, {OB_EMPTY_IMAGE_HIDE_FRONT, "BACK", 0, "Back", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; prop = RNA_def_property(srna, "empty_image_side", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "empty_image_visibility_flag"); diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c index 5b1ef3e9b6e..43f41f2704a 100644 --- a/source/blender/makesrna/intern/rna_object_api.c +++ b/source/blender/makesrna/intern/rna_object_api.c @@ -52,7 +52,7 @@ static const EnumPropertyItem space_items[] = { "The local space of a bone's parent bone"}, {CONSTRAINT_SPACE_LOCAL, "LOCAL", 0, "Local Space", "The local space of an object/bone"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifdef RNA_RUNTIME @@ -494,7 +494,7 @@ void RNA_api_object(StructRNA *srna) static const EnumPropertyItem mesh_type_items[] = { {eModifierMode_Realtime, "PREVIEW", 0, "Preview", "Apply modifier preview settings"}, {eModifierMode_Render, "RENDER", 0, "Render", "Apply modifier render settings"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifndef NDEBUG @@ -502,7 +502,7 @@ void RNA_api_object(StructRNA *srna) {0, "SOURCE", 0, "Source", "Source mesh"}, {1, "DEFORM", 0, "Deform", "Objects deform mesh"}, {2, "FINAL", 0, "Final", "Objects final mesh"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c index 3820babda47..be5c3247210 100644 --- a/source/blender/makesrna/intern/rna_object_force.c +++ b/source/blender/makesrna/intern/rna_object_force.c @@ -41,7 +41,7 @@ static const EnumPropertyItem effector_shape_items[] = { {PFIELD_SHAPE_PLANE, "PLANE", 0, "Plane", "Field originates from the local XY plane of the object"}, {PFIELD_SHAPE_SURFACE, "SURFACE", 0, "Surface", "Field originates from the surface of the object"}, {PFIELD_SHAPE_POINTS, "POINTS", 0, "Every Point", "Field originates from all of the vertices of the object"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifdef RNA_RUNTIME @@ -55,14 +55,14 @@ static const EnumPropertyItem curve_shape_items[] = { {PFIELD_SHAPE_LINE, "LINE", 0, "Line", "Field originates from the local Z axis of the object"}, {PFIELD_SHAPE_PLANE, "PLANE", 0, "Plane", "Field originates from the local XY plane of the object"}, {PFIELD_SHAPE_SURFACE, "SURFACE", 0, "Curve", "Field originates from the curve itself"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem empty_shape_items[] = { {PFIELD_SHAPE_POINT, "POINT", 0, "Point", "Field originates from the object center"}, {PFIELD_SHAPE_LINE, "LINE", 0, "Line", "Field originates from the local Z axis of the object"}, {PFIELD_SHAPE_PLANE, "PLANE", 0, "Plane", "Field originates from the local XY plane of the object"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem vortex_shape_items[] = { @@ -70,20 +70,20 @@ static const EnumPropertyItem vortex_shape_items[] = { {PFIELD_SHAPE_PLANE, "PLANE", 0, "Plane", ""}, {PFIELD_SHAPE_SURFACE, "SURFACE", 0, "Surface falloff (New)", ""}, {PFIELD_SHAPE_POINTS, "POINTS", 0, "Every Point (New)", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem curve_vortex_shape_items[] = { {PFIELD_SHAPE_POINT, "POINT", 0, "Point", ""}, {PFIELD_SHAPE_PLANE, "PLANE", 0, "Plane", ""}, {PFIELD_SHAPE_SURFACE, "SURFACE", 0, "Curve (New)", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem empty_vortex_shape_items[] = { {PFIELD_SHAPE_POINT, "POINT", 0, "Point", ""}, {PFIELD_SHAPE_PLANE, "PLANE", 0, "Plane", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #include "MEM_guardedalloc.h" @@ -724,7 +724,7 @@ static void rna_def_pointcache_common(StructRNA *srna) {PTCACHE_COMPRESS_NO, "NO", 0, "No", "No compression"}, {PTCACHE_COMPRESS_LZO, "LIGHT", 0, "Light", "Fast but not so effective compression"}, {PTCACHE_COMPRESS_LZMA, "HEAVY", 0, "Heavy", "Effective but slow compression"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; prop = RNA_def_property(srna, "frame_start", PROP_INT, PROP_TIME); @@ -1128,28 +1128,28 @@ static void rna_def_field(BlenderRNA *brna) {PFIELD_TURBULENCE, "TURBULENCE", ICON_FORCE_TURBULENCE, "Turbulence", "Create turbulence with a noise field"}, {PFIELD_DRAG, "DRAG", ICON_FORCE_DRAG, "Drag", "Create a force that dampens motion"}, {PFIELD_SMOKEFLOW, "SMOKE_FLOW", ICON_FORCE_SMOKEFLOW, "Smoke Flow", "Create a force based on smoke simulation air flow"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem falloff_items[] = { {PFIELD_FALL_SPHERE, "SPHERE", 0, "Sphere", ""}, {PFIELD_FALL_TUBE, "TUBE", 0, "Tube", ""}, {PFIELD_FALL_CONE, "CONE", 0, "Cone", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem texture_items[] = { {PFIELD_TEX_RGB, "RGB", 0, "RGB", ""}, {PFIELD_TEX_GRAD, "GRADIENT", 0, "Gradient", ""}, {PFIELD_TEX_CURL, "CURL", 0, "Curl", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem zdirection_items[] = { {PFIELD_Z_BOTH, "BOTH", 0, "Both Z", ""}, {PFIELD_Z_POS, "POSITIVE", 0, "+Z", ""}, {PFIELD_Z_NEG, "NEGATIVE", 0, "-Z", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem guide_kink_items[] = { @@ -1160,7 +1160,7 @@ static void rna_def_field(BlenderRNA *brna) {4, "BRAID", 0, "Braid", ""}, {5, "ROTATION", 0, "Rotation", ""}, {6, "ROLL", 0, "Roll", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "FieldSettings", NULL); @@ -1486,13 +1486,13 @@ static void rna_def_softbody(BlenderRNA *brna) {SBC_MODE_MIN, "MINIMAL", 0, "Minimal", "Minimal Spring length * Ball Size"}, {SBC_MODE_MAX, "MAXIMAL", 0, "Maximal", "Maximal Spring length * Ball Size"}, {SBC_MODE_AVGMINMAX, "MINMAX", 0, "AvMinMax", "(Min+Max)/2 * Ball Size"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem aerodynamics_type[] = { {0, "SIMPLE", 0, "Simple", "Edges receive a drag force from surrounding media"}, {1, "LIFT_FORCE", 0, "Lift Force", "Edges receive a lift force when passing through surrounding media"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "SoftBodySettings", NULL); diff --git a/source/blender/makesrna/intern/rna_packedfile.c b/source/blender/makesrna/intern/rna_packedfile.c index 9c5f07bfd5b..9f0ad8b27dc 100644 --- a/source/blender/makesrna/intern/rna_packedfile.c +++ b/source/blender/makesrna/intern/rna_packedfile.c @@ -34,7 +34,7 @@ const EnumPropertyItem rna_enum_unpack_method_items[] = { {PF_WRITE_LOCAL, "WRITE_LOCAL", 0, "Write Local File (overwrite existing)", ""}, {PF_USE_ORIGINAL, "USE_ORIGINAL", 0, "Use Original File", ""}, {PF_WRITE_ORIGINAL, "WRITE_ORIGINAL", 0, "Write Original File (overwrite existing)", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifdef RNA_RUNTIME diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index 61a82a40dde..a1b8e359997 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -54,7 +54,7 @@ static const EnumPropertyItem part_from_items[] = { {PART_FROM_VERT, "VERT", 0, "Verts", ""}, {PART_FROM_FACE, "FACE", 0, "Faces", ""}, {PART_FROM_VOLUME, "VOLUME", 0, "Volume", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -63,7 +63,7 @@ static const EnumPropertyItem part_reactor_from_items[] = { {PART_FROM_VERT, "VERT", 0, "Verts", ""}, {PART_FROM_FACE, "FACE", 0, "Faces", ""}, {PART_FROM_VOLUME, "VOLUME", 0, "Volume", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -71,14 +71,14 @@ static const EnumPropertyItem part_dist_items[] = { {PART_DISTR_JIT, "JIT", 0, "Jittered", ""}, {PART_DISTR_RAND, "RAND", 0, "Random", ""}, {PART_DISTR_GRID, "GRID", 0, "Grid", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifdef RNA_RUNTIME static const EnumPropertyItem part_hair_dist_items[] = { {PART_DISTR_JIT, "JIT", 0, "Jittered", ""}, {PART_DISTR_RAND, "RAND", 0, "Random", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -89,7 +89,7 @@ static const EnumPropertyItem part_draw_as_items[] = { {PART_DRAW_CIRC, "CIRC", 0, "Circle", ""}, {PART_DRAW_CROSS, "CROSS", 0, "Cross", ""}, {PART_DRAW_AXIS, "AXIS", 0, "Axis", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifdef RNA_RUNTIME @@ -97,7 +97,7 @@ static const EnumPropertyItem part_hair_draw_as_items[] = { {PART_DRAW_NOT, "NONE", 0, "None", ""}, {PART_DRAW_REND, "RENDER", 0, "Rendered", ""}, {PART_DRAW_PATH, "PATH", 0, "Path", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -109,7 +109,7 @@ static const EnumPropertyItem part_ren_as_items[] = { {PART_DRAW_OB, "OBJECT", 0, "Object", ""}, {PART_DRAW_GR, "COLLECTION", 0, "Collection", ""}, {PART_DRAW_BB, "BILLBOARD", 0, "Billboard", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifdef RNA_RUNTIME @@ -118,7 +118,7 @@ static const EnumPropertyItem part_hair_ren_as_items[] = { {PART_DRAW_PATH, "PATH", 0, "Path", ""}, {PART_DRAW_OB, "OBJECT", 0, "Object", ""}, {PART_DRAW_GR, "COLLECTION", 0, "Collection", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -1446,7 +1446,7 @@ static void rna_def_particle(BlenderRNA *brna) {PARS_UNBORN, "UNBORN", 0, "Unborn", ""}, {PARS_ALIVE, "ALIVE", 0, "Alive", ""}, {PARS_DYING, "DYING", 0, "Dying", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "Particle", NULL); @@ -1587,7 +1587,7 @@ static void rna_def_fluid_settings(BlenderRNA *brna) static const EnumPropertyItem sph_solver_items[] = { {SPH_SOLVER_DDR, "DDR", 0, "Double-Density", "An artistic solver with strong surface tension effects (original)"}, {SPH_SOLVER_CLASSICAL, "CLASSICAL", 0, "Classical", "A more physically-accurate solver"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "SPHFluidSettings", NULL); @@ -1741,7 +1741,7 @@ static void rna_def_particle_settings_mtex(BlenderRNA *brna) {TEXCO_ORCO, "ORCO", 0, "Generated", "Use the original undeformed coordinates of the object"}, {TEXCO_STRAND, "STRAND", 0, "Strand / Particle", "Use normalized strand texture coordinate (1D) or particle age (X) and trail position (Y)"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_mapping_items[] = { @@ -1749,7 +1749,7 @@ static void rna_def_particle_settings_mtex(BlenderRNA *brna) {MTEX_CUBE, "CUBE", 0, "Cube", "Map using the normal vector"}, {MTEX_TUBE, "TUBE", 0, "Tube", "Map with Z as central axis"}, {MTEX_SPHERE, "SPHERE", 0, "Sphere", "Map with Z as central axis"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_x_mapping_items[] = { @@ -1757,7 +1757,7 @@ static void rna_def_particle_settings_mtex(BlenderRNA *brna) {1, "X", 0, "X", ""}, {2, "Y", 0, "Y", ""}, {3, "Z", 0, "Z", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_y_mapping_items[] = { @@ -1765,7 +1765,7 @@ static void rna_def_particle_settings_mtex(BlenderRNA *brna) {1, "X", 0, "X", ""}, {2, "Y", 0, "Y", ""}, {3, "Z", 0, "Z", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_z_mapping_items[] = { @@ -1773,7 +1773,7 @@ static void rna_def_particle_settings_mtex(BlenderRNA *brna) {1, "X", 0, "X", ""}, {2, "Y", 0, "Y", ""}, {3, "Z", 0, "Z", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "ParticleSettingsTextureSlot", "TextureSlot"); @@ -1991,7 +1991,7 @@ static void rna_def_particle_settings(BlenderRNA *brna) {PART_EMITTER, "EMITTER", 0, "Emitter", ""}, /*{PART_REACTOR, "REACTOR", 0, "Reactor", ""}, */ {PART_HAIR, "HAIR", 0, "Hair", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem phys_type_items[] = { @@ -2000,7 +2000,7 @@ static void rna_def_particle_settings(BlenderRNA *brna) {PART_PHYS_KEYED, "KEYED", 0, "Keyed", ""}, {PART_PHYS_BOIDS, "BOIDS", 0, "Boids", ""}, {PART_PHYS_FLUID, "FLUID", 0, "Fluid", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem rot_mode_items[] = { @@ -2014,7 +2014,7 @@ static void rna_def_particle_settings(BlenderRNA *brna) {PART_ROT_OB_X, "OB_X", 0, "Object X", ""}, {PART_ROT_OB_Y, "OB_Y", 0, "Object Y", ""}, {PART_ROT_OB_Z, "OB_Z", 0, "Object Z", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem ave_mode_items[] = { @@ -2026,21 +2026,21 @@ static void rna_def_particle_settings(BlenderRNA *brna) {PART_AVE_GLOBAL_Y, "GLOBAL_Y", 0, "Global Y", ""}, {PART_AVE_GLOBAL_Z, "GLOBAL_Z", 0, "Global Z", ""}, {PART_AVE_RAND, "RAND", 0, "Random", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem react_event_items[] = { {PART_EVENT_DEATH, "DEATH", 0, "Death", ""}, {PART_EVENT_COLLIDE, "COLLIDE", 0, "Collision", ""}, {PART_EVENT_NEAR, "NEAR", 0, "Near", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem child_type_items[] = { {0, "NONE", 0, "None", ""}, {PART_CHILD_PARTICLES, "SIMPLE", 0, "Simple", ""}, {PART_CHILD_FACES, "INTERPOLATED", 0, "Interpolated", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /*TODO: names, tooltips */ @@ -2049,7 +2049,7 @@ static void rna_def_particle_settings(BlenderRNA *brna) {PART_INT_VERLET, "VERLET", 0, "Verlet", ""}, {PART_INT_MIDPOINT, "MIDPOINT", 0, "Midpoint", ""}, {PART_INT_RK4, "RK4", 0, "RK4", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem kink_type_items[] = { @@ -2059,7 +2059,7 @@ static void rna_def_particle_settings(BlenderRNA *brna) {PART_KINK_WAVE, "WAVE", 0, "Wave", ""}, {PART_KINK_BRAID, "BRAID", 0, "Braid", ""}, {PART_KINK_SPIRAL, "SPIRAL", 0, "Spiral", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem bb_align_items[] = { @@ -2068,7 +2068,7 @@ static void rna_def_particle_settings(BlenderRNA *brna) {PART_BB_Z, "Z", 0, "Z", ""}, {PART_BB_VIEW, "VIEW", 0, "View", ""}, {PART_BB_VEL, "VEL", 0, "Velocity", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem bb_anim_items[] = { @@ -2076,14 +2076,14 @@ static void rna_def_particle_settings(BlenderRNA *brna) {PART_BB_ANIM_AGE, "AGE", 0, "Age", ""}, {PART_BB_ANIM_FRAME, "FRAME", 0, "Frame", ""}, {PART_BB_ANIM_ANGLE, "ANGLE", 0, "Angle", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem bb_split_offset_items[] = { {PART_BB_OFF_NONE, "NONE", 0, "None", ""}, {PART_BB_OFF_LINEAR, "LINEAR", 0, "Linear", ""}, {PART_BB_OFF_RANDOM, "RANDOM", 0, "Random", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem draw_col_items[] = { @@ -2091,12 +2091,12 @@ static void rna_def_particle_settings(BlenderRNA *brna) {PART_DRAW_COL_MAT, "MATERIAL", 0, "Material", ""}, {PART_DRAW_COL_VEL, "VELOCITY", 0, "Velocity", ""}, {PART_DRAW_COL_ACC, "ACCELERATION", 0, "Acceleration", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem part_mat_items[] = { {0, "DUMMY", 0, "Dummy", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "ParticleSettings", "ID"); @@ -3225,7 +3225,7 @@ static void rna_def_particle_target(BlenderRNA *brna) {PTARGET_MODE_FRIEND, "FRIEND", 0, "Friend", ""}, {PTARGET_MODE_NEUTRAL, "NEUTRAL", 0, "Neutral", ""}, {PTARGET_MODE_ENEMY, "ENEMY", 0, "Enemy", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c index 058b1bb7cf6..55d11cda9ac 100644 --- a/source/blender/makesrna/intern/rna_pose.c +++ b/source/blender/makesrna/intern/rna_pose.c @@ -65,7 +65,7 @@ const EnumPropertyItem rna_enum_color_sets_items[] = { {19, "THEME19", ICON_COLORSET_19_VEC, "19 - Theme Color Set", ""}, {20, "THEME20", ICON_COLORSET_20_VEC, "20 - Theme Color Set", ""}, {-1, "CUSTOM", 0, "Custom Color Set", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifdef RNA_RUNTIME @@ -795,13 +795,13 @@ static void rna_def_bone_group(BlenderRNA *brna) static const EnumPropertyItem prop_iksolver_items[] = { {IKSOLVER_STANDARD, "LEGACY", 0, "Standard", "Original IK solver"}, {IKSOLVER_ITASC, "ITASC", 0, "iTaSC", "Multi constraint, stateful IK solver"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_solver_items[] = { {ITASC_SOLVER_SDLS, "SDLS", 0, "SDLS", "Selective Damped Least Square"}, {ITASC_SOLVER_DLS, "DLS", 0, "DLS", "Damped Least Square with Numerical Filtering"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; @@ -1265,7 +1265,7 @@ static void rna_def_pose_itasc(BlenderRNA *brna) {ITASC_SIMULATION, "SIMULATION", 0, "Simulation", "State-full solver running in real-time context and ignoring actions " "and non-IK constraints"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_itasc_reiteration_items[] = { {0, "NEVER", 0, "Never", "The solver does not reiterate, not even on first frame (starts from rest pose)"}, @@ -1274,7 +1274,7 @@ static void rna_def_pose_itasc(BlenderRNA *brna) "subsequent frame"}, {ITASC_INITIAL_REITERATION | ITASC_REITERATION, "ALWAYS", 0, "Always", "The solver reiterates (converges) on all frames"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; StructRNA *srna; diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c index a3b780de813..e50daced9d3 100644 --- a/source/blender/makesrna/intern/rna_render.c +++ b/source/blender/makesrna/intern/rna_render.c @@ -71,7 +71,7 @@ const EnumPropertyItem rna_enum_render_pass_type_items[] = { #ifdef WITH_CYCLES_DEBUG {SCE_PASS_DEBUG, "DEBUG", 0, "Pass used for render engine debugging", ""}, #endif - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_bake_pass_type_items[] = { @@ -87,7 +87,7 @@ const EnumPropertyItem rna_enum_bake_pass_type_items[] = { {SCE_PASS_GLOSSY_COLOR, "GLOSSY", 0, "Glossy", ""}, {SCE_PASS_TRANSM_COLOR, "TRANSMISSION", 0, "Transmission", ""}, {SCE_PASS_SUBSURFACE_COLOR, "SUBSURFACE", 0, "Subsurface", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifdef RNA_RUNTIME @@ -461,7 +461,7 @@ static void rna_def_render_engine(BlenderRNA *brna) {SOCK_FLOAT, "VALUE", 0, "Value", ""}, {SOCK_VECTOR, "VECTOR", 0, "Vector", ""}, {SOCK_RGBA, "COLOR", 0, "Color", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "RenderEngine", NULL); diff --git a/source/blender/makesrna/intern/rna_rigidbody.c b/source/blender/makesrna/intern/rna_rigidbody.c index 4ea92f75a3c..d151d640ca4 100644 --- a/source/blender/makesrna/intern/rna_rigidbody.c +++ b/source/blender/makesrna/intern/rna_rigidbody.c @@ -41,7 +41,8 @@ const EnumPropertyItem rna_enum_rigidbody_object_type_items[] = { {RBO_TYPE_ACTIVE, "ACTIVE", 0, "Active", "Object is directly controlled by simulation results"}, {RBO_TYPE_PASSIVE, "PASSIVE", 0, "Passive", "Object is directly controlled by animation system"}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL}, +}; /* collision shapes of objects in rigid body sim */ const EnumPropertyItem rna_enum_rigidbody_object_shape_items[] = { @@ -55,7 +56,8 @@ const EnumPropertyItem rna_enum_rigidbody_object_shape_items[] = { "fewer vertices)"}, {RB_SHAPE_TRIMESH, "MESH", ICON_MESH_MONKEY, "Mesh", "Mesh consisting of triangles only, allowing for more detailed interactions than convex hulls"}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL}, +}; /* collision shapes of constraints in rigid body sim */ const EnumPropertyItem rna_enum_rigidbody_constraint_type_items[] = { @@ -68,13 +70,15 @@ const EnumPropertyItem rna_enum_rigidbody_constraint_type_items[] = { {RBC_TYPE_6DOF_SPRING, "GENERIC_SPRING", ICON_NONE, "Generic Spring", "Restrict translation and rotation to specified axes with springs"}, {RBC_TYPE_MOTOR, "MOTOR", ICON_NONE, "Motor", "Drive rigid body around or along an axis"}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL}, +}; /* bullet spring type */ static const EnumPropertyItem rna_enum_rigidbody_constraint_spring_type_items[] = { {RBC_SPRING_TYPE1, "SPRING1", ICON_NONE, "Blender 2.7", "Spring implementation used in blender 2.7. Damping is capped at 1.0"}, {RBC_SPRING_TYPE2, "SPRING2", ICON_NONE, "Blender 2.8", "New implementation available since 2.8"}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL}, +}; #ifndef RNA_RUNTIME /* mesh source for collision shape creation */ @@ -82,7 +86,8 @@ static const EnumPropertyItem rigidbody_mesh_source_items[] = { {RBO_MESH_BASE, "BASE", 0, "Base", "Base mesh"}, {RBO_MESH_DEFORM, "DEFORM", 0, "Deform", "Deformations (shape keys, deform modifiers)"}, {RBO_MESH_FINAL, "FINAL", 0, "Final", "All modifiers"}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL}, +}; #endif #ifdef RNA_RUNTIME diff --git a/source/blender/makesrna/intern/rna_rna.c b/source/blender/makesrna/intern/rna_rna.c index df7ffa09922..db32215afc8 100644 --- a/source/blender/makesrna/intern/rna_rna.c +++ b/source/blender/makesrna/intern/rna_rna.c @@ -36,13 +36,13 @@ /* Reuse for dynamic types */ const EnumPropertyItem DummyRNA_NULL_items[] = { - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* Reuse for dynamic types with default value */ const EnumPropertyItem DummyRNA_DEFAULT_items[] = { {0, "DEFAULT", 0, "Default", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /** \} */ @@ -60,7 +60,7 @@ const EnumPropertyItem rna_enum_property_type_items[] = { {PROP_ENUM, "ENUM", 0, "Enumeration", ""}, {PROP_POINTER, "POINTER", 0, "Pointer", ""}, {PROP_COLLECTION, "COLLECTION", 0, "Collection", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* XXX Keep in sync with bpy_props.c's property_subtype_xxx_items ??? @@ -103,7 +103,7 @@ const EnumPropertyItem rna_enum_property_subtype_items[] = { /* booleans */ {PROP_LAYER, "LAYER", 0, "Layer", ""}, {PROP_LAYER_MEMBER, "LAYER_MEMBER", 0, "Layer Member", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_property_unit_items[] = { @@ -117,7 +117,7 @@ const EnumPropertyItem rna_enum_property_unit_items[] = { {PROP_UNIT_ACCELERATION, "ACCELERATION", 0, "Acceleration", ""}, {PROP_UNIT_MASS, "MASS", 0, "Mass", ""}, {PROP_UNIT_CAMERA, "CAMERA", 0, "Camera", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /** \} */ @@ -2322,10 +2322,10 @@ static void rna_def_property(BlenderRNA *brna) {PROP_COORDS, "COORDINATES", 0, "Vector Coordinates", ""}, {PROP_LAYER, "LAYER", 0, "Layer", ""}, {PROP_LAYER_MEMBER, "LAYER_MEMBERSHIP", 0, "Layer Membership", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; EnumPropertyItem dummy_prop_tags[] = { - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "Property", NULL); @@ -2641,7 +2641,7 @@ static void rna_def_enum_property(BlenderRNA *brna, StructRNA *srna) /* the itemf func is used instead, keep blender happy */ static const EnumPropertyItem default_dummy_items[] = { {PROP_NONE, "DUMMY", 0, "Dummy", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; prop = RNA_def_property(srna, "default", PROP_ENUM, PROP_NONE); 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 */ diff --git a/source/blender/makesrna/intern/rna_screen.c b/source/blender/makesrna/intern/rna_screen.c index 4064c0d3a34..c2d2258a4bc 100644 --- a/source/blender/makesrna/intern/rna_screen.c +++ b/source/blender/makesrna/intern/rna_screen.c @@ -42,7 +42,7 @@ const EnumPropertyItem rna_enum_region_type_items[] = { {RGN_TYPE_PREVIEW, "PREVIEW", 0, "Preview", ""}, {RGN_TYPE_NAV_BAR, "NAVIGATION_BAR", 0, "Navigation Bar", ""}, {RGN_TYPE_EXECUTE, "EXECUTE", 0, "Execute Buttons", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #include "ED_screen.h" @@ -461,7 +461,7 @@ static void rna_def_region(BlenderRNA *brna) {RGN_ALIGN_VSPLIT, "VERTICAL_SPLIT", 0, "Vertical Split", ""}, {RGN_ALIGN_FLOAT, "FLOAT", 0, "Float", "Region floats on screen, doesn't use any fixed alignment"}, {RGN_ALIGN_QSPLIT, "QUAD_SPLIT", 0, "Quad Split", "Region is split horizontally and vertically"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "Region", NULL); diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c index e1867d36afe..062b97d7b47 100644 --- a/source/blender/makesrna/intern/rna_sculpt_paint.c +++ b/source/blender/makesrna/intern/rna_sculpt_paint.c @@ -56,7 +56,7 @@ const EnumPropertyItem rna_enum_particle_edit_hair_brush_items[] = { {PE_BRUSH_PUFF, "PUFF", 0, "Puff", "Make hairs stand up"}, {PE_BRUSH_CUT, "CUT", 0, "Cut", "Cut hairs"}, {PE_BRUSH_WEIGHT, "WEIGHT", 0, "Weight", "Weight hair particles"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_gpencil_sculpt_brush_items[] = { @@ -74,7 +74,7 @@ const EnumPropertyItem rna_enum_gpencil_sculpt_brush_items[] = { const EnumPropertyItem rna_enum_gpencil_weight_brush_items[] = { {GP_SCULPT_TYPE_WEIGHT, "WEIGHT", ICON_GPBRUSH_WEIGHT, "Weight", "Weight Paint for Vertex Groups"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifndef RNA_RUNTIME @@ -83,7 +83,7 @@ static const EnumPropertyItem rna_enum_gpencil_lock_axis_items[] = { {GP_LOCKAXIS_Y, "AXIS_Y", ICON_AXIS_FRONT, "Front (X-Z)", "Project strokes to plane locked to Y"}, {GP_LOCKAXIS_X, "AXIS_X", ICON_AXIS_SIDE, "Side (Y-Z)", "Project strokes to plane locked to X"}, {GP_LOCKAXIS_Z, "AXIS_Z", ICON_AXIS_TOP, "Top (X-Y)", "Project strokes to plane locked to Z"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -142,7 +142,7 @@ const EnumPropertyItem rna_enum_particle_edit_disconnected_hair_brush_items[] = {PE_BRUSH_LENGTH, "LENGTH", 0, "Length", "Make hairs longer or shorter"}, {PE_BRUSH_CUT, "CUT", 0, "Cut", "Cut hairs"}, {PE_BRUSH_WEIGHT, "WEIGHT", 0, "Weight", "Weight hair particles"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem particle_edit_cache_brush_items[] = { @@ -150,7 +150,7 @@ static const EnumPropertyItem particle_edit_cache_brush_items[] = { {PE_BRUSH_COMB, "COMB", 0, "Comb", "Comb paths"}, {PE_BRUSH_SMOOTH, "SMOOTH", 0, "Smooth", "Smooth paths"}, {PE_BRUSH_LENGTH, "LENGTH", 0, "Length", "Make paths longer or shorter"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static PointerRNA rna_ParticleEdit_brush_get(PointerRNA *ptr) @@ -681,7 +681,7 @@ static void rna_def_sculpt(BlenderRNA *brna) "Collapse Edges", "Collapse short edges to remove mesh detail where possible"}, {SCULPT_DYNTOPO_SUBDIVIDE | SCULPT_DYNTOPO_COLLAPSE, "SUBDIVIDE_COLLAPSE", 0, "Subdivide Collapse", "Both subdivide long edges and collapse short edges to refine mesh detail"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem detail_type_items[] = { @@ -693,7 +693,7 @@ static void rna_def_sculpt(BlenderRNA *brna) "Brush Detail", "Mesh detail is relative to brush radius"}, {SCULPT_DYNTOPO_DETAIL_MANUAL, "MANUAL", 0, "Manual Detail", "Mesh detail does not change on each stroke, only when using Flood Fill"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; StructRNA *srna; @@ -867,7 +867,7 @@ static void rna_def_image_paint(BlenderRNA *brna) "Material", "Detect image slots from the material"}, {IMAGEPAINT_MODE_IMAGE, "IMAGE", 0, "Single Image", "Set image for texture painting directly"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem paint_interp_items[] = { @@ -875,7 +875,7 @@ static void rna_def_image_paint(BlenderRNA *brna) "Linear", "Linear interpolation"}, {IMAGEPAINT_INTERP_CLOSEST, "CLOSEST", 0, "Closest", "No interpolation (sample closest texel)"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "ImagePaint", "Paint"); @@ -1012,26 +1012,26 @@ static void rna_def_particle_edit(BlenderRNA *brna) {SCE_SELECT_PATH, "PATH", ICON_PARTICLE_PATH, "Path", "Path edit mode"}, {SCE_SELECT_POINT, "POINT", ICON_PARTICLE_POINT, "Point", "Point select mode"}, {SCE_SELECT_END, "TIP", ICON_PARTICLE_TIP, "Tip", "Tip select mode"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem puff_mode[] = { {0, "ADD", 0, "Add", "Make hairs more puffy"}, {1, "SUB", 0, "Sub", "Make hairs less puffy"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem length_mode[] = { {0, "GROW", 0, "Grow", "Make hairs longer"}, {1, "SHRINK", 0, "Shrink", "Make hairs shorter"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem edit_type_items[] = { {PE_TYPE_PARTICLES, "PARTICLES", 0, "Particles", ""}, {PE_TYPE_SOFTBODY, "SOFT_BODY", 0, "Soft body", ""}, {PE_TYPE_CLOTH, "CLOTH", 0, "Cloth", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; @@ -1208,14 +1208,14 @@ static void rna_def_gpencil_guides(BlenderRNA *brna) {GP_GUIDE_RADIAL, "RADIAL", 0, "Radial", "Use single point as direction"}, {GP_GUIDE_PARALLEL, "PARALLEL", 0, "Parallel", "Parallel lines"}, {GP_GUIDE_GRID, "GRID", 0, "Grid", "Grid allows horizontal and vertical lines"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_gpencil_guide_references[] = { {GP_GUIDE_REF_CURSOR, "CURSOR", 0, "Cursor", "Use cursor as reference point"}, {GP_GUIDE_REF_CUSTOM, "CUSTOM", 0, "Custom", "Use custom reference point"}, {GP_GUIDE_REF_OBJECT, "OBJECT", 0, "Object", "Use object as reference point"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; prop = RNA_def_property(srna, "use_guide", PROP_BOOLEAN, PROP_NONE); @@ -1290,7 +1290,8 @@ static void rna_def_gpencil_sculpt(BlenderRNA *brna) static const EnumPropertyItem prop_direction_items[] = { {0, "ADD", ICON_ADD, "Add", "Add effect of brush"}, {GP_SCULPT_FLAG_INVERT, "SUBTRACT", ICON_REMOVE, "Subtract", "Subtract effect of brush"}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL}, + }; StructRNA *srna; PropertyRNA *prop; diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index 9c115856254..d4d1d6552c2 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -64,7 +64,7 @@ const EnumPropertyItem rna_enum_sequence_modifier_type_items[] = { {seqModifierType_Mask, "MASK", ICON_NONE, "Mask", ""}, {seqModifierType_WhiteBalance, "WHITE_BALANCE", ICON_NONE, "White Balance", ""}, {seqModifierType_Tonemap, "TONEMAP", ICON_NONE, "Tone Map", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifdef RNA_RUNTIME @@ -1228,7 +1228,7 @@ static void rna_def_strip_proxy(BlenderRNA *brna) {SEQ_PROXY_TC_RECORD_RUN_NO_GAPS, "RECORD_RUN_NO_GAPS", 0, "Record Run No Gaps", "Like record run, but ignore timecode, " "changes in framerate or dropouts"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "SequenceProxy", NULL); @@ -1402,7 +1402,7 @@ static const EnumPropertyItem blend_mode_items[] = { {SEQ_TYPE_ALPHAUNDER, "ALPHA_UNDER", 0, "Alpha Under", ""}, {SEQ_TYPE_GAMCROSS, "GAMMA_CROSS", 0, "Gamma Cross", ""}, {SEQ_TYPE_OVERDROP, "OVER_DROP", 0, "Over Drop", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static void rna_def_sequence_modifiers(BlenderRNA *brna, PropertyRNA *cprop) @@ -1476,7 +1476,7 @@ static void rna_def_sequence(BlenderRNA *brna) {SEQ_TYPE_GAUSSIAN_BLUR, "GAUSSIAN_BLUR", 0, "Gaussian Blur", ""}, {SEQ_TYPE_TEXT, "TEXT", 0, "Text", ""}, {SEQ_TYPE_COLORMIX, "COLORMIX", 0, "Color Mix", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "Sequence", NULL); @@ -1669,7 +1669,7 @@ static void rna_def_editor(BlenderRNA *brna) static const EnumPropertyItem editing_storage_items[] = { {0, "PER_STRIP", 0, "Per Strip", "Store proxies using per strip settings"}, {SEQ_EDIT_PROXY_DIR_STORAGE, "PROJECT", 0, "Project", "Store proxies using project directory"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "SequenceEditor", NULL); RNA_def_struct_ui_text(srna, "Sequence Editor", "Sequence editing data for a Scene data-block"); @@ -1737,7 +1737,7 @@ static void rna_def_filter_video(StructRNA *srna) static const EnumPropertyItem alpha_mode_items[] = { {SEQ_ALPHA_STRAIGHT, "STRAIGHT", 0, "Straight", "RGB channels in transparent pixels are unaffected by the alpha channel"}, {SEQ_ALPHA_PREMUL, "PREMUL", 0, "Premultiplied", "RGB channels in transparent pixels are multiplied by the alpha channel"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; prop = RNA_def_property(srna, "use_deinterlace", PROP_BOOLEAN, PROP_NONE); @@ -2197,13 +2197,13 @@ static void rna_def_wipe(StructRNA *srna) /* not used yet {3, "CROSS", 0, "Cross", ""}, */ {4, "IRIS", 0, "Iris", ""}, {5, "CLOCK", 0, "Clock", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem wipe_direction_items[] = { {0, "OUT", 0, "Out", ""}, {1, "IN", 0, "In", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; RNA_def_struct_sdna_from(srna, "WipeVars", "effectdata"); @@ -2284,13 +2284,13 @@ static void rna_def_transform(StructRNA *srna) {0, "NONE", 0, "None", "No interpolation"}, {1, "BILINEAR", 0, "Bilinear", "Bilinear interpolation"}, {2, "BICUBIC", 0, "Bicubic", "Bicubic interpolation"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem translation_unit_items[] = { {0, "PIXELS", 0, "Pixels", ""}, {1, "PERCENT", 0, "Percent", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; RNA_def_struct_sdna_from(srna, "TransformVars", "effectdata"); @@ -2402,13 +2402,13 @@ static void rna_def_text(StructRNA *srna) {SEQ_TEXT_ALIGN_X_LEFT, "LEFT", 0, "Left", ""}, {SEQ_TEXT_ALIGN_X_CENTER, "CENTER", 0, "Center", ""}, {SEQ_TEXT_ALIGN_X_RIGHT, "RIGHT", 0, "Right", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem text_align_y_items[] = { {SEQ_TEXT_ALIGN_Y_TOP, "TOP", 0, "Top", ""}, {SEQ_TEXT_ALIGN_Y_CENTER, "CENTER", 0, "Center", ""}, {SEQ_TEXT_ALIGN_Y_BOTTOM, "BOTTOM", 0, "Bottom", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; PropertyRNA *prop; @@ -2500,7 +2500,7 @@ static void rna_def_color_mix(StructRNA *srna) {SEQ_TYPE_VALUE, "VALUE", 0, "Value", ""}, {SEQ_TYPE_DIFFERENCE, "DIFFERENCE", 0, "Difference", ""}, {SEQ_TYPE_EXCLUSION, "EXCLUSION", 0, "Exclusion", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; PropertyRNA *prop; @@ -2546,7 +2546,7 @@ static EffectInfo def_effects[] = { {"TextSequence", "Text Sequence", "Sequence strip creating text", rna_def_text, 0}, {"ColorMixSequence", "Color Mix Sequence", "Color Mix Sequence", rna_def_color_mix, 2}, - {"", "", "", NULL, 0} + {"", "", "", NULL, 0}, }; static void rna_def_effects(BlenderRNA *brna) @@ -2574,13 +2574,13 @@ static void rna_def_modifier(BlenderRNA *brna) static const EnumPropertyItem mask_input_type_items[] = { {SEQUENCE_MASK_INPUT_STRIP, "STRIP", 0, "Strip", "Use sequencer strip as mask input"}, {SEQUENCE_MASK_INPUT_ID, "ID", 0, "Mask", "Use mask ID as mask input"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem mask_time_items[] = { {SEQUENCE_MASK_TIME_RELATIVE, "RELATIVE", 0, "Relative", "Mask animation is offset to start of strip"}, {SEQUENCE_MASK_TIME_ABSOLUTE, "ABSOLUTE", 0, "Absolute", "Mask animation is in sync with scene frame"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "SequenceModifier", NULL); @@ -2737,7 +2737,7 @@ static void rna_def_tonemap_modifier(BlenderRNA *brna) static const EnumPropertyItem type_items[] = { {SEQ_TONEMAP_RD_PHOTORECEPTOR, "RD_PHOTORECEPTOR", 0, "R/D Photoreceptor", ""}, {SEQ_TONEMAP_RH_SIMPLE, "RH_SIMPLE", 0, "Rh Simple", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "SequencerTonemapModifierData", "SequenceModifier"); diff --git a/source/blender/makesrna/intern/rna_sequencer_api.c b/source/blender/makesrna/intern/rna_sequencer_api.c index 1c47b60a687..6e3d790e7f1 100644 --- a/source/blender/makesrna/intern/rna_sequencer_api.c +++ b/source/blender/makesrna/intern/rna_sequencer_api.c @@ -469,7 +469,7 @@ void RNA_api_sequences(BlenderRNA *brna, PropertyRNA *cprop) {SEQ_TYPE_GAUSSIAN_BLUR, "GAUSSIAN_BLUR", 0, "Gaussian Blur", ""}, {SEQ_TYPE_TEXT, "TEXT", 0, "Text", ""}, {SEQ_TYPE_COLORMIX, "COLORMIX", 0, "Color Mix", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; RNA_def_property_srna(cprop, "Sequences"); diff --git a/source/blender/makesrna/intern/rna_shader_fx.c b/source/blender/makesrna/intern/rna_shader_fx.c index b62b895868a..f1e3e206717 100644 --- a/source/blender/makesrna/intern/rna_shader_fx.c +++ b/source/blender/makesrna/intern/rna_shader_fx.c @@ -55,7 +55,7 @@ const EnumPropertyItem rna_enum_object_shaderfx_type_items[] = { {eShaderFxType_Shadow, "FX_SHADOW", ICON_SHADERFX, "Shadow", "Create a shadow effect"}, {eShaderFxType_Swirl, "FX_SWIRL", ICON_SHADERFX, "Swirl", "Create a rotation distortion"}, {eShaderFxType_Wave, "FX_WAVE", ICON_SHADERFX, "Wave Distortion", "Apply sinusoidal deformation"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem rna_enum_shaderfx_rim_modes_items[] = { diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c index 0488c71cb16..b1fe38a98fb 100644 --- a/source/blender/makesrna/intern/rna_smoke.c +++ b/source/blender/makesrna/intern/rna_smoke.c @@ -449,7 +449,7 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna) {MOD_SMOKE_NOISEFFT, "NOISEFFT", 0, "FFT", ""}, #endif /* {MOD_SMOKE_NOISECURL, "NOISECURL", 0, "Curl", ""}, */ - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_compression_items[] = { @@ -464,14 +464,14 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna) static const EnumPropertyItem smoke_cache_comp_items[] = { {SM_CACHE_LIGHT, "CACHELIGHT", 0, "Light", "Fast but not so effective compression"}, {SM_CACHE_HEAVY, "CACHEHEAVY", 0, "Heavy", "Effective but slow compression"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem smoke_highres_sampling_items[] = { {SM_HRES_FULLSAMPLE, "FULLSAMPLE", 0, "Full Sample", ""}, {SM_HRES_LINEAR, "LINEAR", 0, "Linear", ""}, {SM_HRES_NEAREST, "NEAREST", 0, "Nearest", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem smoke_data_depth_items[] = { @@ -485,7 +485,7 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna) {SM_BORDER_VERTICAL, "BORDERVERTICAL", 0, "Vertically Open", "Smoke doesn't collide with top and bottom sides"}, {SM_BORDER_CLOSED, "BORDERCLOSED", 0, "Collide All", "Smoke collides with every side"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem cache_file_type_items[] = { @@ -493,25 +493,25 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna) #ifdef WITH_OPENVDB {PTCACHE_FILE_OPENVDB, "OPENVDB", 0, "OpenVDB", "OpenVDB file format"}, #endif - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem smoke_view_items[] = { {MOD_SMOKE_SLICE_VIEW_ALIGNED, "VIEW_ALIGNED", 0, "View", "Slice volume parallel to the view plane"}, {MOD_SMOKE_SLICE_AXIS_ALIGNED, "AXIS_ALIGNED", 0, "Axis", "Slice volume parallel to the major axis"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem axis_slice_method_items[] = { {AXIS_SLICE_FULL, "FULL", 0, "Full", "Slice the whole domain object"}, {AXIS_SLICE_SINGLE, "SINGLE", 0, "Single", "Perform a single slice of the domain object"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem interp_method_item[] = { {VOLUME_INTERP_LINEAR, "LINEAR", 0, "Linear", "Good smoothness and speed"}, {VOLUME_INTERP_CUBIC, "CUBIC", 0, "Cubic", "Smoothed high quality interpolation, but slower"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem axis_slice_position_items[] = { @@ -519,13 +519,13 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna) {SLICE_AXIS_X, "X", 0, "X", "Slice along the X axis"}, {SLICE_AXIS_Y, "Y", 0, "Y", "Slice along the Y axis"}, {SLICE_AXIS_Z, "Z", 0, "Z", "Slice along the Z axis"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem vector_draw_items[] = { {VECTOR_DRAW_NEEDLE, "NEEDLE", 0, "Needle", "Display vectors as needles"}, {VECTOR_DRAW_STREAMLINE, "STREAMLINE", 0, "Streamlines", "Display vectors as streamlines"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "SmokeDomainSettings", NULL); @@ -900,7 +900,7 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna) {FLUID_FIELD_VELOCITY_X, "VELOCITY_X", 0, "X Velocity", "X component of the velocity field"}, {FLUID_FIELD_VELOCITY_Y, "VELOCITY_Y", 0, "Y Velocity", "Y component of the velocity field"}, {FLUID_FIELD_VELOCITY_Z, "VELOCITY_Z", 0, "Z Velocity", "Z component of the velocity field"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; prop = RNA_def_property(srna, "coba_field", PROP_ENUM, PROP_NONE); @@ -934,19 +934,19 @@ static void rna_def_smoke_flow_settings(BlenderRNA *brna) {MOD_SMOKE_FLOW_TYPE_SMOKE, "SMOKE", 0, "Smoke", "Add smoke"}, {MOD_SMOKE_FLOW_TYPE_SMOKEFIRE, "BOTH", 0, "Fire + Smoke", "Add fire and smoke"}, {MOD_SMOKE_FLOW_TYPE_FIRE, "FIRE", 0, "Fire", "Add fire"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem smoke_flow_sources[] = { {MOD_SMOKE_FLOW_SOURCE_PARTICLES, "PARTICLES", ICON_PARTICLES, "Particle System", "Emit smoke from particles"}, {MOD_SMOKE_FLOW_SOURCE_MESH, "MESH", ICON_META_CUBE, "Mesh", "Emit smoke from mesh surface or volume"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem smoke_flow_texture_types[] = { {MOD_SMOKE_FLOW_TEXTURE_MAP_AUTO, "AUTO", 0, "Generated", "Generated coordinates centered to flow object"}, {MOD_SMOKE_FLOW_TEXTURE_MAP_UV, "UV", 0, "UV", "Use UV layer for texture coordinates"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "SmokeFlowSettings", NULL); @@ -1108,7 +1108,7 @@ static void rna_def_smoke_coll_settings(BlenderRNA *brna) {SM_COLL_STATIC, "COLLSTATIC", 0, "Static", "Non moving obstacle"}, {SM_COLL_RIGID, "COLLRIGID", 0, "Rigid", "Rigid obstacle"}, {SM_COLL_ANIMATED, "COLLANIMATED", 0, "Animated", "Animated obstacle"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; StructRNA *srna; diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 4a2dfab869e..e81672a6228 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -98,14 +98,14 @@ const EnumPropertyItem rna_enum_space_type_items[] = { {SPACE_FILE, "FILE_BROWSER", ICON_FILEBROWSER, "File Browser", "Browse for files and assets"}, {SPACE_USERPREF, "PREFERENCES", ICON_PREFERENCES, "Preferences", "Edit persistent configuration settings"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_space_graph_mode_items[] = { {SIPO_MODE_ANIMATION, "FCURVES", ICON_GRAPH, "Graph Editor", "Edit animation/keyframes displayed as 2D curves"}, {SIPO_MODE_DRIVERS, "DRIVERS", ICON_DRIVER, "Drivers", "Edit drivers"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #define SACT_ITEM_DOPESHEET \ @@ -133,7 +133,7 @@ static EnumPropertyItem rna_enum_space_action_mode_all_items[] = { SACT_ITEM_GPENCIL, SACT_ITEM_MASK, SACT_ITEM_CACHEFILE, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static EnumPropertyItem rna_enum_space_action_ui_mode_items[] = { SACT_ITEM_DOPESHEET, @@ -143,14 +143,14 @@ static EnumPropertyItem rna_enum_space_action_ui_mode_items[] = { SACT_ITEM_GPENCIL, SACT_ITEM_MASK, SACT_ITEM_CACHEFILE, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif /* expose as ui_mode */ const EnumPropertyItem rna_enum_space_action_mode_items[] = { SACT_ITEM_DOPESHEET, SACT_ITEM_TIMELINE, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #undef SACT_ITEM_DOPESHEET @@ -176,20 +176,20 @@ const EnumPropertyItem rna_enum_space_image_mode_all_items[] = { SI_ITEM_UV, SI_ITEM_PAINT, SI_ITEM_MASK, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem rna_enum_space_image_mode_ui_items[] = { SI_ITEM_VIEW("View", ICON_FILE_IMAGE), SI_ITEM_PAINT, SI_ITEM_MASK, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_space_image_mode_items[] = { SI_ITEM_VIEW("Image Editor", ICON_IMAGE), SI_ITEM_UV, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #undef SI_ITEM_VIEW @@ -208,14 +208,14 @@ static const EnumPropertyItem stereo3d_camera_items[] = { V3D_S3D_CAMERA_LEFT V3D_S3D_CAMERA_RIGHT V3D_S3D_CAMERA_S3D - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifdef RNA_RUNTIME static const EnumPropertyItem multiview_camera_items[] = { V3D_S3D_CAMERA_VIEWS V3D_S3D_CAMERA_S3D - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -228,7 +228,7 @@ static const EnumPropertyItem multiview_camera_items[] = { static const EnumPropertyItem stereo3d_eye_items[] = { {STEREO_LEFT_ID, "LEFT_EYE", ICON_NONE, "Left Eye"}, {STEREO_RIGHT_ID, "RIGHT_EYE", ICON_NONE, "Right Eye"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -242,7 +242,7 @@ static const EnumPropertyItem display_channels_items[] = { {SI_SHOW_R, "RED", ICON_COLOR_RED, "Red", ""}, {SI_SHOW_G, "GREEN", ICON_COLOR_GREEN, "Green", ""}, {SI_SHOW_B, "BLUE", ICON_COLOR_BLUE, "Blue", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifndef RNA_RUNTIME @@ -256,7 +256,7 @@ static const EnumPropertyItem autosnap_items[] = { {SACTSNAP_SECOND, "SECOND", 0, "Nearest Second", "Snap to actual seconds (nla-action time)"}, /* {-1, "", 0, "", ""}, */ {SACTSNAP_MARKER, "MARKER", 0, "Nearest Marker", "Snap to nearest marker"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -265,14 +265,14 @@ const EnumPropertyItem rna_enum_shading_type_items[] = { {OB_SOLID, "SOLID", ICON_SHADING_SOLID, "Solid", "Display in solid mode"}, {OB_MATERIAL, "MATERIAL", ICON_SHADING_TEXTURE, "LookDev", "Display in LookDev mode"}, {OB_RENDER, "RENDERED", ICON_SHADING_RENDERED, "Rendered", "Display render preview"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem rna_enum_viewport_lighting_items[] = { {V3D_LIGHTING_FLAT, "FLAT", 0, "Flat", "Display using flat lighting"}, {V3D_LIGHTING_STUDIO, "STUDIO", 0, "Studio", "Display using studio lighting"}, {V3D_LIGHTING_MATCAP, "MATCAP", 0, "MatCap", "Display using matcap material and lighting"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem rna_enum_shading_color_type_items[] = { @@ -281,19 +281,19 @@ static const EnumPropertyItem rna_enum_shading_color_type_items[] = { {V3D_SHADING_OBJECT_COLOR, "OBJECT", 0, "Object", "Show object color"}, {V3D_SHADING_RANDOM_COLOR, "RANDOM", 0, "Random", "Show random object color"}, {V3D_SHADING_TEXTURE_COLOR, "TEXTURE", 0, "Texture", "Show texture"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem rna_enum_studio_light_items[] = { {0, "DEFAULT", 0, "Default", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_clip_editor_mode_items[] = { {SC_MODE_TRACKING, "TRACKING", ICON_ANIM_DATA, "Tracking", "Show tracking and solving tools"}, {SC_MODE_MASKEDIT, "MASK", ICON_MOD_MASK, "Mask", "Show mask editing tools"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* Actually populated dynamically trough a function, but helps for context-less access (e.g. doc, i18n...). */ @@ -315,7 +315,7 @@ static const EnumPropertyItem buttons_context_items[] = { {BCONTEXT_PARTICLE, "PARTICLES", ICON_PARTICLES, "Particles", "Particles"}, {BCONTEXT_PHYSICS, "PHYSICS", ICON_PHYSICS, "Physics", "Physics"}, {BCONTEXT_SHADERFX, "SHADERFX", ICON_SHADERFX, "Effects", "Object visual effects" }, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem fileselectparams_recursion_level_items[] = { @@ -324,7 +324,7 @@ static const EnumPropertyItem fileselectparams_recursion_level_items[] = { {2, "ALL_1", 0, "One Level", "List all sub-directories' content, one level of recursion"}, {3, "ALL_2", 0, "Two Levels", "List all sub-directories' content, two levels of recursion"}, {4, "ALL_3", 0, "Three Levels", "List all sub-directories' content, three levels of recursion"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_file_sort_items[] = { @@ -332,7 +332,7 @@ const EnumPropertyItem rna_enum_file_sort_items[] = { {FILE_SORT_EXTENSION, "FILE_SORT_EXTENSION", ICON_SORTBYEXT, "Sort by extension", "Sort the file list by extension/type"}, {FILE_SORT_TIME, "FILE_SORT_TIME", ICON_SORTTIME, "Sort by time", "Sort files by modification time"}, {FILE_SORT_SIZE, "FILE_SORT_SIZE", ICON_SORTSIZE, "Sort by size", "Sort files by size"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifdef RNA_RUNTIME @@ -1175,7 +1175,7 @@ static const EnumPropertyItem *rna_SpaceImageEditor_pivot_itemf( {V3D_AROUND_CURSOR, "CURSOR", ICON_PIVOT_CURSOR, "2D Cursor", ""}, {V3D_AROUND_LOCAL_ORIGINS, "INDIVIDUAL_ORIGINS", ICON_PIVOT_INDIVIDUAL, "Individual Origins", "Pivot around each selected island's own median point"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; SpaceImage *sima = (SpaceImage *)ptr->data; @@ -2083,7 +2083,7 @@ static const EnumPropertyItem dt_uv_items[] = { {SI_UVDT_DASH, "DASH", 0, "Dash", "Display dashed black-white edges"}, {SI_UVDT_BLACK, "BLACK", 0, "Black", "Display black edges"}, {SI_UVDT_WHITE, "WHITE", 0, "White", "Display white edges"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static void rna_def_space(BlenderRNA *brna) @@ -2118,7 +2118,7 @@ static void rna_def_space_mask_info(StructRNA *srna, int noteflag, const char *m static const EnumPropertyItem overlay_mode_items[] = { {MASK_OVERLAY_ALPHACHANNEL, "ALPHACHANNEL", ICON_NONE, "Alpha Channel", "Show alpha channel of the mask"}, {MASK_OVERLAY_COMBINED, "COMBINED", ICON_NONE, "Combined", "Combine space background image with the mask"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; prop = RNA_def_property(srna, "mask", PROP_POINTER, PROP_NONE); @@ -2163,20 +2163,20 @@ static void rna_def_space_image_uv(BlenderRNA *brna) "Select UVs that are at the same location and share a mesh vertex"}, {SI_STICKY_VERTEX, "SHARED_VERTEX", ICON_STICKY_UVS_VERT, "Shared Vertex", "Select UVs that share mesh vertex, irrespective if they are in the same location"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem dt_uvstretch_items[] = { {SI_UVDT_STRETCH_ANGLE, "ANGLE", 0, "Angle", "Angular distortion between UV and 3D angles"}, {SI_UVDT_STRETCH_AREA, "AREA", 0, "Area", "Area distortion between UV and 3D faces"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem pixel_snap_mode_items[] = { {SI_PIXEL_SNAP_DISABLED, "DISABLED", 0, "Disabled", "Don't snap to pixels"}, {SI_PIXEL_SNAP_CORNER, "CORNER", 0, "Corner", "Snap to pixel corners"}, {SI_PIXEL_SNAP_CENTER, "CENTER", 0, "Center", "Snap to pixel centers"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "SpaceUVEditor", NULL); @@ -2281,7 +2281,7 @@ static void rna_def_space_outliner(BlenderRNA *brna) {SO_DATA_API, "DATA_API", ICON_RNA, "Data API", "Display low level Blender data and its properties"}, {SO_ID_ORPHANS, "ORPHAN_DATA", ICON_ORPHAN_DATA, "Orphan Data", "Display data-blocks which are unused and/or will be lost when the file is reloaded"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem filter_state_items[] = { @@ -2289,7 +2289,7 @@ static void rna_def_space_outliner(BlenderRNA *brna) {SO_FILTER_OB_VISIBLE, "VISIBLE", 0, "Visible", "Show visible objects"}, {SO_FILTER_OB_SELECTED, "SELECTED", 0, "Selected", "Show selected objects"}, {SO_FILTER_OB_ACTIVE, "ACTIVE", 0, "Active", "Show only the active object"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "SpaceOutliner", "Space"); @@ -2411,7 +2411,7 @@ static void rna_def_space_view3d_shading(BlenderRNA *brna) {V3D_SHADING_BACKGROUND_THEME, "THEME", 0, "Theme", "Use the theme for background color"}, {V3D_SHADING_BACKGROUND_WORLD, "WORLD", 0, "World", "Use the world for background color"}, {V3D_SHADING_BACKGROUND_VIEWPORT, "VIEWPORT", 0, "Viewport", "Use a custom color limited to this viewport only"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const float default_background_color[] = {0.05f, 0.05f, 0.05f}; @@ -2419,7 +2419,7 @@ static void rna_def_space_view3d_shading(BlenderRNA *brna) {V3D_SHADING_CAVITY_SSAO, "WORLD", 0, "World", "Cavity shading computed in world space, useful for larger-scale occlusion"}, {V3D_SHADING_CAVITY_CURVATURE, "SCREEN", 0, "Screen", "Curvature-based shading, useful for making fine details more visible"}, {V3D_SHADING_CAVITY_BOTH, "BOTH", 0, "Both", "Use both effects simultaneously"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; @@ -3048,7 +3048,7 @@ static void rna_def_space_view3d(BlenderRNA *brna) {RV3D_PERSP, "PERSP", 0, "Perspective", ""}, {RV3D_ORTHO, "ORTHO", 0, "Orthographic", ""}, {RV3D_CAMOB, "CAMERA", 0, "Camera", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem bundle_drawtype_items[] = { @@ -3059,7 +3059,7 @@ static void rna_def_space_view3d(BlenderRNA *brna) {OB_CUBE, "CUBE", 0, "Cube", ""}, {OB_EMPTY_SPHERE, "SPHERE", 0, "Sphere", ""}, {OB_EMPTY_CONE, "CONE", 0, "Cone", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "SpaceView3D", "Space"); @@ -3634,7 +3634,7 @@ static void rna_def_space_sequencer(BlenderRNA *brna) {SEQ_VIEW_SEQUENCE, "SEQUENCER", ICON_SEQ_SEQUENCER, "Sequencer", ""}, {SEQ_VIEW_PREVIEW, "PREVIEW", ICON_SEQ_PREVIEW, "Preview", ""}, {SEQ_VIEW_SEQUENCE_PREVIEW, "SEQUENCER_PREVIEW", ICON_SEQ_SPLITVIEW, "Sequencer/Preview", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem display_mode_items[] = { @@ -3642,7 +3642,7 @@ static void rna_def_space_sequencer(BlenderRNA *brna) {SEQ_DRAW_IMG_WAVEFORM, "WAVEFORM", ICON_SEQ_LUMA_WAVEFORM, "Luma Waveform", ""}, {SEQ_DRAW_IMG_VECTORSCOPE, "VECTOR_SCOPE", ICON_SEQ_CHROMA_SCOPE, "Chroma Vectorscope", ""}, {SEQ_DRAW_IMG_HISTOGRAM, "HISTOGRAM", ICON_SEQ_HISTOGRAM, "Histogram", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem proxy_render_size_items[] = { @@ -3653,21 +3653,21 @@ static void rna_def_space_sequencer(BlenderRNA *brna) {SEQ_PROXY_RENDER_SIZE_75, "PROXY_75", 0, "Proxy size 75%", ""}, {SEQ_PROXY_RENDER_SIZE_100, "PROXY_100", 0, "Proxy size 100%", ""}, {SEQ_PROXY_RENDER_SIZE_FULL, "FULL", 0, "No proxy, full render", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem overlay_type_items[] = { {SEQ_DRAW_OVERLAY_RECT, "RECTANGLE", 0, "Rectangle", "Show rectangle area overlay"}, {SEQ_DRAW_OVERLAY_REFERENCE, "REFERENCE", 0, "Reference", "Show reference frame only"}, {SEQ_DRAW_OVERLAY_CURRENT, "CURRENT", 0, "Current", "Show current frame only"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem preview_channels_items[] = { {SEQ_USE_ALPHA, "COLOR_ALPHA", ICON_IMAGE_RGB_ALPHA, "Color and Alpha", "Display image with RGB colors and alpha transparency"}, {0, "COLOR", ICON_IMAGE_RGB, "Color", "Display image with RGB colors"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem waveform_type_display_items[] = { @@ -3677,7 +3677,7 @@ static void rna_def_space_sequencer(BlenderRNA *brna) "Waveforms drawn for all sound strips"}, {0, "DEFAULT_WAVEFORMS", 0, "Use Strip Option", "Waveforms drawn according to strip setting"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "SpaceSequenceEditor", "Space"); @@ -4073,7 +4073,7 @@ static void rna_def_space_graph(BlenderRNA *brna) {V3D_AROUND_LOCAL_ORIGINS, "INDIVIDUAL_ORIGINS", ICON_PIVOT_INDIVIDUAL, "Individual Centers", ""}, /*{V3D_AROUND_CENTER_MEDIAN, "MEDIAN_POINT", 0, "Median Point", ""}, */ /*{V3D_AROUND_ACTIVE, "ACTIVE_ELEMENT", 0, "Active Element", ""}, */ - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; @@ -4264,7 +4264,7 @@ static void rna_def_console_line(BlenderRNA *brna) {CONSOLE_LINE_INPUT, "INPUT", 0, "Input", ""}, {CONSOLE_LINE_INFO, "INFO", 0, "Info", ""}, {CONSOLE_LINE_ERROR, "ERROR", 0, "Error", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; StructRNA *srna; @@ -4342,7 +4342,7 @@ static void rna_def_fileselect_params(BlenderRNA *brna) {FILE_SHORTDISPLAY, "LIST_SHORT", ICON_SHORTDISPLAY, "Short List", "Display files as short list"}, {FILE_LONGDISPLAY, "LIST_LONG", ICON_LONGDISPLAY, "Long List", "Display files as a detailed list"}, {FILE_IMGDISPLAY, "THUMBNAIL", ICON_IMGDISPLAY, "Thumbnails", "Display files as thumbnails"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem display_size_items[] = { @@ -4350,7 +4350,7 @@ static void rna_def_fileselect_params(BlenderRNA *brna) {64, "SMALL", 0, "Small", ""}, {128, "NORMAL", 0, "Normal", ""}, {256, "LARGE", 0, "Large", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem file_filter_idtypes_items[] = { @@ -4387,7 +4387,7 @@ static void rna_def_fileselect_params(BlenderRNA *brna) {FILTER_ID_VF, "FONT", ICON_FONT_DATA, "Fonts", "Show/hide Font data-blocks"}, {FILTER_ID_WO, "WORLD", ICON_WORLD_DATA, "Worlds", "Show/hide World data-blocks"}, {FILTER_ID_WS, "WORK_SPACE", ICON_NONE, "Workspaces", "Show/hide workspace data-blocks"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem file_filter_idcategories_items[] = { @@ -4408,7 +4408,7 @@ static void rna_def_fileselect_params(BlenderRNA *brna) "ENVIRONMENT", ICON_WORLD_DATA, "Environment", "Show/hide worlds, lights, cameras and speakers"}, {FILTER_ID_BR | FILTER_ID_GD | FILTER_ID_PA | FILTER_ID_PAL | FILTER_ID_PC | FILTER_ID_TXT | FILTER_ID_VF | FILTER_ID_CF, "MISC", ICON_GREASEPENCIL, "Miscellaneous", "Show/hide other data types"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "FileSelectParams", NULL); @@ -4718,7 +4718,8 @@ static void rna_def_space_userpref(BlenderRNA *brna) static const EnumPropertyItem filter_type_items[] = { {0, "NAME", 0, "Name", "Filter based on the operator name"}, {1, "KEY", 0, "Key-Binding", "Filter based on key bindings"}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL}, + }; StructRNA *srna; PropertyRNA *prop; @@ -4805,7 +4806,7 @@ static void rna_def_space_node(BlenderRNA *brna) #ifdef WITH_FREESTYLE {SNODE_TEX_LINESTYLE, "LINESTYLE", ICON_LINE_DATA, "Line Style", "Edit texture nodes from Line Style"}, #endif - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem shader_type_items[] = { @@ -4814,7 +4815,7 @@ static void rna_def_space_node(BlenderRNA *brna) #ifdef WITH_FREESTYLE {SNODE_SHADER_LINESTYLE, "LINESTYLE", ICON_LINE_DATA, "Line Style", "Edit shader nodes from Line Style"}, #endif - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem backdrop_channels_items[] = { @@ -4825,18 +4826,19 @@ static void rna_def_space_node(BlenderRNA *brna) {SNODE_SHOW_R, "RED", ICON_COLOR_RED, "Red", ""}, {SNODE_SHOW_G, "GREEN", ICON_COLOR_GREEN, "Green", ""}, {SNODE_SHOW_B, "BLUE", ICON_COLOR_BLUE, "Blue", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem insert_ofs_dir_items[] = { {SNODE_INSERTOFS_DIR_RIGHT, "RIGHT", 0, "Right"}, {SNODE_INSERTOFS_DIR_LEFT, "LEFT", 0, "Left"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem dummy_items[] = { {0, "DUMMY", 0, "", ""}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL}, + }; srna = RNA_def_struct(brna, "SpaceNodeEditor", "Space"); RNA_def_struct_sdna(srna, "SpaceNode"); @@ -4964,13 +4966,13 @@ static void rna_def_space_clip(BlenderRNA *brna) {SC_VIEW_CLIP, "CLIP", ICON_SEQUENCE, "Clip", "Show editing clip preview"}, {SC_VIEW_GRAPH, "GRAPH", ICON_GRAPH, "Graph", "Show graph view for active element"}, {SC_VIEW_DOPESHEET, "DOPESHEET", ICON_ACTION, "Dopesheet", "Dopesheet view for tracking data"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem gpencil_source_items[] = { {SC_GPENCIL_SRC_CLIP, "CLIP", 0, "Clip", "Show annotation data-block which belongs to movie clip"}, {SC_GPENCIL_SRC_TRACK, "TRACK", 0, "Track", "Show annotation data-block which belongs to active track"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem pivot_items[] = { @@ -4981,7 +4983,7 @@ static void rna_def_space_clip(BlenderRNA *brna) "Individual Origins", "Pivot around each object's own origin"}, {V3D_AROUND_CENTER_MEDIAN, "MEDIAN_POINT", ICON_PIVOT_MEDIAN, "Median Point", "Pivot around the median point of selected objects"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "SpaceClipEditor", "Space"); diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c index 279dac3a573..15cd66fb4ec 100644 --- a/source/blender/makesrna/intern/rna_texture.c +++ b/source/blender/makesrna/intern/rna_texture.c @@ -51,7 +51,7 @@ static const EnumPropertyItem texture_filter_items[] = { {TXF_EWA, "EWA", 0, "EWA", ""}, {TXF_FELINE, "FELINE", 0, "FELINE", ""}, {TXF_AREA, "AREA", 0, "Area", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -70,7 +70,7 @@ const EnumPropertyItem rna_enum_texture_type_items[] = { {TEX_STUCCI, "STUCCI", ICON_TEXTURE, "Stucci", "Procedural - create a fractal noise texture"}, {TEX_VORONOI, "VORONOI", ICON_TEXTURE, "Voronoi", "Procedural - create cell-like patterns based on Worley noise"}, {TEX_WOOD, "WOOD", ICON_TEXTURE, "Wood", "Procedural - wave generated bands or rings, with optional noise"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifndef RNA_RUNTIME @@ -96,7 +96,7 @@ static const EnumPropertyItem blend_type_items[] = { {MTEX_BLEND_SAT, "SATURATION", 0, "Saturation", ""}, {MTEX_BLEND_COLOR, "COLOR", 0, "Color", ""}, {MTEX_BLEND_VAL, "VALUE", 0, "Value", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -411,7 +411,7 @@ static void rna_def_texmapping(BlenderRNA *brna) {MTEX_CUBE, "CUBE", 0, "Cube", "Map using the normal vector"}, {MTEX_TUBE, "TUBE", 0, "Tube", "Map with Z as central axis"}, {MTEX_SPHERE, "SPHERE", 0, "Sphere", "Map with Z as central axis"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_vect_type_items[] = { @@ -419,7 +419,7 @@ static void rna_def_texmapping(BlenderRNA *brna) {TEXMAP_TYPE_POINT, "POINT", 0, "Point", "Transform a point"}, {TEXMAP_TYPE_VECTOR, "VECTOR", 0, "Vector", "Transform a direction vector"}, {TEXMAP_TYPE_NORMAL, "NORMAL", 0, "Normal", "Transform a normal vector with unit length"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_xyz_mapping_items[] = { @@ -427,7 +427,7 @@ static void rna_def_texmapping(BlenderRNA *brna) {1, "X", 0, "X", ""}, {2, "Y", 0, "Y", ""}, {3, "Z", 0, "Z", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; StructRNA *srna; @@ -561,7 +561,7 @@ static void rna_def_mtex(BlenderRNA *brna) static const EnumPropertyItem output_node_items[] = { {0, "DUMMY", 0, "Dummy", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "TextureSlot", NULL); @@ -702,13 +702,13 @@ static const EnumPropertyItem prop_noise_basis_items[] = { "Noise algorithm - Voronoi Crackle: Voronoi tessellation with sharp edges"}, {TEX_CELLNOISE, "CELL_NOISE", 0, "Cell Noise", "Noise algorithm - Cell Noise: Square cell tessellation"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_noise_type[] = { {TEX_NOISESOFT, "SOFT_NOISE", 0, "Soft", "Generate soft noise (smooth transitions)"}, {TEX_NOISEPERL, "HARD_NOISE", 0, "Hard", "Generate hard noise (sharp transitions)"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; @@ -720,7 +720,7 @@ static void rna_def_texture_clouds(BlenderRNA *brna) static const EnumPropertyItem prop_clouds_stype[] = { {TEX_DEFAULT, "GRAYSCALE", 0, "Grayscale", ""}, {TEX_COLOR, "COLOR", 0, "Color", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "CloudsTexture", "Texture"); @@ -776,14 +776,14 @@ static void rna_def_texture_wood(BlenderRNA *brna) {TEX_RING, "RINGS", 0, "Rings", "Use wood texture in rings"}, {TEX_BANDNOISE, "BANDNOISE", 0, "Band Noise", "Add noise to standard wood"}, {TEX_RINGNOISE, "RINGNOISE", 0, "Ring Noise", "Add noise to rings"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_wood_noisebasis2[] = { {TEX_SIN, "SIN", 0, "Sine", "Use a sine wave to produce bands"}, {TEX_SAW, "SAW", 0, "Saw", "Use a saw wave to produce bands"}, {TEX_TRI, "TRI", 0, "Tri", "Use a triangle wave to produce bands"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "WoodTexture", "Texture"); @@ -845,14 +845,14 @@ static void rna_def_texture_marble(BlenderRNA *brna) {TEX_SOFT, "SOFT", 0, "Soft", "Use soft marble"}, {TEX_SHARP, "SHARP", 0, "Sharp", "Use more clearly defined marble"}, {TEX_SHARPER, "SHARPER", 0, "Sharper", "Use very clearly defined marble"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_marble_noisebasis2[] = { {TEX_SIN, "SIN", 0, "Sin", "Use a sine wave to produce bands"}, {TEX_SAW, "SAW", 0, "Saw", "Use a saw wave to produce bands"}, {TEX_TRI, "TRI", 0, "Tri", "Use a triangle wave to produce bands"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "MarbleTexture", "Texture"); @@ -950,13 +950,13 @@ static void rna_def_texture_blend(BlenderRNA *brna) {TEX_HALO, "QUADRATIC_SPHERE", 0, "Quadratic sphere", "Create a quadratic progression in the shape of a sphere"}, {TEX_RAD, "RADIAL", 0, "Radial", "Create a radial progression"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_flip_axis_items[] = { {0, "HORIZONTAL", 0, "Horizontal", "No flipping"}, {TEX_FLIPBLEND, "VERTICAL", 0, "Vertical", "Flip the texture's X and Y axis"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "BlendTexture", "Texture"); @@ -986,7 +986,7 @@ static void rna_def_texture_stucci(BlenderRNA *brna) {TEX_PLASTIC, "PLASTIC", 0, "Plastic", "Use standard stucci"}, {TEX_WALLIN, "WALL_IN", 0, "Wall in", "Create Dimples"}, {TEX_WALLOUT, "WALL_OUT", 0, "Wall out", "Create Ridges"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "StucciTexture", "Texture"); @@ -1047,7 +1047,7 @@ static void rna_def_texture_image(BlenderRNA *brna) "Clip to cubic-shaped area around the image and set exterior pixels as transparent"}, {TEX_REPEAT, "REPEAT", 0, "Repeat", "Cause the image to repeat horizontally and vertically"}, {TEX_CHECKER, "CHECKER", 0, "Checker", "Cause the image to repeat in checker board pattern"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "ImageTexture", "Texture"); @@ -1202,7 +1202,7 @@ static void rna_def_texture_musgrave(BlenderRNA *brna) "Use Perlin noise as a basis, with extended controls"}, {TEX_FBM, "FBM", 0, "fBM", "Fractal Brownian Motion, use Brownian noise as a basis"}, {TEX_HTERRAIN, "HETERO_TERRAIN", 0, "Hetero Terrain", "Similar to multifractal"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "MusgraveTexture", "Texture"); @@ -1290,7 +1290,7 @@ static void rna_def_texture_voronoi(BlenderRNA *brna) {TEX_MINKOVSKY, "MINKOVSKY", 0, "Minkowski", "Use the Minkowski function to calculate distance " "(exponent value determines the shape of the boundaries)"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem prop_coloring_items[] = { @@ -1300,7 +1300,7 @@ static void rna_def_texture_voronoi(BlenderRNA *brna) {TEX_COL2, "POSITION_OUTLINE", 0, "Position and Outline", "Use position plus an outline based on F2-F1"}, {TEX_COL3, "POSITION_OUTLINE_INTENSITY", 0, "Position, Outline, and Intensity", "Multiply position and outline by intensity"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "VoronoiTexture", "Texture"); diff --git a/source/blender/makesrna/intern/rna_tracking.c b/source/blender/makesrna/intern/rna_tracking.c index a02b458fc24..e7b0afbec77 100644 --- a/source/blender/makesrna/intern/rna_tracking.c +++ b/source/blender/makesrna/intern/rna_tracking.c @@ -794,13 +794,13 @@ static const EnumPropertyItem tracker_motion_model[] = { "Search for markers that are translated and rotated between frames"}, {TRACK_MOTION_MODEL_TRANSLATION, "Loc", 0, "Loc", "Search for markers that are translated between frames"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem pattern_match_items[] = { {TRACK_MATCH_KEYFRAME, "KEYFRAME", 0, "Keyframe", "Track pattern from keyframe to next frame"}, {TRACK_MATCH_PREVFRAME, "PREV_FRAME", 0, "Previous frame", "Track pattern from current frame to next frame"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static void rna_def_trackingSettings(BlenderRNA *brna) @@ -814,14 +814,14 @@ static void rna_def_trackingSettings(BlenderRNA *brna) {TRACKING_SPEED_REALTIME, "REALTIME", 0, "Realtime", "Track with realtime speed"}, {TRACKING_SPEED_HALF, "HALF", 0, "Half", "Track with half of realtime speed"}, {TRACKING_SPEED_QUARTER, "QUARTER", 0, "Quarter", "Track with quarter of realtime speed"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem cleanup_items[] = { {TRACKING_CLEAN_SELECT, "SELECT", 0, "Select", "Select unclean tracks"}, {TRACKING_CLEAN_DELETE_TRACK, "DELETE_TRACK", 0, "Delete Track", "Delete unclean tracks"}, {TRACKING_CLEAN_DELETE_SEGMENT, "DELETE_SEGMENTS", 0, "Delete Segments", "Delete unclean segments of tracks"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem refine_items[] = { @@ -845,7 +845,7 @@ static void rna_def_trackingSettings(BlenderRNA *brna) {REFINE_RADIAL_DISTORTION_K1 | REFINE_RADIAL_DISTORTION_K2, "RADIAL_K1_K2", 0, "K1, K2", "Refine radial distortion K1 and K2"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "MovieTrackingSettings", NULL); @@ -1044,13 +1044,13 @@ static void rna_def_trackingCamera(BlenderRNA *brna) {TRACKING_DISTORTION_MODEL_POLYNOMIAL, "POLYNOMIAL", 0, "Polynomial", "Radial distortion model which fits common cameras"}, {TRACKING_DISTORTION_MODEL_DIVISION, "DIVISION", 0, "Divisions", "Division distortion model which " "better represents wide-angle cameras"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem camera_units_items[] = { {CAMERA_UNITS_PX, "PIXELS", 0, "px", "Use pixels for units of focal length"}, {CAMERA_UNITS_MM, "MILLIMETERS", 0, "mm", "Use millimeters for units of focal length"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "MovieTrackingCamera", NULL); @@ -1634,7 +1634,7 @@ static void rna_def_trackingStabilization(BlenderRNA *brna) {TRACKING_FILTER_NEAREST, "NEAREST", 0, "Nearest", "No interpolation, use nearest neighbor pixel"}, {TRACKING_FILTER_BILINEAR, "BILINEAR", 0, "Bilinear", "Simple interpolation between adjacent pixels"}, {TRACKING_FILTER_BICUBIC, "BICUBIC", 0, "Bicubic", "High quality pixel interpolation"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "MovieTrackingStabilization", NULL); @@ -2087,7 +2087,7 @@ static void rna_def_trackingDopesheet(BlenderRNA *brna) {TRACKING_DOPE_SORT_TOTAL, "TOTAL", 0, "Total", "Sort channels by overall amount of tracked segments"}, {TRACKING_DOPE_SORT_AVERAGE_ERROR, "AVERAGE_ERROR", 0, "Average Error", "Sort channels by average reprojection error of tracks after solve"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "MovieTrackingDopesheet", NULL); diff --git a/source/blender/makesrna/intern/rna_ui.c b/source/blender/makesrna/intern/rna_ui.c index ee14eeed1cd..ca36493fe46 100644 --- a/source/blender/makesrna/intern/rna_ui.c +++ b/source/blender/makesrna/intern/rna_ui.c @@ -52,14 +52,14 @@ const EnumPropertyItem rna_enum_operator_context_items[] = { {WM_OP_EXEC_REGION_PREVIEW, "EXEC_REGION_PREVIEW", 0, "Exec Region Preview", ""}, {WM_OP_EXEC_AREA, "EXEC_AREA", 0, "Exec Area", ""}, {WM_OP_EXEC_SCREEN, "EXEC_SCREEN", 0, "Exec Screen", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_uilist_layout_type_items[] = { {UILST_LAYOUT_DEFAULT, "DEFAULT", 0, "Default Layout", "Use the default, multi-rows layout"}, {UILST_LAYOUT_COMPACT, "COMPACT", 0, "Compact Layout", "Use the compact, single-row layout"}, {UILST_LAYOUT_GRID, "GRID", 0, "Grid Layout", "Use the grid-based layout"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifdef RNA_RUNTIME @@ -1030,13 +1030,13 @@ static void rna_def_ui_layout(BlenderRNA *brna) {UI_LAYOUT_ALIGN_LEFT, "LEFT", 0, "Left", ""}, {UI_LAYOUT_ALIGN_CENTER, "CENTER", 0, "Center", ""}, {UI_LAYOUT_ALIGN_RIGHT, "RIGHT", 0, "Right", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem direction_items[] = { {UI_LAYOUT_HORIZONTAL, "HORIZONTAL", 0, "Horizontal", ""}, {UI_LAYOUT_VERTICAL, "VERTICAL", 0, "Vertical", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem emboss_items[] = { @@ -1044,7 +1044,7 @@ static void rna_def_ui_layout(BlenderRNA *brna) {UI_EMBOSS_NONE, "NONE", 0, "None", "Draw only text and icons"}, {UI_EMBOSS_PULLDOWN, "PULLDOWN_MENU", 0, "Pulldown Menu", "Draw pulldown menu style"}, {UI_EMBOSS_RADIAL, "RADIAL_MENU", 0, "Radial Menu", "Draw radial menu style"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* layout */ @@ -1122,7 +1122,7 @@ static void rna_def_panel(BlenderRNA *brna) {PNL_NO_HEADER, "HIDE_HEADER", 0, "Hide Header", "If set to False, the panel shows a header, which contains a clickable " "arrow to collapse the panel and the label (see bl_label)"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "Panel", NULL); diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c index d076aa2965f..a6a913dab89 100644 --- a/source/blender/makesrna/intern/rna_ui_api.c +++ b/source/blender/makesrna/intern/rna_ui_api.c @@ -46,7 +46,7 @@ #define DEF_ICON_BLANK(name) const EnumPropertyItem rna_enum_icon_items[] = { #include "UI_icons.h" - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifdef RNA_RUNTIME @@ -501,13 +501,13 @@ void RNA_api_ui_layout(StructRNA *srna) {'v', "VECTOR", 0, "Vector", ""}, {'c', "COLOR", 0, "Color", ""}, {'h', "HUE", 0, "Hue", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem id_template_filter_items[] = { {UI_TEMPLATE_ID_FILTER_ALL, "ALL", 0, "All", ""}, {UI_TEMPLATE_ID_FILTER_AVAILABLE, "AVAILABLE", 0, "Available", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static float node_socket_color_default[] = { 0.0f, 0.0f, 0.0f, 1.0f }; diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 0cffbcb2b9c..2b06ae06dea 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -56,19 +56,19 @@ static const EnumPropertyItem opensubdiv_compute_type_items[] = { {USER_OPENSUBDIV_COMPUTE_CUDA, "CUDA", 0, "CUDA", ""}, {USER_OPENSUBDIV_COMPUTE_GLSL_TRANSFORM_FEEDBACK, "GLSL_TRANSFORM_FEEDBACK", 0, "GLSL Transform Feedback", ""}, {USER_OPENSUBDIV_COMPUTE_GLSL_COMPUTE, "GLSL_COMPUTE", 0, "GLSL Compute", ""}, - { 0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif static const EnumPropertyItem audio_device_items[] = { {0, "Null", 0, "None", "Null device - there will be no audio output"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_navigation_mode_items[] = { {VIEW_NAVIGATION_WALK, "WALK", 0, "Walk", "Interactively walk or free navigate around the scene"}, {VIEW_NAVIGATION_FLY, "FLY", 0, "Fly", "Use fly dynamics to navigate the scene"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; @@ -76,7 +76,7 @@ const EnumPropertyItem rna_enum_navigation_mode_items[] = { static const EnumPropertyItem rna_enum_language_default_items[] = { {0, "DEFAULT", 0, "Automatic (Automatic)", "Automatically choose system's defined language if available, or fall-back to English"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -84,7 +84,7 @@ static const EnumPropertyItem rna_enum_studio_light_type_items[] = { {STUDIOLIGHT_TYPE_STUDIO, "STUDIO", 0, "Studio", ""}, {STUDIOLIGHT_TYPE_WORLD, "WORLD", 0, "World", ""}, {STUDIOLIGHT_TYPE_MATCAP, "MATCAP", 0, "MatCap", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; @@ -802,7 +802,7 @@ static void rna_def_userdef_theme_ui_font_style(BlenderRNA *brna) static const EnumPropertyItem font_kerning_style[] = { {0, "UNFITTED", 0, "Unfitted", "Use scaled but un-grid-fitted kerning distances"}, {1, "FITTED", 0, "Fitted", "Use scaled and grid-fitted kerning distances"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "ThemeFontStyle", NULL); @@ -3221,7 +3221,7 @@ static void rna_def_userdef_themes(BlenderRNA *brna) {20, "CLIP_EDITOR", ICON_TRACKER, "Movie Clip Editor", ""}, {21, "TOPBAR", ICON_NONE, "Top Bar", ""}, {22, "STATUSBAR", ICON_NONE, "Status Bar", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "Theme", NULL); @@ -3662,7 +3662,7 @@ static void rna_def_userdef_view(BlenderRNA *brna) "milliseconds are shown instead"}, {USER_TIMECODE_SECONDS_ONLY, "SECONDS_ONLY", 0, "Only Seconds", "Direct conversion of frame numbers to seconds"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem color_picker_types[] = { @@ -3673,21 +3673,21 @@ static void rna_def_userdef_view(BlenderRNA *brna) {USER_CP_SQUARE_SV, "SQUARE_SV", 0, "Square (SV + H)", "A square showing Saturation/Value, with Hue slider"}, {USER_CP_SQUARE_HS, "SQUARE_HS", 0, "Square (HS + V)", "A square showing Hue/Saturation, with Value slider"}, {USER_CP_SQUARE_HV, "SQUARE_HV", 0, "Square (HV + S)", "A square showing Hue/Value, with Saturation slider"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem zoom_frame_modes[] = { {ZOOM_FRAME_MODE_KEEP_RANGE, "KEEP_RANGE", 0, "Keep Range", ""}, {ZOOM_FRAME_MODE_SECONDS, "SECONDS", 0, "Seconds", ""}, {ZOOM_FRAME_MODE_KEYFRAMES, "KEYFRAMES", 0, "Keyframes", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem line_width[] = { {-1, "THIN", 0, "Thin", "Thinner lines than the default"}, { 0, "AUTO", 0, "Auto", "Automatic line width based on UI scale"}, { 1, "THICK", 0, "Thick", "Thicker lines than the default"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; PropertyRNA *prop; @@ -3861,7 +3861,7 @@ static void rna_def_userdef_view(BlenderRNA *brna) static const EnumPropertyItem header_align_default_items[] = { {0, "TOP", 0, "Top", ""}, {USER_HEADER_BOTTOM, "BOTTOM", 0, "Bottom", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; prop = RNA_def_property(srna, "header_align_default", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, header_align_default_items); @@ -3874,14 +3874,14 @@ static void rna_def_userdef_view(BlenderRNA *brna) {USER_TEXT_HINTING_NONE, "NONE", 0, "None", ""}, {USER_TEXT_HINTING_SLIGHT, "SLIGHT", 0, "Slight", ""}, {USER_TEXT_HINTING_FULL, "FULL", 0, "Full", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* mini axis */ static const EnumPropertyItem mini_axis_type_items[] = { {0, "MINIMAL", 0, "Simple Axis", ""}, {USER_SHOW_GIZMO_AXIS, "GIZMO", 0, "Interactive Navigation", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; prop = RNA_def_property(srna, "mini_axis_type", PROP_ENUM, PROP_NONE); @@ -4032,20 +4032,20 @@ static void rna_def_userdef_edit(BlenderRNA *brna) static const EnumPropertyItem auto_key_modes[] = { {AUTOKEY_MODE_NORMAL, "ADD_REPLACE_KEYS", 0, "Add/Replace", ""}, {AUTOKEY_MODE_EDITKEYS, "REPLACE_KEYS", 0, "Replace", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem material_link_items[] = { {0, "OBDATA", 0, "ObData", "Toggle whether the material is linked to object data or the object block"}, {USER_MAT_ON_OB, "OBJECT", 0, "Object", "Toggle whether the material is linked to object data or the object block"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem object_align_items[] = { {0, "WORLD", 0, "World", "Align newly added objects to the world coordinate system"}, {USER_ADD_VIEWALIGNED, "VIEW", 0, "View", "Align newly added objects facing the active 3D View direction"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "PreferencesEdit", NULL); @@ -4274,7 +4274,7 @@ static void rna_def_userdef_system(BlenderRNA *brna) {512, "CLAMP_512", 0, "512", ""}, {256, "CLAMP_256", 0, "256", ""}, {128, "CLAMP_128", 0, "128", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem anisotropic_items[] = { @@ -4283,7 +4283,7 @@ static void rna_def_userdef_system(BlenderRNA *brna) {4, "FILTER_4", 0, "4x", ""}, {8, "FILTER_8", 0, "8x", ""}, {16, "FILTER_16", 0, "16x", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem audio_mixing_samples_items[] = { @@ -4295,7 +4295,7 @@ static void rna_def_userdef_system(BlenderRNA *brna) {8192, "SAMPLES_8192", 0, "8192", "Set audio mixing buffer size to 8192 samples"}, {16384, "SAMPLES_16384", 0, "16384", "Set audio mixing buffer size to 16384 samples"}, {32768, "SAMPLES_32768", 0, "32768", "Set audio mixing buffer size to 32768 samples"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem audio_rate_items[] = { @@ -4309,7 +4309,7 @@ static void rna_def_userdef_system(BlenderRNA *brna) /* {88200, "RATE_88200", 0, "88.2 kHz", "Set audio sampling rate to 88200 samples per second"}, */ {96000, "RATE_96000", 0, "96 kHz", "Set audio sampling rate to 96000 samples per second"}, {192000, "RATE_192000", 0, "192 kHz", "Set audio sampling rate to 192000 samples per second"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem audio_format_items[] = { @@ -4319,7 +4319,7 @@ static void rna_def_userdef_system(BlenderRNA *brna) {0x14, "S32", 0, "32-bit Signed", "Set audio sample format to 32 bit signed integer"}, {0x24, "FLOAT", 0, "32-bit Float", "Set audio sample format to 32 bit float"}, {0x28, "DOUBLE", 0, "64-bit Float", "Set audio sample format to 64 bit float"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem audio_channel_items[] = { @@ -4328,7 +4328,7 @@ static void rna_def_userdef_system(BlenderRNA *brna) {4, "SURROUND4", 0, "4 Channels", "Set audio channels to 4 channels"}, {6, "SURROUND51", 0, "5.1 Surround", "Set audio channels to 5.1 surround sound"}, {8, "SURROUND71", 0, "7.1 Surround", "Set audio channels to 7.1 surround sound"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem multi_sample_levels[] = { @@ -4337,14 +4337,14 @@ static void rna_def_userdef_system(BlenderRNA *brna) {USER_MULTISAMPLE_4, "4", 0, "MultiSample: 4", "Use 4x OpenGL MultiSample (requires restart)"}, {USER_MULTISAMPLE_8, "8", 0, "MultiSample: 8", "Use 8x OpenGL MultiSample (requires restart)"}, {USER_MULTISAMPLE_16, "16", 0, "MultiSample: 16", "Use 16x OpenGL MultiSample (requires restart)"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem image_draw_methods[] = { {IMAGE_DRAW_METHOD_2DTEXTURE, "2DTEXTURE", 0, "2D Texture", "Use CPU for display transform and draw image with 2D texture"}, {IMAGE_DRAW_METHOD_GLSL, "GLSL", 0, "GLSL", "Use GLSL shaders for display transform and draw image with 2D texture"}, {IMAGE_DRAW_METHOD_DRAWPIXELS, "DRAWPIXELS", 0, "DrawPixels", "Use CPU for display transform and draw image using DrawPixels"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "PreferencesSystem", NULL); @@ -4554,20 +4554,20 @@ static void rna_def_userdef_input(BlenderRNA *brna) static const EnumPropertyItem view_rotation_items[] = { {0, "TURNTABLE", 0, "Turntable", "Turntable keeps the Z-axis upright while orbiting"}, {USER_TRACKBALL, "TRACKBALL", 0, "Trackball", "Trackball allows you to tumble your view at any angle"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifdef WITH_INPUT_NDOF static const EnumPropertyItem ndof_view_navigation_items[] = { {0, "FREE", 0, "Free", "Use full 6 degrees of freedom by default"}, {NDOF_MODE_ORBIT, "ORBIT", 0, "Orbit", "Orbit about the view center by default"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem ndof_view_rotation_items[] = { {NDOF_TURNTABLE, "TURNTABLE", 0, "Turntable", "Use turntable style rotation in the viewport"}, {0, "TRACKBALL", 0, "Trackball", "Use trackball style rotation in the viewport"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif /* WITH_INPUT_NDOF */ @@ -4575,7 +4575,7 @@ static void rna_def_userdef_input(BlenderRNA *brna) {USER_TABLET_AUTOMATIC, "AUTOMATIC", 0, "Automatic", "Automatically choose Wintab or Windows Ink depending on the device"}, {USER_TABLET_NATIVE, "WINDOWS_INK", 0, "Windows Ink", "Use native Windows Ink API, for modern tablet and pen devices. Requires Windows 8 or newer"}, {USER_TABLET_WINTAB, "WINTAB", 0, "Wintab", "Use Wintab driver for older tablets and Windows versions"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem view_zoom_styles[] = { @@ -4583,13 +4583,13 @@ static void rna_def_userdef_input(BlenderRNA *brna) {USER_ZOOM_DOLLY, "DOLLY", 0, "Dolly", "Zoom in and out based on vertical mouse movement"}, {USER_ZOOM_SCALE, "SCALE", 0, "Scale", "Zoom in and out like scaling the view, mouse movements relative to center"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem view_zoom_axes[] = { {0, "VERTICAL", 0, "Vertical", "Zoom in and out based on vertical mouse movement"}, {USER_ZOOM_HORIZ, "HORIZONTAL", 0, "Horizontal", "Zoom in and out based on horizontal mouse movement"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "PreferencesInput", NULL); @@ -4859,7 +4859,7 @@ static void rna_def_userdef_filepaths(BlenderRNA *brna) {4, "RV", 0, "rv", "Frame player from Tweak Software"}, {5, "MPLAYER", 0, "MPlayer", "Media player for video & png/jpeg/sgi image sequences"}, {50, "CUSTOM", 0, "Custom", "Custom animation player executable path"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "PreferencesFilePaths", NULL); @@ -5085,7 +5085,7 @@ void RNA_def_userdef(BlenderRNA *brna) {USER_SECTION_SYSTEM, "SYSTEM", 0, "System", ""}, {USER_SECTION_SAVE_LOAD, "SAVE_LOAD", 0, "Save & Load", ""}, {USER_SECTION_FILE_PATHS, "FILE_PATHS", 0, "File Paths", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; rna_def_userdef_dothemes(brna); diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index fa689104f7a..6ee2695dfc0 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -49,7 +49,7 @@ static const EnumPropertyItem event_keymouse_value_items[] = { {KM_CLICK, "CLICK", 0, "Click", ""}, {KM_DBL_CLICK, "DOUBLE_CLICK", 0, "Double Click", ""}, {KM_CLICK_DRAG, "CLICK_DRAG", 0, "Click Drag", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem event_tweak_value_items[] = { @@ -62,14 +62,14 @@ static const EnumPropertyItem event_tweak_value_items[] = { {EVT_GESTURE_SW, "SOUTH_WEST", 0, "South-West", ""}, {EVT_GESTURE_W, "WEST", 0, "West", ""}, {EVT_GESTURE_NW, "NORTH_WEST", 0, "North-West", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem event_tweak_type_items[] = { {EVT_TWEAK_L, "EVT_TWEAK_L", 0, "Left", ""}, {EVT_TWEAK_M, "EVT_TWEAK_M", 0, "Middle", ""}, {EVT_TWEAK_R, "EVT_TWEAK_R", 0, "Right", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem event_mouse_type_items[] = { @@ -93,7 +93,7 @@ static const EnumPropertyItem event_mouse_type_items[] = { {WHEELDOWNMOUSE, "WHEELDOWNMOUSE", 0, "Wheel Down", ""}, {WHEELINMOUSE, "WHEELINMOUSE", 0, "Wheel In", ""}, {WHEELOUTMOUSE, "WHEELOUTMOUSE", 0, "Wheel Out", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem event_timer_type_items[] = { @@ -105,12 +105,12 @@ static const EnumPropertyItem event_timer_type_items[] = { {TIMERAUTOSAVE, "TIMER_AUTOSAVE", 0, "Timer Autosave", ""}, {TIMERREPORT, "TIMER_REPORT", 0, "Timer Report", ""}, {TIMERREGION, "TIMERREGION", 0, "Timer Region", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem event_textinput_type_items[] = { {KM_TEXTINPUT, "TEXTINPUT", 0, "Text Input", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem event_ndof_type_items[] = { @@ -160,7 +160,7 @@ static const EnumPropertyItem event_ndof_type_items[] = { {NDOF_BUTTON_A, "NDOF_BUTTON_A", 0, "Button A", ""}, {NDOF_BUTTON_B, "NDOF_BUTTON_B", 0, "Button B", ""}, {NDOF_BUTTON_C, "NDOF_BUTTON_C", 0, "Button C", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif /* RNA_RUNTIME */ @@ -373,7 +373,7 @@ const EnumPropertyItem rna_enum_event_type_items[] = { {EVT_ACTIONZONE_AREA, "ACTIONZONE_AREA", 0, "ActionZone Area", "AZone Area"}, {EVT_ACTIONZONE_REGION, "ACTIONZONE_REGION", 0, "ActionZone Region", "AZone Region"}, {EVT_ACTIONZONE_FULLSCREEN, "ACTIONZONE_FULLSCREEN", 0, "ActionZone Fullscreen", "AZone FullScr"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_event_value_items[] = { @@ -392,12 +392,12 @@ const EnumPropertyItem rna_enum_event_value_items[] = { {EVT_GESTURE_SW, "SOUTH_WEST", 0, "South-West", ""}, {EVT_GESTURE_W, "WEST", 0, "West", ""}, {EVT_GESTURE_NW, "NORTH_WEST", 0, "North-West", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_keymap_propvalue_items[] = { {0, "NONE", 0, "", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; @@ -412,7 +412,7 @@ const EnumPropertyItem rna_enum_event_type_mask_items[] = { {EVT_TYPE_MASK_NDOF, "NDOF", 0, "NDOF", ""}, {EVT_TYPE_MASK_TWEAK, "TWEAK", 0, "Tweak", ""}, {EVT_TYPE_MASK_ACTIONZONE, "ACTIONZONE", 0, "Action Zone", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #if 0 @@ -421,7 +421,7 @@ static const EnumPropertyItem keymap_modifiers_items[] = { {0, "NONE", 0, "None", ""}, {1, "FIRST", 0, "First", ""}, {2, "SECOND", 0, "Second", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -440,7 +440,7 @@ static const EnumPropertyItem operator_flag_items[] = { {OPTYPE_INTERNAL, "INTERNAL", 0, "Internal", "Removes the operator from search results"}, {OPTYPE_USE_EVAL_DATA, "USE_EVAL_DATA", 0, "Use Evaluated Data", "Uses evaluated data (i.e. needs a valid depsgraph for current context)"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #endif @@ -451,12 +451,12 @@ const EnumPropertyItem rna_enum_operator_return_items[] = { /* used as a flag */ {OPERATOR_PASS_THROUGH, "PASS_THROUGH", 0, "Pass Through", "Do nothing and pass the event on"}, {OPERATOR_INTERFACE, "INTERFACE", 0, "Interface", "Handled but not executed (popup menus)"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; const EnumPropertyItem rna_enum_operator_property_tags[] = { {OP_PROP_TAG_ADVANCED, "ADVANCED", 0, "Advanced", "The property is advanced so UI is suggested to hide it"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* flag/enum */ @@ -470,7 +470,7 @@ const EnumPropertyItem rna_enum_wm_report_items[] = { {RPT_ERROR_INVALID_INPUT, "ERROR_INVALID_INPUT", 0, "Invalid Input", ""}, {RPT_ERROR_INVALID_CONTEXT, "ERROR_INVALID_CONTEXT", 0, "Invalid Context", ""}, {RPT_ERROR_OUT_OF_MEMORY, "ERROR_OUT_OF_MEMORY", 0, "Out of Memory", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifdef RNA_RUNTIME @@ -2348,7 +2348,7 @@ static void rna_def_keyconfig(BlenderRNA *brna) {KMI_TYPE_NDOF, "NDOF", 0, "NDOF", ""}, {KMI_TYPE_TEXTINPUT, "TEXTINPUT", 0, "Text Input", ""}, {KMI_TYPE_TIMER, "TIMER", 0, "Timer", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; /* KeyConfig */ diff --git a/source/blender/makesrna/intern/rna_wm_api.c b/source/blender/makesrna/intern/rna_wm_api.c index c3065111020..4e87d06db80 100644 --- a/source/blender/makesrna/intern/rna_wm_api.c +++ b/source/blender/makesrna/intern/rna_wm_api.c @@ -60,7 +60,7 @@ const EnumPropertyItem rna_enum_window_cursor_items[] = { {BC_NS_SCROLLCURSOR, "SCROLL_Y", 0, "Scroll-Y", ""}, {BC_NSEW_SCROLLCURSOR, "SCROLL_XY", 0, "Scroll-XY", ""}, {BC_EYEDROPPER_CURSOR, "EYEDROPPER", 0, "Eyedropper", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; #ifdef RNA_RUNTIME diff --git a/source/blender/makesrna/intern/rna_wm_gizmo.c b/source/blender/makesrna/intern/rna_wm_gizmo.c index 7f60c7bbffd..22a08609d09 100644 --- a/source/blender/makesrna/intern/rna_wm_gizmo.c +++ b/source/blender/makesrna/intern/rna_wm_gizmo.c @@ -1022,7 +1022,7 @@ static void rna_def_gizmo(BlenderRNA *brna, PropertyRNA *cprop) static EnumPropertyItem tweak_actions[] = { {WM_GIZMO_TWEAK_PRECISE, "PRECISE", 0, "Precise", ""}, {WM_GIZMO_TWEAK_SNAP, "SNAP", 0, "Snap", ""}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; func = RNA_def_function(srna, "modal", NULL); RNA_def_function_ui_description(func, ""); @@ -1303,7 +1303,7 @@ static void rna_def_gizmogroup(BlenderRNA *brna) "Show all while interacting"}, {WM_GIZMOGROUPTYPE_TOOL_INIT, "TOOL_INIT", 0, "Tool Init", "Postpone running until tool operator run (when used with a tool)"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; prop = RNA_def_property(srna, "bl_options", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "type->flag"); diff --git a/source/blender/makesrna/intern/rna_world.c b/source/blender/makesrna/intern/rna_world.c index f55442369b4..94ec991c59d 100644 --- a/source/blender/makesrna/intern/rna_world.c +++ b/source/blender/makesrna/intern/rna_world.c @@ -142,7 +142,7 @@ static void rna_def_world_mist(BlenderRNA *brna) {WO_MIST_QUADRATIC, "QUADRATIC", 0, "Quadratic", "Use quadratic progression"}, {WO_MIST_LINEAR, "LINEAR", 0, "Linear", "Use linear progression"}, {WO_MIST_INVERSE_QUADRATIC, "INVERSE_QUADRATIC", 0, "Inverse Quadratic", "Use inverse quadratic progression"}, - {0, NULL, 0, NULL, NULL} + {0, NULL, 0, NULL, NULL}, }; srna = RNA_def_struct(brna, "WorldMistSettings", NULL); |