From cd4044b246ca7c2d7dec488c7ca073bdced618a6 Mon Sep 17 00:00:00 2001
From: Andreas Schenk <andreas_schenk@hms.harvard.edu>
Date: Mon, 9 Jul 2012 00:23:08 -0400
Subject: [PATCH] renamed rad1,rad2 in prim_list.hh, because these symbols are
already defined in vsc++ 2010
---
modules/gfx/src/prim_list.hh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/gfx/src/prim_list.hh b/modules/gfx/src/prim_list.hh
index 80eabe333..ec790dc95 100644
--- a/modules/gfx/src/prim_list.hh
+++ b/modules/gfx/src/prim_list.hh
@@ -49,9 +49,9 @@ class DLLEXPORT_OST_GFX PrimList: public GfxObj
struct LineEntry {
LineEntry(const geom::Vec3& p1, const geom::Vec3& p2, float r1, float r2, const Color& c1, const Color& c2):
- pos1(p1), pos2(p2), rad1(r1), rad2(r2), col1(c1), col2(c2) {}
+ pos1(p1), pos2(p2), radius_1(r1), radius_2(r2), col1(c1), col2(c2) {}
geom::Vec3 pos1, pos2;
- float rad1, rad2;
+ float radius_1, radius_2;
Color col1, col2;
};
--
GitLab