blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Cleanup: clang format

This commit is contained in:
Philipp Oeser 2021-01-08 11:54:53 +01:00
parent c44a17ec4b
commit c889ec916c
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/makesrna/intern/rna_modifier.c
View File

@ -5900,8 +5900,7 @@ static void rna_def_modifier_triangulate(BlenderRNA *brna)
prop = RNA_def_property(srna, "ngon_method", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "ngon_method");
RNA_def_property_enum_items(prop, rna_enum_modifier_triangulate_ngon_method_items);
RNA_def_property_ui_text(
prop, "N-gon Method", "Method for splitting the n-gons into triangles");
RNA_def_property_ui_text(prop, "N-gon Method", "Method for splitting the n-gons into triangles");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "min_vertices", PROP_INT, PROP_UNSIGNED);

3
source/blender/makesrna/intern/rna_nodetree.c
View File

@ -8433,8 +8433,7 @@ static void def_geo_triangulate(StructRNA *srna)
RNA_def_property_enum_sdna(prop, NULL, "custom2");
RNA_def_property_enum_items(prop, rna_node_geometry_triangulate_ngon_method_items);
RNA_def_property_enum_default(prop, GEO_NODE_TRIANGULATE_NGON_BEAUTY);
RNA_def_property_ui_text(
prop, "N-gon Method", "Method for splitting the n-gons into triangles");
RNA_def_property_ui_text(prop, "N-gon Method", "Method for splitting the n-gons into triangles");
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
}

2
source/blender/sequencer/intern/sequencer.c
View File

@ -246,7 +246,7 @@ Editing *SEQ_editing_ensure(Scene *scene)
ed->seqbasep = &ed->seqbase;
ed->cache = NULL;
ed->cache_flag = SEQ_CACHE_STORE_FINAL_OUT;
ed->cache_flag |= SEQ_CACHE_STORE_RAW ;
ed->cache_flag |= SEQ_CACHE_STORE_RAW;
}
return scene->ed;