[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23211] trunk/blender/source/blender: Bugfixes:

[Joshua Leung]

Revision: 23211
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23211
Author:   aligorith
Date:     2009-09-14 12:56:40 +0200 (Mon, 14 Sep 2009)

Log Message:
-----------
Bugfixes:

* #19338: Crash when using Convert operator
Uninitialised var (basact)

* Spacebar when in 3D-View EditMode for Text gets overridden by Search Menu. 
I've tried adding a fix there, but it doesn't seem to work. Woraround for now 
is shift-space for entering text.

* Fixed some compiled warnings in wm_operators.c about naming of var named 
'main'

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_add.c
    trunk/blender/source/blender/windowmanager/intern/wm_operators.c

Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c    2009-09-14 
10:53:39 UTC (rev 23210)
+++ trunk/blender/source/blender/editors/object/object_add.c    2009-09-14 
10:56:40 UTC (rev 23211)
@@ -885,7 +885,7 @@
 static int convert_exec(bContext *C, wmOperator *op)
 {
        Scene *scene= CTX_data_scene(C);
-       Base *basen=NULL, *basact, *basedel=NULL;
+       Base *basen=NULL, *basact=NULL, *basedel=NULL;
        Object *ob, *ob1, *obact= CTX_data_active_object(C);
        DerivedMesh *dm;
        Curve *cu;

Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c    
2009-09-14 10:53:39 UTC (rev 23210)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c    
2009-09-14 10:56:40 UTC (rev 23211)
@@ -34,6 +34,7 @@
 #include <stdio.h>
 
 #include "DNA_ID.h"
+#include "DNA_object_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_userdef_types.h"
@@ -751,6 +752,7 @@
        if(CTX_wm_window(C)==NULL) return 0;
        if(CTX_wm_area(C) && CTX_wm_area(C)->spacetype==SPACE_CONSOLE) return 
0;  // XXX - so we can use the shortcut in the console
        if(CTX_wm_area(C) && CTX_wm_area(C)->spacetype==SPACE_TEXT) return 0;  
// XXX - so we can use the spacebar in the text editor
+       if(CTX_data_edit_object(C) && CTX_data_edit_object(C)->type==OB_CURVE) 
return 0; // XXX - so we can use the spacebar for entering text
        return 1;
 }
 
@@ -996,11 +998,10 @@
        char name[FILE_MAX], dir[FILE_MAX], libname[FILE_MAX], group[GROUP_MAX];
        int idcode;
        BlendHandle *bh;
-       struct Main *main= CTX_data_main(C);
+       struct Main *mainvar= CTX_data_main(C);
        struct Scene *scene= CTX_data_scene(C);
        struct Main *mainl= 0;
        
-       struct ScrArea *sa= CTX_wm_area(C);
        PropertyRNA *prop;
        int totfiles=0;
        short flag;
@@ -1015,7 +1016,7 @@
        } else if (group[0]==0) {
                BKE_report(op->reports, RPT_ERROR, "Nothing indicated");
                return OPERATOR_FINISHED;
-       } else if (BLI_streq(main->name, libname)) {
+       } else if (BLI_streq(mainvar->name, libname)) {
                BKE_report(op->reports, RPT_ERROR, "Cannot use current file as 
library");
                return OPERATOR_FINISHED;
        }
@@ -1063,11 +1064,11 @@
        BLO_library_append_end(C, mainl, &bh, idcode, flag);
        
        /* DISPLISTS? */
-       recalc_all_library_objects(main);
+       recalc_all_library_objects(mainvar);
 
        /* Append, rather than linking */
        if ((flag & FILE_LINK)==0) {
-               make_library_local(libname, main);
+               make_library_local(libname, mainvar);
        }
 
        /* do we need to do this? */


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