Age | Commit message (Collapse) | Author |
|
|
|
Merge remote branch 'upstream/master' into visitortests
Conflicts:
src/cgaladv.cc
src/export.cc
src/openscad.cc
src/polyset.cc
src/transform.cc
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
fix build errors on windows
|
|
Conflicts:
src/mainwin.cc
|
|
|
|
Conflicts:
src/primitives.cc
|
|
|
|
|
|
|
|
|
|
|
|
|
|
of this initiative
|
|
|
|
|
|
|
|
|
|
Conflicts:
src/OpenCSGRenderer.cc
src/csgops.cc
src/mainwin.cc
src/polyset.cc
src/projection.cc
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
src/GLView.h
src/glview.cc
src/mainwin.cc
src/render-opencsg.cc
|
|
|
|
|
|
is to become independent of Qt
|
|
|
|
into cgal-renderer-refactor
|
|
gitorious/glview-refactor
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
With fix for a bug where alpha of 0.0 was mishandled applied.
|