Revision: 14811
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14811
Author: genscher
Date: 2008-05-12 14:24:52 +0200 (Mon, 12 May 2008)
Log Message:
-----------
svn merge -r 14721:14810
https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/cloth/blender/intern/ghost/intern/GHOST_NDOFManager.cpp
branches/cloth/blender/intern/ghost/intern/GHOST_System.cpp
branches/cloth/blender/release/Makefile
branches/cloth/blender/release/scripts/3ds_export.py
branches/cloth/blender/release/scripts/bevel_center.py
branches/cloth/blender/release/scripts/blenderLipSynchro.py
branches/cloth/blender/release/scripts/bpymodules/BPyAddMesh.py
branches/cloth/blender/release/scripts/bpymodules/colladaImEx/collada.py
branches/cloth/blender/release/scripts/bpymodules/colladaImEx/cstartup.py
branches/cloth/blender/release/scripts/bpymodules/colladaImEx/cutils.py
branches/cloth/blender/release/scripts/bpymodules/colladaImEx/translator.py
branches/cloth/blender/release/scripts/bpymodules/dxfReader.py
branches/cloth/blender/release/scripts/colladaImport14.py
branches/cloth/blender/release/scripts/export_m3g.py
branches/cloth/blender/release/scripts/hotkeys.py
branches/cloth/blender/release/scripts/import_dxf.py
branches/cloth/blender/release/scripts/object_apply_def.py
branches/cloth/blender/release/scripts/paths_import.py
branches/cloth/blender/release/scripts/render_save_layers.py
branches/cloth/blender/release/scripts/rvk1_torvk2.py
branches/cloth/blender/release/scripts/x3d_export.py
branches/cloth/blender/source/Makefile
branches/cloth/blender/source/blender/blenkernel/BKE_idprop.h
branches/cloth/blender/source/blender/blenkernel/BKE_writeffmpeg.h
branches/cloth/blender/source/blender/blenkernel/intern/anim.c
branches/cloth/blender/source/blender/blenkernel/intern/collision.c
branches/cloth/blender/source/blender/blenkernel/intern/depsgraph.c
branches/cloth/blender/source/blender/blenkernel/intern/ipo.c
branches/cloth/blender/source/blender/blenkernel/intern/mball.c
branches/cloth/blender/source/blender/blenkernel/intern/modifier.c
branches/cloth/blender/source/blender/blenkernel/intern/object.c
branches/cloth/blender/source/blender/blenkernel/intern/particle.c
branches/cloth/blender/source/blender/blenkernel/intern/particle_system.c
branches/cloth/blender/source/blender/blenkernel/intern/scene.c
branches/cloth/blender/source/blender/blenkernel/intern/writeffmpeg.c
branches/cloth/blender/source/blender/blenlib/BLI_arithb.h
branches/cloth/blender/source/blender/blenlib/BLI_edgehash.h
branches/cloth/blender/source/blender/blenlib/BLI_kdopbvh.h
branches/cloth/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/cloth/blender/source/blender/blenlib/intern/arithb.c
branches/cloth/blender/source/blender/blenlib/intern/edgehash.c
branches/cloth/blender/source/blender/blenloader/intern/readfile.c
branches/cloth/blender/source/blender/blenloader/intern/writefile.c
branches/cloth/blender/source/blender/include/BDR_editface.h
branches/cloth/blender/source/blender/include/BIF_drawseq.h
branches/cloth/blender/source/blender/include/BIF_editmesh.h
branches/cloth/blender/source/blender/include/BIF_interface.h
branches/cloth/blender/source/blender/makesdna/DNA_particle_types.h
branches/cloth/blender/source/blender/makesdna/DNA_scene_types.h
branches/cloth/blender/source/blender/nodes/intern/CMP_nodes/CMP_displace.c
branches/cloth/blender/source/blender/nodes/intern/CMP_nodes/CMP_hueSatVal.c
branches/cloth/blender/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c
branches/cloth/blender/source/blender/python/BPY_interface.c
branches/cloth/blender/source/blender/python/api2_2x/Blender.c
branches/cloth/blender/source/blender/python/api2_2x/Object.c
branches/cloth/blender/source/blender/python/api2_2x/Particle.c
branches/cloth/blender/source/blender/python/api2_2x/Particle.h
branches/cloth/blender/source/blender/python/api2_2x/doc/API_intro.py
branches/cloth/blender/source/blender/python/api2_2x/doc/Object.py
branches/cloth/blender/source/blender/python/api2_2x/doc/epy_docgen.sh
branches/cloth/blender/source/blender/render/intern/source/imagetexture.c
branches/cloth/blender/source/blender/render/intern/source/shadeoutput.c
branches/cloth/blender/source/blender/src/buttons_editing.c
branches/cloth/blender/source/blender/src/buttons_object.c
branches/cloth/blender/source/blender/src/buttons_scene.c
branches/cloth/blender/source/blender/src/buttons_shading.c
branches/cloth/blender/source/blender/src/drawimage.c
branches/cloth/blender/source/blender/src/drawimasel.c
branches/cloth/blender/source/blender/src/drawnla.c
branches/cloth/blender/source/blender/src/drawobject.c
branches/cloth/blender/source/blender/src/drawseq.c
branches/cloth/blender/source/blender/src/drawview.c
branches/cloth/blender/source/blender/src/edit.c
branches/cloth/blender/source/blender/src/editarmature.c
branches/cloth/blender/source/blender/src/editdeform.c
branches/cloth/blender/source/blender/src/editface.c
branches/cloth/blender/source/blender/src/editmesh_lib.c
branches/cloth/blender/source/blender/src/editmesh_mods.c
branches/cloth/blender/source/blender/src/editobject.c
branches/cloth/blender/source/blender/src/editseq.c
branches/cloth/blender/source/blender/src/editsima.c
branches/cloth/blender/source/blender/src/header_image.c
branches/cloth/blender/source/blender/src/header_seq.c
branches/cloth/blender/source/blender/src/header_view3d.c
branches/cloth/blender/source/blender/src/interface.c
branches/cloth/blender/source/blender/src/interface_draw.c
branches/cloth/blender/source/blender/src/parametrizer.c
branches/cloth/blender/source/blender/src/parametrizer.h
branches/cloth/blender/source/blender/src/parametrizer_intern.h
branches/cloth/blender/source/blender/src/sequence.c
branches/cloth/blender/source/blender/src/space.c
branches/cloth/blender/source/blender/src/splash.jpg.c
branches/cloth/blender/source/blender/src/toets.c
branches/cloth/blender/source/blender/src/transform_conversions.c
branches/cloth/blender/source/blender/src/transform_generics.c
branches/cloth/blender/source/blender/src/transform_manipulator.c
branches/cloth/blender/source/blender/src/transform_orientations.c
branches/cloth/blender/source/blender/src/unwrapper.c
branches/cloth/blender/source/gameengine/GamePlayer/Makefile
branches/cloth/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/cloth/blender/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/cloth/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/cloth/blender/source/gameengine/PyDoc/GameLogic.py
branches/cloth/blender/source/nan_definitions.mk
Added Paths:
-----------
branches/cloth/blender/source/blender/python/api2_2x/doc/Particle.py
Removed Paths:
-------------
branches/cloth/blender/source/blender/python/api2_2x/doc/epy_docgen-3.sh
Modified: branches/cloth/blender/intern/ghost/intern/GHOST_NDOFManager.cpp
===================================================================
--- branches/cloth/blender/intern/ghost/intern/GHOST_NDOFManager.cpp
2008-05-12 11:48:55 UTC (rev 14810)
+++ branches/cloth/blender/intern/ghost/intern/GHOST_NDOFManager.cpp
2008-05-12 12:24:52 UTC (rev 14811)
@@ -73,7 +73,9 @@
if (ndofLibraryInit && ndofDeviceOpen)
{
Pid= ndofLibraryInit();
+#if 0
printf("%i client \n", Pid);
+#endif
#if defined(_WIN32) || defined(__APPLE__)
m_DeviceHandle = ndofDeviceOpen((void
*)¤tNdofValues);
#else
Modified: branches/cloth/blender/intern/ghost/intern/GHOST_System.cpp
===================================================================
--- branches/cloth/blender/intern/ghost/intern/GHOST_System.cpp 2008-05-12
11:48:55 UTC (rev 14810)
+++ branches/cloth/blender/intern/ghost/intern/GHOST_System.cpp 2008-05-12
12:24:52 UTC (rev 14811)
@@ -283,9 +283,11 @@
m_eventManager = new GHOST_EventManager ();
m_ndofManager = new GHOST_NDOFManager();
+#if 0
if(m_ndofManager)
printf("ndof manager \n");
-
+#endif
+
#ifdef GHOST_DEBUG
if (m_eventManager) {
m_eventManager->addConsumer(&m_eventPrinter);
Modified: branches/cloth/blender/release/Makefile
===================================================================
--- branches/cloth/blender/release/Makefile 2008-05-12 11:48:55 UTC (rev
14810)
+++ branches/cloth/blender/release/Makefile 2008-05-12 12:24:52 UTC (rev
14811)
@@ -118,7 +118,6 @@
ifneq ($(OS), darwin)
@[ ! -d $(OCGDIR)/bin/.blender ] || \
cp -r $(OCGDIR)/bin/.blender $(DISTDIR)
- @rm -rf $(DISTDIR)/.svn $(DISTDIR)/*/.svn $(DISTDIR)/*/*/.svn
@cp $(NANBLENDERHOME)/bin/.blender/.Blanguages $(CONFDIR)
@cp $(NANBLENDERHOME)/bin/.blender/.bfont.ttf $(CONFDIR)
endif
@@ -144,8 +143,7 @@
@cp ../source/blender/blenpluginapi/*.h $(DISTDIR)/plugins/include/
@chmod 755 $(DISTDIR)/plugins/bmake
@$(MAKE) -C $(DISTDIR)/plugins all > /dev/null || exit 1;
- @rm -fr $(DISTDIR)/plugins/.svn $(DISTDIR)/plugins/*/.svn \
- $(DISTDIR)/plugins/*/*.o
+ @rm -f $(DISTDIR)/plugins/*/*.o
#on OS X the plugins move to the installation directory
ifneq ($(OS),darwin)
@@ -158,7 +156,6 @@
@echo "----> Copy python infrastructure"
@[ ! -d scripts ] || cp -r scripts $(CONFDIR)/scripts
- @[ ! -d $(CONFDIR)/scripts ] || rm -fr $(CONFDIR)/scripts/.svn
$(CONFDIR)/scripts/*/.svn $(CONFDIR)/scripts/*/*/.svn
ifeq ($(OS),darwin)
@echo "----> Move .blender to .app/Contents/MacOS/"
@@ -180,6 +177,8 @@
@[ ! -x $(CONFIG_GUESS)/specific.sh ] || (\
echo "**--> Execute specific.sh in $(CONFIG_GUESS)/" && \
cd $(CONFIG_GUESS) && ./specific.sh )
+ @echo "----> Cleaning .svn metadata directories"
+ @find $(DISTDIR) -type d -name ".svn" | xargs rm -fr
pkg: install
@echo "----> Create distribution file $(BLENDNAME)$(EXT1)"
Modified: branches/cloth/blender/release/scripts/3ds_export.py
===================================================================
--- branches/cloth/blender/release/scripts/3ds_export.py 2008-05-12
11:48:55 UTC (rev 14810)
+++ branches/cloth/blender/release/scripts/3ds_export.py 2008-05-12
12:24:52 UTC (rev 14811)
@@ -1,5 +1,5 @@
#!BPY
-
+# coding: utf-8
"""
Name: '3D Studio (.3ds)...'
Blender: 243
Modified: branches/cloth/blender/release/scripts/bevel_center.py
===================================================================
--- branches/cloth/blender/release/scripts/bevel_center.py 2008-05-12
11:48:55 UTC (rev 14810)
+++ branches/cloth/blender/release/scripts/bevel_center.py 2008-05-12
12:24:52 UTC (rev 14811)
@@ -1,5 +1,5 @@
#!BPY
-
+# coding: utf-8
""" Registration info for Blender menus
Name: 'Bevel Center'
Blender: 243
Modified: branches/cloth/blender/release/scripts/blenderLipSynchro.py
===================================================================
--- branches/cloth/blender/release/scripts/blenderLipSynchro.py 2008-05-12
11:48:55 UTC (rev 14810)
+++ branches/cloth/blender/release/scripts/blenderLipSynchro.py 2008-05-12
12:24:52 UTC (rev 14811)
@@ -1,5 +1,5 @@
#!BPY
-
+# coding: utf-8
"""
Name: 'BlenderLipSynchro'
Blender: 242
Modified: branches/cloth/blender/release/scripts/bpymodules/BPyAddMesh.py
===================================================================
--- branches/cloth/blender/release/scripts/bpymodules/BPyAddMesh.py
2008-05-12 11:48:55 UTC (rev 14810)
+++ branches/cloth/blender/release/scripts/bpymodules/BPyAddMesh.py
2008-05-12 12:24:52 UTC (rev 14811)
@@ -68,11 +68,7 @@
else:
# Mesh with no data, unlikely
me.edges.extend(edges)
- me.faces.extend(faces)
-
- if is_editmode or Blender.Get('add_editmode'):
- EditMode(1)
-
+ me.faces.extend(faces)
else:
# Object mode add new
@@ -95,11 +91,15 @@
ob_act.setMatrix(mat)
ob_act.loc = cursor
+
+ if is_editmode or Blender.Get('add_editmode'):
+ EditMode(1)
+ else: # adding in object mode means we need to calc normals
+ me.calcNormals()
+
+
- if is_editmode or Blender.Get('add_editmode'):
- EditMode(1)
-
def write_mesh_script(filepath, me):
'''
filepath - path to py file
@@ -112,7 +112,7 @@
file.write('#!BPY\n')
file.write('"""\n')
file.write('Name: \'%s\'\n' % name)
- file.write('Blender: 243\n')
+ file.write('Blender: 245\n')
file.write('Group: \'AddMesh\'\n')
file.write('"""\n\n')
file.write('import BPyAddMesh\n')
Modified:
branches/cloth/blender/release/scripts/bpymodules/colladaImEx/collada.py
===================================================================
--- branches/cloth/blender/release/scripts/bpymodules/colladaImEx/collada.py
2008-05-12 11:48:55 UTC (rev 14810)
+++ branches/cloth/blender/release/scripts/bpymodules/colladaImEx/collada.py
2008-05-12 12:24:52 UTC (rev 14811)
@@ -4,6 +4,7 @@
# ***** BEGIN GPL LICENSE BLOCK *****
#
# Copyright (C) 2006: Illusoft - [EMAIL PROTECTED]
+# 2008.05.08 some bugfix for debug mode by migius (AKA Remigiusz Fiedler)
#
# 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
@@ -32,18 +33,18 @@
# TODO: Collada API: finish DaeDocument
class DaeDocument(object):
-
+
def __init__(self, debugM = False):
global debugMode
debugMode = debugM
-
+
self.colladaVersion = '1.4.0'
self.version = ''
self.xmlns = ''
self.asset = DaeAsset()
self.extras = []
-
-
+
+
# create all the libraries
self.animationsLibrary =
DaeLibrary(DaeSyntax.LIBRARY_ANIMATIONS,DaeAnimation,DaeSyntax.ANIMATION)
self.animationClipsLibrary =
DaeLibrary(DaeSyntax.LIBRARY_ANIMATION_CLIPS,DaeAnimationClip,DaeSyntax.ANIMATION_CLIP)
@@ -56,38 +57,38 @@
self.materialsLibrary =
DaeLibrary(DaeSyntax.LIBRARY_MATERIALS,DaeFxMaterial,DaeFxSyntax.MATERIAL)
self.nodesLibrary = DaeLibrary(DaeSyntax.LIBRARY_NODES,
DaeNode, DaeSyntax.NODE)
self.visualScenesLibrary =
DaeLibrary(DaeSyntax.LIBRARY_VISUAL_SCENES,DaeVisualScene,DaeSyntax.VISUAL_SCENE)
-
+
# Physics Support
- self.physicsMaterialsLibrary =
DaeLibrary(DaeSyntax.LIBRARY_PHYSICS_MATERIALS, DaePhysicsMaterial,
DaePhysicsSyntax.PHYSICS_MATERIAL)
- self.physicsScenesLibrary =
DaeLibrary(DaeSyntax.LIBRARY_PHYSICS_SCENES, DaePhysicsScene,
DaePhysicsSyntax.PHYSICS_SCENE)
-
+ self.physicsMaterialsLibrary =
DaeLibrary(DaeSyntax.LIBRARY_PHYSICS_MATERIALS, DaePhysicsMaterial,
DaePhysicsSyntax.PHYSICS_MATERIAL)
+ self.physicsScenesLibrary =
DaeLibrary(DaeSyntax.LIBRARY_PHYSICS_SCENES, DaePhysicsScene,
DaePhysicsSyntax.PHYSICS_SCENE)
+
self.physicsModelsLibrary =
DaeLibrary(DaeSyntax.LIBRARY_PHYSICS_MODELS, DaePhysicsModel,
DaePhysicsSyntax.PHYSICS_MODEL)
-
+
self.scene = None
self.physicsScene = None
-
+
def LoadDocumentFromFile(self, filename):
global debugMode
# Build DOM tree
doc = parse( filename )
-
+
# Get COLLADA element
- colladaNode = doc.documentElement
-
- # Get Attributes
+ colladaNode = doc.documentElement
+
+ # Get Attributes
self.version = colladaNode.getAttribute(DaeSyntax.VERSION)
if not IsVersionOk(self.version, self.colladaVersion):
Debug.Debug('The version of the file (%s) is older then
the version supported by this plugin(%s).'%(self.version,
self.colladaVersion),'ERROR')
doc.unlink()
- return
+ return
self.xmlns = colladaNode.getAttribute(DaeSyntax.XMLNS)
-
+
# get the assets element
self.asset.LoadFromXml(self,xmlUtils.FindElementByTagName(colladaNode,DaeSyntax.ASSET))
-
+
# get the extra elements
self.extras =
CreateObjectsFromXml(self,colladaNode,DaeSyntax.EXTRA,DaeExtra)
-
+
# parse all the libraries
self.imagesLibrary.LoadFromXml(self,xmlUtils.FindElementByTagName(colladaNode,DaeSyntax.LIBRARY_IMAGES))
self.animationsLibrary.LoadFromXml(self,
xmlUtils.FindElementByTagName(colladaNode,DaeSyntax.LIBRARY_ANIMATIONS))
@@ -100,42 +101,46 @@
self.materialsLibrary.LoadFromXml(self,xmlUtils.FindElementByTagName(colladaNode,DaeSyntax.LIBRARY_MATERIALS))
self.nodesLibrary.LoadFromXml(self,xmlUtils.FindElementByTagName(colladaNode,DaeSyntax.LIBRARY_NODES))
self.visualScenesLibrary.LoadFromXml(self,
xmlUtils.FindElementByTagName(colladaNode, DaeSyntax.LIBRARY_VISUAL_SCENES))
-
+
self.physicsMaterialsLibrary.LoadFromXml(self,
xmlUtils.FindElementByTagName(colladaNode, DaeSyntax.LIBRARY_PHYSICS_MATERIALS))
self.physicsModelsLibrary.LoadFromXml(self,
xmlUtils.FindElementByTagName(colladaNode, DaeSyntax.LIBRARY_PHYSICS_MODELS))
self.physicsScenesLibrary.LoadFromXml(self,
xmlUtils.FindElementByTagName(colladaNode, DaeSyntax.LIBRARY_PHYSICS_SCENES))
-
+
# Get the sceneNodes
sceneNodes = colladaNode.getElementsByTagName(DaeSyntax.SCENE)
-
+
# Get the scene
sceneNode = xmlUtils.FindElementByTagName(colladaNode,
DaeSyntax.SCENE)
if sceneNode != None:
scene = DaeScene()
scene.LoadFromXml(self, sceneNode)
self.scene = scene
-
+
doc.unlink()
-
+
if debugMode:
Debug.Debug('Directly exporting this
DaeDocument...','DEBUG')
- self.SaveDocumentToFile(filename+'_out.dae')
-
+ filename0 = filename[:-4]
+ self.SaveDocumentToFile(filename0+'_out.dae')
+
def SaveDocumentToFile(self, filename):
self.version = '1.4.0'
self.xmlns = 'http://www.collada.org/2005/11/COLLADASchema'
colladaNode = Element(DaeSyntax.COLLADA)
colladaNode.setAttribute(DaeSyntax.VERSION, self.version)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
