forked from bartvdbraak/blender
simplify x11 path code, had unneeded NULL checks and std namespace
This commit is contained in:
parent
f12df1e386
commit
5681380db0
@ -43,7 +43,11 @@
|
||||
#include <stdio.h> // for fprintf only
|
||||
#include <cstdlib> // for exit
|
||||
|
||||
using namespace std;
|
||||
#ifdef PREFIX
|
||||
static const char *static_path= PREFIX "/share" ;
|
||||
#else
|
||||
static const char *static_path= NULL;
|
||||
#endif
|
||||
|
||||
GHOST_SystemPathsX11::GHOST_SystemPathsX11()
|
||||
{
|
||||
@ -56,21 +60,12 @@ GHOST_SystemPathsX11::~GHOST_SystemPathsX11()
|
||||
const GHOST_TUns8* GHOST_SystemPathsX11::getSystemDir() const
|
||||
{
|
||||
/* no prefix assumes a portable build which only uses bundled scripts */
|
||||
#ifdef PREFIX
|
||||
return (GHOST_TUns8*) PREFIX "/share";
|
||||
#else
|
||||
return NULL;
|
||||
#endif
|
||||
return (const GHOST_TUns8 *)static_path;
|
||||
}
|
||||
|
||||
const GHOST_TUns8* GHOST_SystemPathsX11::getUserDir() const
|
||||
{
|
||||
const char* env = getenv("HOME");
|
||||
if(env) {
|
||||
return (GHOST_TUns8*) env;
|
||||
} else {
|
||||
return NULL;
|
||||
}
|
||||
return (const GHOST_TUns8 *)getenv("HOME");
|
||||
}
|
||||
|
||||
const GHOST_TUns8* GHOST_SystemPathsX11::getBinaryDir() const
|
||||
|
@ -2332,8 +2332,8 @@ static void attach_ndof_data(wmEvent* event, const GHOST_TEventNDOFMotionData* g
|
||||
data->tx = s * ghost->tx;
|
||||
|
||||
data->rx = s * ghost->rx;
|
||||
data->rx = s * ghost->ry;
|
||||
data->rx = s * ghost->rz;
|
||||
data->ry = s * ghost->ry;
|
||||
data->rz = s * ghost->rz;
|
||||
|
||||
if (U.ndof_flag & NDOF_ZOOM_UPDOWN)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user