[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15203] branches/soc-2008-jaguarandi: Merge from trunk
André Pinto
andresusanopinto at gmail.com
Thu Jun 12 00:53:52 CEST 2008
Revision: 15203
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15203
Author: jaguarandi
Date: 2008-06-12 00:53:52 +0200 (Thu, 12 Jun 2008)
Log Message:
-----------
Merge from trunk
svn merge -r 15104:15202 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/soc-2008-jaguarandi/extern/bFTGL/SConscript
branches/soc-2008-jaguarandi/extern/libopenjpeg/opj_malloc.h
branches/soc-2008-jaguarandi/release/datafiles/blenderbuttons
branches/soc-2008-jaguarandi/release/scripts/import_dxf.py
branches/soc-2008-jaguarandi/source/blender/blenkernel/BKE_object.h
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/collision.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/customdata.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/library.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/object.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/pointcache.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/text.c
branches/soc-2008-jaguarandi/source/blender/blenlib/BLI_arithb.h
branches/soc-2008-jaguarandi/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2008-jaguarandi/source/blender/blenlib/intern/arithb.c
branches/soc-2008-jaguarandi/source/blender/blenlib/intern/bpath.c
branches/soc-2008-jaguarandi/source/blender/blenlib/intern/util.c
branches/soc-2008-jaguarandi/source/blender/include/BIF_resources.h
branches/soc-2008-jaguarandi/source/blender/include/BSE_view.h
branches/soc-2008-jaguarandi/source/blender/include/transform.h
branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_scene_types.h
branches/soc-2008-jaguarandi/source/blender/python/BPY_interface.c
branches/soc-2008-jaguarandi/source/blender/python/api2_2x/Blender.c
branches/soc-2008-jaguarandi/source/blender/python/api2_2x/Object.c
branches/soc-2008-jaguarandi/source/blender/python/api2_2x/Particle.c
branches/soc-2008-jaguarandi/source/blender/python/api2_2x/Sys.c
branches/soc-2008-jaguarandi/source/blender/python/api2_2x/doc/Object.py
branches/soc-2008-jaguarandi/source/blender/python/api2_2x/sceneRender.c
branches/soc-2008-jaguarandi/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2008-jaguarandi/source/blender/render/intern/include/render_types.h
branches/soc-2008-jaguarandi/source/blender/render/intern/source/convertblender.c
branches/soc-2008-jaguarandi/source/blender/render/intern/source/rendercore.c
branches/soc-2008-jaguarandi/source/blender/src/blenderbuttons.c
branches/soc-2008-jaguarandi/source/blender/src/buttons_editing.c
branches/soc-2008-jaguarandi/source/blender/src/buttons_object.c
branches/soc-2008-jaguarandi/source/blender/src/buttons_scene.c
branches/soc-2008-jaguarandi/source/blender/src/drawipo.c
branches/soc-2008-jaguarandi/source/blender/src/drawmesh.c
branches/soc-2008-jaguarandi/source/blender/src/drawview.c
branches/soc-2008-jaguarandi/source/blender/src/editmesh_lib.c
branches/soc-2008-jaguarandi/source/blender/src/editnode.c
branches/soc-2008-jaguarandi/source/blender/src/editparticle.c
branches/soc-2008-jaguarandi/source/blender/src/header_view3d.c
branches/soc-2008-jaguarandi/source/blender/src/meshtools.c
branches/soc-2008-jaguarandi/source/blender/src/space.c
branches/soc-2008-jaguarandi/source/blender/src/transform.c
branches/soc-2008-jaguarandi/source/blender/src/transform_generics.c
branches/soc-2008-jaguarandi/source/blender/src/transform_snap.c
branches/soc-2008-jaguarandi/source/blender/src/view.c
branches/soc-2008-jaguarandi/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/soc-2008-jaguarandi/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_RayCast.cpp
branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/soc-2008-jaguarandi/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
Added Paths:
-----------
branches/soc-2008-jaguarandi/extern/libopenjpeg/patches/
branches/soc-2008-jaguarandi/extern/libopenjpeg/patches/osx.patch
Removed Paths:
-------------
branches/soc-2008-jaguarandi/extern/libopenjpeg/patches/osx.patch
Modified: branches/soc-2008-jaguarandi/extern/bFTGL/SConscript
===================================================================
--- branches/soc-2008-jaguarandi/extern/bFTGL/SConscript 2008-06-11 22:35:27 UTC (rev 15202)
+++ branches/soc-2008-jaguarandi/extern/bFTGL/SConscript 2008-06-11 22:53:52 UTC (rev 15203)
@@ -22,7 +22,7 @@
#ftgl_env.Append (CPPDEFINES = defines)
-incs = 'include src ' + env['BF_FREETYPE_INC']
+incs = 'include src ' + env['BF_FREETYPE_INC'] + ' ' + env['BF_OPENGL_INC']
defs = ''
sources = env.Glob('src/*.cpp')
Modified: branches/soc-2008-jaguarandi/extern/libopenjpeg/opj_malloc.h
===================================================================
--- branches/soc-2008-jaguarandi/extern/libopenjpeg/opj_malloc.h 2008-06-11 22:35:27 UTC (rev 15202)
+++ branches/soc-2008-jaguarandi/extern/libopenjpeg/opj_malloc.h 2008-06-11 22:53:52 UTC (rev 15203)
@@ -76,8 +76,10 @@
#if defined(__sun)
#define HAVE_MEMALIGN
#elif defined(__GNUC__)
- #define HAVE_MEMALIGN
- #include <malloc.h>
+ #ifndef __APPLE__
+ #define HAVE_MEMALIGN
+ #include <malloc.h>
+ #endif
/* Linux x86_64 and OSX always align allocations to 16 bytes */
#elif !defined(__amd64__) && !defined(__APPLE__)
/* FIXME: Yes, this is a big assumption */
Copied: branches/soc-2008-jaguarandi/extern/libopenjpeg/patches (from rev 15202, trunk/blender/extern/libopenjpeg/patches)
Deleted: branches/soc-2008-jaguarandi/extern/libopenjpeg/patches/osx.patch
===================================================================
--- trunk/blender/extern/libopenjpeg/patches/osx.patch 2008-06-11 22:35:27 UTC (rev 15202)
+++ branches/soc-2008-jaguarandi/extern/libopenjpeg/patches/osx.patch 2008-06-11 22:53:52 UTC (rev 15203)
@@ -1,17 +0,0 @@
-Index: opj_malloc.h
-===================================================================
---- opj_malloc.h (revision 15089)
-+++ opj_malloc.h (working copy)
-@@ -76,8 +76,10 @@
- #if defined(__sun)
- #define HAVE_MEMALIGN
- #elif defined(__GNUC__)
-- #define HAVE_MEMALIGN
-- #include <malloc.h>
-+ #ifndef __APPLE__
-+ #define HAVE_MEMALIGN
-+ #include <malloc.h>
-+ #endif
- /* Linux x86_64 and OSX always align allocations to 16 bytes */
- #elif !defined(__amd64__) && !defined(__APPLE__)
- /* FIXME: Yes, this is a big assumption */
Copied: branches/soc-2008-jaguarandi/extern/libopenjpeg/patches/osx.patch (from rev 15202, trunk/blender/extern/libopenjpeg/patches/osx.patch)
===================================================================
--- branches/soc-2008-jaguarandi/extern/libopenjpeg/patches/osx.patch (rev 0)
+++ branches/soc-2008-jaguarandi/extern/libopenjpeg/patches/osx.patch 2008-06-11 22:53:52 UTC (rev 15203)
@@ -0,0 +1,17 @@
+Index: opj_malloc.h
+===================================================================
+--- opj_malloc.h (revision 15089)
++++ opj_malloc.h (working copy)
+@@ -76,8 +76,10 @@
+ #if defined(__sun)
+ #define HAVE_MEMALIGN
+ #elif defined(__GNUC__)
+- #define HAVE_MEMALIGN
+- #include <malloc.h>
++ #ifndef __APPLE__
++ #define HAVE_MEMALIGN
++ #include <malloc.h>
++ #endif
+ /* Linux x86_64 and OSX always align allocations to 16 bytes */
+ #elif !defined(__amd64__) && !defined(__APPLE__)
+ /* FIXME: Yes, this is a big assumption */
Modified: branches/soc-2008-jaguarandi/release/datafiles/blenderbuttons
===================================================================
(Binary files differ)
Modified: branches/soc-2008-jaguarandi/release/scripts/import_dxf.py
===================================================================
--- branches/soc-2008-jaguarandi/release/scripts/import_dxf.py 2008-06-11 22:35:27 UTC (rev 15202)
+++ branches/soc-2008-jaguarandi/release/scripts/import_dxf.py 2008-06-11 22:53:52 UTC (rev 15203)
@@ -1,5 +1,5 @@
#!BPY
-# coding: utf-8
+
"""
Name: 'Autodesk DXF (.dxf)'
Blender: 244
@@ -7,14 +7,15 @@
Tooltip: 'Import for DXF geometry data (Drawing eXchange Format).'
"""
__author__ = 'Kitsu(Ed Blake) & migius(Remigiusz Fiedler)'
-__version__ = '1.0.12 - 2008.02.08 by migius'
+__version__ = '1.0.12 - 2008.06.05 by migius'
__url__ = ["http://blenderartists.org/forum/showthread.php?t=84319",
"http://wiki.blender.org/index.php/Scripts/Manual/Import/DXF-3D"]
__email__ = ["Kitsune_e(at)yahoo.com", "migius(at)4d-vectors.de"]
__bpydoc__ = """\
This script imports objects from DXF (2d/3d) into Blender.
-This script imports 2d and 3d geometery from DXFr12 format files.
+This script imports 2d and 3d geometery from DXF files.
+Supported DXF format versions: from (r2.5) r12 up to 2008.
Enhanced features are:
- configurable object filtering and geometry manipulation,
- configurable material pre-processing,
@@ -40,22 +41,23 @@
Supported DXF>r12 objects:
ELLIPSE,
-(wip v1.0.12 partly supported) LWPOLYLINE (LightWeight),
-(wip v1.0.12) MLINE,
-(wip v1.0.12) MTEXT
+LWPOLYLINE (LightWeight Polylines),
+(wip v1.0.12) SPLINE,
+(wip v1.0.13) MLINE,
+(wip v1.0.13) MTEXT
-Unsupported Objects:
+Unsupported objects:
DXF r12: DIMENSION.
-DXF>r12: SPLINE, GROUP, RAY/XLINE, LEADER, 3DSOLID, BODY, REGION, dynamic BLOCK
+DXF>r12: GROUP, RAY/XLINE, LEADER, 3DSOLID, BODY, REGION, dynamic BLOCK
-Supported Geometry: 2d and 3d DXF-objects.
-Curves imported as curves or meshes optionally.
+Supported geometry: 2d and 3d DXF-objects.
+Curves imported as Blender curves or meshes optionally.
Supported layout modes:
"model space" is default,
"paper space" as option (= "layout views")
-Scene definitions produced with AVE_RENDER:
+Supported scene definition objescts produced with AVE_RENDER:
scene: selection of lights assigned to the camera,
lights: DIRECT, OVERHEAD, SH_SPOT,
(wip v1.0.13 import of AVE_RENDER material definitions)
@@ -77,14 +79,10 @@
Notes:
- Recommend that you run 'RemoveDoubles' on each imported mesh after using this script
- Blocks are created on layer 19 then referenced at each insert point.
-- Big DXF-files (over 1500 objects) decrease import performance.
+- support for DXF-files up to 160MB on systems with 1GB RAM
+- DXF-files with over 1500 objects decrease import performance.
The problem is not the inefficiency of python-scripting but Blenders performance
-in creating new objects in his database - probably a database management problem.
-
-TODO:
-- the new style object visibility
-- support for real 3d-solids (ACIS)
-- (to see more, search for "--todo--" in script code)
+in creating new objects in scene database - probably a database management problem.
"""
@@ -92,6 +90,7 @@
History:
v1.0 - 2008.01. by migius
planned tasks:
+ -- (to see more, search for "--todo--" in script code)
-- command-line-mode/batch-mode
-- in-place-editing for dupliGroups
-- support for MLINE (is exported to r12 as BLOCK*Unnamed with LINEs)
@@ -102,17 +101,23 @@
-- added f_layerFilter
-- to-check: obj/mat/group/_mapping-idea from ideasman42:
-- curves: added "fill/non-fill" option for closed curves: CIRCLEs,ELLIPSEs,POLYLINEs
- -- bug:? object = Object.Get(obname) -> = SCENE.getChildren(obname)
-- "normalize Z" option to correct non-planar figures
-- LINEs need "width" in 3d-space incl vGroups
-- support width_force for LINEs/ELLIPSEs = "solidify"
-- add better support for color_index BYLAYER=256, BYBLOCK=0
- -- bug: "oneMesh" produces sometimes errors
+ -- bug: "oneMesh" produces irregularly errors
-- bug: Registry recall from hd_cache ?? only win32 bug??
+ -- support DXF-definitions of scene, lights and cameras
+ -- support ortho mode for VIEWs and VPORTs as cameras
+ -- add support for SPLINEs
+ v1.0.12: 2008.06.05 by migius
+ b3 bugfix: ob.name conflict with existing meshes (different ob.name/mesh.name)
+ v1.0.12: 2008.05.24 by migius
+ b2 added support for LWPOLYLINEs
+ b2 added support for ProE in readerDXF.py
v1.0.12: 2008.02.08 by migius
- -- support DXF-definitions of scene, lights and cameras
- -- support ortho mode for VIEWs and VPORTs as cameras
+ b1 update: object = Object.Get(obname) -> f_getSceChild().getChildren()
a9 bugfix by non-existing tables views, vports, layers (Kai reported)
v1.0.12: 2008.01.17 by migius
a8 lately used INI-dir/filename persistently stored in Registry
@@ -279,9 +284,9 @@
# --------------------------------------------------------------------------
import Blender
-#import bpy
from Blender import *
#from Blender.Mathutils import Vector, Matrix
+import bpy
#import BPyMessages
from dxfReader import readDXF
@@ -313,6 +318,8 @@
WORLDY = Mathutils.Vector((1,1,0))
WORLDZ = Mathutils.Vector((0,0,1))
+oblist = [] #to be sure, it is an empty list
+
G_SCALE = 1.0 #(0.0001-1000) global scaling factor for all dxf data
G_ORIGIN_X = 0.0 #global translation-vector (x,y,z) in DXF units
G_ORIGIN_Y = 0.0
@@ -330,6 +337,10 @@
TARGET_LAYER = 3 #target blender_layer
GROUP_BYLAYER = 0 #(0/1) all entities from same layer import into one blender-group
+cur_COUNTER = 0 #counter for progress_bar
+M_OBJ = False
+BYBLOCK = 0
+BYLAYER = 256
FILENAME_MAX = 180 #max length of path+file_name string (FILE_MAXDIR + FILE_MAXFILE)
MAX_NAMELENGTH = 17 #max_effective_obnamelength in blender =21=17+(.001)
@@ -342,77 +353,8 @@
FREE = BezTriple.HandleTypes.FREE
VECT = BezTriple.HandleTypes.VECT
ALIGN = BezTriple.HandleTypes.ALIGN
-cur_COUNTER = 0 #counter for progress_bar
-"""This module provides wrapper objects for dxf entities.
-
- The wrappers expect a "dxf object" as input. The dxf object is
- an object with a type and a data attribute. Type is a lowercase
- string matching the 0 code of a dxf entity. Data is a list containing
- dxf objects or lists of [code, data] pairs.
-
- This module is not general, and is only for dxf import.
-"""
-
-# from Stani's dxf writer v1.1 (c)www.stani.be (GPL)
-#---color values
-BYBLOCK = 0
-BYLAYER = 256
-
-#---block-type flags (bit coded values, may be combined):
-ANONYMOUS =1 # This is an anonymous block generated by hatching, associative dimensioning, other internal operations, or an application
-NON_CONSTANT_ATTRIBUTES =2 # This block has non-constant attribute definitions (this bit is not set if the block has any attribute definitions that are constant, or has no attribute definitions at all)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list