diff options
author | Benoit Bolsee <benoit.bolsee@online.be> | 2011-09-09 16:37:56 +0400 |
---|---|---|
committer | Benoit Bolsee <benoit.bolsee@online.be> | 2011-09-09 16:37:56 +0400 |
commit | ca170a8ed6745da4f9de5d2f5a1544571a2df783 (patch) | |
tree | a16451e526b419341f30c5322658d41df9c50be6 /source/blender/makesrna/intern | |
parent | c1c4743696c67f562eda31e90d03c72eaec04567 (diff) |
forgot to resolve one conflict in previous merge
Diffstat (limited to 'source/blender/makesrna/intern')
-rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index 370c9b8bd0c..f6c96c2594c 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -2490,7 +2490,6 @@ static void rna_def_modifier_screw(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_Modifier_update");*/ } -<<<<<<< .working static void rna_def_modifier_navmesh(BlenderRNA *brna) { StructRNA *srna; @@ -2502,7 +2501,6 @@ static void rna_def_modifier_navmesh(BlenderRNA *brna) RNA_def_struct_ui_icon(srna, ICON_MOD_DECIM); } -======= static void rna_def_modifier_weightvg_mask(BlenderRNA *brna, StructRNA *srna) { static EnumPropertyItem weightvg_mask_tex_map_items[] = { @@ -2797,7 +2795,6 @@ static void rna_def_modifier_weightvgproximity(BlenderRNA *brna) rna_def_modifier_weightvg_mask(brna, srna); } ->>>>>>> .merge-right.r40061 void RNA_def_modifier(BlenderRNA *brna) { StructRNA *srna; @@ -2895,13 +2892,10 @@ void RNA_def_modifier(BlenderRNA *brna) rna_def_modifier_smoke(brna); rna_def_modifier_solidify(brna); rna_def_modifier_screw(brna); -<<<<<<< .working rna_def_modifier_navmesh(brna); -======= rna_def_modifier_weightvgedit(brna); rna_def_modifier_weightvgmix(brna); rna_def_modifier_weightvgproximity(brna); ->>>>>>> .merge-right.r40061 } #endif |