[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14533] branches/apricot: changes from trunk

Campbell Barton ideasman42 at gmail.com
Wed Apr 23 23:11:02 CEST 2008 

Revision: 14533
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14533
Author:   campbellbarton
Date:     2008-04-23 23:11:02 +0200 (Wed, 23 Apr 2008)

Log Message:
-----------
changes from trunk

Modified Paths:
--------------
    branches/apricot/release/scripts/3ds_import.py
    branches/apricot/release/scripts/DirectX8Exporter.py
    branches/apricot/release/scripts/ac3d_export.py
    branches/apricot/release/scripts/ac3d_import.py
    branches/apricot/release/scripts/bevel_center.py
    branches/apricot/release/scripts/collada_export.py
    branches/apricot/release/scripts/collada_import.py
    branches/apricot/release/scripts/config.py
    branches/apricot/release/scripts/console.py
    branches/apricot/release/scripts/envelope_symmetry.py
    branches/apricot/release/scripts/export_lightwave_motion.py
    branches/apricot/release/scripts/export_mdd.py
    branches/apricot/release/scripts/faceselect_same_weights.py
    branches/apricot/release/scripts/flt_export.py
    branches/apricot/release/scripts/flt_import.py
    branches/apricot/release/scripts/flt_palettemanager.py
    branches/apricot/release/scripts/flt_toolbar.py
    branches/apricot/release/scripts/help_browser.py
    branches/apricot/release/scripts/help_getting_started.py
    branches/apricot/release/scripts/help_manual.py
    branches/apricot/release/scripts/help_release_notes.py
    branches/apricot/release/scripts/help_tutorials.py
    branches/apricot/release/scripts/help_web_blender.py
    branches/apricot/release/scripts/help_web_devcomm.py
    branches/apricot/release/scripts/help_web_eshop.py
    branches/apricot/release/scripts/help_web_usercomm.py
    branches/apricot/release/scripts/image_edit.py
    branches/apricot/release/scripts/import_lightwave_motion.py
    branches/apricot/release/scripts/lightwave_export.py
    branches/apricot/release/scripts/md2_export.py
    branches/apricot/release/scripts/md2_import.py
    branches/apricot/release/scripts/mesh_boneweight_copy.py
    branches/apricot/release/scripts/mesh_cleanup.py
    branches/apricot/release/scripts/mesh_edges2curves.py
    branches/apricot/release/scripts/mesh_mirror_tool.py
    branches/apricot/release/scripts/mesh_poly_reduce.py
    branches/apricot/release/scripts/obdatacopier.py
    branches/apricot/release/scripts/object_apply_def.py
    branches/apricot/release/scripts/object_batch_name_edit.py
    branches/apricot/release/scripts/off_export.py
    branches/apricot/release/scripts/off_import.py
    branches/apricot/release/scripts/paths_import.py
    branches/apricot/release/scripts/raw_export.py
    branches/apricot/release/scripts/raw_import.py
    branches/apricot/release/scripts/renameobjectbyblock.py
    branches/apricot/release/scripts/render_save_layers.py
    branches/apricot/release/scripts/rvk1_torvk2.py
    branches/apricot/release/scripts/save_theme.py
    branches/apricot/release/scripts/scripttemplate_object_edit.py
    branches/apricot/release/scripts/slp_import.py
    branches/apricot/release/scripts/sysinfo.py
    branches/apricot/release/scripts/unweld.py
    branches/apricot/release/scripts/uv_from_adjacent.py
    branches/apricot/release/scripts/uvcalc_follow_active_coords.py
    branches/apricot/release/scripts/uvcalc_lightmap.py
    branches/apricot/release/scripts/uvcalc_quad_clickproj.py
    branches/apricot/release/scripts/uvcalc_smart_project.py
    branches/apricot/release/scripts/uvcopy.py
    branches/apricot/release/scripts/vertexpaint_gradient.py
    branches/apricot/release/scripts/vertexpaint_selfshadow_ao.py
    branches/apricot/release/scripts/vrml97_export.py
    branches/apricot/release/scripts/weightpaint_clean.py
    branches/apricot/release/scripts/weightpaint_gradient.py
    branches/apricot/release/scripts/weightpaint_grow_shrink.py
    branches/apricot/release/scripts/weightpaint_normalize.py
    branches/apricot/release/scripts/widgetwizard.py
    branches/apricot/release/scripts/xfig_export.py
    branches/apricot/release/scripts/xsi_export.py
    branches/apricot/source/blender/blenkernel/intern/collision.c
    branches/apricot/source/blender/blenkernel/intern/depsgraph.c
    branches/apricot/source/blender/blenkernel/intern/object.c
    branches/apricot/source/blender/blenlib/intern/util.c
    branches/apricot/source/blender/blenpluginapi/iff.h
    branches/apricot/source/blender/python/BPY_extern.h
    branches/apricot/source/blender/python/BPY_interface.c
    branches/apricot/source/blender/python/api2_2x/Node.c
    branches/apricot/source/blender/python/api2_2x/doc/API_related.py
    branches/apricot/source/blender/render/intern/source/convertblender.c
    branches/apricot/source/blender/src/buttons_object.c
    branches/apricot/source/blender/src/header_script.c
    branches/apricot/source/blender/src/headerbuttons.c
    branches/apricot/source/blender/src/seqeffects.c
    branches/apricot/source/blender/src/transform_conversions.c
    branches/apricot/source/blender/src/usiblender.c

Modified: branches/apricot/release/scripts/3ds_import.py
===================================================================
--- branches/apricot/release/scripts/3ds_import.py	2008-04-23 20:11:24 UTC (rev 14532)
+++ branches/apricot/release/scripts/3ds_import.py	2008-04-23 21:11:02 UTC (rev 14533)
@@ -6,9 +6,9 @@
 Tooltip: 'Import from 3DS file format (.3ds)'
 """
 
-__author__= ['Bob Holcomb', 'Richard L?rk?ng', 'Damien McGinnes', 'Campbell Barton']
+__author__= ['Bob Holcomb', 'Richard L?rk?ng', 'Damien McGinnes', 'Campbell Barton', 'Mario Lapin']
 __url__ = ("blenderartists.org", "www.blender.org", "www.gametutorials.com", "lib3ds.sourceforge.net/")
-__version__= '0.995'
+__version__= '0.996'
 __bpydoc__= '''\
 
 3ds Importer
@@ -17,6 +17,15 @@
 
 Loader is based on 3ds loader from www.gametutorials.com (Thanks DigiBen).
 
+0.996 by Mario Lapin (mario.lapin at gmail.com) 13/04/200 <br>
+ - Implemented workaround to correct association between name, geometry and materials of
+   imported meshes.
+   
+   Without this patch, version 0.995 of this importer would associate to each mesh object the
+   geometry and the materials of the previously parsed mesh object. By so, the name of the
+   first mesh object would be thrown away, and the name of the last mesh object would be
+   automatically merged with a '.001' at the end. No object would desappear, however object's
+   names and materials would be completely jumbled.
 
 0.995 by Campbell Barton<br>
 - workaround for buggy mesh vert delete
@@ -319,6 +328,7 @@
 	contextMesh_vertls= None
 	contextMesh_facels= None
 	contextMeshMaterials= {} # matname:[face_idxs]
+	contextMeshUV= None
 	
 	TEXTURE_DICT={}
 	MATDICT={}
@@ -422,6 +432,8 @@
 	#a spare chunk
 	new_chunk= chunk()
 	temp_chunk= chunk()
+	
+	CreateBlenderObject = False
 
 	#loop through all the data for this chunk (previous chunk) and see what it is
 	while (previous_chunk.bytes_read<previous_chunk.length):
@@ -454,6 +466,20 @@
 
 		#is it an object chunk?
 		elif (new_chunk.ID==OBJECT):
+			
+			if CreateBlenderObject:
+				putContextMesh(contextMesh_vertls, contextMesh_facels, contextMeshMaterials)
+				contextMesh_vertls= []; contextMesh_facels= []
+			
+				## preparando para receber o proximo objeto
+				contextMeshMaterials= {} # matname:[face_idxs]
+				contextMeshUV= None
+				#contextMesh.vertexUV= 1 # Make sticky coords.
+				# Reset matrix
+				contextMatrix_rot= None
+				#contextMatrix_tx= None
+				
+			CreateBlenderObject= True
 			tempName= read_string(file)
 			contextObName= tempName
 			new_chunk.bytes_read += len(tempName)+1
@@ -637,20 +663,9 @@
 			#contextMatrix_tx= None
 			#print contextLamp.name, 
 			
-			
 		elif (new_chunk.ID==OBJECT_MESH):
-			# print 'Found an OBJECT_MESH chunk'
-			if contextMesh_facels != None: # Write context mesh if we have one.
-				putContextMesh(contextMesh_vertls, contextMesh_facels, contextMeshMaterials)
-			
-			contextMesh_vertls= []; contextMesh_facels= []
-			
-			contextMeshMaterials= {} # matname:[face_idxs]
-			contextMeshUV= None
-			#contextMesh.vertexUV= 1 # Make sticky coords.
-			# Reset matrix
-			contextMatrix_rot= None
-			#contextMatrix_tx= None
+			## @@ PATCH
+			print 'Found an OBJECT_MESH chunk'
 		
 		elif (new_chunk.ID==OBJECT_VERTICES):
 			'''
@@ -979,4 +994,4 @@
 
 	print 'TOTAL TIME: %.6f' % (Blender.sys.time() - TIME)
 
-'''
\ No newline at end of file
+'''

Modified: branches/apricot/release/scripts/DirectX8Exporter.py
===================================================================
--- branches/apricot/release/scripts/DirectX8Exporter.py	2008-04-23 20:11:24 UTC (rev 14532)
+++ branches/apricot/release/scripts/DirectX8Exporter.py	2008-04-23 21:11:02 UTC (rev 14533)
@@ -7,7 +7,7 @@
 # Tooltip: 'Export to DirectX text file format format for XNA Animation Component Library.'
 """
 __author__ = "minahito (original:Arben (Ben) Omari)"
-__url__ = ("blender", "elysiun", "Adjuster's site http://sunday-lab.blogspot.com/, Author's site http://www.omariben.too.it")
+__url__ = ("blender", "blenderartists.org", "Adjuster's site http://sunday-lab.blogspot.com/, Author's site http://www.omariben.too.it")
 __version__ = "3.0"
 
 __bpydoc__ = """\

Modified: branches/apricot/release/scripts/ac3d_export.py
===================================================================
--- branches/apricot/release/scripts/ac3d_export.py	2008-04-23 20:11:24 UTC (rev 14532)
+++ branches/apricot/release/scripts/ac3d_export.py	2008-04-23 21:11:02 UTC (rev 14533)
@@ -8,7 +8,7 @@
 """
 
 __author__ = "Willian P. Germano"
-__url__ = ("blender", "elysiun", "AC3D's homepage, http://www.ac3d.org",
+__url__ = ("blender", "blenderartists.org", "AC3D's homepage, http://www.ac3d.org",
 	"PLib 3d gaming lib, http://plib.sf.net")
 __version__ = "2.44 2007-05-05"
 

Modified: branches/apricot/release/scripts/ac3d_import.py
===================================================================
--- branches/apricot/release/scripts/ac3d_import.py	2008-04-23 20:11:24 UTC (rev 14532)
+++ branches/apricot/release/scripts/ac3d_import.py	2008-04-23 21:11:02 UTC (rev 14533)
@@ -8,7 +8,7 @@
 """
 
 __author__ = "Willian P. Germano"
-__url__ = ("blender", "elysiun", "AC3D's homepage, http://www.ac3d.org",
+__url__ = ("blender", "blenderartists.org", "AC3D's homepage, http://www.ac3d.org",
 	"PLib 3d gaming lib, http://plib.sf.net")
 __version__ = "2.43.1 2007-02-21"
 

Modified: branches/apricot/release/scripts/bevel_center.py
===================================================================
--- branches/apricot/release/scripts/bevel_center.py	2008-04-23 20:11:24 UTC (rev 14532)
+++ branches/apricot/release/scripts/bevel_center.py	2008-04-23 21:11:02 UTC (rev 14533)
@@ -8,7 +8,7 @@
 """
 
 __author__ = "Loic BERTHE"
-__url__ = ("blender", "elysiun")
+__url__ = ("blender", "blenderartists.org")
 __version__ = "2.0"
 
 __bpydoc__ = """\

Modified: branches/apricot/release/scripts/collada_export.py
===================================================================
--- branches/apricot/release/scripts/collada_export.py	2008-04-23 20:11:24 UTC (rev 14532)
+++ branches/apricot/release/scripts/collada_export.py	2008-04-23 21:11:02 UTC (rev 14533)
@@ -8,7 +8,7 @@
 """
 
 __author__ = "Mikael Lagre"
-__url__ = ("blender", "elysiun", "Project homepage, http://colladablender.sourceforge.net", "Official Collada site, http://www.collada.org")
+__url__ = ("blender", "blenderartists.org", "Project homepage, http://colladablender.sourceforge.net", "Official Collada site, http://www.collada.org")
 __version__ = "0.4"
 __bpydoc__ = """
 Description:

Modified: branches/apricot/release/scripts/collada_import.py
===================================================================
--- branches/apricot/release/scripts/collada_import.py	2008-04-23 20:11:24 UTC (rev 14532)
+++ branches/apricot/release/scripts/collada_import.py	2008-04-23 21:11:02 UTC (rev 14533)
@@ -8,7 +8,7 @@
 """
 
 __author__ = "Mikael Lagre"
-__url__ = ("blender", "elysiun", "Project homepage, http://colladablender.sourceforge.net",)
+__url__ = ("blender", "blenderartist.org", "Project homepage, http://colladablender.sourceforge.net",)
 __version__ = "0.4"
 __bpydoc__ = """\Description: Imports a COLLADA 1.3.1 file into a Blender scene.
 Usage: Run the script from the menu or inside Blender.  

Modified: branches/apricot/release/scripts/config.py
===================================================================
--- branches/apricot/release/scripts/config.py	2008-04-23 20:11:24 UTC (rev 14532)
+++ branches/apricot/release/scripts/config.py	2008-04-23 21:11:02 UTC (rev 14533)
@@ -10,7 +10,7 @@
 __author__ = "Willian P. Germano"
 __version__ = "0.1 2005/04/14"
 __email__ = ('scripts', 'Author, wgermano:ig*com*br')
-__url__ = ('blender', 'elysiun')
+__url__ = ('blender', 'blenderartists.org')
 
 __bpydoc__ ="""\
 This script can be used to view and edit configuration data stored

Modified: branches/apricot/release/scripts/console.py
===================================================================
--- branches/apricot/release/scripts/console.py	2008-04-23 20:11:24 UTC (rev 14532)
+++ branches/apricot/release/scripts/console.py	2008-04-23 21:11:02 UTC (rev 14533)
@@ -1,14 +1,14 @@
 #!BPY
 
 """
-Name: 'Interactive Console'
-Blender: 237
+Name: 'Interactive Python Console'
+Blender: 245
 Group: 'System'
 Tooltip: 'Interactive Python Console'
 """
 
-__author__ = "Campbell Barton AKA Ideasman"
-__url__ = ["Author's homepage, http://members.iinet.net.au/~cpbarton/ideasman/", "blender", "elysiun", "Official Python site, http://www.python.org"]
+__author__ = "Campbell Barton aka ideasman42"
+__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"]
 __bpydoc__ = """\
 This is an interactive console, similar to Python's own command line interpreter.  Since it is embedded in Blender, it has access to all Blender Python modules.
 
@@ -26,8 +26,6 @@
   - Ctrl + Enter: auto compleate based on variable names and modules loaded -- multiple choices popup a menu;<br>
   - Shift + Enter: multiline functions -- delays executing code until only Enter is pressed.
 """
-__author__ = "Campbell Barton AKA Ideasman"
-__url__ = ["http://members.iinet.net.au/~cpbarton/ideasman/", "blender", "elysiun"]
 
 # -------------------------------------------------------------------------- 
 # ***** BEGIN GPL LICENSE BLOCK ***** 

Modified: branches/apricot/release/scripts/envelope_symmetry.py
===================================================================
--- branches/apricot/release/scripts/envelope_symmetry.py	2008-04-23 20:11:24 UTC (rev 14532)
+++ branches/apricot/release/scripts/envelope_symmetry.py	2008-04-23 21:11:02 UTC (rev 14533)
@@ -8,7 +8,7 @@
 """
 
 __author__ = "Jonas Petersen"
-__url__ = ("blender", "elysiun", "Script's homepage, http://www.mindfloaters.de/blender/", "thread at blender.org, http://www.blender.org/modules.php?op=modload&name=phpBB2&file=viewtopic&t=4858 ")
+__url__ = ("blender", "blenderartists.org", "Script's homepage, http://www.mindfloaters.de/blender/", "thread at blender.org, http://www.blender.org/modules.php?op=modload&name=phpBB2&file=viewtopic&t=4858 ")
 __version__ = "0.9 2004-11-10"
 __doc__ = """\
 This script creates perfectly symmetrical envelope sets.  It is part of the

Modified: branches/apricot/release/scripts/export_lightwave_motion.py
===================================================================

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list