[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17343] branches/etch-a-ton: merging 17300 :17342

Martin Poirier theeth at yahoo.com
Thu Nov 6 02:30:24 CET 2008


Revision: 17343
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17343
Author:   theeth
Date:     2008-11-06 02:30:24 +0100 (Thu, 06 Nov 2008)

Log Message:
-----------
merging 17300:17342

Modified Paths:
--------------
    branches/etch-a-ton/SConstruct
    branches/etch-a-ton/config/darwin-config.py
    branches/etch-a-ton/config/linux2-config.py
    branches/etch-a-ton/config/linuxcross-config.py
    branches/etch-a-ton/config/openbsd3-config.py
    branches/etch-a-ton/config/sunos5-config.py
    branches/etch-a-ton/config/win32-mingw-config.py
    branches/etch-a-ton/config/win32-vc-config.py
    branches/etch-a-ton/extern/libopenjpeg/SConscript
    branches/etch-a-ton/extern/libredcode/SConscript
    branches/etch-a-ton/extern/libredcode/format.c
    branches/etch-a-ton/release/scripts/add_mesh_empty.py
    branches/etch-a-ton/release/scripts/bpymodules/BPyTextPlugin.py
    branches/etch-a-ton/release/scripts/bpymodules/colladaImEx/translator.py
    branches/etch-a-ton/release/scripts/bpymodules/dxfLibrary.py
    branches/etch-a-ton/release/scripts/export_dxf.py
    branches/etch-a-ton/release/scripts/export_m3g.py
    branches/etch-a-ton/release/scripts/flt_dofedit.py
    branches/etch-a-ton/release/scripts/flt_lodedit.py
    branches/etch-a-ton/release/scripts/flt_palettemanager.py
    branches/etch-a-ton/release/scripts/flt_toolbar.py
    branches/etch-a-ton/release/scripts/image_auto_layout.py
    branches/etch-a-ton/release/scripts/import_lightwave_motion.py
    branches/etch-a-ton/release/scripts/import_web3d.py
    branches/etch-a-ton/release/scripts/scripttemplate_camer_object.py
    branches/etch-a-ton/release/scripts/scripttemplate_gamelogic.py
    branches/etch-a-ton/release/scripts/scripttemplate_gamelogic_basic.py
    branches/etch-a-ton/release/scripts/scripttemplate_ipo_gen.py
    branches/etch-a-ton/release/scripts/scripttemplate_metaball_create.py
    branches/etch-a-ton/release/scripts/scripttemplate_pyconstraint.py
    branches/etch-a-ton/release/scripts/scripttemplate_text_plugin.py
    branches/etch-a-ton/release/scripts/textplugin_functiondocs.py
    branches/etch-a-ton/release/scripts/textplugin_imports.py
    branches/etch-a-ton/release/scripts/textplugin_membersuggest.py
    branches/etch-a-ton/release/scripts/textplugin_outliner.py
    branches/etch-a-ton/release/scripts/textplugin_suggest.py
    branches/etch-a-ton/release/scripts/textplugin_templates.py
    branches/etch-a-ton/source/blender/blenkernel/BKE_lattice.h
    branches/etch-a-ton/source/blender/blenkernel/BKE_shrinkwrap.h
    branches/etch-a-ton/source/blender/blenkernel/BKE_writeffmpeg.h
    branches/etch-a-ton/source/blender/blenkernel/intern/blender.c
    branches/etch-a-ton/source/blender/blenkernel/intern/deform.c
    branches/etch-a-ton/source/blender/blenkernel/intern/exotic.c
    branches/etch-a-ton/source/blender/blenkernel/intern/lattice.c
    branches/etch-a-ton/source/blender/blenkernel/intern/modifier.c
    branches/etch-a-ton/source/blender/blenkernel/intern/shrinkwrap.c
    branches/etch-a-ton/source/blender/blenkernel/intern/simple_deform.c
    branches/etch-a-ton/source/blender/blenkernel/intern/texture.c
    branches/etch-a-ton/source/blender/blenkernel/intern/writeffmpeg.c
    branches/etch-a-ton/source/blender/imbuf/intern/IMB_anim.h
    branches/etch-a-ton/source/blender/imbuf/intern/amiga.c
    branches/etch-a-ton/source/blender/imbuf/intern/anim.c
    branches/etch-a-ton/source/blender/imbuf/intern/readimage.c
    branches/etch-a-ton/source/blender/imbuf/intern/util.c
    branches/etch-a-ton/source/blender/src/buttons_shading.c
    branches/etch-a-ton/source/blender/src/editmesh_mods.c
    branches/etch-a-ton/source/blender/src/reeb.c
    branches/etch-a-ton/source/gameengine/Ketsji/KX_BlenderMaterial.h
    branches/etch-a-ton/source/gameengine/VideoTexture/BlendType.h
    branches/etch-a-ton/source/gameengine/VideoTexture/CMakeLists.txt
    branches/etch-a-ton/source/gameengine/VideoTexture/Common.h
    branches/etch-a-ton/source/gameengine/VideoTexture/Exception.cpp
    branches/etch-a-ton/source/gameengine/VideoTexture/Exception.h
    branches/etch-a-ton/source/gameengine/VideoTexture/FilterBase.cpp
    branches/etch-a-ton/source/gameengine/VideoTexture/FilterBase.h
    branches/etch-a-ton/source/gameengine/VideoTexture/FilterBlueScreen.cpp
    branches/etch-a-ton/source/gameengine/VideoTexture/FilterBlueScreen.h
    branches/etch-a-ton/source/gameengine/VideoTexture/FilterColor.cpp
    branches/etch-a-ton/source/gameengine/VideoTexture/FilterColor.h
    branches/etch-a-ton/source/gameengine/VideoTexture/FilterNormal.cpp
    branches/etch-a-ton/source/gameengine/VideoTexture/FilterNormal.h
    branches/etch-a-ton/source/gameengine/VideoTexture/FilterSource.cpp
    branches/etch-a-ton/source/gameengine/VideoTexture/FilterSource.h
    branches/etch-a-ton/source/gameengine/VideoTexture/ImageBase.cpp
    branches/etch-a-ton/source/gameengine/VideoTexture/ImageBase.h
    branches/etch-a-ton/source/gameengine/VideoTexture/ImageBuff.cpp
    branches/etch-a-ton/source/gameengine/VideoTexture/ImageBuff.h
    branches/etch-a-ton/source/gameengine/VideoTexture/ImageMix.cpp
    branches/etch-a-ton/source/gameengine/VideoTexture/ImageMix.h
    branches/etch-a-ton/source/gameengine/VideoTexture/ImageRender.cpp
    branches/etch-a-ton/source/gameengine/VideoTexture/ImageRender.h
    branches/etch-a-ton/source/gameengine/VideoTexture/ImageViewport.cpp
    branches/etch-a-ton/source/gameengine/VideoTexture/ImageViewport.h
    branches/etch-a-ton/source/gameengine/VideoTexture/Makefile
    branches/etch-a-ton/source/gameengine/VideoTexture/PyTypeList.cpp
    branches/etch-a-ton/source/gameengine/VideoTexture/PyTypeList.h
    branches/etch-a-ton/source/gameengine/VideoTexture/SConscript
    branches/etch-a-ton/source/gameengine/VideoTexture/Texture.cpp
    branches/etch-a-ton/source/gameengine/VideoTexture/Texture.h
    branches/etch-a-ton/source/gameengine/VideoTexture/VideoBase.cpp
    branches/etch-a-ton/source/gameengine/VideoTexture/VideoBase.h
    branches/etch-a-ton/source/gameengine/VideoTexture/VideoFFmpeg.cpp
    branches/etch-a-ton/source/gameengine/VideoTexture/VideoFFmpeg.h
    branches/etch-a-ton/source/gameengine/VideoTexture/blendVideoTex.cpp
    branches/etch-a-ton/tools/Blender.py

Property Changed:
----------------
    branches/etch-a-ton/release/scripts/add_mesh_empty.py
    branches/etch-a-ton/release/scripts/animation_bake_constraints.py
    branches/etch-a-ton/release/scripts/bpymodules/BPyTextPlugin.py
    branches/etch-a-ton/release/scripts/bpymodules/blend2renderinfo.py
    branches/etch-a-ton/release/scripts/bpymodules/colladaImEx/translator.py
    branches/etch-a-ton/release/scripts/bpymodules/dxfLibrary.py
    branches/etch-a-ton/release/scripts/c3d_import.py
    branches/etch-a-ton/release/scripts/export_dxf.py
    branches/etch-a-ton/release/scripts/export_m3g.py
    branches/etch-a-ton/release/scripts/flt_defaultp.py
    branches/etch-a-ton/release/scripts/flt_dofedit.py
    branches/etch-a-ton/release/scripts/flt_lodedit.py
    branches/etch-a-ton/release/scripts/flt_palettemanager.py
    branches/etch-a-ton/release/scripts/flt_properties.py
    branches/etch-a-ton/release/scripts/import_lightwave_motion.py
    branches/etch-a-ton/release/scripts/import_web3d.py
    branches/etch-a-ton/release/scripts/ms3d_import.py
    branches/etch-a-ton/release/scripts/ms3d_import_ascii.py
    branches/etch-a-ton/release/scripts/object_timeofs_follow_act.py
    branches/etch-a-ton/release/scripts/render_save_layers.py
    branches/etch-a-ton/release/scripts/scripttemplate_text_plugin.py
    branches/etch-a-ton/release/scripts/textplugin_functiondocs.py
    branches/etch-a-ton/release/scripts/textplugin_imports.py
    branches/etch-a-ton/release/scripts/textplugin_membersuggest.py
    branches/etch-a-ton/release/scripts/textplugin_outliner.py
    branches/etch-a-ton/release/scripts/textplugin_suggest.py
    branches/etch-a-ton/release/scripts/textplugin_templates.py
    branches/etch-a-ton/release/scripts/weightpaint_average.py
    branches/etch-a-ton/release/scripts/weightpaint_invert.py
    branches/etch-a-ton/release/scripts/wizard_curve2tree.py
    branches/etch-a-ton/source/gameengine/VideoTexture/BlendType.h
    branches/etch-a-ton/source/gameengine/VideoTexture/CMakeLists.txt
    branches/etch-a-ton/source/gameengine/VideoTexture/Common.h
    branches/etch-a-ton/source/gameengine/VideoTexture/Exception.cpp
    branches/etch-a-ton/source/gameengine/VideoTexture/Exception.h
    branches/etch-a-ton/source/gameengine/VideoTexture/FilterBase.cpp
    branches/etch-a-ton/source/gameengine/VideoTexture/FilterBase.h
    branches/etch-a-ton/source/gameengine/VideoTexture/FilterBlueScreen.cpp
    branches/etch-a-ton/source/gameengine/VideoTexture/FilterBlueScreen.h
    branches/etch-a-ton/source/gameengine/VideoTexture/FilterColor.cpp
    branches/etch-a-ton/source/gameengine/VideoTexture/FilterColor.h
    branches/etch-a-ton/source/gameengine/VideoTexture/FilterNormal.cpp
    branches/etch-a-ton/source/gameengine/VideoTexture/FilterNormal.h
    branches/etch-a-ton/source/gameengine/VideoTexture/FilterSource.cpp
    branches/etch-a-ton/source/gameengine/VideoTexture/FilterSource.h
    branches/etch-a-ton/source/gameengine/VideoTexture/ImageBase.cpp
    branches/etch-a-ton/source/gameengine/VideoTexture/ImageBase.h
    branches/etch-a-ton/source/gameengine/VideoTexture/ImageBuff.cpp
    branches/etch-a-ton/source/gameengine/VideoTexture/ImageBuff.h
    branches/etch-a-ton/source/gameengine/VideoTexture/ImageMix.cpp
    branches/etch-a-ton/source/gameengine/VideoTexture/ImageMix.h
    branches/etch-a-ton/source/gameengine/VideoTexture/ImageRender.cpp
    branches/etch-a-ton/source/gameengine/VideoTexture/ImageRender.h
    branches/etch-a-ton/source/gameengine/VideoTexture/ImageViewport.cpp
    branches/etch-a-ton/source/gameengine/VideoTexture/ImageViewport.h
    branches/etch-a-ton/source/gameengine/VideoTexture/Makefile
    branches/etch-a-ton/source/gameengine/VideoTexture/PyTypeList.cpp
    branches/etch-a-ton/source/gameengine/VideoTexture/PyTypeList.h
    branches/etch-a-ton/source/gameengine/VideoTexture/SConscript
    branches/etch-a-ton/source/gameengine/VideoTexture/Texture.cpp
    branches/etch-a-ton/source/gameengine/VideoTexture/Texture.h
    branches/etch-a-ton/source/gameengine/VideoTexture/VideoBase.cpp
    branches/etch-a-ton/source/gameengine/VideoTexture/VideoBase.h
    branches/etch-a-ton/source/gameengine/VideoTexture/VideoFFmpeg.cpp
    branches/etch-a-ton/source/gameengine/VideoTexture/VideoFFmpeg.h
    branches/etch-a-ton/source/gameengine/VideoTexture/blendVideoTex.cpp

Modified: branches/etch-a-ton/SConstruct
===================================================================
--- branches/etch-a-ton/SConstruct	2008-11-06 00:28:26 UTC (rev 17342)
+++ branches/etch-a-ton/SConstruct	2008-11-06 01:30:24 UTC (rev 17343)
@@ -227,7 +227,7 @@
             context.Result(result)
             return result
 
-        env2 = env.Copy( LIBPATH = env['BF_OPENAL'] ) 
+        env2 = env.Clone( LIBPATH = env['BF_OPENAL'] ) 
         sconf_temp = mkdtemp()
         conf = Configure( env2, {'CheckFreeAlut' : CheckFreeAlut}, sconf_temp, '/dev/null' )
         if conf.CheckFreeAlut( env2 ):

Modified: branches/etch-a-ton/config/darwin-config.py
===================================================================
--- branches/etch-a-ton/config/darwin-config.py	2008-11-06 00:28:26 UTC (rev 17342)
+++ branches/etch-a-ton/config/darwin-config.py	2008-11-06 01:30:24 UTC (rev 17343)
@@ -260,11 +260,11 @@
 ##LOPTS = --dynamic
 ##DYNLDFLAGS = -shared $(LDFLAGS)
 
-BF_PROFILE_FLAGS = ' -pg -g '
+BF_PROFILE_CCFLAGS = ['-pg', '-g ']
 BF_PROFILE = False
 
 BF_DEBUG = False
-BF_DEBUG_FLAGS = '-g'
+BF_DEBUG_CCFLAGS = ['-g']
 
 BF_BUILDDIR='../build/darwin'
 BF_INSTALLDIR='../install/darwin'

Modified: branches/etch-a-ton/config/linux2-config.py
===================================================================
--- branches/etch-a-ton/config/linux2-config.py	2008-11-06 00:28:26 UTC (rev 17342)
+++ branches/etch-a-ton/config/linux2-config.py	2008-11-06 01:30:24 UTC (rev 17343)
@@ -197,11 +197,11 @@
 ##LOPTS = --dynamic
 ##DYNLDFLAGS = -shared $(LDFLAGS)
 
-BF_PROFILE_FLAGS = ['-pg','-g']
 BF_PROFILE = False
+BF_PROFILE_CCFLAGS = ['-pg','-g']
 
 BF_DEBUG = False
-BF_DEBUG_FLAGS = '-g'
+BF_DEBUG_CCFLAGS = ['-g']
 
 BF_BUILDDIR = '../build/linux2'
 BF_INSTALLDIR='../install/linux2'

Modified: branches/etch-a-ton/config/linuxcross-config.py
===================================================================
--- branches/etch-a-ton/config/linuxcross-config.py	2008-11-06 00:28:26 UTC (rev 17342)
+++ branches/etch-a-ton/config/linuxcross-config.py	2008-11-06 01:30:24 UTC (rev 17343)
@@ -144,7 +144,7 @@
 LLIBS = [ '-ldxguid', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz'] #'-lutil', '-lc', '-lm', '-ldl', '-lpthread' ]
 
 BF_DEBUG = False
-BF_DEBUG_FLAGS= ''
+BF_DEBUG_CCFLAGS= []
 
 BF_BUILDDIR = '../build/linuxcross'
 BF_INSTALLDIR='../install/linuxcross'

Modified: branches/etch-a-ton/config/openbsd3-config.py
===================================================================
--- branches/etch-a-ton/config/openbsd3-config.py	2008-11-06 00:28:26 UTC (rev 17342)
+++ branches/etch-a-ton/config/openbsd3-config.py	2008-11-06 01:30:24 UTC (rev 17343)
@@ -155,11 +155,11 @@
 ##LOPTS = --dynamic
 ##DYNLDFLAGS = -shared $(LDFLAGS)
 
-BF_PROFILE_FLAGS = ' -pg -g '
+BF_PROFILE_CCFLAGS = ['-pg', '-g']
 BF_PROFILE = False
 
 BF_DEBUG = False
-BF_DEBUG_FLAGS = '-g'
+BF_DEBUG_CCFLAGS = ['-g']
 
 BF_BUILDDIR='../build/openbsd3'
 BF_INSTALLDIR='../install/openbsd3'

Modified: branches/etch-a-ton/config/sunos5-config.py
===================================================================
--- branches/etch-a-ton/config/sunos5-config.py	2008-11-06 00:28:26 UTC (rev 17342)
+++ branches/etch-a-ton/config/sunos5-config.py	2008-11-06 01:30:24 UTC (rev 17343)
@@ -169,15 +169,15 @@
 ##LOPTS = --dynamic
 ##DYNLDFLAGS = -shared $(LDFLAGS)
 
-BF_PROFILE_FLAGS = ['-pg','-g']
+BF_PROFILE_CCFLAGS = ['-pg','-g']
 BF_PROFILE = False
 
 BF_DEBUG = False
-BF_DEBUG_FLAGS = ''
+BF_DEBUG_CCFLAGS = []
 
 BF_BUILDDIR = '../build/sunos5'
 BF_INSTALLDIR='../install/sunos5'
 BF_DOCDIR='../install/doc'
 
 
-PLATFORM_LINKFLAGS = ['']
+PLATFORM_LINKFLAGS = []

Modified: branches/etch-a-ton/config/win32-mingw-config.py
===================================================================
--- branches/etch-a-ton/config/win32-mingw-config.py	2008-11-06 00:28:26 UTC (rev 17342)
+++ branches/etch-a-ton/config/win32-mingw-config.py	2008-11-06 01:30:24 UTC (rev 17343)
@@ -160,9 +160,9 @@
 LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++']
 
 BF_DEBUG = False
-BF_DEBUG_FLAGS= '-g'
+BF_DEBUG_CCFLAGS= ['-g']
 
-BF_PROFILE_FLAGS = ['-pg','-g']
+BF_PROFILE_CCFLAGS = ['-pg','-g']
 BF_PROFILE = False
 
 BF_BUILDDIR = '..\\build\\win32-mingw'

Modified: branches/etch-a-ton/config/win32-vc-config.py
===================================================================
--- branches/etch-a-ton/config/win32-vc-config.py	2008-11-06 00:28:26 UTC (rev 17342)
+++ branches/etch-a-ton/config/win32-vc-config.py	2008-11-06 01:30:24 UTC (rev 17343)
@@ -150,6 +150,11 @@
 BF_QUICKTIME_LIB = 'qtmlClient'
 BF_QUICKTIME_LIBPATH = '${BF_QUICKTIME}/Libraries'
 
+WITH_BF_OPENJPEG = True 
+
+WITH_BF_REDCODE = False  
+BF_REDCODE_INC = '#extern'
+
 WITH_BF_STATICOPENGL = False
 BF_OPENGL_INC = '${BF_OPENGL}/include'
 BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'

Modified: branches/etch-a-ton/extern/libopenjpeg/SConscript
===================================================================
--- branches/etch-a-ton/extern/libopenjpeg/SConscript	2008-11-06 00:28:26 UTC (rev 17342)
+++ branches/etch-a-ton/extern/libopenjpeg/SConscript	2008-11-06 01:30:24 UTC (rev 17343)
@@ -7,14 +7,18 @@
 sources = env.Glob('*.c')
 incs = '.'
 
-flags = "-Wall -O3 -ffast-math -std=c99"
+if env['OURPLATFORM'] == 'win32-vc':
+	flags = []
+else:
+	flags = ['-Wall', '-O3', '-ffast-math', '-std=c99']
 
-oj_env = env.Copy();
-oj_env.Replace(CCFLAGS = '')
-oj_env.Replace(BF_DEBUG_FLAGS = '')
+oj_env = env.Clone()
+if not env['OURPLATFORM'] == 'win32-vc':
+	oj_env.Replace(CCFLAGS = '')
+	oj_env.Replace(BF_DEBUG_FLAGS = '')
 
 oj_env.BlenderLib ( libname='extern_openjpeg', 
                     sources=sources, includes=Split(incs),
                     defines=[],
                     libtype=['core','intern','player'],
-                    priority=[10, 10, 300], compileflags = Split(flags))
+                    priority=[10, 10, 300], compileflags = flags)

Modified: branches/etch-a-ton/extern/libredcode/SConscript
===================================================================
--- branches/etch-a-ton/extern/libredcode/SConscript	2008-11-06 00:28:26 UTC (rev 17342)
+++ branches/etch-a-ton/extern/libredcode/SConscript	2008-11-06 01:30:24 UTC (rev 17343)
@@ -9,18 +9,6 @@
 sources = env.Glob('*.c')
 incs = '. ../libopenjpeg'
 
-root = "extern/libredcode"
-
-if not os.path.isdir(root + "/include"):
-    os.mkdir(root + "/include");
-if not os.path.isdir(root + "/include/redcode"):
-    os.mkdir(root + "/include/redcode");
-
-for h in env.Glob('*.h'):
-    shutil.copyfile(root + "/" + h,
-                    root + "/include/redcode/" + h)
-
-
 env.BlenderLib ( libname='extern_redcode', 
                  sources=sources, includes=Split(incs),
                  defines=[],

Modified: branches/etch-a-ton/extern/libredcode/format.c
===================================================================
--- branches/etch-a-ton/extern/libredcode/format.c	2008-11-06 00:28:26 UTC (rev 17342)
+++ branches/etch-a-ton/extern/libredcode/format.c	2008-11-06 01:30:24 UTC (rev 17343)
@@ -1,4 +1,9 @@
+#ifdef _WIN32
+#include <Winsock2.h>
+#else
 #include <netinet/in.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

Modified: branches/etch-a-ton/release/scripts/add_mesh_empty.py
===================================================================
--- branches/etch-a-ton/release/scripts/add_mesh_empty.py	2008-11-06 00:28:26 UTC (rev 17342)
+++ branches/etch-a-ton/release/scripts/add_mesh_empty.py	2008-11-06 01:30:24 UTC (rev 17343)
@@ -1,13 +1,13 @@
-#!BPY
-"""
-Name: 'Empty mesh'
-Blender: 243
-Group: 'AddMesh'
-"""
-import BPyAddMesh
-import Blender
-
-def main():
-	BPyAddMesh.add_mesh_simple('EmptyMesh', [], [], [])
-
+#!BPY
+"""
+Name: 'Empty mesh'
+Blender: 243
+Group: 'AddMesh'
+"""
+import BPyAddMesh
+import Blender
+
+def main():
+	BPyAddMesh.add_mesh_simple('EmptyMesh', [], [], [])
+
 main()
\ No newline at end of file


Property changes on: branches/etch-a-ton/release/scripts/add_mesh_empty.py
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native


Property changes on: branches/etch-a-ton/release/scripts/animation_bake_constraints.py
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/etch-a-ton/release/scripts/bpymodules/BPyTextPlugin.py
===================================================================
--- branches/etch-a-ton/release/scripts/bpymodules/BPyTextPlugin.py	2008-11-06 00:28:26 UTC (rev 17342)
+++ branches/etch-a-ton/release/scripts/bpymodules/BPyTextPlugin.py	2008-11-06 01:30:24 UTC (rev 17343)
@@ -1,814 +1,814 @@
-"""The BPyTextPlugin Module
-
-Use get_cached_descriptor(txt) to retrieve information about the script held in
-the txt Text object.
-
-Use print_cache_for(txt) to print the information to the console.
-
-Use line, cursor = current_line(txt) to get the logical line and cursor position
-
-Use get_targets(line, cursor) to find out what precedes the cursor:
-	aaa.bbb.cc|c.ddd -> ['aaa', 'bbb', 'cc']
-
-Use resolve_targets(txt, targets) to turn a target list into a usable object if
-one is found to match.
-"""
-
-import bpy, sys, os
-import __builtin__, tokenize
-from Blender.sys import time
-from tokenize import generate_tokens, TokenError, \
-		COMMENT, DEDENT, INDENT, NAME, NEWLINE, NL, STRING, NUMBER
-
-class Definition:
-	"""Describes a definition or defined object through its name, line number
-	and docstring. This is the base class for definition based descriptors.
-	"""
-	
-	def __init__(self, name, lineno, doc=''):
-		self.name = name
-		self.lineno = lineno
-		self.doc = doc
-
-class ScriptDesc:
-	"""Describes a script through lists of further descriptor objects (classes,
-	defs, vars) and dictionaries to built-in types (imports). If a script has
-	not been fully parsed, its incomplete flag will be set. The time of the last
-	parse is held by the time field and the name of the text object from which
-	it was parsed, the name field.
-	"""
-	
-	def __init__(self, name, imports, classes, defs, vars, incomplete=False):
-		self.name = name
-		self.imports = imports
-		self.classes = classes
-		self.defs = defs
-		self.vars = vars
-		self.incomplete = incomplete
-		self.parse_due = 0
-	
-	def set_delay(self, delay):

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list