Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
c7bc1e15
Commit
c7bc1e15
authored
Oct 28, 2013
by
Maciej Suminski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
GAL is not activated by default. Late OpenGL backend initializatization.
parent
bd03ca1f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
opengl_gal.cpp
common/gal/opengl/opengl_gal.cpp
+4
-2
pcbnew.cpp
pcbnew/pcbnew.cpp
+0
-3
No files found.
common/gal/opengl/opengl_gal.cpp
View file @
c7bc1e15
...
@@ -52,11 +52,10 @@ OPENGL_GAL::OPENGL_GAL( wxWindow* aParent, wxEvtHandler* aMouseListener,
...
@@ -52,11 +52,10 @@ OPENGL_GAL::OPENGL_GAL( wxWindow* aParent, wxEvtHandler* aMouseListener,
nonCachedManager
(
false
),
nonCachedManager
(
false
),
overlayManager
(
false
)
overlayManager
(
false
)
{
{
// Create the OpenGL-Context
glContext
=
new
wxGLContext
(
this
);
parentWindow
=
aParent
;
parentWindow
=
aParent
;
mouseListener
=
aMouseListener
;
mouseListener
=
aMouseListener
;
paintListener
=
aPaintListener
;
paintListener
=
aPaintListener
;
glContext
=
NULL
;
// Initialize the flags
// Initialize the flags
isGlewInitialized
=
false
;
isGlewInitialized
=
false
;
...
@@ -113,6 +112,9 @@ OPENGL_GAL::~OPENGL_GAL()
...
@@ -113,6 +112,9 @@ OPENGL_GAL::~OPENGL_GAL()
void
OPENGL_GAL
::
BeginDrawing
()
void
OPENGL_GAL
::
BeginDrawing
()
{
{
if
(
!
glContext
)
glContext
=
new
wxGLContext
(
this
);
SetCurrent
(
*
glContext
);
SetCurrent
(
*
glContext
);
clientDC
=
new
wxClientDC
(
this
);
clientDC
=
new
wxClientDC
(
this
);
...
...
pcbnew/pcbnew.cpp
View file @
c7bc1e15
...
@@ -293,9 +293,6 @@ bool EDA_APP::OnInit()
...
@@ -293,9 +293,6 @@ bool EDA_APP::OnInit()
frame
->
SetFocus
();
frame
->
SetFocus
();
frame
->
GetCanvas
()
->
SetFocus
();
frame
->
GetCanvas
()
->
SetFocus
();
// Activate the GAL
frame
->
UseGalCanvas
(
true
);
return
true
;
return
true
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment