sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

simplify x11 path code, had unneeded NULL checks and std namespace

Browse Source
This commit is contained in:
Campbell Barton 2011-08-07 17:38:36 +00:00
parent f12df1e386
commit 5681380db0
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
intern/ghost/intern/GHOST_SystemPathsX11.cpp
View File

@ -43,7 +43,11 @@
#include <stdio.h> // for fprintf only #include <stdio.h> // for fprintf only
#include <cstdlib> // for exit #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() GHOST_SystemPathsX11::GHOST_SystemPathsX11()
{ {
@ -56,21 +60,12 @@ GHOST_SystemPathsX11::~GHOST_SystemPathsX11()
const GHOST_TUns8* GHOST_SystemPathsX11::getSystemDir() const const GHOST_TUns8* GHOST_SystemPathsX11::getSystemDir() const
{ {
/* no prefix assumes a portable build which only uses bundled scripts */ /* no prefix assumes a portable build which only uses bundled scripts */
#ifdef PREFIX return (const GHOST_TUns8 *)static_path;
return (GHOST_TUns8*) PREFIX "/share";
#else
return NULL;
#endif
} }
const GHOST_TUns8* GHOST_SystemPathsX11::getUserDir() const const GHOST_TUns8* GHOST_SystemPathsX11::getUserDir() const
{ {
const char* env = getenv("HOME"); return (const GHOST_TUns8 *)getenv("HOME");
if(env) {
return (GHOST_TUns8*) env;
} else {
return NULL;
}
} }
const GHOST_TUns8* GHOST_SystemPathsX11::getBinaryDir() const const GHOST_TUns8* GHOST_SystemPathsX11::getBinaryDir() const

4
source/blender/windowmanager/intern/wm_event_system.c
View File

@ -2332,8 +2332,8 @@ static void attach_ndof_data(wmEvent* event, const GHOST_TEventNDOFMotionData* g
data->tx = s * ghost->tx; data->tx = s * ghost->tx;
data->rx = s * ghost->rx; data->rx = s * ghost->rx;
data->rx = s * ghost->ry; data->ry = s * ghost->ry;
data->rx = s * ghost->rz; data->rz = s * ghost->rz;
if (U.ndof_flag & NDOF_ZOOM_UPDOWN) if (U.ndof_flag & NDOF_ZOOM_UPDOWN)
{ {