Merge remote-tracking branch 'svn/trunk' into git_master
This commit is contained in:
commit
4bc7de3645
@ -801,12 +801,13 @@ static void fghCreateMenuCallback( int menu, FGCBUserData userData )
|
|||||||
|
|
||||||
int FGAPIENTRY glutCreateMenu( FGCBMenu callback )
|
int FGAPIENTRY glutCreateMenu( FGCBMenu callback )
|
||||||
{
|
{
|
||||||
|
FGCBMenu* reference;
|
||||||
FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutCreateMenu" );
|
FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutCreateMenu" );
|
||||||
if (!callback)
|
if (!callback)
|
||||||
{
|
{
|
||||||
return glutCreateMenuUcall( NULL, NULL );
|
return glutCreateMenuUcall( NULL, NULL );
|
||||||
}
|
}
|
||||||
FGCBMenu* reference = &callback;
|
reference = &callback;
|
||||||
return glutCreateMenuUcall( fghCreateMenuCallback, *((FGCBUserData*)reference) );
|
return glutCreateMenuUcall( fghCreateMenuCallback, *((FGCBUserData*)reference) );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user