[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57065] blender-autokey:

[Campbell Barton]

Please write commit messages

On Tue, May 28, 2013 at 8:27 AM, Nicholas Rishel <rishel.nick at gmail.com> wrote:
> Revision: 57065
>           http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57065
> Author:   nicholas_rishel
> Date:     2013-05-27 22:27:04 +0000 (Mon, 27 May 2013)
> Log Message:
> -----------
>
>
> Modified Paths:
> --------------
>     blender-autokey/source/blender/editors/space_file/filesel.c
>     blender-autokey/source/blender/editors/space_file/space_file.c
>     blender-autokey/source/blender/editors/space_view3d/drawobject.c
>     blender-autokey/source/blender/windowmanager/intern/wm_event_system.c
>
> Added Paths:
> -----------
>     blender-autokey/
>
>
> Property changes on: blender-autokey
> ___________________________________________________________________
> Added: svn:ignore
>    + *.pdb
> .*
> TAGS
> cscope.out
> sgc.bat
> sgd.bat
> smc.bat
> ssenv.bat
> tags
> user-config.py
> CMakeFiles
> CMakeCache.txt
> blender.bin
> blender.kdev4
> .kdev4
>
> Added: svn:externals
>    +
>
> Added: svn:mergeinfo
>    + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
> /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
> /branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
>
> Modified: blender-autokey/source/blender/editors/space_file/filesel.c
> ===================================================================
> --- trunk/blender/source/blender/editors/space_file/filesel.c   2013-05-27 18:51:31 UTC (rev 57061)
> +++ blender-autokey/source/blender/editors/space_file/filesel.c 2013-05-27 22:27:04 UTC (rev 57065)
> @@ -254,6 +254,8 @@
>         /* initialize the list with previous folders */
>         if (!sfile->folders_prev)
>                 sfile->folders_prev = folderlist_new();
> +       if (!sfile->params->dir[0])
> +               BLI_cleanup_dir(G.main->name, sfile->params->dir);
>         folderlist_pushdir(sfile->folders_prev, sfile->params->dir);
>
>         /* switching thumbnails needs to recalc layout [#28809] */
>
> Modified: blender-autokey/source/blender/editors/space_file/space_file.c
> ===================================================================
> --- trunk/blender/source/blender/editors/space_file/space_file.c        2013-05-27 18:51:31 UTC (rev 57061)
> +++ blender-autokey/source/blender/editors/space_file/space_file.c      2013-05-27 22:27:04 UTC (rev 57065)
> @@ -442,6 +442,10 @@
>         RNA_boolean_set(kmi->ptr, "fill", TRUE);
>         RNA_boolean_set(kmi->ptr, "open", FALSE);
>
> +       /* front and back mouse folder navigation */
> +       WM_keymap_add_item(keymap, "FILE_OT_previous", BUTTON4MOUSE, KM_CLICK, 0, 0);
> +       WM_keymap_add_item(keymap, "FILE_OT_next", BUTTON5MOUSE, KM_CLICK, 0, 0);
> +
>         WM_keymap_add_item(keymap, "FILE_OT_select_all_toggle", AKEY, KM_PRESS, 0, 0);
>         WM_keymap_add_item(keymap, "FILE_OT_refresh", PADPERIOD, KM_PRESS, 0, 0);
>         WM_keymap_add_item(keymap, "FILE_OT_select_border", BKEY, KM_PRESS, 0, 0);
>
> Modified: blender-autokey/source/blender/editors/space_view3d/drawobject.c
> ===================================================================
> --- trunk/blender/source/blender/editors/space_view3d/drawobject.c      2013-05-27 18:51:31 UTC (rev 57061)
> +++ blender-autokey/source/blender/editors/space_view3d/drawobject.c    2013-05-27 22:27:04 UTC (rev 57065)
> @@ -6321,7 +6321,12 @@
>             (G.moving & G_TRANSFORM_OBJ) &&
>             (base->flag & (SELECT + BA_WAS_SEL)))
>         {
> -               theme_id = TH_TRANSFORM;
> +               if (scene->toolsettings->autokey_mode & AUTOKEY_ON) {
> +                       theme_id = TH_EDGE_CREASE; /* XXX improper use of theme colors to test autokey indication color */
> +               }
> +               else {
> +                       theme_id = TH_TRANSFORM;
> +               }
>         }
>         else {
>                 /* Sets the 'colindex' */
>
> Modified: blender-autokey/source/blender/windowmanager/intern/wm_event_system.c
> ===================================================================
> --- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c 2013-05-27 18:51:31 UTC (rev 57061)
> +++ blender-autokey/source/blender/windowmanager/intern/wm_event_system.c       2013-05-27 22:27:04 UTC (rev 57065)
> @@ -1545,7 +1545,7 @@
>         return WM_HANDLER_BREAK;
>  }
>
> -/* fileselect handlers are only in the window queue, so it's save to switch screens or area types */
> +/* fileselect handlers are only in the window queue, so it's safe to switch screens or area types */
>  static int wm_handler_fileselect_call(bContext *C, ListBase *handlers, wmEventHandler *handler, wmEvent *event)
>  {
>         wmWindowManager *wm = CTX_wm_manager(C);
>
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at blender.org
> http://lists.blender.org/mailman/listinfo/bf-blender-cvs



-- 
- Campbell