Two fixes in 2.5 branch:

- crash on start because of unitialized pointer
- Makefile had the python lib on weird location... I prefer all 
  blender/source/blender/ libs together on 1 place? The Make needs
  cleaning... it assumes publisher stuff. :)
This commit is contained in:
Ton Roosendaal
2008-01-10 18:13:34 +00:00
parent 43cf3af8c0
commit 42e2b4edde
3 changed files with 4 additions and 2 deletions

View File

@@ -85,7 +85,6 @@ GRPLIB += $(OCGDIR)/blender/render/$(DEBUG_DIR)librender.a
GRPLIB += $(OCGDIR)/blender/radiosity/$(DEBUG_DIR)libradiosity.a
GRPLIB += $(NAN_OPENNL)/lib/$(DEBUG_DIR)libopennl.a
GRPLIB += $(NAN_SUPERLU)/lib/$(DEBUG_DIR)libsuperlu.a
GRPLIB += $(OCGDIR)/blender/python/$(DEBUG_DIR)libpython.a
# nlin: the reason that some libraries appear more than once below is
# to handle circular dependencies in linking among libraries... some
@@ -229,6 +228,8 @@ PULIB += $(OCGDIR)/blender/ed_screen/libed_screen.a
PULIB += $(OCGDIR)/blender/ed_interface/libed_interface.a
PULIB += $(OCGDIR)/blender/ed_view3d/libed_view3d.a
PULIB += $(OCGDIR)/blender/windowmanager/libwindowmanager.a
PULIB += $(OCGDIR)/blender/python/$(DEBUG_DIR)libpython.a
ifeq ($(NAN_NO_KETSJI),true)
PULIB += $(NAN_MOTO)/lib/libmoto.a

View File

@@ -3510,6 +3510,7 @@ static void direct_link_windowmanager(FileData *fd, wmWindowManager *wm)
wm->windowkeymap.first= wm->windowkeymap.last= NULL;
wm->screenkeymap.first= wm->screenkeymap.last= NULL;
wm->windrawable= NULL;
wm->initialized= 0;
}

View File

@@ -159,7 +159,7 @@ typedef struct wmOperator {
vec3i veci;
float fac, deltaf;
int value, delta;
/* custom storage, dna pointer */
void *customdata;
/* or IDproperty list */