Revision: 17500
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17500
Author: campbellbarton
Date: 2008-11-19 04:43:03 +0100 (Wed, 19 Nov 2008)
Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17471:HEAD
Modified Paths:
--------------
branches/projection-paint/SConstruct
branches/projection-paint/config/darwin-config.py
branches/projection-paint/config/linux2-config.py
branches/projection-paint/config/linuxcross-config.py
branches/projection-paint/config/openbsd3-config.py
branches/projection-paint/config/sunos5-config.py
branches/projection-paint/config/win32-mingw-config.py
branches/projection-paint/config/win32-vc-config.py
branches/projection-paint/release/scripts/import_dxf.py
branches/projection-paint/source/blender/blenlib/intern/arithb.c
branches/projection-paint/source/blender/imbuf/IMB_imbuf.h
branches/projection-paint/source/blender/imbuf/intern/imageprocess.c
branches/projection-paint/source/blender/makesdna/intern/SConscript
branches/projection-paint/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/projection-paint/tools/Blender.py
branches/projection-paint/tools/btools.py
Modified: branches/projection-paint/SConstruct
===================================================================
--- branches/projection-paint/SConstruct 2008-11-19 03:28:07 UTC (rev
17499)
+++ branches/projection-paint/SConstruct 2008-11-19 03:43:03 UTC (rev
17500)
@@ -249,7 +249,7 @@
# remove stdc++ from LLIBS if we are building a statc linked CXXFLAGS
if env['WITH_BF_STATICCXX']:
if 'stdc++' in env['LLIBS']:
- env['LLIBS'] = env['LLIBS'].replace('stdc++', ' ')
+ env['LLIBS'].remove('stdc++')
else:
print '\tcould not remove stdc++ library from LLIBS,
WITH_BF_STATICCXX may not work for your platform'
Modified: branches/projection-paint/config/darwin-config.py
===================================================================
--- branches/projection-paint/config/darwin-config.py 2008-11-19 03:28:07 UTC
(rev 17499)
+++ branches/projection-paint/config/darwin-config.py 2008-11-19 03:43:03 UTC
(rev 17500)
@@ -216,14 +216,14 @@
PLATFORM_LINKFLAGS = '-fexceptions -framework CoreServices -framework
Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL
-framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework
QuickTime'
#note to build succesfully on 10.3.9 SDK you need to patch 10.3.9 by adding
the SystemStubs.a lib from 10.4
-LLIBS = 'stdc++ SystemStubs'
+LLIBS = ['stdc++', 'SystemStubs']
# some flags shuffling for different Os versions
if MAC_MIN_VERS == '10.3':
CFLAGS = ['-fuse-cxa-atexit']+CFLAGS
CXXFLAGS = ['-fuse-cxa-atexit']+CXXFLAGS
PLATFORM_LINKFLAGS = '-fuse-cxa-atexit '+PLATFORM_LINKFLAGS
- LLIBS = LLIBS + ' crt3.o'
+ LLIBS.append('crt3.o')
if USE_SDK==True:
SDK_FLAGS=['-isysroot',
MACOSX_SDK,'-mmacosx-version-min='+MAC_MIN_VERS]
@@ -261,6 +261,7 @@
##DYNLDFLAGS = -shared $(LDFLAGS)
BF_PROFILE_CCFLAGS = ['-pg', '-g ']
+BF_PROFILE_LINKFLAGS = ['-pg']
BF_PROFILE = False
BF_DEBUG = False
Modified: branches/projection-paint/config/linux2-config.py
===================================================================
--- branches/projection-paint/config/linux2-config.py 2008-11-19 03:28:07 UTC
(rev 17499)
+++ branches/projection-paint/config/linux2-config.py 2008-11-19 03:43:03 UTC
(rev 17500)
@@ -193,12 +193,13 @@
##FIX_STUBS_WARNINGS = -Wno-unused
-LLIBS = 'util c m dl pthread stdc++'
+LLIBS = ['util', 'c', 'm', 'dl', 'pthread', 'stdc++']
##LOPTS = --dynamic
##DYNLDFLAGS = -shared $(LDFLAGS)
BF_PROFILE = False
BF_PROFILE_CCFLAGS = ['-pg','-g']
+BF_PROFILE_LINKFLAGS = ['-pg']
BF_DEBUG = False
BF_DEBUG_CCFLAGS = ['-g']
Modified: branches/projection-paint/config/linuxcross-config.py
===================================================================
--- branches/projection-paint/config/linuxcross-config.py 2008-11-19
03:28:07 UTC (rev 17499)
+++ branches/projection-paint/config/linuxcross-config.py 2008-11-19
03:43:03 UTC (rev 17500)
@@ -149,6 +149,10 @@
BF_DEBUG = False
BF_DEBUG_CCFLAGS= []
+BF_PROFILE = False
+BF_PROFILE_CCFLAGS = ['-pg','-g']
+BF_PROFILE_LINKFLAGS = ['-pg']
+
BF_BUILDDIR = '../build/linuxcross'
BF_INSTALLDIR='../install/linuxcross'
BF_DOCDIR='../install/doc'
Modified: branches/projection-paint/config/openbsd3-config.py
===================================================================
--- branches/projection-paint/config/openbsd3-config.py 2008-11-19 03:28:07 UTC
(rev 17499)
+++ branches/projection-paint/config/openbsd3-config.py 2008-11-19 03:43:03 UTC
(rev 17500)
@@ -151,12 +151,13 @@
##FIX_STUBS_WARNINGS = -Wno-unused
-LLIBS = 'm stdc++ pthread util'
+LLIBS = ['m', 'stdc++', 'pthread', 'util']
##LOPTS = --dynamic
##DYNLDFLAGS = -shared $(LDFLAGS)
-BF_PROFILE_CCFLAGS = ['-pg', '-g']
BF_PROFILE = False
+BF_PROFILE_CCFLAGS = ['-pg','-g']
+BF_PROFILE_LINKFLAGS = ['-pg']
BF_DEBUG = False
BF_DEBUG_CCFLAGS = ['-g']
Modified: branches/projection-paint/config/sunos5-config.py
===================================================================
--- branches/projection-paint/config/sunos5-config.py 2008-11-19 03:28:07 UTC
(rev 17499)
+++ branches/projection-paint/config/sunos5-config.py 2008-11-19 03:43:03 UTC
(rev 17500)
@@ -165,11 +165,12 @@
##FIX_STUBS_WARNINGS = -Wno-unused
-LLIBS = 'c m dl pthread stdc++'
+LLIBS = ['c', 'm', 'dl', 'pthread', 'stdc++']
##LOPTS = --dynamic
##DYNLDFLAGS = -shared $(LDFLAGS)
-BF_PROFILE_CCFLAGS = ['-pg','-g']
+BF_PROFILE_CCFLAGS = ['-pg', '-g ']
+BF_PROFILE_LINKFLAGS = ['-pg']
BF_PROFILE = False
BF_DEBUG = False
Modified: branches/projection-paint/config/win32-mingw-config.py
===================================================================
--- branches/projection-paint/config/win32-mingw-config.py 2008-11-19
03:28:07 UTC (rev 17499)
+++ branches/projection-paint/config/win32-mingw-config.py 2008-11-19
03:43:03 UTC (rev 17500)
@@ -164,7 +164,8 @@
BF_DEBUG = False
BF_DEBUG_CCFLAGS= ['-g']
-BF_PROFILE_CCFLAGS = ['-pg','-g']
+BF_PROFILE_CCFLAGS = ['-pg', '-g ']
+BF_PROFILE_LINKFLAGS = ['-pg']
BF_PROFILE = False
BF_BUILDDIR = '..\\build\\win32-mingw'
Modified: branches/projection-paint/config/win32-vc-config.py
===================================================================
--- branches/projection-paint/config/win32-vc-config.py 2008-11-19 03:28:07 UTC
(rev 17499)
+++ branches/projection-paint/config/win32-vc-config.py 2008-11-19 03:43:03 UTC
(rev 17500)
@@ -181,7 +181,7 @@
CC_WARN = []
CXX_WARN = []
-LLIBS = 'ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder
shell32 ole32 oleaut32 uuid'
+LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32',
'comdlg32', 'advapi32', 'shfolder', 'shell32', 'ole32', 'oleaut32', 'uuid']
PLATFORM_LINKFLAGS = '''
/SUBSYSTEM:CONSOLE
@@ -197,6 +197,11 @@
/LARGEADDRESSAWARE
'''
+# # Todo
+# BF_PROFILE_CCFLAGS = ['-pg', '-g ']
+# BF_PROFILE_LINKFLAGS = ['-pg']
+# BF_PROFILE = False
+
BF_BUILDDIR = '..\\build\\win32-vc'
BF_INSTALLDIR='..\\install\\win32-vc'
BF_DOCDIR='..\\install\\doc'
Modified: branches/projection-paint/release/scripts/import_dxf.py
===================================================================
--- branches/projection-paint/release/scripts/import_dxf.py 2008-11-19
03:28:07 UTC (rev 17499)
+++ branches/projection-paint/release/scripts/import_dxf.py 2008-11-19
03:43:03 UTC (rev 17500)
@@ -7,7 +7,7 @@
Tooltip: 'Import for DXF geometry data (Drawing eXchange Format).'
"""
__author__ = 'Kitsu(Ed Blake) & migius(Remigiusz Fiedler)'
-__version__ = '1.12 - 2008.08.03 by migius'
+__version__ = '1.12 - 2008.11.16 by migius'
__url__ = ["http://blenderartists.org/forum/showthread.php?t=84319";,
"http://wiki.blender.org/index.php/Scripts/Manual/Import/DXF-3D";]
__email__ = ["migius(at)4d-vectors.de","Kitsune_e(at)yahoo.com"]
@@ -111,6 +111,9 @@
-- support ortho mode for VIEWs and VPORTs as cameras
+ v1.12 - 2008.11.16 by migius
+ d1 remove try_finally: cause not supported in python <2.5
+ d1 add Bezier curves bevel radius support (default 1.0)
v1.12 - 2008.08.03 by migius
c2 warningfix: relocating of globals: layersmap, oblist
c2 modif UI: buttons newScene+targetLayer moved to start panel
@@ -299,7 +302,7 @@
import Blender
from Blender import *
#from Blender.Mathutils import Vector, Matrix
-import bpy
+#import bpy #not used yet
#import BPyMessages
from dxfReader import readDXF
@@ -311,7 +314,7 @@
try:
import os
- if os.name:# != 'mac':
+ if os.name != 'mac':
import psyco
psyco.log(Blender.Get('tempdir')+"/blender.log-psyco")
#psyco.log()
@@ -320,7 +323,7 @@
psyco.profile(0.2)
#print 'psyco imported'
except ImportError:
- #print 'psyco not imported'
+ print 'psyco not imported'
pass
#try: Curve.orderU
@@ -346,7 +349,7 @@
MIN_THICK = MIN_DIST * 10.0 #minimal thickness by forced thickness
MIN_WIDTH = MIN_DIST * 10.0 #minimal width by forced width
TRIM_LIMIT = 3.0 #limit for triming of polylines-wide-segments
(values:0.0 - 5.0)
-ELEVATION = 0.0 #standard elevation = coordinate Z
+ELEVATION = 0.0 #standard elevation = coordinate Z value
BYBLOCK = 0
BYLAYER = 256
@@ -817,6 +820,7 @@
curve.append(BezTriple.New(points[1]))
for point in curve:
point.handleTypes = [VECT, VECT]
+ point.radius = 1.0
curve.flagU = 0 # 0 sets the curve not cyclic=open
c.setResolu(settings.var['curve_res'])
c.update() #important for handles calculation
@@ -1341,9 +1345,11 @@
nurbs_points.append(pkt)
firstpoint = nurbs_points[0]
curve = pline.appendNurb(firstpoint)
- curve.setType(4) # set curvetype NURBS
+ curve.setType(4) # set curve_type NURBS
+ print 'deb: dir(curve):', dir(curve[-1])
#----------------
for point in nurbs_points[1:]:
curve.append(point)
+ #TODO: what is the trick for bevel radius?
curve[-1].radius = 1.0
if self.closed:
curve.flagU = 1+0 # Set curve cyclic=close and
uni
else:
@@ -1359,6 +1365,7 @@
curve.append(BezTriple.New(p))
for point in curve:
point.handleTypes = [AUTO, AUTO]
+ point.radius = 1.0
if self.closed:
curve.flagU = 1 # Set curve cyclic=close
else:
@@ -1380,6 +1387,7 @@
curve.append(BezTriple.New(p))
for point in curve:
point.handleTypes = [AUTO, AUTO]
+ point.radius = 1.0
#curve.setType(1) #Bezier curve
if self.closed:
curve.flagU = 5 #1 # Set curve cyclic=close
@@ -1392,6 +1400,7 @@
p0h1 = [p0h1[i]+begtangent[i] for i in
range(3)]
curve.__setitem__(0,BezTriple.New(p0h1+p0+p0h2))
curve[0].handleTypes = [FREE, ALIGN]
#remi--todo-----
+ curve[0].radius = 1.0
if endtangent:
#print 'deb:polyline2dCurve.draw
curve[-1].vec:', curve[-1].vec #-----
#print 'deb:polyline2dCurve.draw
endtangent:', endtangent #-----
@@ -1401,6 +1410,7 @@
curve.__setitem__(-1,BezTriple.New(p0h1+p0+p0h2))
#print 'deb:polyline2dCurve.draw
curve[-1].vec:', curve[-1].vec #-----
curve[-1].handleTypes = [ALIGN, FREE]
#remi--todo-----
+ curve[-1].radius = 1.0
@@ -1420,13 +1430,16 @@
if i == 0: curve =
pline.appendNurb(BezTriple.New(verts[0]))
else:
curve.append(BezTriple.New(verts[0]))
curve[-1].handleTypes = [VECT,
VECT] #--todo--calculation of bezier-tangents
+ curve[-1].radius = 1.0
for p in verts[1:]:
curve.append(BezTriple.New(p))
curve[-1].handleTypes =
[AUTO, AUTO]
+ curve[-1].radius = 1.0
else:
if i == 0: curve =
pline.appendNurb(BezTriple.New(point1.loc))
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
