diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-04-15 08:44:28 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-04-15 08:46:53 +0400 |
| commit | 955634e17c3ec11254373300f6d6f36ccd3fa212 (patch) | |
| tree | 66fcacbb286b12481bccadf2211e9112a3874ebe /source/blender/makesrna/intern/rna_mesh.c | |
| parent | aa10cf7f5cc3b2acdc0fd79b0eecccae029afcfa (diff) | |
Revert part of last commit,
RNA is low level data access, setting mesh values shouldn't change draw options.
Also its redundant to name attrs Face.freestyle_face_mark,
removed edge/face from attr names
Diffstat (limited to 'source/blender/makesrna/intern/rna_mesh.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_mesh.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index ac917d9fc59..b6ae637bbde 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -759,11 +759,6 @@ static void rna_MEdge_freestyle_edge_mark_set(PointerRNA *ptr, int value) if (!fed) { fed = CustomData_add_layer(&me->edata, CD_FREESTYLE_EDGE, CD_CALLOC, NULL, me->totedge); - - /* auto-enable Freestyle edge mark drawing */ - if (value) { - me->drawflag |= ME_DRAW_FREESTYLE_EDGE; - } } if (value) { fed->flag |= FREESTYLE_EDGE_MARK; @@ -790,11 +785,6 @@ static void rna_MPoly_freestyle_face_mark_set(PointerRNA *ptr, int value) if (!ffa) { ffa = CustomData_add_layer(&me->pdata, CD_FREESTYLE_FACE, CD_CALLOC, NULL, me->totpoly); - - /* auto-enable Freestyle face mark drawing */ - if (value) { - me->drawflag |= ME_DRAW_FREESTYLE_FACE; - } } if (value) { ffa->flag |= FREESTYLE_FACE_MARK; @@ -1870,7 +1860,7 @@ static void rna_def_medge(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_LOOSEEDGE); RNA_def_property_ui_text(prop, "Loose", "Loose edge"); - prop = RNA_def_property(srna, "freestyle_edge_mark", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "freestyle_mark", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_funcs(prop, "rna_MEdge_freestyle_edge_mark_get", "rna_MEdge_freestyle_edge_mark_set"); RNA_def_property_ui_text(prop, "Freestyle Edge Mark", "Edge mark for Freestyle line rendering"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); @@ -2074,7 +2064,7 @@ static void rna_def_mpolygon(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Smooth", ""); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - prop = RNA_def_property(srna, "freestyle_face_mark", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "freestyle_mark", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_funcs(prop, "rna_MPoly_freestyle_face_mark_get", "rna_MPoly_freestyle_face_mark_set"); RNA_def_property_ui_text(prop, "Freestyle Face Mark", "Face mark for Freestyle line rendering"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); |