diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-05-14 20:59:17 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-05-14 20:59:17 +0400 |
commit | 56cba0bb76e48a0391108951d94a235075b8bd12 (patch) | |
tree | 648e8423601390e145091c2afdc568638f6dc932 /release | |
parent | e66002841df17ca8663524ffc3d651a743ff9540 (diff) | |
parent | d1b04a3a9d67f054d978c407461c3f92161a4cc8 (diff) |
Apricot Branch
==============
svn merge -r 14780:HEAD
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/3ds_export.py | 2 | ||||
-rw-r--r-- | release/scripts/bevel_center.py | 2 | ||||
-rw-r--r-- | release/scripts/blenderLipSynchro.py | 2 | ||||
-rw-r--r-- | release/scripts/export_m3g.py | 4 | ||||
-rw-r--r-- | release/scripts/hotkeys.py | 4 | ||||
-rw-r--r-- | release/scripts/import_dxf.py | 5 | ||||
-rw-r--r-- | release/scripts/paths_import.py | 5 | ||||
-rw-r--r-- | release/scripts/rvk1_torvk2.py | 4 | ||||
-rw-r--r-- | release/scripts/uvcalc_lightmap.py | 4 |
9 files changed, 18 insertions, 14 deletions
diff --git a/release/scripts/3ds_export.py b/release/scripts/3ds_export.py index 0209b04844a..54e1ea3db33 100644 --- a/release/scripts/3ds_export.py +++ b/release/scripts/3ds_export.py @@ -1,5 +1,5 @@ #!BPY - +# coding: utf-8 """ Name: '3D Studio (.3ds)...' Blender: 243 diff --git a/release/scripts/bevel_center.py b/release/scripts/bevel_center.py index 105112e6ec3..063c6380483 100644 --- a/release/scripts/bevel_center.py +++ b/release/scripts/bevel_center.py @@ -1,5 +1,5 @@ #!BPY - +# coding: utf-8 """ Registration info for Blender menus Name: 'Bevel Center' Blender: 243 diff --git a/release/scripts/blenderLipSynchro.py b/release/scripts/blenderLipSynchro.py index ef765086e25..c4815811512 100644 --- a/release/scripts/blenderLipSynchro.py +++ b/release/scripts/blenderLipSynchro.py @@ -1,5 +1,5 @@ #!BPY - +# coding: utf-8 """ Name: 'BlenderLipSynchro' Blender: 242 diff --git a/release/scripts/export_m3g.py b/release/scripts/export_m3g.py index 08215b3d027..86ac03cc407 100644 --- a/release/scripts/export_m3g.py +++ b/release/scripts/export_m3g.py @@ -1,4 +1,5 @@ #!BPY +# coding: utf-8 """ Registration info for Blender menus: Name: 'M3G (.m3g, .java)...' Blender: 244 @@ -3069,4 +3070,5 @@ def file_callback_m3g(filename): Window.RedrawAll() if __name__ == '__main__': - gui()
\ No newline at end of file + gui() + diff --git a/release/scripts/hotkeys.py b/release/scripts/hotkeys.py index bfaac252b21..929132933ec 100644 --- a/release/scripts/hotkeys.py +++ b/release/scripts/hotkeys.py @@ -1,5 +1,5 @@ #!BPY - +# coding: utf-8 """ Registration info for Blender menus: Name: 'HotKey and MouseAction Reference' Blender: 242 @@ -918,4 +918,4 @@ def bevent(evt): Blender.Window.Redraw() if __name__ == '__main__': - Register(draw, event, bevent)
\ No newline at end of file + Register(draw, event, bevent) diff --git a/release/scripts/import_dxf.py b/release/scripts/import_dxf.py index 4fa7a6472cf..88b42e3e564 100644 --- a/release/scripts/import_dxf.py +++ b/release/scripts/import_dxf.py @@ -1,5 +1,5 @@ #!BPY - +# coding: utf-8 """ Name: 'Autodesk DXF (.dxf)' Blender: 244 @@ -5942,4 +5942,5 @@ if 1: main(_dxf) print 'TOTAL TIME: %.6f' % (Blender.sys.time() - TIME) -"""
\ No newline at end of file +""" + diff --git a/release/scripts/paths_import.py b/release/scripts/paths_import.py index 6afb5c8ebba..b35d7fe5c65 100644 --- a/release/scripts/paths_import.py +++ b/release/scripts/paths_import.py @@ -1,5 +1,5 @@ #!BPY - +# coding: utf-8 """ Name: 'Paths (.svg, .ps, .eps, .ai, Gimp)' Blender: 233 @@ -92,4 +92,5 @@ elif argv=='Gimp_2_0': fonctionSELECT = functionSELECT # can they all be called function? text = 'Import %s' % argv -Blender.Window.FileSelector (fonctionSELECT, text)
\ No newline at end of file +Blender.Window.FileSelector (fonctionSELECT, text) + diff --git a/release/scripts/rvk1_torvk2.py b/release/scripts/rvk1_torvk2.py index c8d6fe0e741..c723efb61a7 100644 --- a/release/scripts/rvk1_torvk2.py +++ b/release/scripts/rvk1_torvk2.py @@ -1,5 +1,5 @@ #!BPY - +# coding: utf-8 """ Registration info for Blender menus: <- these words are ignored Name: 'Deformed mesh to Rvk' Blender: 243 @@ -270,4 +270,4 @@ def deform2rvk(): EDITMODE=Blender.Window.EditMode() Blender.Window.EditMode(0) deform2rvk() -Blender.Window.EditMode(EDITMODE)
\ No newline at end of file +Blender.Window.EditMode(EDITMODE) diff --git a/release/scripts/uvcalc_lightmap.py b/release/scripts/uvcalc_lightmap.py index 3b7c3ac7cf9..bd5a72995cb 100644 --- a/release/scripts/uvcalc_lightmap.py +++ b/release/scripts/uvcalc_lightmap.py @@ -517,7 +517,7 @@ def main(): if not Draw.PupBlock('Lightmap Pack', [\ 'Context...', - ('Active Object', PREF_ACT_ONLY, 'If disabled, use all objects for packing the lightmap.'),\ + ('Active Object', PREF_ACT_ONLY, 'If disabled, include other selected objects for packing the lightmap.'),\ ('Selected Faces', PREF_SEL_ONLY, 'Use only selected faces from all selected meshes.'),\ 'Image & UVs...', ('Share Tex Space', PREF_PACK_IN_ONE, 'Objects Share texture space, map all objects into 1 uvmap'),\ @@ -538,7 +538,7 @@ def main(): return meshes = [ ob.getData(mesh=1) ] else: - meshes = dict([ (me.name, me) for ob in scn.objects.context for me in (ob.getData(mesh=1),) if not me.lib]) + meshes = dict([ (me.name, me) for ob in scn.objects.context for me in (ob.getData(mesh=1),) if not me.lib if len(me.faces)]) meshes = meshes.values() if not meshes: Draw.PupMenu('Error%t|No mesh objects selected.') |