diff options
| author | Marius Kintel <marius@kintel.net> | 2013-03-28 03:55:51 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-03-28 03:55:51 (GMT) |
| commit | eefcd6d0b271642d470cd55bc47d1579d943938e (patch) | |
| tree | 48f9e4db455879025adb9317b740bfa4b72c2d66 /src/rendersettings.h | |
| parent | f70578f362c8c2c78036c9de846c20802ac7aa81 (diff) | |
| parent | beff2b1f4811b7f9d2b58bfc6a469a363bc9bfd0 (diff) | |
Merge branch 'master' into epec-kernel
Conflicts:
src/PolySetCGALEvaluator.cc
Diffstat (limited to 'src/rendersettings.h')
| -rw-r--r-- | src/rendersettings.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/rendersettings.h b/src/rendersettings.h index 15a0746..e4fa6c8 100644 --- a/src/rendersettings.h +++ b/src/rendersettings.h @@ -25,6 +25,8 @@ public: void setColors(const std::map<RenderColor, Color4f> &colors); Color4f color(RenderColor idx); + unsigned int openCSGTermLimit, img_width, img_height; + double far_gl_clip_limit; private: RenderSettings(); ~RenderSettings() {} |