Revision: 16011
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16011
Author: bdiego
Date: 2008-08-07 22:41:45 +0200 (Thu, 07 Aug 2008)
Log Message:
-----------
branches/blender-2.47
Merge from trunk:
Revision: 14917
Revision: 15926
Revision: 15933
Revision: 15935
Revision: 15937
Revision: 15948
Revision: 15949
Revision: 15952
Revision: 15965
Revision: 15966
Revision: 15969
Revision: 15973
Revision: 15975
Revision: 15978
Revision: 15979
Revision: 15985
Revision: 15995
Revision: 15996
This have big changes because the rev 14917 remove an old script and
also we have update to the collada, flt and dxf script.
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14917
Modified Paths:
--------------
branches/blender-2.47/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
branches/blender-2.47/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.vcproj
branches/blender-2.47/release/scripts/bpymodules/colladaImEx/collada.py
branches/blender-2.47/release/scripts/bpymodules/colladaImEx/cstartup.py
branches/blender-2.47/release/scripts/bpymodules/colladaImEx/helperObjects.py
branches/blender-2.47/release/scripts/bpymodules/colladaImEx/translator.py
branches/blender-2.47/release/scripts/bpymodules/colladaImEx/xmlUtils.py
branches/blender-2.47/release/scripts/flt_export.py
branches/blender-2.47/release/scripts/import_dxf.py
branches/blender-2.47/source/blender/blenkernel/BKE_texture.h
branches/blender-2.47/source/blender/blenkernel/intern/modifier.c
branches/blender-2.47/source/blender/blenkernel/intern/particle.c
branches/blender-2.47/source/blender/blenkernel/intern/texture.c
branches/blender-2.47/source/blender/python/api2_2x/Constraint.c
branches/blender-2.47/source/blender/render/intern/source/convertblender.c
branches/blender-2.47/source/blender/src/buttons_object.c
branches/blender-2.47/source/blender/src/drawseq.c
branches/blender-2.47/source/blender/src/editseq.c
branches/blender-2.47/source/gameengine/Converter/KX_IpoConvert.cpp
branches/blender-2.47/source/gameengine/GamePlayer/common/windows/GPW_Canvas.h
branches/blender-2.47/source/gameengine/Ketsji/KX_TouchEventManager.cpp
branches/blender-2.47/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/blender-2.47/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/blender-2.47/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/blender-2.47/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
Removed Paths:
-------------
branches/blender-2.47/release/scripts/bpymodules/dxfImportObjects.py
Modified:
branches/blender-2.47/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
===================================================================
--- branches/blender-2.47/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
2008-08-07 20:12:56 UTC (rev 16010)
+++ branches/blender-2.47/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
2008-08-07 20:41:45 UTC (rev 16011)
@@ -237,6 +237,7 @@
BasicRuntimeChecks="3"
RuntimeLibrary="1"
DefaultCharIsUnsigned="TRUE"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="2"
PrecompiledHeaderFile="..\..\..\..\build\msvc_7\source\gameengine\ketsji\debug\KX_ketsji.pch"
AssemblerListingLocation="..\..\..\..\build\msvc_7\source\gameengine\ketsji\debug\"
Modified:
branches/blender-2.47/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.vcproj
===================================================================
---
branches/blender-2.47/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.vcproj
2008-08-07 20:12:56 UTC (rev 16010)
+++
branches/blender-2.47/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.vcproj
2008-08-07 20:41:45 UTC (rev 16011)
@@ -171,6 +171,7 @@
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="2"
PrecompiledHeaderFile="..\..\..\..\..\..\build\msvc_7\source\gameengine\physics\sumo\debug\PHY_Sumo.pch"
AssemblerListingLocation="..\..\..\..\..\..\build\msvc_7\source\gameengine\physics\sumo\debug\"
Modified:
branches/blender-2.47/release/scripts/bpymodules/colladaImEx/collada.py
===================================================================
--- branches/blender-2.47/release/scripts/bpymodules/colladaImEx/collada.py
2008-08-07 20:12:56 UTC (rev 16010)
+++ branches/blender-2.47/release/scripts/bpymodules/colladaImEx/collada.py
2008-08-07 20:41:45 UTC (rev 16011)
@@ -169,8 +169,9 @@
self.geometriesLibrary.GetItemCount()+
self.lightsLibrary.GetItemCount()+
##self.materialsLibrary.GetItemCount()+
- self.nodesLibrary.GetItemCount()##+
- ##self.visualScenesLibrary.GetItemCount()
+ self.nodesLibrary.GetItemCount()+
+ ##self.visualScenesLibrary.GetItemCount()+
+ 0
)
def __str__(self):
@@ -202,10 +203,13 @@
def LoadFromXml(self,daeDocument, xmlNode):
if xmlNode is None:
return
-
self.id = xmlNode.getAttribute(DaeSyntax.ID)
self.name = xmlNode.getAttribute(DaeSyntax.NAME)
+ if self.id is None:
+ if debprn: print 'deb: missing Node.ID tag
!!!!!****!!!!!'
+ self.id = self.name # TODO: try to repair corrupt
xmlNode data
+
def SaveToXml(self, daeDocument):
node = super(DaeElement,self).SaveToXml(daeDocument)
SetAttribute(node,DaeSyntax.ID,StripString(self.id))
@@ -479,8 +483,8 @@
self.target = xmlUtils.ReadAttribute(xmlNode, DaeSyntax.TARGET)
def SaveToXml(self, daeDocument):
-# print 'deb:DaeChannel() self.source=', self.source #-------
-# print 'deb:DaeChannel() self.target=', self.target #-------
+# if debprn: print 'deb:DaeChannel() self.source=', self.source
#-------
+# if debprn: print 'deb:DaeChannel() self.target=', self.target
#-------
node = super(DaeChannel, self).SaveToXml(daeDocument)
#org SetAttribute(node, DaeSyntax.SOURCE,
StripString('#'+self.source.id))
SetAttribute(node, DaeSyntax.SOURCE,
StripString('#'+self.source))
@@ -1922,7 +1926,7 @@
VCOUNT = 'vcount'
- ##BIND_MATERIAL = 'bind_material'
+ BIND_MATERIAL = 'bind_material' #---
SKELETON = 'skeleton'
P = 'p'
@@ -2005,7 +2009,7 @@
ANIMATION_CLIP = 'animation_clip'
GEOMETRY = 'geometry'
IMAGE = 'image'
- ##EFFECT = 'effect'
+ EFFECT = 'effect' #---
VISUAL_SCENE = 'visual_scene'
CONTROLLER = 'controller'
MATERIAL = 'material'
@@ -2056,7 +2060,7 @@
INSTANCE_ANIMATION = 'instance_animation'
INSTANCE_CAMERA = 'instance_camera'
INSTANCE_CONTROLLER = 'instance_controller'
- ##INSTANCE_EFFECT = 'instance_effect'
+ INSTANCE_EFFECT = 'instance_effect' #---
INSTANCE_GEOMETRY = 'instance_geometry'
INSTANCE_LIGHT = 'instance_light'
INSTANCE_NODE = 'instance_node'
@@ -2129,20 +2133,20 @@
def __init__(self):
super(DaeFxBindVertexInput, self).__init__()
self.semantic = "CHANNEL1"
- self.input_semantic = "TEXCOORD";
- self.input_set = "1";
- self.syntax = "bind_vertex_input";
+ self.input_semantic = "TEXCOORD"
+ self.input_set = "1"
+ self.syntax = "bind_vertex_input"
def LoadFromXml(self, daeDocument, xmlNode):
- self.semantic = xmlUtils.ReadAttribute(xmlNode, "semantic");
- self.input_set = xmlUtils.ReadAttribute(xmlNode,
"input_semantic");
- self.input_semantic = xmlUtils.ReadAttribute(xmlNode,
"input_set");
+ self.semantic = xmlUtils.ReadAttribute(xmlNode, "semantic")
+ self.input_set = xmlUtils.ReadAttribute(xmlNode,
"input_semantic")
+ self.input_semantic = xmlUtils.ReadAttribute(xmlNode,
"input_set")
def SaveToXml(self, daeDocument):
node = super(DaeFxBindVertexInput,self).SaveToXml(daeDocument)
- SetAttribute(node, "semantic", self.semantic);
- SetAttribute(node, "input_semantic", self.input_semantic);
- SetAttribute(node, "input_set", self.input_set);
+ SetAttribute(node, "semantic", self.semantic)
+ SetAttribute(node, "input_semantic", self.input_semantic)
+ SetAttribute(node, "input_set", self.input_set)
return node
@@ -2255,7 +2259,7 @@
def SaveToXml(self, daeDocument):
node = super(DaeFxSampler2D,self).SaveToXml(daeDocument)
-# print 'deb:####class DaeFxSampler2D SaveToXml self.source=',
self.source #----------
+# if debprn: print 'deb:####class DaeFxSampler2D SaveToXml
self.source=', self.source #----------
AppendChild(daeDocument, node, self.source) #bug----
AppendChild(daeDocument, node, self.minfilter);
AppendChild(daeDocument, node, self.maxfilter);
@@ -3475,10 +3479,10 @@
return True
def StripString(text):
- if text != None:
- return text.replace(' ','_').replace('.','_')
- else:
- return text;
+ if text != None:
+ return text.replace(' ','_').replace('.','_')
+ else:
+ return text;
def CreateExtra(colladaInstance):
if isinstance(colladaInstance, DaeEntity):
Modified:
branches/blender-2.47/release/scripts/bpymodules/colladaImEx/cstartup.py
===================================================================
--- branches/blender-2.47/release/scripts/bpymodules/colladaImEx/cstartup.py
2008-08-07 20:12:56 UTC (rev 16010)
+++ branches/blender-2.47/release/scripts/bpymodules/colladaImEx/cstartup.py
2008-08-07 20:41:45 UTC (rev 16011)
@@ -23,8 +23,8 @@
# ***** END GPL LICENCE BLOCK *****
# --------------------------------------------------------------------------
-#debug = True
-debug = False
+debug = False #--- debug mode
+debprn = False #--- print debug "print 'deb: ..."
_ERROR = False
_PERROR = False
@@ -36,7 +36,7 @@
print "Error! Could not find Blender modules!"
_ERROR = True
-__version__ = '0.3.159'
+__version__ = '0.3.160'
# Show the wait cursor in blender
Blender.Window.WaitCursor(1)
@@ -50,13 +50,13 @@
#defaultFileUrl = 'animation_robot.DAE'
defaultExportUrl = ''
-# Check if full version of python is installed.
+# Check if full version of python is installed.
try:
import os
except ImportError:
print"Error! Could not find full version of Python..."
_ERROR = True
-
+
if _ERROR:
from sys import version_info
version = '%s.%s' % version_info[0:2]
@@ -83,45 +83,45 @@
except NameError:
print "\nError! Could not find Collada Utils (cutils) module!"
_ERROR = True
-
+
try:
import xmlUtils
except NameError:
print "\nError! Could not find XML module!"
_PERROR = True
-
+
try:
import collada
except NameError:
print "Error! Could not find Collada(collada.py) module"
_PERROR = True
-
+
try:
import translator
except NameError:
print "Error! Could not find Collada Translator (translator.py)
module"
_PERROR = True
-
+
try:
import helperObjects
except NameError:
print "Error! Could not find Collada helperObjects
(helperObjects.py) module"
_PERROR = True
-
+
# Try to load extra python modules
try:
import math
except NameError:
print "Error! Could not find math module"
_PERROR = True
-
+
if _PERROR:
Blender.Draw.PupMenu("Cannot load plugin modules.")
else:
# A List with al the modules (in the scriptsdir) to be reloaded
modules = [cutils, xmlUtils, collada, helperObjects, translator]
-
+
def Main(doImp, scriptsLoc):
global debug, __version__, doImport, scriptsLocation, defaultFilename,
valsLoaded
if _ERROR or _PERROR:
@@ -138,33 +138,33 @@
print 'Could not find a scripts path'
else:
scriptsLocation = scriptsLoc
-
-
+
+
if not ReloadModules():
print 'cannot reload all modules'
return False
# Clear the console
cutils.ClearConsole()
-
+
# set the debuglevel
if debug:
cutils.Debug.SetLevel('DEBUG')
else:
cutils.Debug.SetLevel('FEEDBACK')
-
+
cutils.Debug.Debug('Illusoft Collada 1.4 Plugin v%s
started'%(__version__),'FEEDBACK')
# Create a Collada <-> Blender Translator
if debug:
print 'keep track of the time to execute this script' #---------
startTime = Blender.sys.time()
-
+
##fileurl = scriptsDir
fileurl = ''
if doImport:
fileurl+= defaultFileUrl
else :
fileurl += defaultExportUrl
- print 'deb: fileurl=',fileurl #-------
+ if debprn: print 'deb: fileurl=',fileurl #-------
useTriangles = False
usePolygons = False
@@ -181,37 +181,37 @@
onlyMainScene = False
transl =
translator.Translator(doImport,__version__,debug,fileurl, useTriangles,
usePolygons, bakeMatrices, exportSelection, newScene, clearScene, lookAt,
usePhysics, exportCurrentScene, exportRelativePaths, useUV, sampleAnimation,
onlyMainScene)
-
- ##transl =
translator.Translator(doImport,__version__,debug,fileurl)
- ##translator =
Translator(False,__version__,debug,scriptsDir+defaultExportUrl)
+
+ ##transl =
translator.Translator(doImport,__version__,debug,fileurl)
+ ##translator =
Translator(False,__version__,debug,scriptsDir+defaultExportUrl)
##translator =
Translator(True,__version__,debug,scriptsDir+defaultExportUrl)
# Redraw al 3D windows.
- print 'deb: ---- the end ----' #-----
- Blender.Window.RedrawAll()
-
+ if debprn: print 'deb: ---- the end ----' #-----
+ Blender.Window.RedrawAll()
+
# calculate the elapsed time
endTime = Blender.sys.time()
elapsedTime = endTime - startTime
cutils.Debug.Debug('FINISHED - time elapsed:
%.1f'%(elapsedTime),'FEEDBACK')
-
+
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
