diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 09:50:46 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 09:52:59 +0300 |
commit | a54bdd76cb34005d07a65c2c3a8198b7b8e8c95a (patch) | |
tree | c30e2477cc3c12b1dd046f4fd12c728114c94563 /source/blender/makesrna/intern | |
parent | 223f9310955f6b0d6f1089c16802a57e20fcadb3 (diff) |
ClangFormat: format '#if 0' code
Previous cleanups didn't account for space after '#'.
Diffstat (limited to 'source/blender/makesrna/intern')
-rw-r--r-- | source/blender/makesrna/intern/rna_cloth.c | 3 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_curve.c | 5 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_fcurve.c | 6 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_gpencil_modifier.c | 5 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_mesh.c | 6 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 72 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 22 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 6 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_object_api.c | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_object_force.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_pose.c | 6 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_rna.c | 30 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 12 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_sequencer.c | 9 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_ui.c | 3 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_ui_api.c | 43 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 2 |
17 files changed, 158 insertions, 78 deletions
diff --git a/source/blender/makesrna/intern/rna_cloth.c b/source/blender/makesrna/intern/rna_cloth.c index b1a2ec32a88..160634307f9 100644 --- a/source/blender/makesrna/intern/rna_cloth.c +++ b/source/blender/makesrna/intern/rna_cloth.c @@ -788,7 +788,8 @@ static void rna_def_cloth_sim_settings(BlenderRNA *brna) prop = RNA_def_property(srna, "max_spring_extensions", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "maxspringlen"); RNA_def_property_range(prop, 1.0, 1000.0); - RNA_def_property_ui_text(prop, "Maximum Spring Extension", "Maximum extension before spring gets cut"); + RNA_def_property_ui_text( + prop, "Maximum Spring Extension", "Maximum extension before spring gets cut"); # endif } diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index 448ea1387f4..2e021d7ae15 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -1311,10 +1311,11 @@ static void rna_def_charinfo(BlenderRNA *brna) prop = RNA_def_property(srna, "use_wrap", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_CHINFO_WRAP); RNA_def_property_ui_text(prop, "Wrap", ""); - RNA_def_property_update(prop, 0, "rna_Curve_update_data"); */ + RNA_def_property_update(prop, 0, "rna_Curve_update_data"); + * / # endif - prop = RNA_def_property(srna, "use_small_caps", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_small_caps", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_CHINFO_SMALLCAPS); RNA_def_property_ui_text(prop, "Small Caps", ""); RNA_def_property_ui_icon(prop, ICON_SMALL_CAPS, 0); diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c index d8a687fdb84..f4026b5025c 100644 --- a/source/blender/makesrna/intern/rna_fcurve.c +++ b/source/blender/makesrna/intern/rna_fcurve.c @@ -1518,12 +1518,12 @@ static void rna_def_fmodifier(BlenderRNA *brna) RNA_def_struct_refine_func(srna, "rna_FModifierType_refine"); RNA_def_struct_ui_text(srna, "F-Modifier", "Modifier for values of F-Curve"); -# if 0 /* XXX not used yet */ - /* name */ +# if 0 /* XXX not used yet */ + /* name */ prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); RNA_def_struct_name_property(srna, prop); RNA_def_property_ui_text(prop, "Name", "Short description of F-Curve Modifier"); -# endif /* XXX not used yet */ +# endif /* XXX not used yet */ /* type */ prop = RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_gpencil_modifier.c b/source/blender/makesrna/intern/rna_gpencil_modifier.c index 076f0d8b85a..d1ae46a74f7 100644 --- a/source/blender/makesrna/intern/rna_gpencil_modifier.c +++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c @@ -1665,8 +1665,9 @@ static void rna_def_modifier_gpencilarmature(BlenderRNA *brna) prop = RNA_def_property(srna, "use_multi_modifier", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "multi", 0); RNA_def_property_ui_text( - prop, "Multi Modifier", - "Use same input as previous modifier, and mix results using overall vgroup"); + prop, + "Multi Modifier", + "Use same input as previous modifier, and mix results using overall vgroup"); RNA_def_property_update(prop, 0, "rna_GpencilModifier_dependency_update"); # endif diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index a4ad07af6b7..c76e243e100 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -1030,7 +1030,8 @@ static void rna_MeshPoly_vertices_set(PointerRNA *ptr, const int *values) /* disabling, some importers don't know the total material count when assigning materials */ # if 0 -static void rna_MeshPoly_material_index_range(PointerRNA *ptr, int *min, int *max, int *softmin, int *softmax) +static void rna_MeshPoly_material_index_range( + PointerRNA *ptr, int *min, int *max, int *softmin, int *softmax) { Mesh *me = rna_mesh(ptr); *min = 0; @@ -3041,7 +3042,8 @@ static void rna_def_mesh(BlenderRNA *brna) RNA_def_property_array(prop, 3); RNA_def_property_ui_text(prop, "Texture Space Location", "Texture space location"); RNA_def_property_editable_func(prop, "rna_Mesh_texspace_editable"); - RNA_def_property_float_funcs(prop, "rna_Mesh_texspace_loc_get", "rna_Mesh_texspace_loc_set", NULL); + RNA_def_property_float_funcs( + prop, "rna_Mesh_texspace_loc_get", "rna_Mesh_texspace_loc_set", NULL); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); # endif diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index 860c2c3ba89..1a986da1a94 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -1049,8 +1049,10 @@ static const EnumPropertyItem *rna_DataTransferModifier_layers_select_src_itemf( # if 0 /* XXX Don't think we want this in modifier version... */ if (BKE_object_pose_armature_get(ob_src)) { - RNA_enum_items_add_value(&item, &totitem, rna_enum_dt_layers_select_src_items, DT_LAYERS_VGROUP_SRC_BONE_SELECT); - RNA_enum_items_add_value(&item, &totitem, rna_enum_dt_layers_select_src_items, DT_LAYERS_VGROUP_SRC_BONE_DEFORM); + RNA_enum_items_add_value( + &item, &totitem, rna_enum_dt_layers_select_src_items, DT_LAYERS_VGROUP_SRC_BONE_SELECT); + RNA_enum_items_add_value( + &item, &totitem, rna_enum_dt_layers_select_src_items, DT_LAYERS_VGROUP_SRC_BONE_DEFORM); } # endif @@ -1373,16 +1375,28 @@ static PropertyRNA *rna_def_property_subdivision_common(StructRNA *srna, const c "Smooth, keep corners", "UVs are smoothed, corners on discontinuous boundary are kept sharp"}, # if 0 - {SUBSURF_UV_SMOOTH_PRESERVE_CORNERS_AND_JUNCTIONS, "PRESERVE_CORNERS_AND_JUNCTIONS", 0, - "Smooth, keep corners+junctions", "UVs are smoothed, corners on discontinuous boundary and " + {SUBSURF_UV_SMOOTH_PRESERVE_CORNERS_AND_JUNCTIONS, + "PRESERVE_CORNERS_AND_JUNCTIONS", + 0, + "Smooth, keep corners+junctions", + "UVs are smoothed, corners on discontinuous boundary and " "junctions of 3 or more regions are kept sharp"}, - {SUBSURF_UV_SMOOTH_PRESERVE_CORNERS_JUNCTIONS_AND_CONCAVE, "PRESERVE_CORNERS_JUNCTIONS_AND_CONCAVE", 0, - "Smooth, keep corners+junctions+concave", "UVs are smoothed, corners on discontinuous boundary, " + {SUBSURF_UV_SMOOTH_PRESERVE_CORNERS_JUNCTIONS_AND_CONCAVE, + "PRESERVE_CORNERS_JUNCTIONS_AND_CONCAVE", + 0, + "Smooth, keep corners+junctions+concave", + "UVs are smoothed, corners on discontinuous boundary, " "junctions of 3 or more regions and darts and concave corners are kept sharp"}, - {SUBSURF_UV_SMOOTH_PRESERVE_BOUNDARIES, "PRESERVE_BOUNDARIES", 0, - "Smooth, keep corners", "UVs are smoothed, boundaries are kept sharp"}, - {SUBSURF_UV_SMOOTH_ALL, "PRESERVE_BOUNDARIES", 0, - "Smooth all", "UVs and boundaries are smoothed"}, + {SUBSURF_UV_SMOOTH_PRESERVE_BOUNDARIES, + "PRESERVE_BOUNDARIES", + 0, + "Smooth, keep corners", + "UVs are smoothed, boundaries are kept sharp"}, + {SUBSURF_UV_SMOOTH_ALL, + "PRESERVE_BOUNDARIES", + 0, + "Smooth all", + "UVs and boundaries are smoothed"}, # endif {0, NULL, 0, NULL, NULL}, }; @@ -2956,9 +2970,9 @@ static void rna_def_modifier_meshdeform(BlenderRNA *brna) PropertyRNA *prop; # if 0 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, "VOLUME", 0, "Volume", "Bind to volume inside cage mesh"}, + {1, "SURFACE", 0, "Surface", "Bind to surface of cage mesh"}, + {0, NULL, 0, NULL, NULL}, }; # endif @@ -4109,7 +4123,8 @@ static void rna_def_modifier_screw(BlenderRNA *brna) # if 0 prop = RNA_def_property(srna, "use_angle_object", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SCREW_OBJECT_ANGLE); - RNA_def_property_ui_text(prop, "Object Angle", "Use the angle between the objects rather than the fixed angle"); + RNA_def_property_ui_text( + prop, "Object Angle", "Use the angle between the objects rather than the fixed angle"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); # endif } @@ -4643,8 +4658,11 @@ static void rna_def_modifier_ocean(BlenderRNA *brna) "Displace", "Displace existing geometry according to simulation"}, # if 0 - {MOD_OCEAN_GEOM_SIM_ONLY, "SIM_ONLY", 0, "Sim Only", - "Leaves geometry unchanged, but still runs simulation (to be used from texture)"}, + {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}, }; @@ -5457,10 +5475,15 @@ static void rna_def_modifier_datatransfer(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_Modifier_update"); # if 0 - prop = RNA_def_enum(srna, "layers_shapekey_select_src", rna_enum_dt_layers_select_src_items, DT_LAYERS_ALL_SRC, - "Source Layers Selection", "Which layers to transfer, in case of multi-layers types"); + prop = RNA_def_enum(srna, + "layers_shapekey_select_src", + rna_enum_dt_layers_select_src_items, + DT_LAYERS_ALL_SRC, + "Source Layers Selection", + "Which layers to transfer, in case of multi-layers types"); RNA_def_property_enum_sdna(prop, NULL, "layers_select_src[DT_MULTILAYER_INDEX_SHAPEKEY]"); - RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_DataTransferModifier_layers_select_src_itemf"); + RNA_def_property_enum_funcs( + prop, NULL, NULL, "rna_DataTransferModifier_layers_select_src_itemf"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); # endif @@ -5498,10 +5521,15 @@ static void rna_def_modifier_datatransfer(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_Modifier_update"); # if 0 - prop = RNA_def_enum(srna, "layers_shapekey_select_dst", rna_enum_dt_layers_select_dst_items, DT_LAYERS_NAME_DST, - "Destination Layers Matching", "How to match source and destination layers"); + prop = RNA_def_enum(srna, + "layers_shapekey_select_dst", + rna_enum_dt_layers_select_dst_items, + DT_LAYERS_NAME_DST, + "Destination Layers Matching", + "How to match source and destination layers"); RNA_def_property_enum_sdna(prop, NULL, "layers_select_dst[DT_MULTILAYER_INDEX_SHAPEKEY]"); - RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_DataTransferModifier_layers_select_dst_itemf"); + RNA_def_property_enum_funcs( + prop, NULL, NULL, "rna_DataTransferModifier_layers_select_dst_itemf"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); # endif diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index fb0ee247598..8a064bd065d 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -4990,7 +4990,7 @@ static void def_sh_script(StructRNA *srna) RNA_def_function_ui_description(func, "Find a socket by name"); parm = RNA_def_string(func, "name", NULL, 0, "Socket name", ""); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); - /*parm =*/ RNA_def_boolean(func, "is_output", false, "Output", "Whether the socket is an output"); + /*parm =*/RNA_def_boolean(func, "is_output", false, "Output", "Whether the socket is an output"); parm = RNA_def_pointer(func, "result", "NodeSocket", "", ""); RNA_def_function_return(func, parm); @@ -5001,7 +5001,7 @@ static void def_sh_script(StructRNA *srna) RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); parm = RNA_def_enum(func, "type", node_socket_type_items, SOCK_FLOAT, "Type", ""); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); - /*parm =*/ RNA_def_boolean(func, "is_output", false, "Output", "Whether the socket is an output"); + /*parm =*/RNA_def_boolean(func, "is_output", false, "Output", "Whether the socket is an output"); parm = RNA_def_pointer(func, "result", "NodeSocket", "", ""); RNA_def_function_return(func, parm); @@ -5335,11 +5335,11 @@ static void def_cmp_image(StructRNA *srna) # if 0 static const EnumPropertyItem type_items[] = { - {IMA_SRC_FILE, "IMAGE", 0, "Image", ""}, - {IMA_SRC_MOVIE, "MOVIE", "Movie", ""}, - {IMA_SRC_SEQUENCE, "SEQUENCE", "Sequence", ""}, - {IMA_SRC_GENERATED, "GENERATED", "Generated", ""}, - {0, NULL, 0, NULL, NULL}, + {IMA_SRC_FILE, "IMAGE", 0, "Image", ""}, + {IMA_SRC_MOVIE, "MOVIE", "Movie", ""}, + {IMA_SRC_SEQUENCE, "SEQUENCE", "Sequence", ""}, + {IMA_SRC_GENERATED, "GENERATED", "Generated", ""}, + {0, NULL, 0, NULL, NULL}, }; # endif @@ -6891,9 +6891,11 @@ static void def_cmp_bokehblur(StructRNA *srna) prop = RNA_def_property(srna, "f_stop", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "custom3"); RNA_def_property_range(prop, 0.0f, 128.0f); - RNA_def_property_ui_text(prop, "F-stop", - "Amount of focal blur, 128=infinity=perfect focus, half the value doubles " - "the blur radius"); + RNA_def_property_ui_text( + prop, + "F-stop", + "Amount of focal blur, 128=infinity=perfect focus, half the value doubles " + "the blur radius"); RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); # endif diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index b36e6490e5f..6aed3003ab9 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -2521,8 +2521,10 @@ static void rna_def_object(BlenderRNA *brna) /* FIXME: this is not a single field any more! (drotAxis and drotAngle) */ RNA_def_property_float_sdna(prop, NULL, "dquat"); RNA_def_property_float_array_default(prop, rna_default_axis_angle); - RNA_def_property_ui_text(prop, "Delta Rotation (Axis Angle)", - "Extra rotation added to the rotation of the object (when using Axis-Angle rotations)"); + RNA_def_property_ui_text( + prop, + "Delta Rotation (Axis Angle)", + "Extra rotation added to the rotation of the object (when using Axis-Angle rotations)"); RNA_def_property_update(prop, NC_OBJECT | ND_TRANSFORM, "rna_Object_internal_update"); # endif diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c index 7862671b867..63ccc10afb2 100644 --- a/source/blender/makesrna/intern/rna_object_api.c +++ b/source/blender/makesrna/intern/rna_object_api.c @@ -439,8 +439,8 @@ static void rna_Object_shape_key_remove(Object *ob, } # if 0 -static void rna_Mesh_assign_verts_to_group(Object *ob, bDeformGroup *group, int *indices, int totindex, - float weight, int assignmode) +static void rna_Mesh_assign_verts_to_group( + Object *ob, bDeformGroup *group, int *indices, int totindex, float weight, int assignmode) { if (ob->type != OB_MESH) { BKE_report(reports, RPT_ERROR, "Object should be of mesh type"); diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c index 157d011eb72..4cafa42c9fc 100644 --- a/source/blender/makesrna/intern/rna_object_force.c +++ b/source/blender/makesrna/intern/rna_object_force.c @@ -537,7 +537,7 @@ static void rna_FieldSettings_dependency_update(Main *bmain, Scene *scene, Point if (ob->type == OB_CURVE && ob->pd->forcefield == PFIELD_GUIDE) { Curve *cu = ob->data; cu->flag |= (CU_PATH | CU_3D); - do_curvebuts(B_CU3D); /* all curves too */ + do_curvebuts(B_CU3D); /* all curves too */ } # endif diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c index 4b764529562..5f652777481 100644 --- a/source/blender/makesrna/intern/rna_pose.c +++ b/source/blender/makesrna/intern/rna_pose.c @@ -461,8 +461,10 @@ static void rna_pose_bgroup_name_index_get(PointerRNA *ptr, char *value, int ind grp = BLI_findlink(&pose->agroups, index - 1); - if (grp) BLI_strncpy(value, grp->name, sizeof(grp->name)); - else value[0] = '\0'; + if (grp) + BLI_strncpy(value, grp->name, sizeof(grp->name)); + else + value[0] = '\0'; } static int rna_pose_bgroup_name_index_length(PointerRNA *ptr, int index) diff --git a/source/blender/makesrna/intern/rna_rna.c b/source/blender/makesrna/intern/rna_rna.c index aa5ea62657b..16897a2b4d6 100644 --- a/source/blender/makesrna/intern/rna_rna.c +++ b/source/blender/makesrna/intern/rna_rna.c @@ -1685,11 +1685,19 @@ int rna_property_override_diff_default(Main *bmain, # if 0 if (rna_path) { - printf("Checking %s, %s [%d] vs %s [%d]; is_id: %d, diffing: %d; " - "insert: %d (could be used: %d, do_create: %d)\n", - rna_path, propname_a ? propname_a : "", idx_a, propname_b ? propname_b : "", idx_b, - is_id, is_valid_for_diffing, is_valid_for_insertion, - (RNA_property_override_flag(prop_a) & PROPOVERRIDE_STATIC_INSERTION) != 0, do_create); + printf( + "Checking %s, %s [%d] vs %s [%d]; is_id: %d, diffing: %d; " + "insert: %d (could be used: %d, do_create: %d)\n", + rna_path, + propname_a ? propname_a : "", + idx_a, + propname_b ? propname_b : "", + idx_b, + is_id, + is_valid_for_diffing, + is_valid_for_insertion, + (RNA_property_override_flag(prop_a) & PROPOVERRIDE_STATIC_INSERTION) != 0, + do_create); } # endif @@ -3045,11 +3053,17 @@ void RNA_def_rna(BlenderRNA *brna) prop = RNA_def_property(srna, "structs", PROP_COLLECTION, PROP_NONE); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_struct_type(prop, "Struct"); - RNA_def_property_collection_funcs(prop, "rna_BlenderRNA_structs_begin", "rna_iterator_listbase_next", - "rna_iterator_listbase_end", "rna_iterator_listbase_get", + RNA_def_property_collection_funcs(prop, + "rna_BlenderRNA_structs_begin", + "rna_iterator_listbase_next", + "rna_iterator_listbase_end", + "rna_iterator_listbase_get", /* included for speed, can be removed */ # if 0 - NULL, NULL, NULL, NULL); + NULL, + NULL, + NULL, + NULL); # else "rna_BlenderRNA_structs_length", "rna_BlenderRNA_structs_lookup_int", diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index c80abb239a3..e14f499e714 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -6080,7 +6080,8 @@ static void rna_def_scene_render_data(BlenderRNA *brna) RNA_def_property_enum_sdna(prop, NULL, "seq_rend_type"); RNA_def_property_enum_items(prop, rna_enum_shading_type_items); /* XXX Label and tooltips are obviously wrong! */ - RNA_def_property_ui_text(prop, "Sequencer Preview Shading", "Method to draw in the sequencer view"); + RNA_def_property_ui_text( + prop, "Sequencer Preview Shading", "Method to draw in the sequencer view"); # endif prop = RNA_def_property(srna, "use_sequencer_gl_textured_solid", PROP_BOOLEAN, PROP_NONE); @@ -7314,7 +7315,8 @@ void RNA_def_scene(BlenderRNA *brna) # if 0 /* XXX: Is this actually needed? */ prop = RNA_def_property(srna, "use_frame_drop", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SCE_FRAME_DROP); - RNA_def_property_ui_text(prop, "Frame Dropping", "Play back dropping frames if frame display is too slow"); + RNA_def_property_ui_text( + prop, "Frame Dropping", "Play back dropping frames if frame display is too slow"); RNA_def_property_update(prop, NC_SCENE, NULL); # endif @@ -7455,8 +7457,10 @@ void RNA_def_scene(BlenderRNA *brna) # if 0 /* XXX: Is this actually needed? */ prop = RNA_def_property(srna, "use_audio_sync", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "audio.flag", AUDIO_SYNC); - RNA_def_property_ui_text(prop, "Audio Sync", - "Play back and sync with audio clock, dropping frames if frame display is too slow"); + RNA_def_property_ui_text( + prop, + "Audio Sync", + "Play back and sync with audio clock, dropping frames if frame display is too slow"); RNA_def_property_update(prop, NC_SCENE, NULL); # endif diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index a00d4c99455..01ea7471b29 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -729,7 +729,10 @@ static int rna_Sequence_input_count_get(PointerRNA *ptr) static void rna_SoundSequence_filename_set(PointerRNA *ptr, const char *value) { Sequence *seq = (Sequence *)(ptr->data); - BLI_split_dirfile(value, seq->strip->dir, seq->strip->stripdata->name, sizeof(seq->strip->dir), + BLI_split_dirfile(value, + seq->strip->dir, + seq->strip->stripdata->name, + sizeof(seq->strip->dir), sizeof(seq->strip->stripdata->name)); } @@ -1954,8 +1957,8 @@ static void rna_def_effect_inputs(StructRNA *srna, int count) } # if 0 - if (count == 3) { // not used by any effects (perhaps one day plugins?) - prop = RNA_def_property(srna, "input_3", PROP_POINTER, PROP_NONE); + if (count == 3) { // not used by any effects (perhaps one day plugins?) + prop = RNA_def_property(srna, "input_3", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "seq3"); RNA_def_property_flag(prop, PROP_EDITABLE | PROP_NEVER_NULL); RNA_def_property_ui_text(prop, "Input 3", "Third input for the effect strip"); diff --git a/source/blender/makesrna/intern/rna_ui.c b/source/blender/makesrna/intern/rna_ui.c index 1941f1bc1b2..dd378c60c72 100644 --- a/source/blender/makesrna/intern/rna_ui.c +++ b/source/blender/makesrna/intern/rna_ui.c @@ -1171,7 +1171,8 @@ static void rna_def_ui_layout(BlenderRNA *brna) # if 0 prop = RNA_def_property(srna, "keep_aspect", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_funcs(prop, "rna_UILayout_keep_aspect_get", "rna_UILayout_keep_aspect_set"); + RNA_def_property_boolean_funcs( + prop, "rna_UILayout_keep_aspect_get", "rna_UILayout_keep_aspect_set"); # endif prop = RNA_def_property(srna, "scale_x", PROP_FLOAT, PROP_UNSIGNED); diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c index d8e13fda114..e9ea8e6c838 100644 --- a/source/blender/makesrna/intern/rna_ui_api.c +++ b/source/blender/makesrna/intern/rna_ui_api.c @@ -878,30 +878,49 @@ void RNA_api_ui_layout(StructRNA *srna) api_ui_item_op_common(func); parm = RNA_def_string(func, "property", NULL, 0, "", "Identifier of property in operator"); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); - parm = RNA_def_boolean(func, "value", false, "", "Value of the property to call the operator with"); - RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); */ + parm = RNA_def_boolean( + func, "value", false, "", "Value of the property to call the operator with"); + RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); + * / - func = RNA_def_function(srna, "operator_int", "uiItemIntO"); + func = RNA_def_function(srna, "operator_int", "uiItemIntO"); api_ui_item_op_common(func); parm = RNA_def_string(func, "property", NULL, 0, "", "Identifier of property in operator"); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); - parm = RNA_def_int(func, "value", 0, INT_MIN, INT_MAX, "", - "Value of the property to call the operator with", INT_MIN, INT_MAX); - RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); */ + parm = RNA_def_int(func, + "value", + 0, + INT_MIN, + INT_MAX, + "", + "Value of the property to call the operator with", + INT_MIN, + INT_MAX); + RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); + * / - func = RNA_def_function(srna, "operator_float", "uiItemFloatO"); + func = RNA_def_function(srna, "operator_float", "uiItemFloatO"); api_ui_item_op_common(func); parm = RNA_def_string(func, "property", NULL, 0, "", "Identifier of property in operator"); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); - parm = RNA_def_float(func, "value", 0, -FLT_MAX, FLT_MAX, "", - "Value of the property to call the operator with", -FLT_MAX, FLT_MAX); - RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); */ + parm = RNA_def_float(func, + "value", + 0, + -FLT_MAX, + FLT_MAX, + "", + "Value of the property to call the operator with", + -FLT_MAX, + FLT_MAX); + RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); + * / - func = RNA_def_function(srna, "operator_string", "uiItemStringO"); + func = RNA_def_function(srna, "operator_string", "uiItemStringO"); api_ui_item_op_common(func); parm = RNA_def_string(func, "property", NULL, 0, "", "Identifier of property in operator"); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); - parm = RNA_def_string(func, "value", NULL, 0, "", "Value of the property to call the operator with"); + parm = RNA_def_string( + func, "value", NULL, 0, "", "Value of the property to call the operator with"); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); # endif diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 5a017e96fa7..54a880293ad 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -5128,7 +5128,7 @@ static void rna_def_userdef_input(BlenderRNA *brna) prop = RNA_def_boolean(srna, "use_ndof", true, "", ""); # else prop = RNA_def_boolean(srna, "use_ndof", false, "", ""); -# endif /* WITH_INPUT_NDOF */ +# endif /* WITH_INPUT_NDOF */ RNA_def_property_flag(prop, PROP_IDPROPERTY); RNA_def_property_clear_flag(prop, PROP_EDITABLE); |