Revision: 23513
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23513
Author: campbellbarton
Date: 2009-09-28 05:19:52 +0200 (Mon, 28 Sep 2009)
Log Message:
-----------
- removed 2.4x release/scripts
- moved release/io and release/ui into release/scripts/io, ui
- updated scons, cmake, make
When porting 2.4x scripts back, use a command like this so as not to loose the
commit history...
svn cp
https://svn.blender.org/svnroot/bf-blender/branches/blender2.4/release/scripts/raw_import.py
release/scripts/io/import_raw.py
Modified Paths:
--------------
trunk/blender/SConstruct
trunk/blender/release/Makefile
trunk/blender/source/blender/blenloader/BLO_readfile.h
trunk/blender/source/blender/python/intern/bpy_interface.c
trunk/blender/source/creator/CMakeLists.txt
trunk/blender/source/darwin/Makefile
Added Paths:
-----------
trunk/blender/release/scripts/io/
trunk/blender/release/scripts/ui/
Removed Paths:
-------------
trunk/blender/release/io/
trunk/blender/release/scripts/3ds_export.py
trunk/blender/release/scripts/3ds_import.py
trunk/blender/release/scripts/Axiscopy.py
trunk/blender/release/scripts/DirectX8Exporter.py
trunk/blender/release/scripts/DirectX8Importer.py
trunk/blender/release/scripts/IDPropBrowser.py
trunk/blender/release/scripts/ac3d_export.py
trunk/blender/release/scripts/ac3d_import.py
trunk/blender/release/scripts/add_mesh_empty.py
trunk/blender/release/scripts/add_mesh_torus.py
trunk/blender/release/scripts/animation_bake_constraints.py
trunk/blender/release/scripts/animation_clean.py
trunk/blender/release/scripts/animation_trajectory.py
trunk/blender/release/scripts/armature_symmetry.py
trunk/blender/release/scripts/bevel_center.py
trunk/blender/release/scripts/blenderLipSynchro.py
trunk/blender/release/scripts/bpydata/
trunk/blender/release/scripts/bpymodules/
trunk/blender/release/scripts/bvh_import.py
trunk/blender/release/scripts/c3d_import.py
trunk/blender/release/scripts/camera_changer.py
trunk/blender/release/scripts/colladaExport14.py
trunk/blender/release/scripts/colladaImport14.py
trunk/blender/release/scripts/collada_export.py
trunk/blender/release/scripts/collada_import.py
trunk/blender/release/scripts/config.py
trunk/blender/release/scripts/console.py
trunk/blender/release/scripts/discombobulator.py
trunk/blender/release/scripts/envelope_symmetry.py
trunk/blender/release/scripts/export-iv-0.1.py
trunk/blender/release/scripts/export_dxf.py
trunk/blender/release/scripts/export_fbx.py
trunk/blender/release/scripts/export_lightwave_motion.py
trunk/blender/release/scripts/export_m3g.py
trunk/blender/release/scripts/export_map.py
trunk/blender/release/scripts/export_mdd.py
trunk/blender/release/scripts/export_obj.py
trunk/blender/release/scripts/faceselect_same_weights.py
trunk/blender/release/scripts/flt_defaultp.py
trunk/blender/release/scripts/flt_dofedit.py
trunk/blender/release/scripts/flt_export.py
trunk/blender/release/scripts/flt_filewalker.py
trunk/blender/release/scripts/flt_import.py
trunk/blender/release/scripts/flt_lodedit.py
trunk/blender/release/scripts/flt_palettemanager.py
trunk/blender/release/scripts/flt_properties.py
trunk/blender/release/scripts/flt_toolbar.py
trunk/blender/release/scripts/help_bpy_api.py
trunk/blender/release/scripts/help_browser.py
trunk/blender/release/scripts/hotkeys.py
trunk/blender/release/scripts/image_2d_cutout.py
trunk/blender/release/scripts/image_auto_layout.py
trunk/blender/release/scripts/image_billboard.py
trunk/blender/release/scripts/image_edit.py
trunk/blender/release/scripts/import_dxf.py
trunk/blender/release/scripts/import_edl.py
trunk/blender/release/scripts/import_lightwave_motion.py
trunk/blender/release/scripts/import_mdd.py
trunk/blender/release/scripts/import_obj.py
trunk/blender/release/scripts/import_web3d.py
trunk/blender/release/scripts/lightwave_export.py
trunk/blender/release/scripts/lightwave_import.py
trunk/blender/release/scripts/md2_export.py
trunk/blender/release/scripts/md2_import.py
trunk/blender/release/scripts/mesh_boneweight_copy.py
trunk/blender/release/scripts/mesh_cleanup.py
trunk/blender/release/scripts/mesh_edges2curves.py
trunk/blender/release/scripts/mesh_mirror_tool.py
trunk/blender/release/scripts/mesh_poly_reduce.py
trunk/blender/release/scripts/mesh_poly_reduce_grid.py
trunk/blender/release/scripts/mesh_skin.py
trunk/blender/release/scripts/mesh_solidify.py
trunk/blender/release/scripts/mesh_unfolder.py
trunk/blender/release/scripts/mesh_wire.py
trunk/blender/release/scripts/ms3d_import.py
trunk/blender/release/scripts/ms3d_import_ascii.py
trunk/blender/release/scripts/obdatacopier.py
trunk/blender/release/scripts/object_active_to_other.py
trunk/blender/release/scripts/object_apply_def.py
trunk/blender/release/scripts/object_batch_name_edit.py
trunk/blender/release/scripts/object_cookie_cutter.py
trunk/blender/release/scripts/object_drop.py
trunk/blender/release/scripts/object_find.py
trunk/blender/release/scripts/object_random_loc_sz_rot.py
trunk/blender/release/scripts/object_sel2dupgroup.py
trunk/blender/release/scripts/object_timeofs_follow_act.py
trunk/blender/release/scripts/off_export.py
trunk/blender/release/scripts/off_import.py
trunk/blender/release/scripts/paths_import.py
trunk/blender/release/scripts/ply_import.py
trunk/blender/release/scripts/raw_export.py
trunk/blender/release/scripts/raw_import.py
trunk/blender/release/scripts/renameobjectbyblock.py
trunk/blender/release/scripts/render_save_layers.py
trunk/blender/release/scripts/rvk1_torvk2.py
trunk/blender/release/scripts/save_theme.py
trunk/blender/release/scripts/scripttemplate_background_job.py
trunk/blender/release/scripts/scripttemplate_camera_object.py
trunk/blender/release/scripts/scripttemplate_gamelogic.py
trunk/blender/release/scripts/scripttemplate_gamelogic_basic.py
trunk/blender/release/scripts/scripttemplate_gamelogic_module.py
trunk/blender/release/scripts/scripttemplate_ipo_gen.py
trunk/blender/release/scripts/scripttemplate_mesh_edit.py
trunk/blender/release/scripts/scripttemplate_metaball_create.py
trunk/blender/release/scripts/scripttemplate_object_edit.py
trunk/blender/release/scripts/scripttemplate_pyconstraint.py
trunk/blender/release/scripts/scripttemplate_text_plugin.py
trunk/blender/release/scripts/slp_import.py
trunk/blender/release/scripts/sysinfo.py
trunk/blender/release/scripts/textplugin_convert_ge.py
trunk/blender/release/scripts/textplugin_functiondocs.py
trunk/blender/release/scripts/textplugin_imports.py
trunk/blender/release/scripts/textplugin_membersuggest.py
trunk/blender/release/scripts/textplugin_outliner.py
trunk/blender/release/scripts/textplugin_suggest.py
trunk/blender/release/scripts/textplugin_templates.py
trunk/blender/release/scripts/unweld.py
trunk/blender/release/scripts/uv_export.py
trunk/blender/release/scripts/uv_seams_from_islands.py
trunk/blender/release/scripts/uvcalc_follow_active_coords.py
trunk/blender/release/scripts/uvcalc_lightmap.py
trunk/blender/release/scripts/uvcalc_quad_clickproj.py
trunk/blender/release/scripts/uvcalc_smart_project.py
trunk/blender/release/scripts/uvcopy.py
trunk/blender/release/scripts/vertexpaint_from_material.py
trunk/blender/release/scripts/vertexpaint_gradient.py
trunk/blender/release/scripts/vertexpaint_selfshadow_ao.py
trunk/blender/release/scripts/vrml97_export.py
trunk/blender/release/scripts/weightpaint_average.py
trunk/blender/release/scripts/weightpaint_clean.py
trunk/blender/release/scripts/weightpaint_copy.py
trunk/blender/release/scripts/weightpaint_envelope_assign.py
trunk/blender/release/scripts/weightpaint_gradient.py
trunk/blender/release/scripts/weightpaint_grow_shrink.py
trunk/blender/release/scripts/weightpaint_invert.py
trunk/blender/release/scripts/weightpaint_normalize.py
trunk/blender/release/scripts/widgetwizard.py
trunk/blender/release/scripts/wizard_bolt_factory.py
trunk/blender/release/scripts/wizard_curve2tree.py
trunk/blender/release/scripts/wizard_landscape_ant.py
trunk/blender/release/scripts/x3d_export.py
trunk/blender/release/scripts/xsi_export.py
trunk/blender/release/ui/
Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct 2009-09-27 16:20:42 UTC (rev 23512)
+++ trunk/blender/SConstruct 2009-09-28 03:19:52 UTC (rev 23513)
@@ -476,8 +476,8 @@
dotblenderinstall.append(env.Install(dir=td,
source=srcfile))
if env['WITH_BF_PYTHON']:
- #-- .blender/scripts, .blender/ui, .blender/io
- scriptpaths=['release/scripts', 'release/ui',
'release/io']
+ #-- .blender/scripts
+ scriptpaths=['release/scripts']
for scriptpath in scriptpaths:
for dp, dn, df in os.walk(scriptpath):
if '.svn' in dn:
Modified: trunk/blender/release/Makefile
===================================================================
--- trunk/blender/release/Makefile 2009-09-27 16:20:42 UTC (rev 23512)
+++ trunk/blender/release/Makefile 2009-09-28 03:19:52 UTC (rev 23513)
@@ -153,9 +153,6 @@
@echo "----> Copy python infrastructure"
@[ ! -d scripts ] || cp -r scripts $(CONFDIR)/scripts
-
- @echo "----> Copy python UI files"
- @[ ! -d ui ] || cp -r ui $(CONFDIR)/ui
ifeq ($(OS),darwin)
@echo "----> Copy python modules"
Deleted: trunk/blender/release/scripts/3ds_export.py
===================================================================
--- trunk/blender/release/scripts/3ds_export.py 2009-09-27 16:20:42 UTC (rev
23512)
+++ trunk/blender/release/scripts/3ds_export.py 2009-09-28 03:19:52 UTC (rev
23513)
@@ -1,1019 +0,0 @@
-#!BPY
-# coding: utf-8
-"""
-Name: '3D Studio (.3ds)...'
-Blender: 243
-Group: 'Export'
-Tooltip: 'Export to 3DS file format (.3ds).'
-"""
-
-__author__ = ["Campbell Barton", "Bob Holcomb", "Richard Lärkäng", "Damien
McGinnes", "Mark Stijnman"]
-__url__ = ("blenderartists.org", "www.blender.org", "www.gametutorials.com",
"lib3ds.sourceforge.net/")
-__version__ = "0.90a"
-__bpydoc__ = """\
-
-3ds Exporter
-
-This script Exports a 3ds file.
-
-Exporting is based on 3ds loader from www.gametutorials.com(Thanks DigiBen)
and using information
-from the lib3ds project (http://lib3ds.sourceforge.net/) sourcecode.
-"""
-
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# Script copyright (C) Bob Holcomb
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# ***** END GPL LICENCE BLOCK *****
-# --------------------------------------------------------------------------
-
-
-######################################################
-# Importing modules
-######################################################
-
-import Blender
-import bpy
-from BPyMesh import getMeshFromObject
-from BPyObject import getDerivedObjects
-try:
- import struct
-except:
- struct = None
-
-# So 3ds max can open files, limit names to 12 in length
-# this is verry annoying for filenames!
-name_unique = []
-name_mapping = {}
-def sane_name(name):
- name_fixed = name_mapping.get(name)
- if name_fixed != None:
- return name_fixed
-
- if len(name) > 12:
- new_name = name[:12]
- else:
- new_name = name
-
- i = 0
-
- while new_name in name_unique:
- new_name = new_name[:-4] + '.%.3d' % i
- i+=1
-
- name_unique.append(new_name)
- name_mapping[name] = new_name
- return new_name
-
-######################################################
-# Data Structures
-######################################################
-
-#Some of the chunks that we will export
-#----- Primary Chunk, at the beginning of each file
-PRIMARY= long("0x4D4D",16)
-
-#------ Main Chunks
-OBJECTINFO = long("0x3D3D",16); #This gives the version of the
mesh and is found right before the material and object information
-VERSION = long("0x0002",16); #This gives the version of the
.3ds file
-KFDATA = long("0xB000",16); #This is the header for all of the
key frame info
-
-#------ sub defines of OBJECTINFO
-MATERIAL=45055 #0xAFFF // This stored the
texture info
-OBJECT=16384 #0x4000 // This stores the
faces, vertices, etc...
-
-#>------ sub defines of MATERIAL
-MATNAME = long("0xA000",16); # This holds the material name
-MATAMBIENT = long("0xA010",16); # Ambient color of the
object/material
-MATDIFFUSE = long("0xA020",16); # This holds the color of the
object/material
-MATSPECULAR = long("0xA030",16); # SPecular color of the
object/material
-MATSHINESS = long("0xA040",16); # ??
-MATMAP = long("0xA200",16); # This is a header for a new
material
-MATMAPFILE = long("0xA300",16); # This holds the file name of the
texture
-
-RGB1= long("0x0011",16)
-RGB2= long("0x0012",16)
-
-#>------ sub defines of OBJECT
-OBJECT_MESH = long("0x4100",16); # This lets us know that we are
reading a new object
-OBJECT_LIGHT = long("0x4600",16); # This lets un know we are reading
a light object
-OBJECT_CAMERA= long("0x4700",16); # This lets un know we are reading
a camera object
-
-#>------ sub defines of CAMERA
-OBJECT_CAM_RANGES= long("0x4720",16); # The camera range values
-
-#>------ sub defines of OBJECT_MESH
-OBJECT_VERTICES = long("0x4110",16); # The objects vertices
-OBJECT_FACES = long("0x4120",16); # The objects faces
-OBJECT_MATERIAL = long("0x4130",16); # This is found if the object has
a material, either texture map or color
-OBJECT_UV = long("0x4140",16); # The UV texture coordinates
-OBJECT_TRANS_MATRIX = long("0x4160",16); # The Object Matrix
-
-#>------ sub defines of KFDATA
-KFDATA_KFHDR = long("0xB00A",16);
-KFDATA_KFSEG = long("0xB008",16);
-KFDATA_KFCURTIME = long("0xB009",16);
-KFDATA_OBJECT_NODE_TAG = long("0xB002",16);
-
-#>------ sub defines of OBJECT_NODE_TAG
-OBJECT_NODE_ID = long("0xB030",16);
-OBJECT_NODE_HDR = long("0xB010",16);
-OBJECT_PIVOT = long("0xB013",16);
-OBJECT_INSTANCE_NAME = long("0xB011",16);
-POS_TRACK_TAG = long("0xB020",16);
-ROT_TRACK_TAG = long("0xB021",16);
-SCL_TRACK_TAG = long("0xB022",16);
-
-def uv_key(uv):
- return round(uv.x, 6), round(uv.y, 6)
-
-# size defines:
-SZ_SHORT = 2
-SZ_INT = 4
-SZ_FLOAT = 4
-
-class _3ds_short(object):
- '''Class representing a short (2-byte integer) for a 3ds file.
- *** This looks like an unsigned short H is unsigned from the struct
docs - Cam***'''
- __slots__ = 'value'
- def __init__(self, val=0):
- self.value=val
-
- def get_size(self):
- return SZ_SHORT
-
- def write(self,file):
- file.write(struct.pack("<H", self.value))
-
- def __str__(self):
- return str(self.value)
-
-class _3ds_int(object):
- '''Class representing an int (4-byte integer) for a 3ds file.'''
- __slots__ = 'value'
- def __init__(self, val=0):
- self.value=val
-
- def get_size(self):
- return SZ_INT
-
- def write(self,file):
- file.write(struct.pack("<I", self.value))
-
- def __str__(self):
- return str(self.value)
-
-class _3ds_float(object):
- '''Class representing a 4-byte IEEE floating point number for a 3ds
file.'''
- __slots__ = 'value'
- def __init__(self, val=0.0):
- self.value=val
-
- def get_size(self):
- return SZ_FLOAT
-
- def write(self,file):
- file.write(struct.pack("<f", self.value))
-
- def __str__(self):
- return str(self.value)
-
-
-class _3ds_string(object):
- '''Class representing a zero-terminated string for a 3ds file.'''
- __slots__ = 'value'
- def __init__(self, val=""):
- self.value=val
-
- def get_size(self):
- return (len(self.value)+1)
-
- def write(self,file):
- binary_format = "<%ds" % (len(self.value)+1)
- file.write(struct.pack(binary_format, self.value))
-
- def __str__(self):
- return self.value
-
-class _3ds_point_3d(object):
- '''Class representing a three-dimensional point for a 3ds file.'''
- __slots__ = 'x','y','z'
- def __init__(self, point=(0.0,0.0,0.0)):
- self.x, self.y, self.z = point
-
- def get_size(self):
- return 3*SZ_FLOAT
-
- def write(self,file):
- file.write(struct.pack('<3f', self.x, self.y, self.z))
-
- def __str__(self):
- return '(%f, %f, %f)' % (self.x, self.y, self.z)
-
-# Used for writing a track
-"""
-class _3ds_point_4d(object):
- '''Class representing a four-dimensional point for a 3ds file, for
instance a quaternion.'''
- __slots__ = 'x','y','z','w'
- def __init__(self, point=(0.0,0.0,0.0,0.0)):
- self.x, self.y, self.z, self.w = point
-
- def get_size(self):
- return 4*SZ_FLOAT
-
- def write(self,file):
- data=struct.pack('<4f', self.x, self.y, self.z, self.w)
- file.write(data)
-
- def __str__(self):
- return '(%f, %f, %f, %f)' % (self.x, self.y, self.z, self.w)
-"""
-
-class _3ds_point_uv(object):
- '''Class representing a UV-coordinate for a 3ds file.'''
- __slots__ = 'uv'
- def __init__(self, point=(0.0,0.0)):
- self.uv = point
-
- def __cmp__(self, other):
- return cmp(self.uv,other.uv)
-
- def get_size(self):
- return 2*SZ_FLOAT
-
- def write(self,file):
- data=struct.pack('<2f', self.uv[0], self.uv[1])
- file.write(data)
-
- def __str__(self):
- return '(%g, %g)' % self.uv
-
-class _3ds_rgb_color(object):
- '''Class representing a (24-bit) rgb color for a 3ds file.'''
- __slots__ = 'r','g','b'
- def __init__(self, col=(0,0,0)):
- self.r, self.g, self.b = col
-
- def get_size(self):
- return 3
-
- def write(self,file):
- file.write( struct.pack('<3c', chr(int(255*self.r)),
chr(int(255*self.g)), chr(int(255*self.b)) ) )
-
- def __str__(self):
- return '{%f, %f, %f}' % (self.r, self.g, self.b)
-
-class _3ds_face(object):
- '''Class representing a face for a 3ds file.'''
- __slots__ = 'vindex'
- def __init__(self, vindex):
- self.vindex = vindex
-
- def get_size(self):
- return 4*SZ_SHORT
-
- def write(self,file):
- # The last zero is only used by 3d studio
- file.write(struct.pack("<4H", self.vindex[0],self.vindex[1],
self.vindex[2], 0))
-
- def __str__(self):
- return '[%d %d %d]' % (self.vindex[0],self.vindex[1],
self.vindex[2])
-
-class _3ds_array(object):
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
