[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17748] branches/blender2.5/blender/source /blender/windowmanager/intern: 2.5

[Ton Roosendaal]

Revision: 17748
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17748
Author:   ton
Date:     2008-12-08 17:43:19 +0100 (Mon, 08 Dec 2008)

Log Message:
-----------
2.5

Minor cleanups.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/windowmanager/intern/wm.c
    
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c
    branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c

Modified: branches/blender2.5/blender/source/blender/windowmanager/intern/wm.c
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/intern/wm.c        
2008-12-08 15:02:57 UTC (rev 17747)
+++ branches/blender2.5/blender/source/blender/windowmanager/intern/wm.c        
2008-12-08 16:43:19 UTC (rev 17748)
@@ -74,11 +74,6 @@
 {
        int tot;
 
-       if(op->ptr) {
-       //      MEM_freeN(op->ptr);
-       //      op->ptr= NULL;
-       }
-       
        BLI_addtail(&wm->operators, op);
        tot= BLI_countlist(&wm->operators);
        
@@ -130,7 +125,7 @@
 }
 
 
-/* context is allowed to be NULL, do net free wm itself (library.c) */
+/* context is allowed to be NULL, do not free wm itself (library.c) */
 void wm_close_and_free(bContext *C, wmWindowManager *wm)
 {
        wmWindow *win;

Modified: 
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- 
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c
   2008-12-08 15:02:57 UTC (rev 17747)
+++ 
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c
   2008-12-08 16:43:19 UTC (rev 17748)
@@ -310,9 +310,11 @@
 
                if((retval & OPERATOR_FINISHED) && (ot->flag & 
OPTYPE_REGISTER)) {
                        wm_operator_register(C->wm, op);
+                       handler->op= NULL;
                }
                else if(!(retval & OPERATOR_RUNNING_MODAL)) {
                        wm_operator_free(op);
+                       handler->op= NULL;
                }
        }
 
@@ -400,6 +402,7 @@
                                handler->op= NULL;
                        }
                        
+                       
                        /* remove modal handler, operator itself should have 
been cancelled and freed */
                        if(retval & (OPERATOR_CANCELLED|OPERATOR_FINISHED)) {
                                BLI_remlink(handlers, handler);

Modified: 
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c  
2008-12-08 15:02:57 UTC (rev 17747)
+++ branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c  
2008-12-08 16:43:19 UTC (rev 17748)
@@ -872,7 +872,7 @@
        write_flags = G.fileflags & ~(G_FILE_COMPRESS | G_FILE_LOCK | 
G_FILE_SIGN);
        BLO_write_file(C, tstr, write_flags, &err);
        
-       return 1;
+       return OPERATOR_FINISHED;
 }
 
 void WM_write_autosave(bContext *C)


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