[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40065] branches/soc-2010-nicks/source/ blender/makesrna/intern/rna_modifier.c: forgot to resolve one conflict in previous merge

[Benoit Bolsee]

Revision: 40065
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40065
Author:   ben2610
Date:     2011-09-09 12:37:56 +0000 (Fri, 09 Sep 2011)
Log Message:
-----------
forgot to resolve one conflict in previous merge

Modified Paths:
--------------
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_modifier.c

Modified: branches/soc-2010-nicks/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- branches/soc-2010-nicks/source/blender/makesrna/intern/rna_modifier.c	2011-09-09 12:23:45 UTC (rev 40064)
+++ branches/soc-2010-nicks/source/blender/makesrna/intern/rna_modifier.c	2011-09-09 12:37:56 UTC (rev 40065)
@@ -2490,7 +2490,6 @@
 	RNA_def_property_update(prop, 0, "rna_Modifier_update");*/
 }
 
-<<<<<<< .working
 static void rna_def_modifier_navmesh(BlenderRNA *brna)
 {
 	StructRNA *srna;
@@ -2502,7 +2501,6 @@
 	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 @@
 	rna_def_modifier_weightvg_mask(brna, srna);
 }
 
->>>>>>> .merge-right.r40061
 void RNA_def_modifier(BlenderRNA *brna)
 {
 	StructRNA *srna;
@@ -2895,13 +2892,10 @@
 	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