diff options
| author | Andre Susano Pinto <andresusanopinto@gmail.com> | 2008-09-19 16:05:45 +0400 |
|---|---|---|
| committer | Andre Susano Pinto <andresusanopinto@gmail.com> | 2008-09-19 16:05:45 +0400 |
| commit | 2f9f0710d140466f3b8030b66f4637b7f12b9d4a (patch) | |
| tree | e6d677c854c99f0416045d8c31577082d2bc6061 /release | |
| parent | 27de7cc2e178167ec51d2f3706ad6cadf2c68e65 (diff) | |
Revert last merge from trunk
svn merge -r 16539:16538 https://svn.blender.org/svnroot/bf-blender/branches/soc-2008-jaguarandi/
Diffstat (limited to 'release')
| -rw-r--r-- | release/datafiles/blenderbuttons | bin | 68242 -> 69599 bytes | |||
| -rw-r--r-- | release/scripts/mesh_cleanup.py | 32 | ||||
| -rw-r--r-- | release/scripts/object_find.py | 26 | ||||
| -rw-r--r-- | release/scripts/sysinfo.py | 2 |
4 files changed, 20 insertions, 40 deletions
diff --git a/release/datafiles/blenderbuttons b/release/datafiles/blenderbuttons Binary files differindex 6993840e51f..a4834091692 100644 --- a/release/datafiles/blenderbuttons +++ b/release/datafiles/blenderbuttons diff --git a/release/scripts/mesh_cleanup.py b/release/scripts/mesh_cleanup.py index 27adca335cb..608201acb98 100644 --- a/release/scripts/mesh_cleanup.py +++ b/release/scripts/mesh_cleanup.py @@ -121,29 +121,25 @@ def rem_unused_materials(me): material_users= dict( [(i,0) for i in xrange(len_materials)] ) for f in me.faces: - f_mat = f.mat # Make sure the face index isnt too big. this happens sometimes. - if f_mat >= len_materials: - f_mat = f.mat = 0 - material_users[f_mat] += 1 + if f.mat >= len_materials: + f.mat=0 + material_users[f.mat] += 1 - # mat_idx_subtract= 0 - # reindex_mapping= dict( [(i,0) for i in xrange(len_materials)] ) - - reindex_mapping_ls = range(len_materials) - for i in range(len_materials-1, -1, -1): + mat_idx_subtract= 0 + reindex_mapping= dict( [(i,0) for i in xrange(len_materials)] ) + i= len_materials + while i: + i-=1 + if material_users[i] == 0: - del reindex_mapping_ls[i] - del materials[i] + mat_idx_subtract+=1 + reindex_mapping[i]= mat_idx_subtract + materials.pop(i) rem_materials+=1 - reindex_mapping= {} - - for i, mat in enumerate(reindex_mapping_ls): - reindex_mapping[mat] = i - for f in me.faces: - f.mat= reindex_mapping[f.mat] + f.mat= f.mat - reindex_mapping[f.mat] me.materials= materials return rem_materials @@ -453,4 +449,4 @@ def main(): if __name__ == '__main__': - main()
\ No newline at end of file + main() diff --git a/release/scripts/object_find.py b/release/scripts/object_find.py index f12af07e3e4..0cfd6ad1d92 100644 --- a/release/scripts/object_find.py +++ b/release/scripts/object_find.py @@ -61,20 +61,8 @@ def get_object_images(ob): me.activeUVLayer = orig_uvlayer - - # Now get material images - for mat in me.materials: - if mat: - for mtex in mat.getTextures(): - if mtex: - tex = mtex.tex - i = tex.getImage() - if i: unique_images[i.name] = i - return unique_images.values() - - # Todo, support other object types, materials return [] @@ -130,7 +118,7 @@ def main(): def activate(ob, scn): bpy.data.scenes.active = scn scn.objects.selected = [] - scn.Layers = ob.Layers & (1<<20)-1 + scn.Layers = ob.Layers ob.sel = 1 def name_cmp(name_search, name_found): @@ -207,13 +195,11 @@ def main(): activate(ob, scn) return if NAME_TEXTURE: - for mtex in mat.getTextures(): - if mtex: - tex = mtex.tex - if tex: - if name_cmp(NAME_TEXTURE, tex.name): - activate(ob, scn) - return + for tex in mat.getTextures(): + if tex: + if name_cmp(NAME_MATERIAL, tex.name): + activate(ob, scn) + return Draw.PupMenu('No Objects Found') diff --git a/release/scripts/sysinfo.py b/release/scripts/sysinfo.py index 3a671e7221e..9f24885829c 100644 --- a/release/scripts/sysinfo.py +++ b/release/scripts/sysinfo.py @@ -94,8 +94,6 @@ output = Blender.Text.New(output_filename) output.write(header + "\n\n") -output.write("%s\n\n" % Blender.Get('buildinfo')) - output.write("Platform: %s\n========\n\n" % sys.platform) output.write("Python:\n======\n\n") |