[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13195] branches/blender2.5/blender/source : Two fixes in 2.5 branch:

[Ton Roosendaal]

Revision: 13195
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13195
Author:   ton
Date:     2008-01-10 19:13:34 +0100 (Thu, 10 Jan 2008)

Log Message:
-----------
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. :)

Modified Paths:
--------------
    branches/blender2.5/blender/source/Makefile
    branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
    branches/blender2.5/blender/source/blender/makesdna/DNA_windowmanager_types.h

Modified: branches/blender2.5/blender/source/Makefile
===================================================================
--- branches/blender2.5/blender/source/Makefile	2008-01-10 17:38:17 UTC (rev 13194)
+++ branches/blender2.5/blender/source/Makefile	2008-01-10 18:13:34 UTC (rev 13195)
@@ -85,7 +85,6 @@
 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,7 +228,9 @@
 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
     PULIB += $(OCGDIR)/kernel/gen_system/$(DEBUG_DIR)libgen_system.a

Modified: branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c	2008-01-10 17:38:17 UTC (rev 13194)
+++ branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c	2008-01-10 18:13:34 UTC (rev 13195)
@@ -3510,6 +3510,7 @@
 	wm->windowkeymap.first= wm->windowkeymap.last= NULL;
 	wm->screenkeymap.first= wm->screenkeymap.last= NULL;
 	
+	wm->windrawable= NULL;
 	wm->initialized= 0;
 }
 

Modified: branches/blender2.5/blender/source/blender/makesdna/DNA_windowmanager_types.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesdna/DNA_windowmanager_types.h	2008-01-10 17:38:17 UTC (rev 13194)
+++ branches/blender2.5/blender/source/blender/makesdna/DNA_windowmanager_types.h	2008-01-10 18:13:34 UTC (rev 13195)
@@ -159,7 +159,7 @@
 	vec3i	veci;
 	float fac, deltaf;
 	int value, delta;
-
+	
 	/* custom storage, dna pointer */
 	void *customdata; 
 	/* or IDproperty list */