svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22099:22130
This commit is contained in:
commit
de36dd1e99
@ -155,11 +155,9 @@ init(
|
||||
GHOST_TSuccess success = GHOST_System::init();
|
||||
|
||||
if (success) {
|
||||
m_keyboard_vector = new char[32];
|
||||
|
||||
m_displayManager = new GHOST_DisplayManagerX11(this);
|
||||
|
||||
if (m_keyboard_vector && m_displayManager) {
|
||||
if (m_displayManager) {
|
||||
return GHOST_kSuccess;
|
||||
}
|
||||
}
|
||||
@ -715,9 +713,9 @@ getModifierKeys(
|
||||
|
||||
// analyse the masks retuned from XQueryPointer.
|
||||
|
||||
memset(m_keyboard_vector,0,sizeof(m_keyboard_vector));
|
||||
memset((void *)m_keyboard_vector,0,sizeof(m_keyboard_vector));
|
||||
|
||||
XQueryKeymap(m_display,m_keyboard_vector);
|
||||
XQueryKeymap(m_display,(char *)m_keyboard_vector);
|
||||
|
||||
// now translate key symobols into keycodes and
|
||||
// test with vector.
|
||||
|
@ -258,7 +258,7 @@ private :
|
||||
GHOST_TUns64 m_start_time;
|
||||
|
||||
/// A vector of keyboard key masks
|
||||
char *m_keyboard_vector;
|
||||
char m_keyboard_vector[32];
|
||||
|
||||
/**
|
||||
* Return the ghost window associated with the
|
||||
|
@ -187,6 +187,8 @@ GHOST_WindowX11(
|
||||
printf("%s:%d: X11 glxChooseVisual() failed for OpenGL, verify working openGL system!\n", __FILE__, __LINE__);
|
||||
return;
|
||||
}
|
||||
|
||||
memset(&m_xtablet, 0, sizeof(m_xtablet));
|
||||
|
||||
// Create a bunch of attributes needed to create an X window.
|
||||
|
||||
|
@ -2213,7 +2213,7 @@ static void where_is_pose_bone(Scene *scene, Object *ob, bPoseChannel *pchan, fl
|
||||
Mat4MulSerie(pchan->pose_mat, tmat, offs_bone, pchan->chan_mat, NULL, NULL, NULL, NULL, NULL);
|
||||
}
|
||||
else if(bone->flag & BONE_NO_SCALE) {
|
||||
float orthmat[4][4], vec[3];
|
||||
float orthmat[4][4];
|
||||
|
||||
/* get the official transform, but we only use the vector from it (optimize...) */
|
||||
Mat4MulSerie(pchan->pose_mat, parchan->pose_mat, offs_bone, pchan->chan_mat, NULL, NULL, NULL, NULL, NULL);
|
||||
|
@ -360,6 +360,8 @@ int checkPackedFile(char *filename, PackedFile *pf)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
close(file);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -289,7 +289,10 @@ short imb_savetarga(struct ImBuf * ibuf, char *name, int flags)
|
||||
fildes = fopen(name,"wb");
|
||||
if (!fildes) return 0;
|
||||
|
||||
if (fwrite(buf, 1, 18,fildes) != 18) return (0);
|
||||
if (fwrite(buf, 1, 18,fildes) != 18) {
|
||||
fclose(fildes);
|
||||
return (0);
|
||||
}
|
||||
|
||||
if (ibuf->cmap){
|
||||
for (i = 0 ; i<ibuf->maxcol ; i++){
|
||||
|
@ -485,15 +485,18 @@ static void *read_file_data(char *filename, int *len_r)
|
||||
data= MEM_mallocN(*len_r, "read_file_data");
|
||||
if (!data) {
|
||||
*len_r= -1;
|
||||
fclose(fp);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (fread(data, *len_r, 1, fp)!=1) {
|
||||
*len_r= -1;
|
||||
MEM_freeN(data);
|
||||
fclose(fp);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
fclose(fp);
|
||||
return data;
|
||||
}
|
||||
|
||||
|
@ -782,6 +782,16 @@ extern "C" void StartKetsjiShellSimulation(struct wmWindow *win,
|
||||
delete mousedevice;
|
||||
mousedevice = NULL;
|
||||
}
|
||||
if (rasterizer)
|
||||
{
|
||||
delete rasterizer;
|
||||
rasterizer = NULL;
|
||||
}
|
||||
if (rendertools)
|
||||
{
|
||||
delete rendertools;
|
||||
rendertools = NULL;
|
||||
}
|
||||
SND_DeviceManager::Unsubscribe();
|
||||
|
||||
} while (exitrequested == KX_EXIT_REQUEST_RESTART_GAME || exitrequested == KX_EXIT_REQUEST_START_OTHER_GAME);
|
||||
|
Loading…
Reference in New Issue
Block a user