[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40784] branches/soc-2011-carrot/source/ blender/editors/space_view3d/drawmesh.c: Missed a merge conflict.
Miika Hamalainen
miika.hamalainen at kolumbus.fi
Tue Oct 4 14:27:49 CEST 2011
Revision: 40784
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40784
Author: miikah
Date: 2011-10-04 12:27:48 +0000 (Tue, 04 Oct 2011)
Log Message:
-----------
Missed a merge conflict.
Modified Paths:
--------------
branches/soc-2011-carrot/source/blender/editors/space_view3d/drawmesh.c
Modified: branches/soc-2011-carrot/source/blender/editors/space_view3d/drawmesh.c
===================================================================
--- branches/soc-2011-carrot/source/blender/editors/space_view3d/drawmesh.c 2011-10-04 11:42:44 UTC (rev 40783)
+++ branches/soc-2011-carrot/source/blender/editors/space_view3d/drawmesh.c 2011-10-04 12:27:48 UTC (rev 40784)
@@ -395,9 +395,9 @@
}
}
-static int draw_mcol__set_draw_legacy(MTFace *tface, MCol *mcol, int matnr)
+static int draw_mcol__set_draw_legacy(MTFace *tface, int has_mcol, int matnr)
{
- if (mcol) return 1;
+ if (has_mcol) return 1;
else return 2;
}
More information about the Bf-blender-cvs
mailing list