[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21900] branches/blender2.5/blender: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r20937 :21899
Campbell Barton
ideasman42 at gmail.com
Sat Jul 25 22:59:10 CEST 2009
Revision: 21900
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21900
Author: campbellbarton
Date: 2009-07-25 22:59:09 +0200 (Sat, 25 Jul 2009)
Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r20937:21899
missing commits from peter 20942, 21165, 21170, 21174, 21597
these files still need manual merging
source/blender/makesdna/DNA_sequence_types.h
source/blender/src/sequence.c
source/blender/src/seqeffects.c
source/blender/src/editseq.c
source/blender/include/BSE_sequence.h
Modified Paths:
--------------
branches/blender2.5/blender/blenderplayer/CMakeLists.txt
branches/blender2.5/blender/config/win32-mingw-config.py
branches/blender2.5/blender/release/datafiles/splash.jpg
branches/blender2.5/blender/release/scripts/bpymodules/colladaImEx/translator.py
branches/blender2.5/blender/release/scripts/bvh_import.py
branches/blender2.5/blender/release/scripts/collada_export.py
branches/blender2.5/blender/release/scripts/export_dxf.py
branches/blender2.5/blender/release/scripts/export_fbx.py
branches/blender2.5/blender/release/scripts/export_map.py
branches/blender2.5/blender/release/scripts/export_obj.py
branches/blender2.5/blender/release/scripts/import_dxf.py
branches/blender2.5/blender/release/scripts/import_obj.py
branches/blender2.5/blender/release/scripts/object_active_to_other.py
branches/blender2.5/blender/release/scripts/vertexpaint_selfshadow_ao.py
branches/blender2.5/blender/release/windows/extra/python26.zip
branches/blender2.5/blender/source/blender/avi/intern/avi.c
branches/blender2.5/blender/source/blender/blenkernel/BKE_softbody.h
branches/blender2.5/blender/source/blender/blenkernel/intern/mesh.c
branches/blender2.5/blender/source/blender/blenkernel/intern/softbody.c
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
branches/blender2.5/blender/source/blender/imbuf/intern/iris.c
branches/blender2.5/blender/source/blender/imbuf/intern/util.c
branches/blender2.5/blender/source/blender/makesdna/DNA_object_force.h
branches/blender2.5/blender/source/blender/nodes/intern/CMP_nodes/CMP_mapUV.c
branches/blender2.5/blender/source/blender/render/intern/source/shadeoutput.c
branches/blender2.5/blender/source/blender/render/intern/source/texture.c
branches/blender2.5/blender/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/blender2.5/blender/source/gameengine/Converter/BL_ActionActuator.cpp
branches/blender2.5/blender/source/gameengine/Converter/BL_ActionActuator.h
branches/blender2.5/blender/source/gameengine/Converter/BL_ArmatureObject.h
branches/blender2.5/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/blender2.5/blender/source/gameengine/PyDoc/API_intro.py
branches/blender2.5/blender/source/gameengine/PyDoc/GameTypes.py
Removed Paths:
-------------
branches/blender2.5/blender/ChangeLog
Deleted: branches/blender2.5/blender/ChangeLog
===================================================================
--- branches/blender2.5/blender/ChangeLog 2009-07-25 20:51:45 UTC (rev 21899)
+++ branches/blender2.5/blender/ChangeLog 2009-07-25 20:59:09 UTC (rev 21900)
@@ -1,114 +0,0 @@
-
-Fri Feb 21 10:37:54 CST 2003 mein at cs.umn.edu
- Added Goofsters alt-m menu for merging verts in edit mode.
-
-Fri Feb 21 10:37:54 CST 2003 mein at cs.umn.edu
- Added MacOSX plugin stuff
-
-Thu Apr 24 00:48:43 CST 2003 cwant at ualberta.ca
- Added auto-skinning support. When parenting a mesh to an
- armature the user is confronted with a menu about creating
- weight groups. They can either create empty groups,
- create groups that are populated based on a closest bone
- algorithm, or create no groups.
-
-Mon Apr 28 04:04:44 CET 2003 phaseIV at zonnet.nl
- Added Quicktime image and movie import for textures.
- Added Quicktime movie export for rendering.
- Note: the selected export codec isn't saved in the blendfile.
- Enable with the WITH_QUICKTIME compile flag.
-
-Mon Apr 28 12:32:12 CET 2003 phaseIV at zonnet.nl
- Added (Win32) text clipboard support and a rightmouse menu to
- the text editor. Added the possibility to export text from
- the editor to a 3D Font object with alt-m. (up to 1000 chars)
- Added rename/delete popups to the file and imageselectors.
- Redesigned the userpreference window layout. (unfinished atm.)
-
-Mon Apr 28 23:17:04 CET 2003 phaseIV at zonnet.nl
- Added a 3D font loader that uses the Freetype2 library to
- parse the vector data. Freetype2 supports many font formats
- including Type1, TrueType and OpenType fonts.
- Enable with the WITH_FREETYPE2 compile flag.
-
-Initial Change Log for Blender 2.26 Sun Feb 9 10:53:10 UTC 2003
-
-New features of Blender 2.26:
------------------------------
-
-- Mousewheel support for all windows. Two user settings are added in the
- top window for mousewheel usage. The zoom direction [WZoom] and the
- number of lines that get scrolled [WLines] can be set here.
- The mousewheel also works to increase/decrease the size of the circle
- while selecting or doing proportional scaling.
-
-- A "fake user" button next to the material popup has been added, to keep
- the data when it has been unlinked from an object. (Basically a shortcut
- for pressing Shift+F4 and F)
-
-- Added support for manipulating Ipo bezier handles through the action
- window. Selecting action keys and pressing VKEY, HKEY, or shift-HKEY
- modifies the handles of the keys in the same way it does in the IPO
- window.
-
-- CKEY in the action window scrolls the window so that the current frame
- is in the center.
-
-- Extra selection support for the action window, including:
- - border select initiated in the channel names border selects the
- channels and constraint channels.
- - right click or border select initiated in the horizontal scroll
- causes blender to select all keys for the selected frames.
- - right click or border select in the vertical scroll causes blender
- to select all keys for the channel or constraint channels that are
- to the left of the selection.
-
-- X-ray bones support for showing armature bones in shaded mode (disabled
- depth test). The new x-ray button is added in the edit buttons when the
- armature is selected.
-
-- TKEY in the action window changes the Ipo type (constant/linear/bezier)
- for the Ipo curves owned by the selected channels
-
-- Simple shaded+wire and solid+wire drawmodes. It basically draws the
- wireframe after drawing the model in solid/shaded/textured mode.
- The user can set this per object using the "Wire" button in the edit
- buttons window.
-
-- A headerbutton for drawing linenumbers in the texteditor.
-
-- Ctrl keystrokes for cut/copy/paste/undo/redo in the texteditor.
-
-- NTSC render preset (Image size - 720x480, Aspect ratio - 10x11, 30 fps)
-
-
-Bugfixes:
----------
-
-- Make switching to bottom, back, and left view (shift+pad7, shift+pad1
- and shift+pad1) work when in camera view.
-
-- Full screen by default under Unix.
-
-- Ignore WM_DELETE_WINDOW on IRIX.
-
-- Icons in the imageselect window get drawn properly.
-
-
-Workarounds:
-------------
-
-- A small modification is made that prevents closing the renderwindow on
- Mac OSX, so the GUI won't becoming irresponsive.
-
-
-Still Not working:
------------------
-
-Plugins in MacOSX
-
-Older Python API
-
-New build system using configure (this is partially working but
- needs some work)
-
Modified: branches/blender2.5/blender/blenderplayer/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/blenderplayer/CMakeLists.txt 2009-07-25 20:51:45 UTC (rev 21899)
+++ branches/blender2.5/blender/blenderplayer/CMakeLists.txt 2009-07-25 20:59:09 UTC (rev 21900)
@@ -69,7 +69,6 @@
bf_blenkernel
verse
bf_blenkernel
- bf_decimation
bf_blenloader
bf_blenpluginapi
bf_blroutines
Modified: branches/blender2.5/blender/config/win32-mingw-config.py
===================================================================
--- branches/blender2.5/blender/config/win32-mingw-config.py 2009-07-25 20:51:45 UTC (rev 21899)
+++ branches/blender2.5/blender/config/win32-mingw-config.py 2009-07-25 20:59:09 UTC (rev 21900)
@@ -4,6 +4,7 @@
BF_PYTHON = LIBDIR + '/python'
BF_PYTHON_VERSION = '3.1'
#BF_PYTHON_VERSION = '2.6'
+#BF_PYTHON_VERSION = '2.6'
WITH_BF_STATICPYTHON = False
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = 'python'
Modified: branches/blender2.5/blender/release/datafiles/splash.jpg
===================================================================
(Binary files differ)
Modified: branches/blender2.5/blender/release/scripts/bpymodules/colladaImEx/translator.py
===================================================================
--- branches/blender2.5/blender/release/scripts/bpymodules/colladaImEx/translator.py 2009-07-25 20:51:45 UTC (rev 21899)
+++ branches/blender2.5/blender/release/scripts/bpymodules/colladaImEx/translator.py 2009-07-25 20:59:09 UTC (rev 21900)
@@ -3065,7 +3065,7 @@
for k, daePolygons in daePolygonsDict.iteritems():
if k != -1:
if not useUV and not mesh.materials is None and len(mesh.materials) > 0 and k >= 0:
- daePolygons.material = mesh.materials[k].name
+ daePolygons.material = getattr(mesh.materials[k], 'name', "")
elif mesh.faceUV and (useUV or mesh.materials is None or len(mesh.materials) == 0):
daePolygons.material = uvTextures[k]
offsetCount = 0
Modified: branches/blender2.5/blender/release/scripts/bvh_import.py
===================================================================
--- branches/blender2.5/blender/release/scripts/bvh_import.py 2009-07-25 20:51:45 UTC (rev 21899)
+++ branches/blender2.5/blender/release/scripts/bvh_import.py 2009-07-25 20:59:09 UTC (rev 21900)
@@ -277,12 +277,17 @@
for bvh_node in bvh_nodes.itervalues():
if not bvh_node.rest_tail_world:
- if len(bvh_node.children)==1:
+ if len(bvh_node.children)==0:
+ # could just fail here, but rare BVH files have childless nodes
+ bvh_node.rest_tail_world = Vector(bvh_node.rest_head_world)
+ bvh_node.rest_tail_local = Vector(bvh_node.rest_head_local)
+ elif len(bvh_node.children)==1:
bvh_node.rest_tail_world= Vector(bvh_node.children[0].rest_head_world)
bvh_node.rest_tail_local= Vector(bvh_node.children[0].rest_head_local)
else:
- if not bvh_node.children:
- raise 'error, bvh node has no end and no children. bad file'
+ # allow this, see above
+ #if not bvh_node.children:
+ # raise 'error, bvh node has no end and no children. bad file'
# Removed temp for now
rest_tail_world= Vector(0,0,0)
Modified: branches/blender2.5/blender/release/scripts/collada_export.py
===================================================================
--- branches/blender2.5/blender/release/scripts/collada_export.py 2009-07-25 20:51:45 UTC (rev 21899)
+++ branches/blender2.5/blender/release/scripts/collada_export.py 2009-07-25 20:59:09 UTC (rev 21900)
@@ -3248,6 +3248,9 @@
Window.DrawProgressBar( progress, "Exporting geometry %.0f %%..." % ( progress * 100.0 ) )
meshMaterials = rawMesh.getMaterials( -1 )
for material in meshMaterials:
+ if material==None:
+ continue
+
key = material.getName( )
materials[ key ] = material
Modified: branches/blender2.5/blender/release/scripts/export_dxf.py
===================================================================
--- branches/blender2.5/blender/release/scripts/export_dxf.py 2009-07-25 20:51:45 UTC (rev 21899)
+++ branches/blender2.5/blender/release/scripts/export_dxf.py 2009-07-25 20:59:09 UTC (rev 21900)
@@ -1,13 +1,13 @@
#!BPY
"""
- Name: 'Autodesk DXF (.dxf)'
+ Name: 'Autodesk DXF (.dxf/dwg)'
Blender: 249
Group: 'Export'
Tooltip: 'Export geometry to DXF/DWG-r12 (Drawing eXchange Format).'
"""
-__version__ = "1.34 - 2009.06.08"
+__version__ = "1.35 - 2009.06.18"
__author__ = "Remigiusz Fiedler (AKA migius)"
__license__ = "GPL"
__url__ = "http://wiki.blender.org/index.php/Scripts/Manual/Export/autodesk_dxf"
@@ -31,19 +31,27 @@
- HPGL output, usefull for correct scaled printing of 2d drawings
TODO:
-- export dupligroups and dupliverts as blocks (option for the user to decide)
+- export dupligroups and dupliverts as blocks (as option)
- optimize POLYFACE routine: remove double-vertices
-- more stable support for X,Y-rotated curves(to POLYLINEs): fix blender negative-matrix.invert()
+- fix support for X,Y-rotated curves(to POLYLINEs): fix blender negative-matrix.invert()
- support hierarchies: groups, instances, parented structures
- support n/f-gons as POLYFACEs with invisible edges
- mapping materials to DXF-styles
- ProgressBar
+- export rotation of Camera to VIEW/VPORT
+- export parented Cameras to VIEW/VPORT
- wip: write drawing extends for automatic view positioning in CAD
-- wip: correct text-objects in persp-projection
-- wip: translate Camera to VPORT/VIEW
+- wip: fix text-objects in persp-projection
- wip: translate current 3D-View to *ACTIVE-VPORT
+- wip: fix support Include-Duplis, cause not conform with INSERT-method
History
+v1.35 - 2009.06.18 by migius
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list