diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-06 12:31:58 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-06 12:31:58 +0300 |
| commit | 8a3adaa48568382c1d0e67fabb8ec3d07b94dd42 (patch) | |
| tree | 6211427d0fe723e99c0f6e5a6779594d31254171 /source/blender/makesrna | |
| parent | 5f669240663649ee5532f935a8178bf9db7b10cf (diff) | |
| parent | bb98eef777cbc3484bfcb50ea460b9c5622e9200 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/space_node/drawnode.c
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 0bb222b2dff..1f0782cb7e3 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -6255,11 +6255,6 @@ static void def_cmp_mask(StructRNA *srna) RNA_def_property_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Mask", ""); - prop = RNA_def_property(srna, "use_antialiasing", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "custom1", CMP_NODEFLAG_MASK_AA); - RNA_def_property_ui_text(prop, "Anti-Alias", "Apply an anti-aliasing filter to the mask"); - RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "use_feather", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "custom1", CMP_NODEFLAG_MASK_NO_FEATHER); RNA_def_property_ui_text(prop, "Feather", "Use feather information from the mask"); |