[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40755] trunk/blender: fix [#28784] CRASHER on load with load_post handler

[Campbell Barton]

Revision: 40755
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40755
Author:   campbellbarton
Date:     2011-10-02 21:21:14 +0000 (Sun, 02 Oct 2011)
Log Message:
-----------
fix [#28784] CRASHER on load with load_post handler

also fix pacman package build spec.

Modified Paths:
--------------
    trunk/blender/build_files/package_spec/pacman/PKGBUILD
    trunk/blender/source/blender/windowmanager/intern/wm_files.c

Modified: trunk/blender/build_files/package_spec/pacman/PKGBUILD
===================================================================
--- trunk/blender/build_files/package_spec/pacman/PKGBUILD      2011-10-02 
20:09:45 UTC (rev 40754)
+++ trunk/blender/build_files/package_spec/pacman/PKGBUILD      2011-10-02 
21:21:14 UTC (rev 40755)
@@ -4,7 +4,7 @@
 blender_srcdir=$(dirname $startdir)"/../.."
 # value may be formatted: 35042:35051M
 blender_revision=$(svnversion $blender_srcdir | cut -d: -f2 | awk '{print $3}')
-blender_version=$(grep BLENDER_VERSION 
$blender_srcdir/source/blender/blenkernel/BKE_blender.h | awk '{print $3}')
+blender_version=$(grep "BLENDER_VERSION\s" 
$blender_srcdir/source/blender/blenkernel/BKE_blender.h | awk '{print $3}')
 blender_version=$(expr $blender_version / 100).$(expr $blender_version % 100)  
# 256 -> 2.56
 blender_version_char=$(sed -ne 's/.*BLENDER_VERSION_CHAR.*\([a-z]\)$/\1/p' 
$blender_srcdir/source/blender/blenkernel/BKE_blender.h)
 # blender_subversion=$(grep BLENDER_SUBVERSION 
$blender_srcdir/source/blender/blenkernel/BKE_blender.h | awk '{print $3}')

Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c        
2011-10-02 20:09:45 UTC (rev 40754)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c        
2011-10-02 21:21:14 UTC (rev 40755)
@@ -412,6 +412,10 @@
                BPY_app_handlers_reset();
                BPY_modules_load_user(C);
 #endif
+
+               /* important to do before NULL'ing the context */
+               BLI_exec_cb(CTX_data_main(C), NULL, BLI_CB_EVT_LOAD_POST);
+
                CTX_wm_window_set(C, NULL); /* exits queues */
 
 #if 0  /* gives popups on windows but not linux, bug in report API but disable 
for now to stop users getting annoyed  */
@@ -429,8 +433,6 @@
                // XXX          undo_editmode_clear();
                BKE_reset_undo();
                BKE_write_undo(C, "original");  /* save current state */
-
-               BLI_exec_cb(CTX_data_main(C), NULL, BLI_CB_EVT_LOAD_POST);
        }
        else if(retval == BKE_READ_EXOTIC_OK_OTHER)
                BKE_write_undo(C, "Import file");

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs