style cleanyp: split > 120 width lines.
authorCampbell Barton <ideasman42@gmail.com>
Sun, 19 Feb 2012 06:00:20 +0000 (06:00 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 19 Feb 2012 06:00:20 +0000 (06:00 +0000)
source/blender/editors/object/object_edit.c
source/blender/windowmanager/intern/wm_draw.c
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_gesture.c
source/blender/windowmanager/intern/wm_keymap.c
source/blender/windowmanager/intern/wm_operators.c
source/blender/windowmanager/intern/wm_window.c

index 1286ac8..b7affcd 100644 (file)
@@ -1004,7 +1004,10 @@ static void UNUSED_FUNCTION(copy_attr_menu)(Main *bmain, Scene *scene, View3D *v
         * view3d_edit_object_copyattrmenu() and in toolbox.c
         */
        
-       strcpy(str, "Copy Attributes %t|Location%x1|Rotation%x2|Size%x3|Draw Options%x4|Time Offset%x5|Dupli%x6|Object Color%x31|%l|Mass%x7|Damping%x8|All Physical Attributes%x11|Properties%x9|Logic Bricks%x10|Protected Transform%x29|%l");
+       strcpy(str,
+              "Copy Attributes %t|Location%x1|Rotation%x2|Size%x3|Draw Options%x4|"
+              "Time Offset%x5|Dupli%x6|Object Color%x31|%l|Mass%x7|Damping%x8|All Physical Attributes%x11|Properties%x9|"
+              "Logic Bricks%x10|Protected Transform%x29|%l");
        
        strcat (str, "|Object Constraints%x22");
        strcat (str, "|NLA Strips%x26");
index 4fe1104..df4ebfd 100644 (file)
@@ -90,9 +90,16 @@ static void wm_paintcursor_draw(bContext *C, ARegion *ar)
                                        if (ELEM(win->grabcursor, GHOST_kGrabWrap, GHOST_kGrabHide)) {
                                                int x = 0, y = 0;
                                                wm_get_cursor_position(win, &x, &y);
-                                               pc->draw(C, x - ar_other->winrct.xmin, y - ar_other->winrct.ymin, pc->customdata);
-                                       } else {
-                                               pc->draw(C, win->eventstate->x - ar_other->winrct.xmin, win->eventstate->y - ar_other->winrct.ymin, pc->customdata);
+                                               pc->draw(C,
+                                                        x - ar_other->winrct.xmin,
+                                                        y - ar_other->winrct.ymin,
+                                                        pc->customdata);
+                                       }
+                                       else {
+                                               pc->draw(C,
+                                                        win->eventstate->x - ar_other->winrct.xmin,
+                                                        win->eventstate->y - ar_other->winrct.ymin,
+                                                        pc->customdata);
                                        }
                                }
                        }
@@ -458,7 +465,8 @@ static int wm_triple_gen_textures(wmWindow *win, wmDrawTriple *triple)
 
                        if(triple->x[x] > maxsize || triple->y[y] > maxsize) {
                                glBindTexture(triple->target, 0);
-                               printf("WM: failed to allocate texture for triple buffer drawing (texture too large for graphics card).\n");
+                               printf("WM: failed to allocate texture for triple buffer drawing "
+                                      "(texture too large for graphics card).\n");
                                return 0;
                        }
 
index f7da70b..d78faa7 100644 (file)
@@ -82,7 +82,8 @@
 #  include "RNA_enum_types.h"
 #endif
 
-static int wm_operator_call_internal(bContext *C, wmOperatorType *ot, PointerRNA *properties, ReportList *reports, short context, short poll_only);
+static int wm_operator_call_internal(bContext *C, wmOperatorType *ot, PointerRNA *properties, ReportList *reports,
+                                     short context, short poll_only);
 
 /* ************ event management ************** */
 
@@ -223,7 +224,9 @@ void wm_event_do_notifiers(bContext *C)
                                }
                        }
 
-                       if(note->window==win || (note->window == NULL && (note->reference == NULL || note->reference == CTX_data_scene(C)))) {
+                       if (note->window == win ||
+                               (note->window == NULL && (note->reference == NULL || note->reference == CTX_data_scene(C))))
+                       {
                                if(note->category==NC_SCENE) {
                                        if(note->data==ND_FRAME)
                                                do_anim= 1;
@@ -637,7 +640,8 @@ int WM_operator_repeat_check(const bContext *UNUSED(C), wmOperator *op)
 
 static wmOperator *wm_operator_create(wmWindowManager *wm, wmOperatorType *ot, PointerRNA *properties, ReportList *reports)
 {
-       wmOperator *op= MEM_callocN(sizeof(wmOperator), ot->idname);    /* XXX operatortype names are static still. for debug */
+       /* XXX operatortype names are static still. for debug */
+       wmOperator *op= MEM_callocN(sizeof(wmOperator), ot->idname);
        
        /* XXX adding new operator could be function, only happens here now */
        op->type= ot;
@@ -818,8 +822,10 @@ static int wm_operator_invoke(bContext *C, wmOperatorType *ot, wmEvent *event, P
                        if(op->type->flag & OPTYPE_UNDO && CTX_wm_manager(C) == wm)
                                wm->op_undo_depth--;
                }
-               else
-                       printf("invalid operator call %s\n", ot->idname); /* debug, important to leave a while, should never happen */
+               else {
+                       /* debug, important to leave a while, should never happen */
+                       printf("invalid operator call '%s'\n", ot->idname);
+               }
                
                /* Note, if the report is given as an argument then assume the caller will deal with displaying them
                 * currently python only uses this */
@@ -842,9 +848,12 @@ static int wm_operator_invoke(bContext *C, wmOperatorType *ot, wmEvent *event, P
                                int wrap;
 
                                if (op->opm) {
-                                       wrap = (U.uiflag & USER_CONTINUOUS_MOUSE) && ((op->opm->flag & OP_GRAB_POINTER) || (op->opm->type->flag & OPTYPE_GRAB_POINTER));
-                               } else {
-                                       wrap = (U.uiflag & USER_CONTINUOUS_MOUSE) && ((op->flag & OP_GRAB_POINTER) || (ot->flag & OPTYPE_GRAB_POINTER));
+                                       wrap = (U.uiflag & USER_CONTINUOUS_MOUSE) &&
+                                              ((op->opm->flag & OP_GRAB_POINTER) || (op->opm->type->flag & OPTYPE_GRAB_POINTER));
+                               }
+                               else {
+                                       wrap = (U.uiflag & USER_CONTINUOUS_MOUSE) &&
+                                              ((op->flag & OP_GRAB_POINTER) || (ot->flag & OPTYPE_GRAB_POINTER));
                                }
 
                                /* exception, cont. grab in header is annoying */
@@ -860,7 +869,9 @@ static int wm_operator_invoke(bContext *C, wmOperatorType *ot, wmEvent *event, P
                                        ARegion *ar= CTX_wm_region(C);
                                        ScrArea *sa= CTX_wm_area(C);
 
-                                       if(ar && ar->regiontype == RGN_TYPE_WINDOW && event && BLI_in_rcti(&ar->winrct, event->x, event->y)) {
+                                       if (ar && ar->regiontype == RGN_TYPE_WINDOW && event &&
+                                           BLI_in_rcti(&ar->winrct, event->x, event->y))
+                                       {
                                                winrect= &ar->winrct;
                                        }
                                        else if(sa) {
@@ -895,7 +906,8 @@ static int wm_operator_invoke(bContext *C, wmOperatorType *ot, wmEvent *event, P
  * this is for python to access since its done the operator lookup
  * 
  * invokes operator in context */
-static int wm_operator_call_internal(bContext *C, wmOperatorType *ot, PointerRNA *properties, ReportList *reports, short context, short poll_only)
+static int wm_operator_call_internal(bContext *C, wmOperatorType *ot, PointerRNA *properties, ReportList *reports,
+                                     short context, short poll_only)
 {
        wmWindow *window= CTX_wm_window(C);
        wmEvent *event;
@@ -1297,7 +1309,8 @@ static void wm_event_modalkeymap(const bContext *C, wmOperator *op, wmEvent *eve
 }
 
 /* Warning: this function removes a modal handler, when finished */
-static int wm_handler_operator_call(bContext *C, ListBase *handlers, wmEventHandler *handler, wmEvent *event, PointerRNA *properties)
+static int wm_handler_operator_call(bContext *C, ListBase *handlers, wmEventHandler *handler,
+                                    wmEvent *event, PointerRNA *properties)
 {
        int retval= OPERATOR_PASS_THROUGH;
        
@@ -1615,9 +1628,10 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers)
                                if(!keymap->poll || keymap->poll(C)) {
                                        for(kmi= keymap->items.first; kmi; kmi= kmi->next) {
                                                if(wm_eventmatch(event, kmi)) {
-                                                       
-                                                       event->keymap_idname= kmi->idname;      /* weak, but allows interactive callback to not use rawkey */
-                                                       
+
+                                                       /* weak, but allows interactive callback to not use rawkey */
+                                                       event->keymap_idname = kmi->idname;
+
                                                        action |= wm_handler_operator_call(C, handlers, handler, event, kmi->ptr);
                                                        if(action & WM_HANDLER_BREAK)  /* not always_pass here, it denotes removed handler */
                                                                break;
@@ -1716,7 +1730,8 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers)
                        ) {
                                event->val = KM_DBL_CLICK;
                                /* removed this because in cases where we're this is used as a single click
-                                * event, this will give old coords, since the distance is checked above, using new coords should be ok. */
+                                * event, this will give old coords,
+                                * since the distance is checked above, using new coords should be ok. */
                                //   event->x = win->eventstate->prevclickx;
                                //   event->y = win->eventstate->prevclicky;
                                action |= wm_handlers_do(C, event, handlers);
@@ -2233,7 +2248,8 @@ void WM_event_remove_keymap_handler(ListBase *handlers, wmKeyMap *keymap)
        }
 }
 
-wmEventHandler *WM_event_add_ui_handler(const bContext *C, ListBase *handlers, wmUIHandlerFunc func, wmUIHandlerRemoveFunc remove, void *userdata)
+wmEventHandler *WM_event_add_ui_handler(const bContext *C, ListBase *handlers,
+                                        wmUIHandlerFunc func, wmUIHandlerRemoveFunc remove, void *userdata)
 {
        wmEventHandler *handler= MEM_callocN(sizeof(wmEventHandler), "event ui handler");
        handler->ui_handle= func;
@@ -2249,7 +2265,8 @@ wmEventHandler *WM_event_add_ui_handler(const bContext *C, ListBase *handlers, w
 }
 
 /* set "postpone" for win->modalhandlers, this is in a running for() loop in wm_handlers_do() */
-void WM_event_remove_ui_handler(ListBase *handlers, wmUIHandlerFunc func, wmUIHandlerRemoveFunc remove, void *userdata, int postpone)
+void WM_event_remove_ui_handler(ListBase *handlers,
+                                wmUIHandlerFunc func, wmUIHandlerRemoveFunc remove, void *userdata, int postpone)
 {
        wmEventHandler *handler;
        
@@ -2629,7 +2646,9 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int U
                case GHOST_kEventButtonDown:
                case GHOST_kEventButtonUp: {
                        GHOST_TEventButtonData *bd= customdata;
-                       event.val= (type==GHOST_kEventButtonDown) ? KM_PRESS:KM_RELEASE; /* Note!, this starts as 0/1 but later is converted to KM_PRESS/KM_RELEASE by tweak */
+
+                       /* Note!, this starts as 0/1 but later is converted to KM_PRESS/KM_RELEASE by tweak */
+                       event.val= (type==GHOST_kEventButtonDown) ? KM_PRESS:KM_RELEASE;
                        
                        if (bd->button == GHOST_kButtonMaskLeft)
                                event.type= LEFTMOUSE;
@@ -2700,7 +2719,8 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int U
 
                        if (event.utf8_buf[0]) {
                                if (BLI_str_utf8_size(event.utf8_buf) == -1) {
-                                       printf("%s: ghost detected an invalid unicode character '%d'!\n", __func__, (int)(unsigned char)event.utf8_buf[0]);
+                                       printf("%s: ghost detected an invalid unicode character '%d'!\n",
+                                              __func__, (int)(unsigned char)event.utf8_buf[0]);
                                        event.utf8_buf[0]= '\0';
                                }
                        }
@@ -2709,19 +2729,27 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int U
                        /* assigning both first and second is strange - campbell */
                        switch(event.type) {
                        case LEFTSHIFTKEY: case RIGHTSHIFTKEY:
-                               event.shift= evt->shift= (event.val==KM_PRESS) ? ((evt->ctrl || evt->alt || evt->oskey) ? (KM_MOD_FIRST | KM_MOD_SECOND) : KM_MOD_FIRST) : FALSE;
+                               event.shift = evt->shift = (event.val == KM_PRESS) ?
+                                               ((evt->ctrl || evt->alt || evt->oskey) ? (KM_MOD_FIRST | KM_MOD_SECOND) : KM_MOD_FIRST) :
+                                               FALSE;
                                break;
                        case LEFTCTRLKEY: case RIGHTCTRLKEY:
-                               event.ctrl= evt->ctrl= (event.val==KM_PRESS) ? ((evt->shift || evt->alt || evt->oskey) ? (KM_MOD_FIRST | KM_MOD_SECOND) : KM_MOD_FIRST) : FALSE;
+                               event.ctrl = evt->ctrl = (event.val == KM_PRESS) ?
+                                               ((evt->shift || evt->alt || evt->oskey) ? (KM_MOD_FIRST | KM_MOD_SECOND) : KM_MOD_FIRST) :
+                                               FALSE;
                                break;
                        case LEFTALTKEY: case RIGHTALTKEY:
-                               event.alt= evt->alt= (event.val==KM_PRESS) ? ((evt->ctrl || evt->shift || evt->oskey) ? (KM_MOD_FIRST | KM_MOD_SECOND) : KM_MOD_FIRST) : FALSE;
+                               event.alt = evt->alt = (event.val == KM_PRESS) ?
+                                               ((evt->ctrl || evt->shift || evt->oskey) ? (KM_MOD_FIRST | KM_MOD_SECOND) : KM_MOD_FIRST) :
+                                               FALSE;
                                break;
                        case OSKEY:
-                               event.oskey= evt->oskey= (event.val==KM_PRESS) ? ((evt->ctrl || evt->alt || evt->shift) ? (KM_MOD_FIRST | KM_MOD_SECOND) : KM_MOD_FIRST) : FALSE;
+                               event.oskey = evt->oskey = (event.val == KM_PRESS) ?
+                                               ((evt->ctrl || evt->alt || evt->shift) ? (KM_MOD_FIRST | KM_MOD_SECOND) : KM_MOD_FIRST) :
+                                               FALSE;
                                break;
                        default:
-                               if(event.val==KM_PRESS && event.keymodifier==0)
+                               if(event.val == KM_PRESS && event.keymodifier==0)
                                        evt->keymodifier= event.type; /* only set in eventstate, for next event */
                                else if(event.val==KM_RELEASE && event.keymodifier==event.type)
                                        event.keymodifier= evt->keymodifier= 0;
index a4c9088..bae6c7a 100644 (file)
@@ -391,7 +391,10 @@ void WM_read_file(bContext *C, const char *filepath, ReportList *reports)
                
 // XXX         mainwindow_set_filename_to_title(G.main->name);
 
-               if(retval == BKE_READ_FILE_OK_USERPREFS) wm_init_userdef(C);    // in case a userdef is read from regular .blend
+               if(retval == BKE_READ_FILE_OK_USERPREFS) {
+                       /* in case a userdef is read from regular .blend */
+                       wm_init_userdef(C);
+               }
                
                if (retval != BKE_READ_FILE_FAIL) {
                        G.relbase_valid = 1;
@@ -420,13 +423,20 @@ void WM_read_file(bContext *C, const char *filepath, ReportList *reports)
 
                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  */
+#if 0
+               /* gives popups on windows but not linux, bug in report API
+                * but disable for now to stop users getting annoyed  */
                /* TODO, make this show in header info window */
                {
                        Scene *sce;
-                       for(sce= G.main->scene.first; sce; sce= sce->id.next) {
-                               if(sce->r.engine[0] && BLI_findstring(&R_engines, sce->r.engine, offsetof(RenderEngineType, idname)) == NULL) {
-                                       BKE_reportf(reports, RPT_WARNING, "Engine not available: '%s' for scene: %s, an addon may need to be installed or enabled", sce->r.engine, sce->id.name+2);
+                       for (sce= G.main->scene.first; sce; sce= sce->id.next) {
+                               if (sce->r.engine[0] &&
+                                   BLI_findstring(&R_engines, sce->r.engine, offsetof(RenderEngineType, idname)) == NULL)
+                               {
+                                       BKE_reportf(reports, RPT_WARNING,
+                                                   "Engine not available: '%s' for scene: %s, "
+                                                   "an addon may need to be installed or enabled",
+                                                   sce->r.engine, sce->id.name+2);
                                }
                        }
                }
@@ -659,8 +669,10 @@ static ImBuf *blend_file_thumb(Scene *scene, int **thumb_pt)
                return NULL;
 
        /* gets scaled to BLEN_THUMB_SIZE */
-       ibuf= ED_view3d_draw_offscreen_imbuf_simple(scene, scene->camera, BLEN_THUMB_SIZE * 2, BLEN_THUMB_SIZE * 2, IB_rect, OB_SOLID, err_out);
-       
+       ibuf= ED_view3d_draw_offscreen_imbuf_simple(scene, scene->camera,
+                                                   BLEN_THUMB_SIZE * 2, BLEN_THUMB_SIZE * 2,
+                                                   IB_rect, OB_SOLID, err_out);
+
        if(ibuf) {              
                float aspect= (scene->r.xsch*scene->r.xasp) / (scene->r.ysch*scene->r.yasp);
 
index 4fb8751..acf6ded 100644 (file)
@@ -74,7 +74,9 @@ wmGesture *WM_gesture_new(bContext *C, wmEvent *event, int type)
        
        wm_subwindow_getorigin(window, gesture->swinid, &sx, &sy);
        
-       if( ELEM5(type, WM_GESTURE_RECT, WM_GESTURE_CROSS_RECT, WM_GESTURE_TWEAK, WM_GESTURE_CIRCLE, WM_GESTURE_STRAIGHTLINE)) {
+       if (ELEM5(type, WM_GESTURE_RECT, WM_GESTURE_CROSS_RECT, WM_GESTURE_TWEAK,
+                       WM_GESTURE_CIRCLE, WM_GESTURE_STRAIGHTLINE))
+       {
                rcti *rect= MEM_callocN(sizeof(rcti), "gesture rect new");
                
                gesture->customdata= rect;
index 661bd90..d603262 100644 (file)
@@ -767,7 +767,9 @@ char *WM_keymap_item_to_string(wmKeyMapItem *kmi, char *str, int len)
        return str;
 }
 
-static wmKeyMapItem *wm_keymap_item_find_handlers(const bContext *C, ListBase *handlers, const char *opname, int UNUSED(opcontext), IDProperty *properties, int compare_props, int hotkey, wmKeyMap **keymap_r)
+static wmKeyMapItem *wm_keymap_item_find_handlers(
+        const bContext *C, ListBase *handlers, const char *opname, int UNUSED(opcontext),
+        IDProperty *properties, int compare_props, int hotkey, wmKeyMap **keymap_r)
 {
        wmWindowManager *wm= CTX_wm_manager(C);
        wmEventHandler *handler;
@@ -806,7 +808,9 @@ static wmKeyMapItem *wm_keymap_item_find_handlers(const bContext *C, ListBase *h
        return NULL;
 }
 
-static wmKeyMapItem *wm_keymap_item_find_props(const bContext *C, const char *opname, int opcontext, IDProperty *properties, int compare_props, int hotkey, wmKeyMap **keymap_r)
+static wmKeyMapItem *wm_keymap_item_find_props(
+        const bContext *C, const char *opname, int opcontext,
+        IDProperty *properties, int compare_props, int hotkey, wmKeyMap **keymap_r)
 {
        wmWindow *win= CTX_wm_window(C);
        ScrArea *sa= CTX_wm_area(C);
@@ -854,7 +858,9 @@ static wmKeyMapItem *wm_keymap_item_find_props(const bContext *C, const char *op
        return found;
 }
 
-static wmKeyMapItem *wm_keymap_item_find(const bContext *C, const char *opname, int opcontext, IDProperty *properties, const short hotkey, const short sloppy, wmKeyMap **keymap_r)
+static wmKeyMapItem *wm_keymap_item_find(
+        const bContext *C, const char *opname, int opcontext,
+        IDProperty *properties, const short hotkey, const short sloppy, wmKeyMap **keymap_r)
 {
        wmKeyMapItem *found= wm_keymap_item_find_props(C, opname, opcontext, properties, 1, hotkey, keymap_r);
 
@@ -864,7 +870,9 @@ static wmKeyMapItem *wm_keymap_item_find(const bContext *C, const char *opname,
        return found;
 }
 
-char *WM_key_event_operator_string(const bContext *C, const char *opname, int opcontext, IDProperty *properties, const short sloppy, char *str, int len)
+char *WM_key_event_operator_string(
+        const bContext *C, const char *opname, int opcontext,
+        IDProperty *properties, const short sloppy, char *str, int len)
 {
        wmKeyMapItem *kmi= wm_keymap_item_find(C, opname, opcontext, properties, 0, sloppy, NULL);
        
@@ -876,7 +884,9 @@ char *WM_key_event_operator_string(const bContext *C, const char *opname, int op
        return NULL;
 }
 
-int WM_key_event_operator_id(const bContext *C, const char *opname, int opcontext, IDProperty *properties, int hotkey, wmKeyMap **keymap_r)
+int WM_key_event_operator_id(
+        const bContext *C, const char *opname, int opcontext,
+        IDProperty *properties, int hotkey, wmKeyMap **keymap_r)
 {
        wmKeyMapItem *kmi= wm_keymap_item_find(C, opname, opcontext, properties, hotkey, TRUE, keymap_r);
        
index 19c4516..eddd3c4 100644 (file)
@@ -153,7 +153,9 @@ void WM_operatortype_append(void (*opfunc)(wmOperatorType*))
                ot->name= IFACE_("Dummy Name");
        }
 
-       RNA_def_struct_ui_text(ot->srna, ot->name, ot->description ? ot->description:IFACE_("(undocumented operator)")); // XXX All ops should have a description but for now allow them not to.
+       // XXX All ops should have a description but for now allow them not to.
+       RNA_def_struct_ui_text(ot->srna, ot->name, ot->description ? ot->description:IFACE_("(undocumented operator)"));
+
        RNA_def_struct_identifier(ot->srna, ot->idname);
 
        BLI_ghash_insert(global_ops_hash, (void *)ot->idname, ot);
@@ -1136,7 +1138,8 @@ int WM_operator_props_popup(bContext *C, wmOperator *op, wmEvent *UNUSED(event))
 {
        
        if((op->type->flag & OPTYPE_REGISTER)==0) {
-               BKE_reportf(op->reports, RPT_ERROR, "Operator '%s' does not have register enabled, incorrect invoke function.", op->type->idname);
+               BKE_reportf(op->reports, RPT_ERROR,
+                           "Operator '%s' does not have register enabled, incorrect invoke function.", op->type->idname);
                return OPERATOR_CANCELLED;
        }
        
@@ -1845,7 +1848,10 @@ static void WM_OT_link_append(wmOperatorType *ot)
        
        ot->flag |= OPTYPE_UNDO;
 
-       WM_operator_properties_filesel(ot, FOLDERFILE|BLENDERFILE, FILE_LOADLIB, FILE_OPENFILE, WM_FILESEL_FILEPATH|WM_FILESEL_DIRECTORY|WM_FILESEL_FILENAME| WM_FILESEL_RELPATH|WM_FILESEL_FILES, FILE_DEFAULTDISPLAY);
+       WM_operator_properties_filesel(
+               ot, FOLDERFILE|BLENDERFILE, FILE_LOADLIB, FILE_OPENFILE,
+               WM_FILESEL_FILEPATH|WM_FILESEL_DIRECTORY|WM_FILESEL_FILENAME|WM_FILESEL_RELPATH|WM_FILESEL_FILES,
+               FILE_DEFAULTDISPLAY);
        
        RNA_def_boolean(ot->srna, "link", 1, "Link", "Link the objects or datablocks rather than appending");
        RNA_def_boolean(ot->srna, "autoselect", 1, "Select", "Select the linked objects");
@@ -3205,8 +3211,8 @@ static int radial_control_get_properties(bContext *C, wmOperator *op)
                return 0;
        
        /* slightly ugly; allow this property to not resolve
-          correctly. needed because 3d texture paint shares the same
-          keymap as 2d image paint */
+        * correctly. needed because 3d texture paint shares the same
+        * keymap as 2d image paint */
        if(!radial_control_get_path(&ctx_ptr, op, "zoom_path",
                                                                &rc->zoom_ptr, &rc->zoom_prop, 2,
                                                                RC_PROP_REQUIRE_FLOAT|RC_PROP_ALLOW_MISSING))
index fe967bb..599de56 100644 (file)
@@ -155,7 +155,8 @@ void wm_window_free(bContext *C, wmWindowManager *wm, wmWindow *win)
                        CTX_wm_window_set(C, NULL);
        }       
 
-       /* always set drawable and active to NULL, prevents non-drawable state of main windows (bugs #22967 and #25071, possibly #22477 too) */
+       /* always set drawable and active to NULL,
+        * prevents non-drawable state of main windows (bugs #22967 and #25071, possibly #22477 too) */
        wm->windrawable= NULL;
        wm->winactive= NULL;
 
@@ -751,7 +752,10 @@ static int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr private)
                                                        }
                                                        
                                                        if(type!=GHOST_kEventWindowSize) {
-                                                               if(G.f & G_DEBUG) printf("win move event pos %d %d size %d %d\n", win->posx, win->posy, win->sizex, win->sizey);
+                                                               if(G.f & G_DEBUG) {
+                                                                       printf("win move event pos %d %d size %d %d\n",
+                                                                              win->posx, win->posy, win->sizex, win->sizey);
+                                                               }
                                                        }
                                                        
                                                }