← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/blender/gutsy-security

« back to all changes in this revision

Viewing changes to source/blender/src/editimasel.c

  • Committer: Bazaar Package Importer
  • Author(s): Lukas Fittl
  • Date: 2006-09-20 01:57:27 UTC
  • mfrom: (1.2.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20060920015727-gmoqlxwstx9wwqs3
Tags: 2.42a-1ubuntu1
* Merge from Debian unstable (Closes: Malone #55903). Remaining changes:
  - debian/genpot: Add python scripts from Lee June <blender@eyou.com> to
    generate a reasonable PO template from the sources. Since gettext is used
    in a highly nonstandard way, xgettext does not work for this job.
  - debian/rules: Call the scripts, generate po/blender.pot, and clean it up
    in the clean target.
  - Add a proper header to the generated PO template.
* debian/control: Build depend on libavformat-dev >= 3:0.cvs20060823-3.1,
  otherwise this package will FTBFS

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/src/editimasel.c
1
1
/**
2
 
 * $Id: editimasel.c,v 1.17 2005/03/19 21:08:12 zuster Exp $
 
2
 * $Id: editimasel.c,v 1.18 2006/01/28 18:33:18 hos Exp $
3
3
 *
4
4
 * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
5
5
 *
179
179
                        queredraw = 1;
180
180
                        
181
181
                case 1: /* dir entry */
182
 
                        checkdir(simasel->dir);
 
182
                        BLI_cleanup_dir(G.sce, simasel->dir);
183
183
                        clear_ima_dir(simasel);
184
184
                        queredraw = 1;
185
185
                        break;
188
188
                        selname= fsmenu_get_entry(simasel->fileselmenuitem-1);
189
189
                        if (selname) {
190
190
                                strcpy(simasel->dir, selname);
191
 
                                checkdir(simasel->dir);
 
191
                                BLI_cleanup_dir(G.sce, simasel->dir);
192
192
                                clear_ima_dir(simasel);
193
193
                            queredraw = 1;
194
194
                        }
349
349
                }
350
350
                if (G.qual == 0){
351
351
                        imadir_parent(simasel);
352
 
                        checkdir(simasel->dir);
 
352
                        BLI_cleanup_dir(G.sce, simasel->dir);
353
353
                        clear_ima_dir(simasel);
354
354
                        queredraw = 1;
355
355
                }