soc-2008-mxcurioni: merged changes to revision 14798, compilation works for rendering...
authorMaxime Curioni <maxime.curioni@gmail.com>
Sun, 11 May 2008 20:28:47 +0000 (20:28 +0000)
committerMaxime Curioni <maxime.curioni@gmail.com>
Sun, 11 May 2008 20:28:47 +0000 (20:28 +0000)
499 files changed:
SConstruct
config/darwin-config.py
config/linux2-config.py
config/linuxcross-config.py
config/openbsd3-config.py
config/sunos5-config.py
config/win32-mingw-config.py
config/win32-vc-config.py
extern/SConscript
intern/guardedalloc/intern/mallocn.c
intern/guardedalloc/intern/mmap_win.c [deleted file]
intern/guardedalloc/make/msvc_7_0/guardedalloc.vcproj
intern/guardedalloc/mmap_win.h [deleted file]
release/Makefile
release/datafiles/splash.jpg
release/scripts/DirectX8Exporter.py
release/scripts/ac3d_export.py
release/scripts/ac3d_import.py
release/scripts/bevel_center.py
release/scripts/bpymodules/BPyAddMesh.py
release/scripts/config.py
release/scripts/console.py
release/scripts/envelope_symmetry.py
release/scripts/export_lightwave_motion.py
release/scripts/faceselect_same_weights.py
release/scripts/flt_export.py
release/scripts/flt_import.py
release/scripts/flt_palettemanager.py
release/scripts/flt_toolbar.py
release/scripts/help_browser.py
release/scripts/help_getting_started.py
release/scripts/help_manual.py
release/scripts/help_release_notes.py
release/scripts/help_tutorials.py
release/scripts/help_web_blender.py
release/scripts/help_web_devcomm.py
release/scripts/help_web_eshop.py
release/scripts/help_web_usercomm.py
release/scripts/image_edit.py
release/scripts/import_lightwave_motion.py
release/scripts/lightwave_export.py
release/scripts/md2_export.py
release/scripts/md2_import.py
release/scripts/mesh_boneweight_copy.py
release/scripts/mesh_cleanup.py
release/scripts/mesh_edges2curves.py
release/scripts/mesh_mirror_tool.py
release/scripts/mesh_poly_reduce.py
release/scripts/obdatacopier.py
release/scripts/object_apply_def.py
release/scripts/object_batch_name_edit.py
release/scripts/off_export.py
release/scripts/off_import.py
release/scripts/paths_import.py
release/scripts/raw_export.py
release/scripts/raw_import.py
release/scripts/renameobjectbyblock.py
release/scripts/render_save_layers.py
release/scripts/rvk1_torvk2.py
release/scripts/save_theme.py
release/scripts/scripttemplate_camer_object.py
release/scripts/scripttemplate_ipo_gen.py [deleted file]
release/scripts/scripttemplate_metaball_create.py
release/scripts/scripttemplate_object_edit.py
release/scripts/slp_import.py
release/scripts/sysinfo.py
release/scripts/unweld.py
release/scripts/uv_from_adjacent.py
release/scripts/uvcalc_follow_active_coords.py
release/scripts/uvcalc_lightmap.py
release/scripts/uvcalc_quad_clickproj.py
release/scripts/uvcalc_smart_project.py
release/scripts/uvcopy.py
release/scripts/vertexpaint_gradient.py
release/scripts/vertexpaint_selfshadow_ao.py
release/scripts/vrml97_export.py
release/scripts/weightpaint_clean.py
release/scripts/weightpaint_gradient.py
release/scripts/weightpaint_grow_shrink.py
release/scripts/weightpaint_normalize.py
release/scripts/widgetwizard.py
release/scripts/xfig_export.py
release/scripts/xsi_export.py
source/blender/SConscript
source/blender/blenkernel/BKE_particle.h
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/mball.c
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/particle.c
source/blender/blenlib/BLI_arithb.h
source/blender/blenlib/BLI_winstuff.h
source/blender/blenlib/intern/arithb.c
source/blender/blenlib/intern/noise.c
source/blender/blenlib/intern/psfont.c
source/blender/blenlib/intern/util.c
source/blender/blenlib/intern/winstuff.c
source/blender/blenloader/intern/readfile.c
source/blender/blenpluginapi/intern/pluginapi.c
source/blender/freestyle/SConscript [new file with mode: 0644]
source/blender/freestyle/intern/AUTHORS.TXT [new file with mode: 0755]
source/blender/freestyle/intern/BUGS.TXT [new file with mode: 0755]
source/blender/freestyle/intern/CHANGELOG.TXT [new file with mode: 0755]
source/blender/freestyle/intern/COPYRIGHT.TXT [new file with mode: 0755]
source/blender/freestyle/intern/Config.pri [new file with mode: 0755]
source/blender/freestyle/intern/Freestyle-vc7-debug.sln [new file with mode: 0755]
source/blender/freestyle/intern/Freestyle-vc7-release.sln [new file with mode: 0755]
source/blender/freestyle/intern/Freestyle-vc8-debug.sln [new file with mode: 0755]
source/blender/freestyle/intern/Freestyle-vc8-release.sln [new file with mode: 0755]
source/blender/freestyle/intern/INSTALL.TXT [new file with mode: 0755]
source/blender/freestyle/intern/LICENSE.TXT [new file with mode: 0755]
source/blender/freestyle/intern/Makefile.pro [new file with mode: 0755]
source/blender/freestyle/intern/README.TXT [new file with mode: 0755]
source/blender/freestyle/intern/THANKS.TXT [new file with mode: 0755]
source/blender/freestyle/intern/TODO.TXT [new file with mode: 0755]
source/blender/freestyle/intern/app/AppAboutWindow.cpp [new file with mode: 0755]
source/blender/freestyle/intern/app/AppAboutWindow.h [new file with mode: 0755]
source/blender/freestyle/intern/app/AppCanvas.cpp [new file with mode: 0755]
source/blender/freestyle/intern/app/AppCanvas.h [new file with mode: 0755]
source/blender/freestyle/intern/app/AppConfig.cpp [new file with mode: 0755]
source/blender/freestyle/intern/app/AppConfig.h [new file with mode: 0755]
source/blender/freestyle/intern/app/AppDensityCurvesWindow.cpp [new file with mode: 0755]
source/blender/freestyle/intern/app/AppDensityCurvesWindow.h [new file with mode: 0755]
source/blender/freestyle/intern/app/AppGL2DCurvesViewer.cpp [new file with mode: 0755]
source/blender/freestyle/intern/app/AppGL2DCurvesViewer.h [new file with mode: 0755]
source/blender/freestyle/intern/app/AppGLWidget.cpp [new file with mode: 0755]
source/blender/freestyle/intern/app/AppGLWidget.h [new file with mode: 0755]
source/blender/freestyle/intern/app/AppInteractiveShaderWindow.cpp [new file with mode: 0755]
source/blender/freestyle/intern/app/AppInteractiveShaderWindow.h [new file with mode: 0755]
source/blender/freestyle/intern/app/AppMainWindow.cpp [new file with mode: 0755]
source/blender/freestyle/intern/app/AppMainWindow.h [new file with mode: 0755]
source/blender/freestyle/intern/app/AppOptionsWindow.cpp [new file with mode: 0755]
source/blender/freestyle/intern/app/AppOptionsWindow.h [new file with mode: 0755]
source/blender/freestyle/intern/app/AppProgressBar.cpp [new file with mode: 0755]
source/blender/freestyle/intern/app/AppProgressBar.h [new file with mode: 0755]
source/blender/freestyle/intern/app/AppStyleWindow.cpp [new file with mode: 0755]
source/blender/freestyle/intern/app/AppStyleWindow.h [new file with mode: 0755]
source/blender/freestyle/intern/app/ConfigIO.cpp [new file with mode: 0755]
source/blender/freestyle/intern/app/ConfigIO.h [new file with mode: 0755]
source/blender/freestyle/intern/app/Controller.cpp [new file with mode: 0755]
source/blender/freestyle/intern/app/Controller.h [new file with mode: 0755]
source/blender/freestyle/intern/app/Main.cpp [new file with mode: 0755]
source/blender/freestyle/intern/app/QGLBasicWidget.cpp [new file with mode: 0755]
source/blender/freestyle/intern/app/QGLBasicWidget.h [new file with mode: 0755]
source/blender/freestyle/intern/app/QStyleModuleSyntaxHighlighter.cpp [new file with mode: 0755]
source/blender/freestyle/intern/app/QStyleModuleSyntaxHighlighter.h [new file with mode: 0755]
source/blender/freestyle/intern/app/app.pro [new file with mode: 0755]
source/blender/freestyle/intern/app/appmainwindowbase4.ui [new file with mode: 0755]
source/blender/freestyle/intern/app/densitycurveswindow4.ui [new file with mode: 0755]
source/blender/freestyle/intern/app/freestyle.qrc [new file with mode: 0755]
source/blender/freestyle/intern/app/icons/add.png [new file with mode: 0755]
source/blender/freestyle/intern/app/icons/arrow_down.png [new file with mode: 0755]
source/blender/freestyle/intern/app/icons/arrow_left.png [new file with mode: 0755]
source/blender/freestyle/intern/app/icons/arrow_right.png [new file with mode: 0755]
source/blender/freestyle/intern/app/icons/arrow_up.png [new file with mode: 0755]
source/blender/freestyle/intern/app/icons/clear.png [new file with mode: 0755]
source/blender/freestyle/intern/app/icons/close.png [new file with mode: 0755]
source/blender/freestyle/intern/app/icons/edit.png [new file with mode: 0755]
source/blender/freestyle/intern/app/icons/eye0.png [new file with mode: 0755]
source/blender/freestyle/intern/app/icons/eye1.png [new file with mode: 0755]
source/blender/freestyle/intern/app/icons/folder.png [new file with mode: 0755]
source/blender/freestyle/intern/app/icons/home.png [new file with mode: 0755]
source/blender/freestyle/intern/app/icons/mod0.png [new file with mode: 0755]
source/blender/freestyle/intern/app/icons/mod1.png [new file with mode: 0755]
source/blender/freestyle/intern/app/icons/ok.png [new file with mode: 0755]
source/blender/freestyle/intern/app/icons/reload.png [new file with mode: 0755]
source/blender/freestyle/intern/app/icons/remove.png [new file with mode: 0755]
source/blender/freestyle/intern/app/icons/save.png [new file with mode: 0755]
source/blender/freestyle/intern/app/icons/save_as.png [new file with mode: 0755]
source/blender/freestyle/intern/app/interactiveshaderwindow4.ui [new file with mode: 0755]
source/blender/freestyle/intern/app/optionswindow4.ui [new file with mode: 0755]
source/blender/freestyle/intern/app/progressdialog4.ui [new file with mode: 0755]
source/blender/freestyle/intern/app/src.pri [new file with mode: 0755]
source/blender/freestyle/intern/app/stylewindow4.ui [new file with mode: 0755]
source/blender/freestyle/intern/build_bundle.macosx.py [new file with mode: 0755]
source/blender/freestyle/intern/geometry/BBox.h [new file with mode: 0755]
source/blender/freestyle/intern/geometry/Bezier.cpp [new file with mode: 0755]
source/blender/freestyle/intern/geometry/Bezier.h [new file with mode: 0755]
source/blender/freestyle/intern/geometry/FastGrid.cpp [new file with mode: 0755]
source/blender/freestyle/intern/geometry/FastGrid.h [new file with mode: 0755]
source/blender/freestyle/intern/geometry/FitCurve.cpp [new file with mode: 0755]
source/blender/freestyle/intern/geometry/FitCurve.h [new file with mode: 0755]
source/blender/freestyle/intern/geometry/Geom.h [new file with mode: 0755]
source/blender/freestyle/intern/geometry/GeomCleaner.cpp [new file with mode: 0755]
source/blender/freestyle/intern/geometry/GeomCleaner.h [new file with mode: 0755]
source/blender/freestyle/intern/geometry/GeomUtils.cpp [new file with mode: 0755]
source/blender/freestyle/intern/geometry/GeomUtils.h [new file with mode: 0755]
source/blender/freestyle/intern/geometry/Grid.cpp [new file with mode: 0755]
source/blender/freestyle/intern/geometry/Grid.h [new file with mode: 0755]
source/blender/freestyle/intern/geometry/HashGrid.cpp [new file with mode: 0755]
source/blender/freestyle/intern/geometry/HashGrid.h [new file with mode: 0755]
source/blender/freestyle/intern/geometry/Noise.cpp [new file with mode: 0755]
source/blender/freestyle/intern/geometry/Noise.h [new file with mode: 0755]
source/blender/freestyle/intern/geometry/Polygon.h [new file with mode: 0755]
source/blender/freestyle/intern/geometry/SweepLine.h [new file with mode: 0755]
source/blender/freestyle/intern/geometry/VecMat.h [new file with mode: 0755]
source/blender/freestyle/intern/geometry/geometry.pro [new file with mode: 0755]
source/blender/freestyle/intern/geometry/matrix_util.cpp [new file with mode: 0755]
source/blender/freestyle/intern/geometry/matrix_util.h [new file with mode: 0755]
source/blender/freestyle/intern/geometry/normal_cycle.cpp [new file with mode: 0755]
source/blender/freestyle/intern/geometry/normal_cycle.h [new file with mode: 0755]
source/blender/freestyle/intern/geometry/src.pri [new file with mode: 0755]
source/blender/freestyle/intern/image/GaussianFilter.cpp [new file with mode: 0755]
source/blender/freestyle/intern/image/GaussianFilter.h [new file with mode: 0755]
source/blender/freestyle/intern/image/Image.h [new file with mode: 0755]
source/blender/freestyle/intern/image/ImagePyramid.cpp [new file with mode: 0755]
source/blender/freestyle/intern/image/ImagePyramid.h [new file with mode: 0755]
source/blender/freestyle/intern/image/image.pro [new file with mode: 0755]
source/blender/freestyle/intern/image/src.pri [new file with mode: 0755]
source/blender/freestyle/intern/libconfig.pri [new file with mode: 0755]
source/blender/freestyle/intern/makedsp.vcnet.debug.bat [new file with mode: 0755]
source/blender/freestyle/intern/makedsp.vcnet.release.bat [new file with mode: 0755]
source/blender/freestyle/intern/rendering/GLBBoxRenderer.cpp [new file with mode: 0755]
source/blender/freestyle/intern/rendering/GLBBoxRenderer.h [new file with mode: 0755]
source/blender/freestyle/intern/rendering/GLDebugRenderer.cpp [new file with mode: 0755]
source/blender/freestyle/intern/rendering/GLDebugRenderer.h [new file with mode: 0755]
source/blender/freestyle/intern/rendering/GLFreeMemoryVisitor.cpp [new file with mode: 0644]
source/blender/freestyle/intern/rendering/GLFreeMemoryVisitor.h [new file with mode: 0644]
source/blender/freestyle/intern/rendering/GLMonoColorRenderer.cpp [new file with mode: 0755]
source/blender/freestyle/intern/rendering/GLMonoColorRenderer.h [new file with mode: 0755]
source/blender/freestyle/intern/rendering/GLRenderer.cpp [new file with mode: 0755]
source/blender/freestyle/intern/rendering/GLRenderer.h [new file with mode: 0755]
source/blender/freestyle/intern/rendering/GLSelectRenderer.cpp [new file with mode: 0755]
source/blender/freestyle/intern/rendering/GLSelectRenderer.h [new file with mode: 0755]
source/blender/freestyle/intern/rendering/GLStrokeRenderer.cpp [new file with mode: 0755]
source/blender/freestyle/intern/rendering/GLStrokeRenderer.h [new file with mode: 0755]
source/blender/freestyle/intern/rendering/GLUtils.cpp [new file with mode: 0755]
source/blender/freestyle/intern/rendering/GLUtils.h [new file with mode: 0755]
source/blender/freestyle/intern/rendering/extgl.cpp [new file with mode: 0755]
source/blender/freestyle/intern/rendering/extgl.h [new file with mode: 0755]
source/blender/freestyle/intern/rendering/pbuffer.cpp [new file with mode: 0755]
source/blender/freestyle/intern/rendering/pbuffer.h [new file with mode: 0755]
source/blender/freestyle/intern/rendering/rendering.pro [new file with mode: 0755]
source/blender/freestyle/intern/rendering/src.pri [new file with mode: 0755]
source/blender/freestyle/intern/scene_graph/DrawingStyle.h [new file with mode: 0755]
source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp [new file with mode: 0755]
source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h [new file with mode: 0755]
source/blender/freestyle/intern/scene_graph/LineRep.cpp [new file with mode: 0755]
source/blender/freestyle/intern/scene_graph/LineRep.h [new file with mode: 0755]
source/blender/freestyle/intern/scene_graph/Material.h [new file with mode: 0755]
source/blender/freestyle/intern/scene_graph/MaxFileLoader.cpp [new file with mode: 0755]
source/blender/freestyle/intern/scene_graph/MaxFileLoader.h [new file with mode: 0755]
source/blender/freestyle/intern/scene_graph/Node.h [new file with mode: 0755]
source/blender/freestyle/intern/scene_graph/NodeCamera.cpp [new file with mode: 0644]
source/blender/freestyle/intern/scene_graph/NodeCamera.h [new file with mode: 0644]
source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.cpp [new file with mode: 0755]
source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h [new file with mode: 0755]
source/blender/freestyle/intern/scene_graph/NodeGroup.cpp [new file with mode: 0755]
source/blender/freestyle/intern/scene_graph/NodeGroup.h [new file with mode: 0755]
source/blender/freestyle/intern/scene_graph/NodeLight.cpp [new file with mode: 0755]
source/blender/freestyle/intern/scene_graph/NodeLight.h [new file with mode: 0755]
source/blender/freestyle/intern/scene_graph/NodeShape.cpp [new file with mode: 0755]
source/blender/freestyle/intern/scene_graph/NodeShape.h [new file with mode: 0755]
source/blender/freestyle/intern/scene_graph/NodeTransform.cpp [new file with mode: 0755]
source/blender/freestyle/intern/scene_graph/NodeTransform.h [new file with mode: 0755]
source/blender/freestyle/intern/scene_graph/OrientedLineRep.cpp [new file with mode: 0755]
source/blender/freestyle/intern/scene_graph/OrientedLineRep.h [new file with mode: 0755]
source/blender/freestyle/intern/scene_graph/Rep.cpp [new file with mode: 0755]
source/blender/freestyle/intern/scene_graph/Rep.h [new file with mode: 0755]
source/blender/freestyle/intern/scene_graph/ScenePrettyPrinter.cpp [new file with mode: 0755]
source/blender/freestyle/intern/scene_graph/ScenePrettyPrinter.h [new file with mode: 0755]
source/blender/freestyle/intern/scene_graph/SceneVisitor.cpp [new file with mode: 0755]
source/blender/freestyle/intern/scene_graph/SceneVisitor.h [new file with mode: 0755]
source/blender/freestyle/intern/scene_graph/TriangleRep.cpp [new file with mode: 0755]
source/blender/freestyle/intern/scene_graph/TriangleRep.h [new file with mode: 0755]
source/blender/freestyle/intern/scene_graph/VertexRep.cpp [new file with mode: 0755]
source/blender/freestyle/intern/scene_graph/VertexRep.h [new file with mode: 0755]
source/blender/freestyle/intern/scene_graph/scene_graph.pro [new file with mode: 0755]
source/blender/freestyle/intern/scene_graph/src.pri [new file with mode: 0755]
source/blender/freestyle/intern/stroke/AdvancedFunctions0D.cpp [new file with mode: 0755]
source/blender/freestyle/intern/stroke/AdvancedFunctions0D.h [new file with mode: 0755]
source/blender/freestyle/intern/stroke/AdvancedFunctions1D.cpp [new file with mode: 0755]
source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h [new file with mode: 0755]
source/blender/freestyle/intern/stroke/AdvancedPredicates1D.h [new file with mode: 0755]
source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp [new file with mode: 0755]
source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h [new file with mode: 0755]
source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp [new file with mode: 0755]
source/blender/freestyle/intern/stroke/BasicStrokeShaders.h [new file with mode: 0755]
source/blender/freestyle/intern/stroke/Canvas.cpp [new file with mode: 0755]
source/blender/freestyle/intern/stroke/Canvas.h [new file with mode: 0755]
source/blender/freestyle/intern/stroke/Chain.cpp [new file with mode: 0755]
source/blender/freestyle/intern/stroke/Chain.h [new file with mode: 0755]
source/blender/freestyle/intern/stroke/ChainingIterators.cpp [new file with mode: 0755]
source/blender/freestyle/intern/stroke/ChainingIterators.h [new file with mode: 0755]
source/blender/freestyle/intern/stroke/ContextFunctions.cpp [new file with mode: 0755]
source/blender/freestyle/intern/stroke/ContextFunctions.h [new file with mode: 0755]
source/blender/freestyle/intern/stroke/Curve.cpp [new file with mode: 0755]
source/blender/freestyle/intern/stroke/Curve.h [new file with mode: 0755]
source/blender/freestyle/intern/stroke/CurveAdvancedIterators.h [new file with mode: 0755]
source/blender/freestyle/intern/stroke/CurveIterators.h [new file with mode: 0755]
source/blender/freestyle/intern/stroke/Modifiers.h [new file with mode: 0755]
source/blender/freestyle/intern/stroke/Module.h [new file with mode: 0755]
source/blender/freestyle/intern/stroke/Operators.cpp [new file with mode: 0755]
source/blender/freestyle/intern/stroke/Operators.h [new file with mode: 0755]
source/blender/freestyle/intern/stroke/PSStrokeRenderer.cpp [new file with mode: 0755]
source/blender/freestyle/intern/stroke/PSStrokeRenderer.h [new file with mode: 0755]
source/blender/freestyle/intern/stroke/Predicates0D.h [new file with mode: 0755]
source/blender/freestyle/intern/stroke/Predicates1D.h [new file with mode: 0755]
source/blender/freestyle/intern/stroke/QInformationMap.h [new file with mode: 0755]
source/blender/freestyle/intern/stroke/Stroke.cpp [new file with mode: 0755]
source/blender/freestyle/intern/stroke/Stroke.h [new file with mode: 0755]
source/blender/freestyle/intern/stroke/StrokeAdvancedIterators.h [new file with mode: 0755]
source/blender/freestyle/intern/stroke/StrokeIO.cpp [new file with mode: 0755]
source/blender/freestyle/intern/stroke/StrokeIO.h [new file with mode: 0755]
source/blender/freestyle/intern/stroke/StrokeIterators.h [new file with mode: 0755]
source/blender/freestyle/intern/stroke/StrokeLayer.cpp [new file with mode: 0755]
source/blender/freestyle/intern/stroke/StrokeLayer.h [new file with mode: 0755]
source/blender/freestyle/intern/stroke/StrokeRenderer.cpp [new file with mode: 0755]
source/blender/freestyle/intern/stroke/StrokeRenderer.h [new file with mode: 0755]
source/blender/freestyle/intern/stroke/StrokeRep.cpp [new file with mode: 0755]
source/blender/freestyle/intern/stroke/StrokeRep.h [new file with mode: 0755]
source/blender/freestyle/intern/stroke/StrokeShader.h [new file with mode: 0755]
source/blender/freestyle/intern/stroke/StrokeTesselator.cpp [new file with mode: 0755]
source/blender/freestyle/intern/stroke/StrokeTesselator.h [new file with mode: 0755]
source/blender/freestyle/intern/stroke/StyleModule.h [new file with mode: 0755]
source/blender/freestyle/intern/stroke/TextStrokeRenderer.cpp [new file with mode: 0755]
source/blender/freestyle/intern/stroke/TextStrokeRenderer.h [new file with mode: 0755]
source/blender/freestyle/intern/stroke/src.pri [new file with mode: 0755]
source/blender/freestyle/intern/stroke/stroke.pro [new file with mode: 0755]
source/blender/freestyle/intern/swig/Freestyle.i [new file with mode: 0755]
source/blender/freestyle/intern/swig/FreestyleWrapper.vc7.vcproj [new file with mode: 0755]
source/blender/freestyle/intern/swig/FreestyleWrapper.vc8.vcproj [new file with mode: 0755]
source/blender/freestyle/intern/swig/Makefile [new file with mode: 0755]
source/blender/freestyle/intern/swig/Makefile.cygwin [new file with mode: 0755]
source/blender/freestyle/intern/swig/Makefile.linux [new file with mode: 0755]
source/blender/freestyle/intern/swig/Makefile.mac [new file with mode: 0644]
source/blender/freestyle/intern/swig/Makefile.noswig [new file with mode: 0755]
source/blender/freestyle/intern/swig/ModuleWrapper.cpp [new file with mode: 0755]
source/blender/freestyle/intern/swig/ModuleWrapper.h [new file with mode: 0755]
source/blender/freestyle/intern/system/BaseIterator.h [new file with mode: 0755]
source/blender/freestyle/intern/system/BaseObject.cpp [new file with mode: 0755]
source/blender/freestyle/intern/system/BaseObject.h [new file with mode: 0755]
source/blender/freestyle/intern/system/Cast.h [new file with mode: 0755]
source/blender/freestyle/intern/system/Exception.cpp [new file with mode: 0755]
source/blender/freestyle/intern/system/Exception.h [new file with mode: 0755]
source/blender/freestyle/intern/system/FreestyleConfig.h [new file with mode: 0755]
source/blender/freestyle/intern/system/Id.h [new file with mode: 0755]
source/blender/freestyle/intern/system/Interpreter.h [new file with mode: 0755]
source/blender/freestyle/intern/system/Precision.h [new file with mode: 0755]
source/blender/freestyle/intern/system/ProgressBar.h [new file with mode: 0755]
source/blender/freestyle/intern/system/PseudoNoise.cpp [new file with mode: 0755]
source/blender/freestyle/intern/system/PseudoNoise.h [new file with mode: 0755]
source/blender/freestyle/intern/system/PythonInterpreter.cpp [new file with mode: 0755]
source/blender/freestyle/intern/system/PythonInterpreter.h [new file with mode: 0755]
source/blender/freestyle/intern/system/RandGen.cpp [new file with mode: 0755]
source/blender/freestyle/intern/system/RandGen.h [new file with mode: 0755]
source/blender/freestyle/intern/system/StringUtils.cpp [new file with mode: 0755]
source/blender/freestyle/intern/system/StringUtils.h [new file with mode: 0755]
source/blender/freestyle/intern/system/TimeStamp.cpp [new file with mode: 0755]
source/blender/freestyle/intern/system/TimeStamp.h [new file with mode: 0755]
source/blender/freestyle/intern/system/TimeUtils.h [new file with mode: 0755]
source/blender/freestyle/intern/system/src.pri [new file with mode: 0755]
source/blender/freestyle/intern/system/system.pro [new file with mode: 0755]
source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp [new file with mode: 0755]
source/blender/freestyle/intern/view_map/FEdgeXDetector.h [new file with mode: 0755]
source/blender/freestyle/intern/view_map/Functions0D.cpp [new file with mode: 0755]
source/blender/freestyle/intern/view_map/Functions0D.h [new file with mode: 0755]
source/blender/freestyle/intern/view_map/Functions1D.cpp [new file with mode: 0755]
source/blender/freestyle/intern/view_map/Functions1D.h [new file with mode: 0755]
source/blender/freestyle/intern/view_map/Interface0D.h [new file with mode: 0755]
source/blender/freestyle/intern/view_map/Interface1D.h [new file with mode: 0755]
source/blender/freestyle/intern/view_map/Silhouette.cpp [new file with mode: 0755]
source/blender/freestyle/intern/view_map/Silhouette.h [new file with mode: 0755]
source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp [new file with mode: 0755]
source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.h [new file with mode: 0755]
source/blender/freestyle/intern/view_map/SteerableViewMap.cpp [new file with mode: 0755]
source/blender/freestyle/intern/view_map/SteerableViewMap.h [new file with mode: 0755]
source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp [new file with mode: 0755]
source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h [new file with mode: 0755]
source/blender/freestyle/intern/view_map/ViewMap.cpp [new file with mode: 0755]
source/blender/freestyle/intern/view_map/ViewMap.h [new file with mode: 0755]
source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h [new file with mode: 0755]
source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp [new file with mode: 0755]
source/blender/freestyle/intern/view_map/ViewMapBuilder.h [new file with mode: 0755]
source/blender/freestyle/intern/view_map/ViewMapIO.cpp [new file with mode: 0755]
source/blender/freestyle/intern/view_map/ViewMapIO.h [new file with mode: 0755]
source/blender/freestyle/intern/view_map/ViewMapIterators.h [new file with mode: 0755]
source/blender/freestyle/intern/view_map/ViewMapTesselator.cpp [new file with mode: 0755]
source/blender/freestyle/intern/view_map/ViewMapTesselator.h [new file with mode: 0755]
source/blender/freestyle/intern/view_map/src.pri [new file with mode: 0755]
source/blender/freestyle/intern/view_map/view_map.pro [new file with mode: 0755]
source/blender/freestyle/intern/winged_edge/Curvature.cpp [new file with mode: 0755]
source/blender/freestyle/intern/winged_edge/Curvature.h [new file with mode: 0755]
source/blender/freestyle/intern/winged_edge/Nature.h [new file with mode: 0755]
source/blender/freestyle/intern/winged_edge/WEdge.cpp [new file with mode: 0755]
source/blender/freestyle/intern/winged_edge/WEdge.h [new file with mode: 0755]
source/blender/freestyle/intern/winged_edge/WFillGrid.cpp [new file with mode: 0755]
source/blender/freestyle/intern/winged_edge/WFillGrid.h [new file with mode: 0755]
source/blender/freestyle/intern/winged_edge/WSFillGrid.cpp [new file with mode: 0755]
source/blender/freestyle/intern/winged_edge/WSFillGrid.h [new file with mode: 0755]
source/blender/freestyle/intern/winged_edge/WXEdge.cpp [new file with mode: 0755]
source/blender/freestyle/intern/winged_edge/WXEdge.h [new file with mode: 0755]
source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp [new file with mode: 0755]
source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h [new file with mode: 0755]
source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp [new file with mode: 0755]
source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h [new file with mode: 0755]
source/blender/freestyle/intern/winged_edge/src.pri [new file with mode: 0755]
source/blender/freestyle/intern/winged_edge/winged_edge.pro [new file with mode: 0755]
source/blender/freestyle/style_modules/ChainingIterators.py [new file with mode: 0755]
source/blender/freestyle/style_modules/Functions0D.py [new file with mode: 0755]
source/blender/freestyle/style_modules/Functions1D.py [new file with mode: 0755]
source/blender/freestyle/style_modules/PredicatesB1D.py [new file with mode: 0755]
source/blender/freestyle/style_modules/PredicatesU0D.py [new file with mode: 0755]
source/blender/freestyle/style_modules/PredicatesU1D.py [new file with mode: 0755]
source/blender/freestyle/style_modules/anisotropic_diffusion.py [new file with mode: 0755]
source/blender/freestyle/style_modules/apriori_and_causal_density.py [new file with mode: 0755]
source/blender/freestyle/style_modules/apriori_density.py [new file with mode: 0755]
source/blender/freestyle/style_modules/backbone_stretcher.py [new file with mode: 0755]
source/blender/freestyle/style_modules/blueprint_circles.py [new file with mode: 0755]
source/blender/freestyle/style_modules/blueprint_ellipses.py [new file with mode: 0755]
source/blender/freestyle/style_modules/blueprint_squares.py [new file with mode: 0755]
source/blender/freestyle/style_modules/cartoon.py [new file with mode: 0755]
source/blender/freestyle/style_modules/contour.py [new file with mode: 0755]
source/blender/freestyle/style_modules/curvature2d.py [new file with mode: 0755]
source/blender/freestyle/style_modules/external_contour.py [new file with mode: 0755]
source/blender/freestyle/style_modules/external_contour_sketchy.py [new file with mode: 0755]
source/blender/freestyle/style_modules/external_contour_smooth.py [new file with mode: 0755]
source/blender/freestyle/style_modules/extra-lines.sml [new file with mode: 0755]
source/blender/freestyle/style_modules/haloing.py [new file with mode: 0755]
source/blender/freestyle/style_modules/ignore_small_occlusions.py [new file with mode: 0755]
source/blender/freestyle/style_modules/invisible_lines.py [new file with mode: 0755]
source/blender/freestyle/style_modules/japanese_bigbrush.py [new file with mode: 0755]
source/blender/freestyle/style_modules/logical_operators.py [new file with mode: 0755]
source/blender/freestyle/style_modules/long_anisotropically_dense.py [new file with mode: 0755]
source/blender/freestyle/style_modules/multiple_parameterization.py [new file with mode: 0755]
source/blender/freestyle/style_modules/nature.py [new file with mode: 0755]
source/blender/freestyle/style_modules/near_lines.py [new file with mode: 0755]
source/blender/freestyle/style_modules/occluded_by_specific_object.py [new file with mode: 0755]
source/blender/freestyle/style_modules/polygonalize.py [new file with mode: 0755]
source/blender/freestyle/style_modules/qi0.py [new file with mode: 0755]
source/blender/freestyle/style_modules/qi0_not_external_contour.py [new file with mode: 0755]
source/blender/freestyle/style_modules/qi1.py [new file with mode: 0755]
source/blender/freestyle/style_modules/qi2.py [new file with mode: 0755]
source/blender/freestyle/style_modules/sequentialsplit_sketchy.py [new file with mode: 0755]
source/blender/freestyle/style_modules/shaders.py [new file with mode: 0755]
source/blender/freestyle/style_modules/sketchy_multiple_parameterization.py [new file with mode: 0755]
source/blender/freestyle/style_modules/sketchy_topology_broken.py [new file with mode: 0755]
source/blender/freestyle/style_modules/sketchy_topology_preserved.py [new file with mode: 0755]
source/blender/freestyle/style_modules/split_at_highest_2d_curvatures.py [new file with mode: 0755]
source/blender/freestyle/style_modules/split_at_tvertices.py [new file with mode: 0755]
source/blender/freestyle/style_modules/stroke_texture.py [new file with mode: 0755]
source/blender/freestyle/style_modules/suggestive.py [new file with mode: 0755]
source/blender/freestyle/style_modules/thickness_fof_depth_discontinuity.py [new file with mode: 0755]
source/blender/freestyle/style_modules/tipremover.py [new file with mode: 0755]
source/blender/freestyle/style_modules/tvertex_remover.py [new file with mode: 0755]
source/blender/freestyle/style_modules/uniformpruning_zsort.py [new file with mode: 0755]
source/blender/freestyle/style_modules/vector.py [new file with mode: 0755]
source/blender/imbuf/intern/openexr/openexr_api.cpp
source/blender/imbuf/intern/radiance_hdr.c
source/blender/imbuf/intern/readimage.c
source/blender/include/BIF_drawseq.h
source/blender/makesdna/intern/CMakeLists.txt
source/blender/makesdna/intern/SConscript
source/blender/nodes/intern/CMP_nodes/CMP_displace.c
source/blender/nodes/intern/CMP_nodes/CMP_hueSatVal.c
source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c
source/blender/python/BPY_extern.h
source/blender/python/BPY_interface.c
source/blender/python/api2_2x/Node.c
source/blender/python/api2_2x/doc/API_related.py
source/blender/render/intern/source/imagetexture.c
source/blender/render/intern/source/rayshade.c
source/blender/render/intern/source/rendercore.c
source/blender/render/intern/source/shadeoutput.c
source/blender/src/buttons_editing.c
source/blender/src/buttons_object.c
source/blender/src/buttons_shading.c
source/blender/src/drawimage.c
source/blender/src/drawimasel.c
source/blender/src/drawipo.c
source/blender/src/drawobject.c
source/blender/src/drawseq.c
source/blender/src/editmesh_lib.c
source/blender/src/editobject.c
source/blender/src/editseq.c
source/blender/src/filesel.c
source/blender/src/header_image.c
source/blender/src/header_script.c
source/blender/src/header_seq.c
source/blender/src/headerbuttons.c
source/blender/src/parametrizer.c
source/blender/src/parametrizer.h
source/blender/src/parametrizer_intern.h
source/blender/src/sequence.c
source/blender/src/space.c
source/blender/src/splash.jpg.c
source/blender/src/unwrapper.c
source/blender/src/usiblender.c
source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
source/gameengine/BlenderRoutines/mac_compat_glext.h [deleted file]
source/gameengine/GamePlayer/common/SConscript
source/gameengine/GamePlayer/ghost/SConscript
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
source/gameengine/Rasterizer/SConscript
tools/Blender.py
tools/btools.py

index 869ba6454c81394fa515a6209c92a63f43b1499a..341638c0e0ccf7f0d7c189201a629dc41fdd8a13 100644 (file)
@@ -264,18 +264,23 @@ if not quickie and do_clean:
     if os.path.exists(B.root_build_dir):
         print B.bc.HEADER+'Cleaning...'+B.bc.ENDC
         dirs = os.listdir(B.root_build_dir)
-        for entry in dirs:
-            if os.path.isdir(B.root_build_dir + entry) == 1:
-                print "clean dir %s"%(B.root_build_dir+entry)
-                shutil.rmtree(B.root_build_dir+entry)
-            else: # remove file
-                print "remove file %s"%(B.root_build_dir+entry)
-                os.remove(B.root_build_dir+entry)
+        for dir in dirs:
+            if os.path.isdir(B.root_build_dir + dir) == 1:
+                print "clean dir %s"%(B.root_build_dir+dir)
+                shutil.rmtree(B.root_build_dir+dir)
         for confile in ['extern/ffmpeg/config.mak', 'extern/x264/config.mak',
-                'extern/xvidcore/build/generic/platform.inc']:
+                'extern/xvidcore/build/generic/platform.inc','extern/freestyle/lib3ds/Makefile','extern/freestyle/swig/Makefile']:
             if os.path.exists(confile):
                 print "clean file %s"%confile
                 os.remove(confile)
+
+        if platform in ('win32-vc', 'win32-mingw'):
+            makesdnafile = B.root_build_dir+'makesdna.exe'
+        else:
+            makesdnafile = B.root_build_dir+'makesdna'
+        if os.path.exists(makesdnafile):
+            print "removing", makesdnafile
+            os.remove(makesdnafile)
         print B.bc.OKGREEN+'...done'+B.bc.ENDC
     else:
         print B.bc.HEADER+'Already Clean, nothing to do.'+B.bc.ENDC
@@ -335,12 +340,15 @@ if env['WITH_BF_PLAYER']:
     playerlist = B.create_blender_liblist(env, 'player')
     env.BlenderProg(B.root_build_dir, "blenderplayer", dobj + playerlist + thestatlibs, [], thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer')
 
+
+
 ##### Now define some targets
 
 
 #------------ INSTALL
 
 #-- binaries
+
 blenderinstall = []
 if  env['OURPLATFORM']=='darwin':
     for prg in B.program_list:
index 8fd6c3251ba64b46be82667cea44b90c0ac87f93..115123f998442b1863f3c426b51b36aae72349ba 100644 (file)
@@ -143,7 +143,6 @@ BF_FTGL_LIB = 'extern_ftgl'
 
 WITH_BF_GAMEENGINE='true'
 WITH_BF_PLAYER='true'
-WITH_BF_GLEXT= '1'
 
 WITH_BF_ODE = 'false'
 BF_ODE = LIBDIR + '/ode'
@@ -161,6 +160,22 @@ BF_SOLID_LIB = 'extern_solid'
 
 WITH_BF_YAFRAY = 'true'
 
+WITH_BF_FREESTYLE = 'true'
+BF_FREESTYLE = '#extern/freestyle'
+BF_FREESTYLE_SRC = '#source/blender/freestyle/src'
+BF_SWIG = '${BF_FREESTYLE}/swig'
+BF_SWIG_LIB = 'extern_swig'
+BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
+BF_LIB3DS_LIB = 'extern_lib3ds'
+BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
+BF_LIB3DS_INC = '${BF_LIB3DS}'
+
+# WITH_BF_OPENEXR = 'true'
+# BF_OPENEXR = '${LCGDIR}/openexr'
+# BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR'
+# BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread'
+# BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
+
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
index 4d8b5c97512862b65233319a26aa52262dba0f90..f59dcf266ee3f986958d23aeed066dd27c530edb 100644 (file)
@@ -86,6 +86,16 @@ BF_SOLID_LIB = 'extern_solid'
 
 WITH_BF_YAFRAY = 'true'
 
+WITH_BF_FREESTYLE = 'true'
+BF_FREESTYLE = '#extern/freestyle'
+BF_FREESTYLE_SRC = '#source/blender/freestyle/src'
+BF_SWIG = '${BF_FREESTYLE}/swig'
+BF_SWIG_LIB = 'extern_swig'
+BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
+BF_LIB3DS_LIB = 'extern_lib3ds'
+BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
+BF_LIB3DS_INC = '${BF_LIB3DS}'
+
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
index e6c4e8769b42dee8621414b15044f9857bbe6111..603f6a1a8802e158252f79f58f80c4e2db75e699 100644 (file)
@@ -6,6 +6,18 @@ BF_VERSE_INCLUDE = "#extern/verse/dist"
 
 WITH_BF_YAFRAY = 'true'
 
+WITH_BF_FREESTYLE = 'true'
+BF_FREESTYLE = '#extern/freestyle'
+BF_FREESTYLE_SRC = '#source/blender/freestyle/src'
+BF_SWIG = '${BF_FREESTYLE}/swig'
+BF_SWIG_LIB = 'extern_swig'
+BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
+BF_LIB3DS_LIB = 'extern_lib3ds'
+BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
+BF_LIB3DS_INC = '${BF_LIB3DS}'
+
+###########################
+
 BF_PYTHON = LIBDIR + '/python'
 BF_PYTHON_VERSION = '2.5'
 BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
index f7f254973af9b42b106713d7be106af4a81fc05d..9a4c0d6f34e8ce378e92ee891ba058b30dd4f948 100644 (file)
@@ -80,6 +80,16 @@ BF_SOLID_LIB = 'extern_solid'
 
 WITH_BF_YAFRAY = 'true'
 
+WITH_BF_FREESTYLE = 'true'
+BF_FREESTYLE = '#extern/freestyle'
+BF_FREESTYLE_SRC = '#source/blender/freestyle/src'
+BF_SWIG = '${BF_FREESTYLE}/swig'
+BF_SWIG_LIB = 'extern_swig'
+BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
+BF_LIB3DS_LIB = 'extern_lib3ds'
+BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
+BF_LIB3DS_INC = '${BF_LIB3DS}'
+
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
index b3ca0e267ff117a4b6be809178da8e325b13fd42..cccc380f60cf293d6d0b1923b5fbe136ff028ba4 100644 (file)
@@ -82,6 +82,16 @@ BF_SOLID_LIB = 'extern_solid'
 
 WITH_BF_YAFRAY = 'true'
 
+WITH_BF_FREESTYLE = 'true'
+BF_FREESTYLE = '#extern/freestyle'
+BF_FREESTYLE_SRC = '#source/blender/freestyle/src'
+BF_SWIG = '${BF_FREESTYLE}/swig'
+BF_SWIG_LIB = 'extern_swig'
+BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
+BF_LIB3DS_LIB = 'extern_lib3ds'
+BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
+BF_LIB3DS_INC = '${BF_LIB3DS}'
+
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
index d9fd6ce8d4f18657649148ccd0a81c8b4c410442..9757c0264b5597b067de6aca24a2fb606e204362 100644 (file)
@@ -97,6 +97,16 @@ BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
 
 WITH_BF_YAFRAY = 'true'
 
+WITH_BF_FREESTYLE = 'true'
+BF_FREESTYLE = '#extern/freestyle'
+BF_FREESTYLE_SRC = '#source/blender/freestyle/src'
+BF_SWIG = '${BF_FREESTYLE}/swig'
+BF_SWIG_LIB = 'extern_swig'
+BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
+BF_LIB3DS_LIB = 'extern_lib3ds'
+BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
+BF_LIB3DS_INC = '${BF_LIB3DS}'
+
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
index 32b6597b5d55eda149f52615642cd376808585cf..8e7d6c56c13928460ac418140159cd8286001a62 100644 (file)
@@ -108,6 +108,16 @@ WITH_BF_YAFRAY = 'true'
 
 WITH_BF_BINRELOC = 'false'
 
+WITH_BF_FREESTYLE = 'true'
+BF_FREESTYLE = '#extern/freestyle'
+BF_FREESTYLE_SRC = '#source/blender/freestyle/src'
+BF_SWIG = '${BF_FREESTYLE}/swig'
+BF_SWIG_LIB = 'extern_swig'
+BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
+BF_LIB3DS_LIB = 'extern_lib3ds'
+BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
+BF_LIB3DS_INC = '${BF_LIB3DS}'
+
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
index 09eaf080c28df948aafe1010232a82b4976ac4a2..7997981b7f2fd9a6a04baa10b059f30c6f565564 100644 (file)
@@ -9,6 +9,10 @@ if env['WITH_BF_GAMEENGINE']:
 if env['WITH_BF_BULLET']:
     SConscript(['bullet2/src/SConscript'])
 
+if env['WITH_BF_FREESTYLE']:
+    SConscript(['freestyle/lib3ds/SConscript'])
+    SConscript(['freestyle/swig/SConscript'])
+
 if env['WITH_BF_INTERNATIONAL']:
     SConscript(['bFTGL/SConscript'])
 
index 25f2fd8d26903ef1d7c78bf23eb0a49d865f47de..f95d9aa418a176d3728f897cc1318a6d6f565ce3 100644 (file)
 #include <stdarg.h>
 
 /* mmap exception */
-#if defined(AMIGA) || defined(__BeOS)
-#elif defined(WIN32)
-#include <sys/types.h>
-#include "mmap_win.h"
+#if defined(AMIGA) || defined(__BeOS) || defined(WIN32)
 #else
 #include <sys/types.h>
 #include <sys/mman.h>
@@ -292,7 +289,7 @@ void *MEM_callocN(unsigned int len, const char *str)
 /* note; mmap returns zero'd memory */
 void *MEM_mapallocN(unsigned int len, const char *str)
 {
-#if defined(AMIGA) || defined(__BeOS)
+#if defined(AMIGA) || defined(__BeOS) || defined(WIN32)
        return MEM_callocN(len, str);
 #else
        MemHead *memh;
@@ -589,7 +586,7 @@ static void rem_memblock(MemHead *memh)
     totblock--;
     mem_in_use -= memh->len;
    
-#if defined(AMIGA) || defined(__BeOS)
+#if defined(AMIGA) || defined(__BeOS) || defined(WIN32)
     free(memh);
 #else   
    
diff --git a/intern/guardedalloc/intern/mmap_win.c b/intern/guardedalloc/intern/mmap_win.c
deleted file mode 100644 (file)
index cc31cf5..0000000
+++ /dev/null
@@ -1,261 +0,0 @@
-/**
- * $Id: $
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * 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 the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. 
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2008 Blender Foundation.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): Andrea Weikert.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-#if defined(WIN32)
-
-#include <windows.h>
-#include <errno.h>
-#include <io.h>
-#include <sys/types.h>
-#include <stdio.h>
-
-#include "mmap_win.h"
-
-#ifndef FILE_MAP_EXECUTE
-//not defined in earlier versions of the Platform  SDK (before February 2003)
-#define FILE_MAP_EXECUTE 0x0020
-#endif
-
-/* --------------------------------------------------------------------- */
-/* local storage definitions                                                    */
-/* --------------------------------------------------------------------- */
-/* all memory mapped chunks are put in linked lists */
-typedef struct mmapLink
-{
-       struct mmapLink *next,*prev;
-} mmapLink;
-
-typedef struct mmapListBase 
-{
-       void *first, *last;
-} mmapListBase;
-
-typedef struct MemMap {
-       struct MemMap *next,*prev;
-       void *mmap;
-       HANDLE fhandle;
-       HANDLE maphandle;
-} MemMap;
-
-/* --------------------------------------------------------------------- */
-/* local functions                                                       */
-/* --------------------------------------------------------------------- */
-
-static void mmap_addtail(volatile mmapListBase *listbase, void *vlink);
-static void mmap_remlink(volatile mmapListBase *listbase, void *vlink);
-static void *mmap_findlink(volatile mmapListBase *listbase, void *ptr);
-
-static int mmap_get_prot_flags (int flags);
-static int mmap_get_access_flags (int flags);
-
-/* --------------------------------------------------------------------- */
-/* vars                                                                  */
-/* --------------------------------------------------------------------- */
-volatile static struct mmapListBase _mmapbase;
-volatile static struct mmapListBase *mmapbase = &_mmapbase;
-
-
-/* --------------------------------------------------------------------- */
-/* implementation                                                        */
-/* --------------------------------------------------------------------- */
-
-/* mmap for windows */
-void *mmap(void *start, size_t len, int prot, int flags, int fd, off_t offset)
-{
-       HANDLE fhandle = INVALID_HANDLE_VALUE;
-       HANDLE maphandle;
-       int prot_flags = mmap_get_prot_flags(prot);
-       int access_flags = mmap_get_access_flags(prot);
-       MemMap *mm = NULL;
-       void *ptr = NULL;
-
-       if ( flags & MAP_FIXED ) {
-               return MAP_FAILED;
-       }
-
-       /*
-       if ( fd == -1 ) {
-               _set_errno( EBADF );
-        return MAP_FAILED;
-       }
-       */
-
-       if ( fd != -1 ) {
-               fhandle = (HANDLE) _get_osfhandle (fd);
-       }
-       if ( fhandle == INVALID_HANDLE_VALUE ) {
-               if (!(flags & MAP_ANONYMOUS)) {
-                       errno = EBADF;
-                       return MAP_FAILED;
-               }
-       } else {
-               if ( !DuplicateHandle( GetCurrentProcess(), fhandle, GetCurrentProcess(),
-                                                       &fhandle, 0, FALSE, DUPLICATE_SAME_ACCESS ) ) {
-                       return MAP_FAILED;
-               }
-       }
-
-       maphandle = CreateFileMapping(fhandle, NULL, prot_flags, 0, len, NULL);
-       if ( maphandle == 0 ) {
-        errno = EBADF;
-               return MAP_FAILED;
-    }
-
-       ptr = MapViewOfFile(maphandle, access_flags, 0, offset, 0);
-       if ( ptr == NULL ) {
-               DWORD dwLastErr = GetLastError();
-               if ( dwLastErr == ERROR_MAPPED_ALIGNMENT )
-                       errno=EINVAL;
-               else
-                       errno=EACCES;
-               CloseHandle(maphandle);
-               return MAP_FAILED;
-       }
-
-       mm= (MemMap *)malloc(sizeof(MemMap));
-       if (!mm) {
-               errno=ENOMEM;
-       }
-       mm->fhandle = fhandle;
-       mm->maphandle = maphandle;
-       mm->mmap = ptr;
-       mmap_addtail(mmapbase, mm);
-
-    return ptr;
-}
-
-/* munmap for windows */
-long munmap(void *ptr, long size)
-{
-       MemMap *mm = mmap_findlink(mmapbase, ptr);
-       if (!mm) {
-               errno=EINVAL;
-        return -1; 
-       }
-       UnmapViewOfFile( mm->mmap );
-       CloseHandle( mm->maphandle );
-       CloseHandle( mm->fhandle);
-       mmap_remlink(mmapbase, mm);
-    return 0;
-}
-
-/* --------------------------------------------------------------------- */
-/* local functions                                                       */
-/* --------------------------------------------------------------------- */
-
-static void mmap_addtail(volatile mmapListBase *listbase, void *vlink)
-{
-       struct mmapLink *link= vlink;
-
-       if (link == 0) return;
-       if (listbase == 0) return;
-
-       link->next = 0;
-       link->prev = listbase->last;
-
-       if (listbase->last) ((struct mmapLink *)listbase->last)->next = link;
-       if (listbase->first == 0) listbase->first = link;
-       listbase->last = link;
-}
-
-static void mmap_remlink(volatile mmapListBase *listbase, void *vlink)
-{
-       struct mmapLink *link= vlink;
-
-       if (link == 0) return;
-       if (listbase == 0) return;
-
-       if (link->next) link->next->prev = link->prev;
-       if (link->prev) link->prev->next = link->next;
-
-       if (listbase->last == link) listbase->last = link->prev;
-       if (listbase->first == link) listbase->first = link->next;
-}
-
-static void *mmap_findlink(volatile mmapListBase *listbase, void *ptr)
-{
-       MemMap *mmap_ptr = (MemMap*)ptr;
-       MemMap *mm;
-
-       if (ptr == 0) return NULL;
-       if (listbase == 0) return NULL;
-       
-       mm = (MemMap *)listbase->first;
-       while (mm) {
-               if (mm->mmap == ptr) {
-                       return mm;
-               }
-               mm = mm->next;
-       }
-       return NULL;
-}
-
-static int mmap_get_prot_flags (int flags)
-{
-       int prot = PAGE_NOACCESS;
-
-       if ( ( flags & PROT_READ ) == PROT_READ ) {
-        if ( ( flags & PROT_WRITE ) == PROT_WRITE ) {
-            prot = (flags & PROT_EXEC) ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE;
-               } else {
-                       prot = (flags & PROT_EXEC) ? PAGE_EXECUTE_READ : PAGE_READONLY;
-               }
-    } else if ( ( flags & PROT_WRITE ) == PROT_WRITE ) {
-               prot = (flags & PROT_EXEC) ? PAGE_EXECUTE_READ : PAGE_WRITECOPY;
-    } else if ( ( flags & PROT_EXEC ) == PROT_EXEC ) {
-        prot = PAGE_EXECUTE_READ;
-    }
-       return prot;
-}
-
-static int mmap_get_access_flags (int flags)
-{
-       int access = 0;
-
-       if ( ( flags & PROT_READ ) == PROT_READ ) {
-        if ( ( flags & PROT_WRITE ) == PROT_WRITE ) {
-            access = FILE_MAP_WRITE;
-               } else {
-                       access = (flags & PROT_EXEC) ? FILE_MAP_EXECUTE : FILE_MAP_READ;
-               }
-    } else if ( ( flags & PROT_WRITE ) == PROT_WRITE ) {
-               access = FILE_MAP_COPY;
-    } else if ( ( flags & PROT_EXEC ) == PROT_EXEC ) {
-        access = FILE_MAP_EXECUTE;
-    }
-       return access;
-}
-
-
-#endif // WIN32
-
-
-
-
-
index 40e88511d5dbf95d06bfdc3aa68df8d98aabb00e..cb3490716fa8947af81cd58ddf0cef6abe75d564 100644 (file)
@@ -251,9 +251,6 @@ ECHO Done
                        <File
                                RelativePath="..\..\intern\mallocn.c">
                        </File>
-                       <File
-                               RelativePath="..\..\intern\mmap_win.c">
-                       </File>
                </Filter>
                <Filter
                        Name="Header Files"
@@ -264,13 +261,6 @@ ECHO Done
                                <File
                                        RelativePath="..\..\MEM_guardedalloc.h">
                                </File>
-                               <File
-                                       RelativePath="..\..\mmap_win.h">
-                               </File>
-                       </Filter>
-                       <Filter
-                               Name="intern"
-                               Filter="">
                        </Filter>
                </Filter>
        </Files>
diff --git a/intern/guardedalloc/mmap_win.h b/intern/guardedalloc/mmap_win.h
deleted file mode 100644 (file)
index f83a2d6..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * $Id: $
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * 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 the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. 
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2008 Blender Foundation.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): Andrea Weikert.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-#ifndef MMAP_WIN_H
-#define MMAP_WIN_H
-
-#define PROT_NONE 0
-#define PROT_READ 1
-#define PROT_WRITE 2
-#define PROT_EXEC 4
-
-#define MAP_FILE 0
-#define MAP_SHARED 1
-#define MAP_PRIVATE 2
-#define MAP_TYPE 0xF
-#define MAP_FIXED 0x10
-#define MAP_ANONYMOUS 0x20
-#define MAP_ANON MAP_ANONYMOUS
-
-#define MAP_FAILED ((void *)-1)
-
-void *mmap(void *start, size_t len, int prot, int flags, int fd, off_t offset);
-long munmap(void *ptr, long size);
-
-#endif
-
index f440e2dface576b478221895a35c0be860c7118d..953144b522340180a1a387897846025c007787c5 100644 (file)
@@ -118,6 +118,7 @@ install: package
     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
@@ -143,7 +144,8 @@ ifneq ($(NOPLUGINS),true)
        @cp ../source/blender/blenpluginapi/*.h $(DISTDIR)/plugins/include/
        @chmod 755 $(DISTDIR)/plugins/bmake
        @$(MAKE) -C $(DISTDIR)/plugins all  > /dev/null || exit 1;
-       @rm -f $(DISTDIR)/plugins/*/*.o
+       @rm -fr $(DISTDIR)/plugins/.svn $(DISTDIR)/plugins/*/.svn \
+             $(DISTDIR)/plugins/*/*.o
 
 #on OS X the plugins move to the installation directory
     ifneq ($(OS),darwin)
@@ -156,6 +158,7 @@ endif
 
        @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/"
@@ -177,8 +180,6 @@ endif
        @[ ! -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)"
index da88c0b8eaa25949fcb6fb74401fb7fc7b67ff19..0d328ee4b7ccf066eb69d138884cbeebe3d4d44f 100644 (file)
Binary files a/release/datafiles/splash.jpg and b/release/datafiles/splash.jpg differ
index 2ec42057039eb620825cfeebb7f439e532e99e72..3dbd8d9d5395cde2660a6f32df0feba15e41341c 100644 (file)
@@ -7,7 +7,7 @@
 # Tooltip: 'Export to DirectX text file format format for XNA Animation Component Library.'
 """
 __author__ = "minahito (original:Arben (Ben) Omari)"
-__url__ = ("blender", "blenderartists.org", "Adjuster's site http://sunday-lab.blogspot.com/, Author's site http://www.omariben.too.it")
+__url__ = ("blender", "elysiun", "Adjuster's site http://sunday-lab.blogspot.com/, Author's site http://www.omariben.too.it")
 __version__ = "3.0"
 
 __bpydoc__ = """\
index 57f27c7e3a2c012433323be0208a411b5e3f91bc..bccb7978f5f23d195ef9f626d15e175835d6adf0 100644 (file)
@@ -8,7 +8,7 @@ Tip: 'Export selected meshes to AC3D (.ac) format'
 """
 
 __author__ = "Willian P. Germano"
-__url__ = ("blender", "blenderartists.org", "AC3D's homepage, http://www.ac3d.org",
+__url__ = ("blender", "elysiun", "AC3D's homepage, http://www.ac3d.org",
        "PLib 3d gaming lib, http://plib.sf.net")
 __version__ = "2.44 2007-05-05"
 
index 6a2b290e010a5f851664d5b15c5c838440927948..9a7004e4b4ddb5aeea94c42023856b098c23f12c 100644 (file)
@@ -8,7 +8,7 @@ Tip: 'Import an AC3D (.ac) file.'
 """
 
 __author__ = "Willian P. Germano"
-__url__ = ("blender", "blenderartists.org", "AC3D's homepage, http://www.ac3d.org",
+__url__ = ("blender", "elysiun", "AC3D's homepage, http://www.ac3d.org",
        "PLib 3d gaming lib, http://plib.sf.net")
 __version__ = "2.43.1 2007-02-21"
 
index 063c6380483e48e0795d0529ed9db40cf5cf242f..a68b382ad2b1030baf621d7cf1faeb13279ef8aa 100644 (file)
@@ -8,7 +8,7 @@ Tip: 'Bevel selected faces, edges, and vertices'
 """
 
 __author__ = "Loic BERTHE"
-__url__ = ("blender", "blenderartists.org")
+__url__ = ("blender", "elysiun")
 __version__ = "2.0"
 
 __bpydoc__ = """\
index ef42eab9e8fe23f98644f39c2e6b789ac4e5bc4e..bd3ee845d21cd467eb230534dad2c9f194e1302c 100644 (file)
@@ -68,7 +68,11 @@ def add_mesh_simple(name, verts, edges, faces):
                else:
                        # Mesh with no data, unlikely
                        me.edges.extend(edges)
-                       me.faces.extend(faces)          
+                       me.faces.extend(faces)
+
+               if is_editmode or Blender.Get('add_editmode'):
+                       EditMode(1)
+               
        else:
                
                # Object mode add new
@@ -91,13 +95,9 @@ def add_mesh_simple(name, verts, edges, faces):
                        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):
@@ -112,7 +112,7 @@ def write_mesh_script(filepath, me):
        file.write('#!BPY\n')
        file.write('"""\n')
        file.write('Name: \'%s\'\n' % name)
-       file.write('Blender: 245\n')
+       file.write('Blender: 243\n')
        file.write('Group: \'AddMesh\'\n')
        file.write('"""\n\n')
        file.write('import BPyAddMesh\n')
index 4251bad86544e9ea9918d3a0321f107c9a305081..69f929dab97ee1072ca505c9c5bd08c2ac514d09 100644 (file)
@@ -10,7 +10,7 @@ Tooltip: 'View and edit available scripts configuration data'
 __author__ = "Willian P. Germano"
 __version__ = "0.1 2005/04/14"
 __email__ = ('scripts', 'Author, wgermano:ig*com*br')
-__url__ = ('blender', 'blenderartists.org')
+__url__ = ('blender', 'elysiun')
 
 __bpydoc__ ="""\
 This script can be used to view and edit configuration data stored
index 9a18c724d4710ca1bf5f61bbc6ba7d07f619c2a9..62e0b2eb1d879f2316902a8a31dcdbe0bac1c417 100644 (file)
@@ -1,14 +1,14 @@
 #!BPY
 
 """
-Name: 'Interactive Python Console'
-Blender: 245
+Name: 'Interactive Console'
+Blender: 237
 Group: 'System'
 Tooltip: 'Interactive Python Console'
 """
 
-__author__ = "Campbell Barton aka ideasman42"
-__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"]
+__author__ = "Campbell Barton AKA Ideasman"
+__url__ = ["Author's homepage, http://members.iinet.net.au/~cpbarton/ideasman/", "blender", "elysiun", "Official Python site, http://www.python.org"]
 __bpydoc__ = """\
 This is an interactive console, similar to Python's own command line interpreter.  Since it is embedded in Blender, it has access to all Blender Python modules.
 
@@ -26,6 +26,8 @@ Usage:<br>
   - Ctrl + Enter: auto compleate based on variable names and modules loaded -- multiple choices popup a menu;<br>
   - Shift + Enter: multiline functions -- delays executing code until only Enter is pressed.
 """
+__author__ = "Campbell Barton AKA Ideasman"
+__url__ = ["http://members.iinet.net.au/~cpbarton/ideasman/", "blender", "elysiun"]
 
 # -------------------------------------------------------------------------- 
 # ***** BEGIN GPL LICENSE BLOCK ***** 
index a52e622a65bc66f9ac92d14d5cdeac1dc9e3cd98..935dae9aabebe43bc9bfed7bdf76442217274dec 100644 (file)
@@ -8,7 +8,7 @@ Tooltip: 'Make envelope symetrical'
 """
 
 __author__ = "Jonas Petersen"
-__url__ = ("blender", "blenderartists.org", "Script's homepage, http://www.mindfloaters.de/blender/", "thread at blender.org, http://www.blender.org/modules.php?op=modload&name=phpBB2&file=viewtopic&t=4858 ")
+__url__ = ("blender", "elysiun", "Script's homepage, http://www.mindfloaters.de/blender/", "thread at blender.org, http://www.blender.org/modules.php?op=modload&name=phpBB2&file=viewtopic&t=4858 ")
 __version__ = "0.9 2004-11-10"
 __doc__ = """\
 This script creates perfectly symmetrical envelope sets.  It is part of the
index 562e44f3a2bca254e6d523e025449d7b9e6a46a5..93a5961baef4615fc531c2f8bf4443d085869750 100644 (file)
@@ -8,7 +8,7 @@ Tip: 'Export Loc Rot Size chanels to a Lightwave .mot file'
 """
 
 __author__ = "Daniel Salazar (ZanQdo)"
-__url__ = ("blender", "blenderartists.org",
+__url__ = ("blender", "elysiun",
 "e-mail: zanqdo@gmail.com")
 __version__ = "16/04/08"
 
index 967aedec3633db7687ba511f98300b225a26e512..b8d50cf09b6043b6a66f57ef1d1eb850c0e37dcd 100644 (file)
@@ -1,13 +1,13 @@
 #!BPY
 """
 Name: 'Same Weights...'
-Blender: 245
+Blender: 241
 Group: 'FaceSelect'
 Tooltip: 'Select same faces with teh same weight for the active group.'
 """
 
-__author__ = ["Campbell Barton aka ideasman42"]
-__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"]
+__author__ = ["Campbell Barton"]
+__url__ = ("blender", "elysiun", "http://members.iinet.net.au/~cpbarton/ideasman/")
 __version__ = "0.1"
 __bpydoc__ = """\
 
index 35022a69bbbcd7ce3321bb127228be391d7b4a8a..80d68d10b62cd95ff5b5bd41d8cc49b52ee5b160 100644 (file)
@@ -8,7 +8,7 @@ Tip: 'Export to OpenFlight v16.0 (.flt)'
 
 __author__ = "Greg MacDonald, Geoffrey Bantle"
 __version__ = "2.0 11/21/07"
-__url__ = ("blender", "blenderartists.org", "Author's homepage, http://sourceforge.net/projects/blight/")
+__url__ = ("blender", "elysiun", "Author's homepage, http://sourceforge.net/projects/blight/")
 __bpydoc__ = """\
 This script exports v16.0 OpenFlight files.  OpenFlight is a
 registered trademark of MultiGen-Paradigm, Inc.
index c924194f44b282559bfbd7cb5fbcb100e1150f22..d31376995d48d884e0f5f6613e1415063adc1d0a 100644 (file)
@@ -10,7 +10,7 @@ Tip: 'Import OpenFlight (.flt)'
 
 __author__ = "Greg MacDonald, Campbell Barton, Geoffrey Bantle"
 __version__ = "2.0 11/21/07"
-__url__ = ("blender", "blenderartists.org", "Author's homepage, http://sourceforge.net/projects/blight/")
+__url__ = ("blender", "elysiun", "Author's homepage, http://sourceforge.net/projects/blight/")
 __bpydoc__ = """\
 This script imports OpenFlight files into Blender. OpenFlight is a
 registered trademark of MultiGen-Paradigm, Inc.
index 6edaf2974ab04c3227e9d949163e509a5715884a..c641a0a4f08a27c525750196243140d53e4979ee 100644 (file)
@@ -10,7 +10,7 @@ Tooltip: 'Manage FLT colors'
 __author__ = "Geoffrey Bantle"
 __version__ = "1.0 11/21/2007"
 __email__ = ('scripts', 'Author, ')
-__url__ = ('blender', 'blenderartists.org')
+__url__ = ('blender', 'elysiun')
 
 __bpydoc__ ="""\
 
index a707b87f84658955cc47678cdec1f330da7cc349..565849859c1e491347803e4a83860d6171eda294 100644 (file)
@@ -10,7 +10,7 @@ Tooltip: 'Tools for working with FLT databases'
 __author__ = "Geoffrey Bantle"
 __version__ = "1.0 11/21/07"
 __email__ = ('scripts', 'Author, ')
-__url__ = ('blender', 'blenderartists.org')
+__url__ = ('blender', 'elysiun')
 
 __bpydoc__ ="""\
 This script provides tools for working with OpenFlight databases in Blender. OpenFlight is a
index 696dfd3ca2b48f5395224c4e1e7d93ce76fbb630..d321ffa62562098e7be2b04ef5be04835c652dea 100644 (file)
@@ -10,7 +10,7 @@ Tooltip: 'Show help information about a chosen installed script.'
 __author__ = "Willian P. Germano"
 __version__ = "0.1 11/02/04"
 __email__ = ('scripts', 'Author, wgermano:ig*com*br')
-__url__ = ('blender', 'blenderartists.org')
+__url__ = ('blender', 'elysiun')
 
 __bpydoc__ ="""\
 This script shows help information for scripts registered in the menus.
@@ -84,7 +84,8 @@ DEFAULT_EMAILS = {
 }
 
 DEFAULT_LINKS = {
-       'blender': ["blender.org\'s Python forum", "http://www.blender.org/modules.php?op=modload&name=phpBB2&file=viewforum&f=9"]
+       'blender': ["blender.org\'s Python forum", "http://www.blender.org/modules.php?op=modload&name=phpBB2&file=viewforum&f=9"],
+       'elysiun': ["elYsiun\'s Python and Plugins forum", "http://www.elysiun.com/forum/viewforum.php?f=5"]
 }
 
 PADDING = 15
index 81b002da4e49fc5b6b045067fca8dd10adae2c08..19eac9e2e2091ac47f5dd108717b2b7c041d8041 100644 (file)
@@ -7,7 +7,7 @@ Tooltip: 'Help for new users'
 """
 
 __author__ = "Matt Ebb"
-__url__ = ("blender", "blenderartists.org")
+__url__ = ("blender", "elysiun")
 __version__ = "1.0"
 __bpydoc__ = """\
 This script opens the user's default web browser at www.blender3d.org's
index cf293bf7c2cac10b73bf2be6144cbf765f33977a..75d93522c31e4feec4b093046ad4468cf8a2974e 100644 (file)
@@ -7,7 +7,7 @@ Tooltip: 'The Blender reference manual'
 """
 
 __author__ = "Matt Ebb"
-__url__ = ("blender", "blenderartists.org")
+__url__ = ("blender", "elysiun")
 __version__ = "1.0"
 __bpydoc__ = """\
 This script opens the user's default web browser at www.blender3d.org's
index af7a70424895de59afab25b9e4076df432a02809..4938275516317944fc78d97ebcb3d689ae9572b6 100644 (file)
@@ -7,7 +7,7 @@ Tooltip: 'Information about the changes in this version of Blender'
 """
 
 __author__ = "Matt Ebb"
-__url__ = ("blender", "blenderartists.org")
+__url__ = ("blender", "elysiun")
 __version__ = "1.0"
 __bpydoc__ = """\
 This script opens the user's default web browser at www.blender3d.org's
index 04d6c79945562c21f505314d502eab111a765448..1fbabc43eb68d41c2c297c1ac10e28fd502294ad 100644 (file)
@@ -8,7 +8,7 @@ Tooltip: 'Tutorials for learning to use Blender'
 """
 
 __author__ = "Matt Ebb"
-__url__ = ("blender", "blenderartists.org")
+__url__ = ("blender", "elysiun")
 __version__ = "1.0"
 __bpydoc__ = """\
 This script opens the user's default web browser at www.blender3d.org's
index 0f9e32dea0eda27cbd3de3e4498b8ceadc679195..999746c1f9c20c4ec45397768517d9176b991116 100644 (file)
@@ -8,7 +8,7 @@ Tooltip: 'The official Blender website'
 """
 
 __author__ = "Matt Ebb"
-__url__ = ("blender", "blenderartists.org")
+__url__ = ("blender", "elysiun")
 __version__ = "1.0"
 __bpydoc__ = """\
 This script opens the user's default web browser at Blender's main site,
index 344622cc11375bfb50bd45ebe2a74e1fbcca38e9..afe9ef064d92ec2aefdeb8b45f2e4f758be1f10f 100644 (file)
@@ -8,7 +8,7 @@ Tooltip: 'Get involved with Blender development'
 """
 
 __author__ = "Matt Ebb"
-__url__ = ("blender", "blenderartists.org")
+__url__ = ("blender", "elysiun")
 __version__ = "1.0"
 __bpydoc__ = """\
 This script opens the user's default web browser at www.blender.org, the
index 451fd7351508f7daf7f4c39401ad1c9d919a4f6b..997d07ca2551e6c1ecc12db732fc706240568086 100644 (file)
@@ -8,7 +8,7 @@ Tooltip: 'Buy official Blender resources and merchandise online'
 """
 
 __author__ = "Matt Ebb"
-__url__ = ("blender", "blenderartists.org")
+__url__ = ("blender", "elysiun")
 __version__ = "1.0"
 __bpydoc__ = """\
 This script opens the user's default web browser at www.blender3d.org's
index fbe19956eb770a2dda22f37aa2f946f9b395cf9f..56f64764ac71d1b31dcd8b5241264a2b51095021 100644 (file)
@@ -8,7 +8,7 @@ Tooltip: 'Get involved with other Blender users'
 """
 
 __author__ = "Matt Ebb"
-__url__ = ("blender", "blenderartists.org")
+__url__ = ("blender", "elysiun")
 __version__ = "1.0"
 __bpydoc__ = """\
 This script opens the user's default web browser at www.blender3d.org's
index a7132a4f986fe1b00905071a911c2ac512396755..14ab57515ba87bf4ba3c84cd972ae13edd5889c8 100644 (file)
@@ -7,7 +7,7 @@ Tooltip: 'Open in an application for editing. (hold Shift to configure)'
 """
 
 __author__ = "Campbell Barton"
-__url__ = ["blender", "blenderartists.org"]
+__url__ = ["blender", "elysiun"]
 __version__ = "1.0"
 
 __bpydoc__ = """\
index c242a9f6bd3ee9507de7848c48ee0d06e056fcc2..bec988c8da550ae81ebf5f71822972542327f5cc 100644 (file)
@@ -8,7 +8,7 @@ Tip: 'Import Loc Rot Size chanels from a Lightwave .mot file'
 """
 
 __author__ = "Daniel Salazar (ZanQdo)"
-__url__ = ("blender", "blenderartists.org",
+__url__ = ("blender", "elysiun",
 "e-mail: zanqdo@gmail.com")
 __version__ = "16/04/08"
 
index 458e61f3a28744feacd400176dba05db21024398..b0fc1cc7fafa2f05b96bf242e85ae1a43795317c 100644 (file)
@@ -8,7 +8,7 @@ Tooltip: 'Export selected meshes to LightWave File Format (.lwo)'
 """
 
 __author__ = "Anthony D'Agostino (Scorpius)"
-__url__ = ("blender", "blenderartists.org",
+__url__ = ("blender", "elysiun",
 "Author's homepage, http://www.redrival.com/scorpius")
 __version__ = "Part of IOSuite 0.5"
 
index 588336ed4476a7776f174430b526bf0fe18bc366..6fc7c1adfa216f0e3ea98d694271c18147aee81b 100644 (file)
@@ -10,7 +10,7 @@ Tooltip: 'Export to Quake file format (.md2).'
 __author__ = 'Bob Holcomb'
 __version__ = '0.18.1 patch 1'
 __url__ = ["Bob's site, http://bane.servebeer.com",
-     "Support forum, http://bane.servebeer.com", "blender", "blenderartists.org"]
+     "Support forum, http://bane.servebeer.com", "blender", "elysiun"]
 __email__ = ["Bob Holcomb, bob_holcomb:hotmail*com", "scripts"]
 __bpydoc__ = """\
 This script Exports a Quake 2 file (MD2).
index f52746259a6f1707027ab0d7866a1bc8c32703ab..ec778c1e1b8ec88a34e8051f6e4b238040c32a6e 100644 (file)
@@ -10,7 +10,7 @@ Tooltip: 'Import from Quake file format (.md2).'
 __author__ = 'Bob Holcomb'
 __version__ = '0.16'
 __url__ = ["Bob's site, http://bane.servebeer.com",
-     "Support forum, http://scourage.servebeer.com/phpbb/", "blender", "blenderartists.org"]
+     "Support forum, http://scourage.servebeer.com/phpbb/", "blender", "elysiun"]
 __email__ = ["Bob Holcomb, bob_holcomb:hotmail*com", "scripts"]
 __bpydoc__ = """\
 This script imports a Quake 2 file (MD2), textures, 
index d2a477fbc0b77bc1287fb1cbbd21060e55b6c731..8aa9a1e321366c592bca38a200fbf9604179ac50 100644 (file)
@@ -1,13 +1,13 @@
 #!BPY
 """
 Name: 'Bone Weight Copy'
-Blender: 245
+Blender: 243
 Group: 'Object'
 Tooltip: 'Copy Bone Weights from 1 mesh, to all other selected meshes.'
 """
 
-__author__ = "Campbell Barton aka ideasman42"
-__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"]
+__author__ = ["Campbell Barton"]
+__url__ = ("blender", "elysiun", "http://members.iinet.net.au/~cpbarton/ideasman/")
 __version__ = "0.1"
 __bpydoc__ = """\
 
index 608201acb98a78825baa5643e14e75166fb21a96..1eb3e3968b2b89241923a4256dbc9313d78ced55 100644 (file)
@@ -1,13 +1,13 @@
 #!BPY
 """
 Name: 'Clean Meshes'
-Blender: 245
+Blender: 242
 Group: 'Mesh'
 Tooltip: 'Clean unused data from all selected mesh objects.'
 """
 
-__author__ = "Campbell Barton aka ideasman42"
-__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"]
+__author__ = ["Campbell Barton"]
+__url__ = ("blender", "elysiun", "http://members.iinet.net.au/~cpbarton/ideasman/")
 __version__ = "0.1"
 __bpydoc__ = """\
 Clean Meshes
index 006bdf10b49f3b38e0c72c44c96b8c8d528ffd73..f65eccae9a4bfd20d0eac7e13e111156e2369a46 100644 (file)
@@ -6,7 +6,7 @@ Group: 'Mesh'
 Tip: 'Edges not used by a face are converted into polyline(s)'
 """
 __author__ = ("Campbell Barton")
-__url__ = ("blender", "blenderartists.org")
+__url__ = ("blender", "elysiun")
 __version__ = "1.0 2006/02/08"
 
 __bpydoc__ = """\
index 33ce6936c7fa5d7a741c35dcd5b1d37e215f5e71..045f37b833300687c0247897689d5cef62dec0b3 100644 (file)
@@ -6,8 +6,8 @@ Group: 'Mesh'
 Tooltip: 'Snap Verticies to X mirrord locations and weights.'
 """
 
-__author__ = "Campbell Barton aka ideasman42"
-__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"]
+__author__= ['Campbell Barton']
+__url__= ["blender", "elysiun", "http://members.iinet.net.au/~cpbarton/ideasman/"]
 __version__= '1.0'
 __bpydoc__= '''\
 This script is used to mirror vertex locations and weights
index 6dfd7a90efc99bfae2d75664af3ce8bb9f00762c..9d8bb61f6529f73643f8653a8d83649f15a62379 100644 (file)
@@ -7,7 +7,7 @@ Tooltip: 'Removed polygons from a mesh while maintaining the shape, textures and
 """
 
 __author__ = "Campbell Barton"
-__url__ = ("blender", "blenderartists.org")
+__url__ = ("blender", "elysiun")
 __version__ = "1.0 2006/02/07"
 
 __bpydoc__ = """\
index 2f5617951de78c5dd1b1359cd67487e302f9bfd5..561e40e15da7be4b3ba3778655fcb4173dfe85ac 100644 (file)
@@ -8,7 +8,7 @@ Tip: 'Copy data from active object to other selected ones.'
 """
 
 __author__ = "Jean-Michel Soler (jms), Campbell Barton (Ideasman42)"
-__url__ = ("blender", "blenderartists.org",
+__url__ = ("blender", "elysiun",
 "Script's homepage, http://jmsoler.free.fr/didacticiel/blender/tutor/cpl_lampdatacopier.htm",
 "Communicate problems and errors, http://www.zoo-logique.org/3D.Blender/newsportal/thread.php?group=3D.Blender")
 __version__ = "0.1.2"
index 006e97463d83519e7d62d1e7cb2060836e0792f5..67e4179a67496d7271081159e92814402a95da08 100644 (file)
@@ -12,7 +12,7 @@ __author__ = "Martin Poirier (theeth), Jean-Michel Soler (jms), Campbell Barton
 # Martin Poirier's Apply_Def.py and
 # Jean-Michel Soler's Fix From Everything
 
-__url__ = ("http://www.blender.org", "http://blenderartists.org", "http://jmsoler.free.fr")
+__url__ = ("http://www.blender.org", "http://blenderartists.org", "http://members.iinet.net.au/~cpbarton/ideasman/", "http://jmsoler.free.fr")
 __version__ = "1.6 07/07/2006"
 
 __bpydoc__ = """\
@@ -77,11 +77,7 @@ def copy_vgroups(source_ob, target_ob):
                for vgroupname in vgroups:
                        target_me.addVertGroup(vgroupname)
                        if len(target_me.verts) == len(source_me.verts):
-                               try: # in rare cases this can raise an 'no deform groups assigned to mesh' error
-                                       vlist = source_me.getVertsFromGroup(vgroupname, True)
-                               except:
-                                       vlist = []
-                               
+                               vlist = source_me.getVertsFromGroup(vgroupname, True)
                                try:
                                        for vpair in vlist:
                                                target_me.assignVertsToGroup(vgroupname, [vpair[0]], vpair[1], ADD)
@@ -175,4 +171,4 @@ def apply_deform():
        Blender.Window.RedrawAll()
 
 if __name__=='__main__':
-       apply_deform()
+       apply_deform()
\ No newline at end of file
index 4db3a6210db0a7c4a21ce50c80ccfc49059926f7..05ca5868d1938980cd2a0cf9f3e2b310796f6062 100644 (file)
@@ -6,7 +6,7 @@ Group: 'Object'
 Tooltip: 'Apply the chosen rule to rename all selected objects at once.'
 """
 __author__ = "Campbell Barton"
-__url__ = ("blender", "blenderartists.org")
+__url__ = ("blender", "elysiun")
 __version__ = "1.0"
 
 __bpydoc__ = """\
index 6aac3ff885b006472ebbf1ca8c03f964141841f4..236e61956900db18f32d957ebf0c566b971d21e5 100644 (file)
@@ -8,7 +8,7 @@ Tooltip: 'Export selected mesh to DEC Object File Format (*.off)'
 """
 
 __author__ = "Anthony D'Agostino (Scorpius)"
-__url__ = ("blender", "blenderartists.org",
+__url__ = ("blender", "elysiun",
 "Author's homepage, http://www.redrival.com/scorpius")
 __version__ = "Part of IOSuite 0.5"
 
index e8ab96c51c5af3ad2826e64c25e4b95f3a157bae..50c0d3d6f7e4832c8500eb4d76f3b71b469bcca7 100644 (file)
@@ -8,7 +8,7 @@ Tooltip: 'Import DEC Object File Format (*.off)'
 """
 
 __author__ = "Anthony D'Agostino (Scorpius), Campbell Barton (Ideasman)"
-__url__ = ("blender", "blenderartists.org",
+__url__ = ("blender", "elysiun",
 "Author's homepage, http://www.redrival.com/scorpius")
 __version__ = "Part of IOSuite 0.5"
 
index b35d7fe5c653a05e5187c9ea3d170bec99051391..788c6b0216ba04b39e69981215e8234f137d97d5 100644 (file)
@@ -13,7 +13,7 @@ Tip: 'Import a path from any of a set of formats (still experimental)'
 """
 
 __author__ = "Jean-Michel Soler (jms)"
-__url__ = ("blender", "blenderartists.org",
+__url__ = ("blender", "elysiun",
 "AI importer's homepage, http://jmsoler.free.fr/didacticiel/blender/tutor/cpl_import_ai.htm",
 "Communicate problems and errors, http://www.zoo-logique.org/3D.Blender/newsportal/thread.php?group=3D.Blender")
 __version__ = "0.1.1"
index e3c588cac1023f015fb285c80abd0189bf695993..14de4b1e3710033a9c7ddcc94059638dcf8de835 100644 (file)
@@ -8,7 +8,7 @@ Tooltip: 'Export selected mesh to Raw Format (.raw)'
 """
 
 __author__ = "Anthony D'Agostino (Scorpius)"
-__url__ = ("blender", "blenderartists.org",
+__url__ = ("blender", "elysiun",
 "Author's homepage, http://www.redrival.com/scorpius")
 __version__ = "Part of IOSuite 0.5"
 
index 76c03c77337ccc994e1b86205a12d20a5e14024d..a77ed9cc03a7af33140b84859776470903494f37 100644 (file)
@@ -8,7 +8,7 @@ Tooltip: 'Import Raw Triangle File Format (.raw)'
 """
 
 __author__ = "Anthony D'Agostino (Scorpius)"
-__url__ = ("blender", "blenderartists.org",
+__url__ = ("blender", "elysiun",
 "Author's homepage, http://www.redrival.com/scorpius")
 __version__ = "Part of IOSuite 0.5"
 
index eeea815c650127d2b64e7c557b1b425a00e90a67..403aa32717e6c369a7301cf62c4596d700850377 100644 (file)
@@ -8,7 +8,7 @@ Tip: 'GUI to select and rename objects.'
 """
 
 __author__ = "Jean-Michel Soler (jms)"
-__url__ = ("blender", "blenderartists.org",
+__url__ = ("blender", "elysiun",
 "Script's homepage, http://jmsoler.free.fr/didacticiel/blender/tutor/cpl_renameobjectgui.htm",
 "Communicate problems and errors, http://www.zoo-logique.org/3D.Blender/newsportal/thread.php?group=3D.Blender")
 __version__ = "233"
index ad1265be50c017756bfc29da3e8099670d0346c5..04bedde6e8d47873e466519f4275bacc13c3fead 100644 (file)
@@ -8,7 +8,7 @@ Tooltip: 'Save current renderlayers as a BPython script'
 """
 
 __author__ = "Campbell Barton"
-__url__ = ("blender", "blenderartists.org")
+__url__ = ("blender", "elysiun")
 __version__ = "1.0"
 
 __bpydoc__ = """\
@@ -47,12 +47,8 @@ rend = sce.render
 
 # default filename: theme's name + '_theme.py' in user's scripts dir:
 default_fname = Blender.Get("scriptsdir")
-if not default_fname:
-       default_fname = Blender.Get("uscriptsdir")
-
-if default_fname:
-       default_fname = Blender.sys.join(default_fname, sce.name + '_renderlayer.py')
-       default_fname = default_fname.replace(' ','_')
+default_fname = Blender.sys.join(default_fname, sce.name + '_renderlayer.py')
+default_fname = default_fname.replace(' ','_')
 
 def write_renderlayers(filename):
        "Write the current renderlayer as a bpython script"
@@ -117,4 +113,4 @@ rend = sce.render
        except:
                Blender.Draw.PupMenu("Warning - check console!%t|Menus could not be automatically updated")
 
-FileSelector(write_renderlayers, "Save RenderLayers", default_fname)
+FileSelector(write_renderlayers, "Save RenderLayers", default_fname)
\ No newline at end of file
index c723efb61a7df2e0be3395e3ab850e061a5163d5..c490ba328c8114790de10d2e564186445eef8f6c 100644 (file)
@@ -8,7 +8,7 @@ Tip: 'Copy deform data (not surf. subdiv) of active obj to rvk of the 2nd select
 """
 
 __author__ = "Jean-Michel Soler (jms)"
-__url__ = ("blender", "blenderartists.org",
+__url__ = ("blender", "elysiun",
 "Script's homepage, http://jmsoler.free.fr/didacticiel/blender/tutor/cpl_rvk1versrvk2.htm",
 "Communicate problems and errors, http://www.zoo-logique.org/3D.Blender/newsportal/thread.php?group=3D.Blender")
 __version__ = "2007/04/27"
index 1d23b12403a11c8fc7f6070b5fdd1597f25b95ac..a99050b404d9a3e4ab0b42636c530c3d81e7d4e8 100644 (file)
@@ -8,7 +8,7 @@ Tooltip: 'Save current theme as a BPython script'
 """
 
 __author__ = "Willian P. Germano"
-__url__ = ("blender", "blenderartists.org")
+__url__ = ("blender", "elysiun")
 __version__ = "2.43 2006/12/30"
 
 __bpydoc__ = """\
index cacc35ed1a5f08ada0456f1404539181bba34840..b4df64d91083cd92b724c3f2fb00cdfaf699db66 100644 (file)
@@ -98,7 +98,7 @@ SceneCheck()
 
 '''
 
-new_text = bpy.data.texts.new('camobject_template.py')
+new_text = bpy.data.texts.new('pyconstraint_template.py')
 new_text.write(script_data)
 bpy.data.texts.active = new_text
 Window.RedrawAll()
diff --git a/release/scripts/scripttemplate_ipo_gen.py b/release/scripts/scripttemplate_ipo_gen.py
deleted file mode 100644 (file)
index 791eaed..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-#!BPY
-"""
-Name: 'Camera/Object Example'
-Blender: 245
-Group: 'ScriptTemplate'
-Tooltip: 'Script template for setting the camera direction'
-"""
-
-from Blender import Window
-import bpy
-
-script_data = \
-'''#!BPY
-"""
-Name: 'My Ipo Script'
-Blender: 245
-Group: 'Animation'
-Tooltip: 'Put some useful info here'
-"""
-
-# Add a licence here if you wish to re-distribute, we recommend the GPL
-
-from Blender import Ipo, Mathutils, Window
-import bpy, BPyMessages
-
-def makeRandomIpo(object, firstFrame, numberOfFrames, frameStep):
-       # Create an new Ipo Curve of name myIpo and type Object
-       myIpo = bpy.data.ipos.new('myIpo', 'Object')
-       
-       # Create LocX, LocY, and LocZ Ipo curves in our new Curve Object
-       # and store them so we can access them later
-       myIpo_x = myIpo.addCurve('LocX')
-       myIpo_y = myIpo.addCurve('LocY')
-       myIpo_z = myIpo.addCurve('LocZ')
-       
-       # What value we want to scale our random value by
-       ipoScale = 4
-       
-       # This Calculates the End Frame for use in an xrange() expression
-       endFrame = firstFrame + (numberOfFrames * frameStep) + frameStep
-       
-       for frame in xrange(firstFrame, endFrame, frameStep):
-               
-               # Use the Mathutils Rand() function to get random numbers
-               ipoValue_x = Mathutils.Rand(-1, 1) * ipoScale
-               ipoValue_y = Mathutils.Rand(-1, 1) * ipoScale
-               ipoValue_z = Mathutils.Rand(-1, 1) * ipoScale
-               
-               # Append to the Ipo curve at location frame, with the value ipoValue_x
-               # Note that we should pass the append function a tuple or a BezTriple
-               myIpo_x.append((frame, ipoValue_x))
-       
-               # Similar to above
-               myIpo_y.append((frame, ipoValue_y))
-               myIpo_z.append((frame, ipoValue_z))
-       
-       # Link our new Ipo Curve to the passed object
-       object.setIpo(myIpo)
-       print object
-       
-       
-def main():
-       
-       # Get the active scene, since there can be multiple ones
-       sce = bpy.data.scenes.active
-       
-       # Get the active object
-       object = sce.objects.active
-       
-       # If there is no active object, pop up an error message
-       if not object:
-               BPyMessages.Error_NoActive()
-               
-       Window.WaitCursor(1)
-       
-       # Call our makeRandomIpo function
-       # Pass it our object, Tell it to keys from the start frame until the end frame, at a step of 10 frames
-       # between them
-       
-       makeRandomIpo(object, sce.render.sFrame, sce.render.eFrame, 10)
-       
-       Window.WaitCursor(0)
-
-if __name__ == '__main__':
-       main()
-
-'''
-
-new_text = bpy.data.texts.new('ipo_template.py')
-new_text.write(script_data)
-bpy.data.texts.active = new_text
-Window.RedrawAll()
index 28db9de3af6fdd8a44c2a256b3699ff24a47de3b..881f9c4fc4b871466614fa1357e04f02f1692f39 100644 (file)
@@ -70,7 +70,7 @@ if __name__ == '__main__':
     main() 
 '''
 
-new_text = bpy.data.texts.new('metaball_template.py')
+new_text = bpy.data.texts.new('pyconstraint_template.py')
 new_text.write(script_data)
 bpy.data.texts.active = new_text
 Window.RedrawAll()
index 3ba20f20dd103fbb9852d5c5b472e144fa416252..4f8e0bccfa2352d39b251a9ef3c0a20c7bbc2e41 100644 (file)
@@ -13,7 +13,7 @@ script_data = \
 '''#!BPY
 """
 Name: 'My Object Script'
-Blender: 245
+Blender: 244
 Group: 'Object'
 Tooltip: 'Put some useful info here'
 """
@@ -78,4 +78,4 @@ if __name__ == '__main__':
 new_text = bpy.data.texts.new('object_template.py')
 new_text.write(script_data)
 bpy.data.texts.active = new_text
-Window.RedrawAll()
+Window.RedrawAll()
\ No newline at end of file
index 30387ad744032aa5636d6c15b32f57f60b760648..95f6900cf10a07ae48e0699e549e747fe3168d67 100644 (file)
@@ -8,7 +8,7 @@ Tooltip: 'Import Pro Engineer (.slp) File Format'
 """
 
 __author__ = "Anthony D'Agostino (Scorpius)"
-__url__ = ("blender", "blenderartists.org",
+__url__ = ("blender", "elysiun",
 "Author's homepage, http://www.redrival.com/scorpius")
 __version__ = "Part of IOSuite 0.5"
 
index 9f24885829c76c4107b1340fe6526f0d8faca6bc..01cff8ae57f990f7df72ea903660e3c84f8fe237 100644 (file)
@@ -8,7 +8,7 @@ Tooltip: 'Information about your Blender environment, useful to diagnose problem
 """
 
 __author__ = "Willian P. Germano"
-__url__ = ("blenderartists.org", "blenderartists.org")
+__url__ = ("blender", "elysiun")
 __version__ = "1.1"
 __bpydoc__ = """\
 This script creates a text in Blender's Text Editor with information
index 3385e66e2d89adb18b5e0efd6bc2a5a08d2250b9..34877837bb733c9ffc2c998ec79343a1ecdfe72c 100644 (file)
@@ -7,7 +7,7 @@ Tip: 'Unweld all faces from a (or several) selected and common vertex. Made vert
 """
 
 __author__ = "Jean-Michel Soler (jms)"
-__url__ = ("blender", "blenderartists.org",
+__url__ = ("blender", "elysiun",
 "Script's homepage, http://jmsoler.free.fr/didacticiel/blender/tutor/cpl_faces2vertex.htm#exemple",
 "Communicate problems and errors, http://www.zoo-logique.org/3D.Blender/newsportal/thread.php?group=3D.Blender")
 __version__ = "0.4.6 "
index 285cca97d8b358d054778f0ecc8dd91512322bbb..dfdad3118d9a5bbfc053f462079166b6bdb6a716 100644 (file)
@@ -6,7 +6,7 @@ Group: 'UVCalculation'
 Tooltip: 'Assign UVs to selected faces from surrounding unselected faces.'
 """
 __author__ = "Campbell Barton"
-__url__ = ("blender", "blenderartists.org")
+__url__ = ("blender", "elysiun")
 __version__ = "1.0 2006/02/07"
 
 __bpydoc__ = """\
index 79a445329cccfc14a4aa8dd0885f9e8588bebec4..2a79d0d05dfeefec46680a93b47bd341c4c5743b 100644 (file)
@@ -6,7 +6,7 @@ Group: 'UVCalculation'
 Tooltip: 'Follow from active quads.'
 """
 __author__ = "Campbell Barton"
-__url__ = ("blender", "blenderartists.org")
+__url__ = ("blender", "elysiun")
 __version__ = "1.0 2006/02/07"
 
 __bpydoc__ = """\
index 3b7c3ac7cf905df9abfb69e496e1d3488b216a9b..af9acb09e17113540f9221f33798bb2d2f1ae5b9 100644 (file)
@@ -5,8 +5,8 @@ Blender: 242
 Group: 'UVCalculation'
 Tooltip: 'Give each face non overlapping space on a texture.'
 """
-__author__ = "Campbell Barton aka ideasman42"
-__url__ = ("blender", "blenderartists.org")
+__author__ = "Campbell Barton"
+__url__ = ("blender", "elysiun")
 __version__ = "1.0 2006/02/07"
 
 __bpydoc__ = """\
index 0bba747e010cb73968f667eb0f80bfec603f28a2..791fd661cc9e504b66d6a6424c045d13add3d669 100644 (file)
@@ -2,13 +2,13 @@
 
 """ Registration info for Blender menus: <- these words are ignored
 Name: 'Click project from face'
-Blender: 245
+Blender: 242
 Group: 'UVCalculation'
 Tooltip: '3 Clicks to project uvs onto selected faces.'
 """
 
-__author__ = "Campbell Barton aka ideasman42"
-__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"]
+__author__ = ["Campbell Barton"]
+__url__ = ("blender", "elysiun", "http://members.iinet.net.au/~cpbarton/ideasman/")
 __version__ = "0.1"
 __bpydoc__=\
 '''
index d622e1a2af8398deacfb73abe92e7fc8d72b887e..49d52d12d47d12fd8c3fb75c479cc88c127ad12b 100644 (file)
@@ -9,7 +9,7 @@ Tooltip: 'UV Unwrap mesh faces for all select mesh objects'
 
 
 __author__ = "Campbell Barton"
-__url__ = ("blender", "blenderartists.org")
+__url__ = ("blender", "elysiun")
 __version__ = "1.1 12/18/05"
 
 __bpydoc__ = """\
index 73206e4710933d467efc42d16ff6bc26eadbfb65..1ac63dd52b54e8569653606635d67c052020daa1 100644 (file)
@@ -7,7 +7,9 @@ Tip: 'Copy UV coords from a mesh to another that has same vertex indices'
 """
 
 __author__ = "Toni Alatalo, Martin Poirier et. al."
-__url__ = ("blender", "blenderartists.org")
+__url__ = ("blender", "elysiun",
+"Script's homepage, http://www.elysiun.com/forum/viewtopic.php?t=14897", 
+"Communicate problems and errors, http://www.elysiun.com/forum/viewtopic.php?t=14897")
 __version__ = "0.2 01/2006"
 
 __bpydoc__ = """\
index 17eccb4f67f27173b64500f93347ca3c80465f8f..d0b7de329df4c5c025441d9c10ace2a1e5421756 100644 (file)
@@ -1,13 +1,13 @@
 #!BPY
 """
 Name: 'VCol Gradient...'
-Blender: 245
+Blender: 241
 Group: 'VertexPaint'
 Tooltip: 'Click on the start and end grad points for the mesh for selected faces.'
 """
 
-__author__ = "Campbell Barton aka ideasman42"
-__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"]
+__author__ = ["Campbell Barton"]
+__url__ = ("blender", "elysiun", "http://members.iinet.net.au/~cpbarton/ideasman/")
 __version__ = "0.1"
 
 # ***** BEGIN GPL LICENSE BLOCK *****
index 95ba7d2fb23c600ef84e96228d2364b934a73c2c..7a6f4f9176dd3d39aabc92d775ab1adcc595f3d4 100644 (file)
@@ -1,13 +1,13 @@
 #!BPY
 """
 Name: 'Self Shadow VCols (AO)...'
-Blender: 245
+Blender: 241
 Group: 'VertexPaint'
 Tooltip: 'Generate Fake Ambient Occlusion with vertex colors.'
 """
 
-__author__ = "Campbell Barton aka ideasman42"
-__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"]
+__author__ = ["Campbell Barton"]
+__url__ = ("blender", "elysiun", "http://members.iinet.net.au/~cpbarton/ideasman/")
 __version__ = "0.1"
 __bpydoc__ = """\
 
index eb3be80c99c55182590a59a661f75468f0e38036..57ffd243bfc0b69990a62943be247babfe5bff5b 100644 (file)
@@ -10,7 +10,7 @@ Tooltip: 'Export to VRML97 file (.wrl)'
 """
 
 __author__ = ("Rick Kimball", "Ken Miller", "Steve Matthews", "Bart")
-__url__ = ["blender", "blenderartists.org",
+__url__ = ["blender", "elysiun",
 "Author's (Rick) homepage, http://kimballsoftware.com/blender",
 "Author's (Bart) homepage, http://www.neeneenee.de/vrml"]
 __email__ = ["Bart, bart:neeneenee*de"]
index ba1896f011e41fe5cdd30dc1e67d2e675f3c4650..d6cddba5fa25b54659790b8d5bf86f7ea2ca8fd7 100644 (file)
@@ -1,13 +1,13 @@
 #!BPY
 """
 Name: 'Clean Weight...'
-Blender: 245
+Blender: 241
 Group: 'WeightPaint'
 Tooltip: 'Removed verts from groups below a weight limit.'
 """
 
-__author__ = "Campbell Barton aka ideasman42"
-__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"]
+__author__ = ["Campbell Barton"]
+__url__ = ("blender", "elysiun", "http://members.iinet.net.au/~cpbarton/ideasman/")
 __version__ = "0.1"
 __bpydoc__ = """\
 
index eb7aff7eb896d109a3cc47683d9b923495dfca64..a2bff999610f65890c66d68553776f16d918e57a 100644 (file)
@@ -1,13 +1,13 @@
 #!BPY
 """
 Name: 'Weight Gradient...'
-Blender: 245
+Blender: 241
 Group: 'WeightPaint'
 Tooltip: 'Click on the start and end grad points for the mesh for selected faces.'
 """
 
-__author__ = "Campbell Barton aka ideasman42"
-__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"]
+__author__ = ["Campbell Barton"]
+__url__ = ("blender", "elysiun", "http://members.iinet.net.au/~cpbarton/ideasman/")
 __version__ = "0.1"
 __bpydoc__=\
 '''
index 5c0f28685f9bf44c3a8d4df4689a1fe3536a1b9b..5527f59e5ae194cdab67e7cf1a40b37d3b0d5ec1 100644 (file)
@@ -1,13 +1,13 @@
 #!BPY
 """
 Name: 'Grow/Shrink Weight...'
-Blender: 245
+Blender: 241
 Group: 'WeightPaint'
 Tooltip: 'Grow/Shrink active vertex group.'
 """
 
-__author__ = "Campbell Barton aka ideasman42"
-__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"]
+__author__ = ["Campbell Barton"]
+__url__ = ("blender", "elysiun", "http://members.iinet.net.au/~cpbarton/ideasman/")
 __version__ = "0.1"
 __bpydoc__ = """\
 
index 6059922eecb1405bbfaf4b6daa3ab3c0d84ef38c..1f6c3d201aa691553408f460091b1ac0b37e3c2d 100644 (file)
@@ -1,13 +1,13 @@
 #!BPY
 """
 Name: 'Normalize/Scale Weight...'
-Blender: 245
+Blender: 241
 Group: 'WeightPaint'
 Tooltip: 'Normalize the weight of the active weightgroup.'
 """
 
-__author__ = "Campbell Barton aka ideasman42"
-__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"]
+__author__ = ["Campbell Barton"]
+__url__ = ("blender", "elysiun", "http://members.iinet.net.au/~cpbarton/ideasman/")
 __version__ = "0.1"
 __bpydoc__ = """\
 
index a7ddd68268a6935f734db3517c3b0a13f5a0d8f7..8facf115d9e0fee1fb602ea9d36894b1f26f9a90 100644 (file)
@@ -8,7 +8,7 @@ Tip: 'Adds Widgets for Driven Shapes'
 """
 
 __author__ = ["Johnny Matthews (guitargeek)"]
-__url__ = ("blender", "blenderartists.org")
+__url__ = ("blender", "elysiun")
 __version__ = "0.0.9 12/15/05"
 
 __bpydoc__ = """\
index ddc0dd4dceab83e539c2d1ff811ae30c4b71c036..e8e0c0ded0ed7242a123a789bd8a17e61a8ed069 100644 (file)
@@ -7,7 +7,7 @@ Tooltip: 'Export selected mesh to xfig Format (.fig)'
 """
 
 __author__ = 'Dino Ghilardi',  'Campbell Barton AKA Ideasman42'
-__url__ = ("blender", "blenderartists.org")
+__url__ = ("blender", "elysiun")
 __version__ = "1.1"
 
 __bpydoc__ = """\
index d86d8cb82cfc228941b07473936bf39e3d8b0b47..62dc32cbc78af86d727f28fc7418e70b0fcd14c4 100644 (file)
@@ -10,7 +10,7 @@ Tooltip: 'Export to a SoftImage XSI file'
 
 __author__ = ("Elira")
 __url__ = ["Author's site, http://www.creative-realms.net/~elira/blender.html",
-"SoftImage's site, www.softimage.com", "blenderartists.org"]
+"SoftImage's site, www.softimage.com", "elysiun"]
 __email__ = ["scripts"]
 __version__ = "2005/11/01"
 
index 56a661238f810756e48650907e36b7ed2dd5f953..09d30ddafd08fd3481b10f7adbf1842b97cd20bf 100644 (file)
@@ -31,3 +31,6 @@ if env['WITH_BF_OPENEXR'] == 1:
 
 if env['WITH_BF_QUICKTIME'] == 1:
     SConscript (['quicktime/SConscript'])
+
+if env['WITH_BF_FREESTYLE'] == 1:
+       SConscript(['freestyle/SConscript'])
index 944a90816798bce1568ca62fc8834ba97570638e..fbde861891d9cc6233557f80a6f87dd50a500b7c 100644 (file)
@@ -231,7 +231,6 @@ struct ParticleSystemModifierData *psys_get_modifier(struct Object *ob, struct P
 struct ParticleSettings *psys_new_settings(char *name, struct Main *main);
 struct ParticleSettings *psys_copy_settings(struct ParticleSettings *part);
 void psys_flush_settings(struct ParticleSettings *part, int event, int hair_recalc);
-void make_local_particlesettings(struct ParticleSettings *part);
 
 struct LinkNode *psys_using_settings(struct ParticleSettings *part, int flush_update);
 void psys_changed_type(struct ParticleSystem *psys);
index 974754968656a4def51f9474502fd0b29f3e6182..0d91f106ed77ce5fd810a4675c2ce467ea0fcac5 100644 (file)
@@ -337,7 +337,6 @@ static void frames_duplilist(ListBase *lb, Object *ob, int level, int animated)
 {
        extern int enable_cu_speed;     /* object.c */
        Object copyob;
-       DupliObject *dob;
        int cfrao, ok;
        
        /* simple preventing of too deep nested groups */
@@ -361,8 +360,7 @@ static void frames_duplilist(ListBase *lb, Object *ob, int level, int animated)
                if(ok) {
                        do_ob_ipo(ob);
                        where_is_object_time(ob, (float)G.scene->r.cfra);
-                       dob= new_dupli_object(lb, ob, ob->obmat, ob->lay, G.scene->r.cfra, OB_DUPLIFRAMES, animated);
-                       Mat4CpyMat4(dob->omat, copyob.obmat);
+                       new_dupli_object(lb, ob, ob->obmat, ob->lay, G.scene->r.cfra, OB_DUPLIFRAMES, animated);
                }
        }
 
@@ -725,7 +723,7 @@ static void face_duplilist(ListBase *lb, ID *id, Object *par, float par_space_ma
 static void new_particle_duplilist(ListBase *lb, ID *id, Object *par, float par_space_mat[][4], ParticleSystem *psys, int level, int animated)
 {
        GroupObject *go;
-       Object *ob=0, **oblist=0, obcopy, *obcopylist=0;
+       Object *ob=0, **oblist=0;
        DupliObject *dob;
        ParticleSettings *part;
        ParticleData *pa;
@@ -735,7 +733,7 @@ static void new_particle_duplilist(ListBase *lb, ID *id, Object *par, float par_
        ParticleSystemModifierData *psmd;
        float ctime, pa_time, scale = 1.0f;
        float tmat[4][4], mat[4][4], obrotmat[4][4], pamat[4][4], size=0.0;
-       float (*obmat)[4], (*oldobmat)[4];
+       float obmat[4][4], (*obmatlist)[4][4]=0;
        float xvec[3] = {-1.0, 0.0, 0.0}, q[4];
        int lay, a, b, k, step_nbr = 0, counter, hair = 0;
        int totpart, totchild, totgroup=0, pa_num;
@@ -760,7 +758,7 @@ static void new_particle_duplilist(ListBase *lb, ID *id, Object *par, float par_
        totchild = psys->totchild;
 
        BLI_srandom(31415926 + psys->seed);
-       
+               
        lay= G.scene->lay;
        if((part->draw_as == PART_DRAW_OB && part->dup_ob) ||
                (part->draw_as == PART_DRAW_GR && part->dup_group && part->dup_group->gobject.first)) {
@@ -780,55 +778,54 @@ static void new_particle_duplilist(ListBase *lb, ID *id, Object *par, float par_
 
                psys->lattice = psys_get_lattice(par, psys);
 
-               /* gather list of objects or single object */
                if(part->draw_as==PART_DRAW_GR) {
                        group_handle_recalc_and_update(par, part->dup_group);
 
-                       for(go=part->dup_group->gobject.first; go; go=go->next)
+                       go= part->dup_group->gobject.first;
+                       while(go) {
+                               go=go->next;
                                totgroup++;
+                       }
 
-                       /* we also copy the actual objects to restore afterwards, since
-                        * where_is_object_time will change the object which breaks transform */
-                       oblist = MEM_callocN(totgroup*sizeof(Object *), "dupgroup object list");
-                       obcopylist = MEM_callocN(totgroup*sizeof(Object), "dupgroup copy list");
-
-                       go = part->dup_group->gobject.first;
+                       oblist= MEM_callocN(totgroup*sizeof(Object *), "dupgroup object list");
+                       obmatlist= MEM_callocN(totgroup*sizeof(float)*4*4, "dupgroup obmat list");
+                       go= part->dup_group->gobject.first;
                        for(a=0; a<totgroup; a++, go=go->next) {
-                               oblist[a] = go->ob;
-                               obcopylist[a] = *go->ob;
+                               oblist[a]=go->ob;
+                               Mat4CpyMat4(obmatlist[a], go->ob->obmat);
                        }
                }
                else {
                        ob = part->dup_ob;
-                       obcopy = *ob;
+                       Mat4CpyMat4(obmat, ob->obmat);
                }
 
                if(totchild==0 || part->draw & PART_DRAW_PARENT)
-                       a = 0;
+                       a=0;
                else
-                       a = totpart;
+                       a=totpart;
 
                for(pa=psys->particles,counter=0; a<totpart+totchild; a++,pa++,counter++) {
                        if(a<totpart) {
-                               /* handle parent particle */
                                if(pa->flag & (PARS_UNEXIST+PARS_NO_DISP))
                                        continue;
 
-                               pa_num = pa->num;
-                               pa_time = pa->time;
-                               size = pa->size;
+                               pa_num=pa->num;
+
+                               pa_time=pa->time;
+
+                               size=pa->size;
                        }
                        else {
-                               /* handle child particle */
-                               cpa = &psys->child[a - totpart];
-
+                               /* TODO: figure these two out */
+                               cpa= &psys->child[a - totpart];
                                pa_num = a;
                                pa_time = psys->particles[cpa->parent].time;
-                               size = psys_get_child_size(psys, cpa, ctime, 0);
+
+                               size=psys_get_child_size(psys, cpa, ctime, 0);
                        }
 
                        if(part->draw_as==PART_DRAW_GR) {
-                               /* for groups, pick the object based on settings */
                                if(part->draw&PART_DRAW_RAND_GR)
                                        b= BLI_rand() % totgroup;
                                else if(part->from==PART_FROM_PARTICLE)
@@ -837,17 +834,11 @@ static void new_particle_duplilist(ListBase *lb, ID *id, Object *par, float par_
                                        b= a % totgroup;
 
                                ob = oblist[b];
-                               obmat = oblist[b]->obmat;
-                               oldobmat = obcopylist[b].obmat;
-                       }
-                       else {
-                               obmat= ob->obmat;
-                               oldobmat= obcopy.obmat;
+                               Mat4CpyMat4(obmat, obmatlist[b]);
                        }
 
                        for(k=0; k<=step_nbr; k++, counter++) {
                                if(hair) {
-                                       /* hair we handle separate and compute transform based on hair keys */
                                        if(a < totpart) {
                                                cache = psys->pathcache[a];
                                                psys_get_dupli_path_transform(par, psys, psmd, pa, 0, cache, pamat, &scale);
@@ -860,7 +851,6 @@ static void new_particle_duplilist(ListBase *lb, ID *id, Object *par, float par_
                                        VECCOPY(pamat[3], cache->co);
                                }
                                else if(step_nbr) {
-                                       /* other keys */
                                        state.time = (float)k / (float)step_nbr;
                                        psys_get_particle_on_path(par, psys, a, &state, 0);
 
@@ -869,7 +859,6 @@ static void new_particle_duplilist(ListBase *lb, ID *id, Object *par, float par_
                                        pamat[3][3]= 1.0f;
                                }
                                else {
-                                       /* first key */
                                        state.time = -1.0;
                                        if(psys_get_particle_state(par, psys, a, &state, 0) == 0)
                                                continue;
@@ -882,7 +871,7 @@ static void new_particle_duplilist(ListBase *lb, ID *id, Object *par, float par_
                                if(part->draw_as==PART_DRAW_GR && psys->part->draw & PART_DRAW_WHOLE_GR) {
                                        for(go= part->dup_group->gobject.first, b=0; go; go= go->next, b++) {
 
-                                               Mat4MulMat4(tmat, obmat, pamat);
+                                               Mat4MulMat4(tmat, obmatlist[b], pamat);
                                                Mat4MulFloat3((float *)tmat, size*scale);
                                                if(par_space_mat)
                                                        Mat4MulMat4(mat, tmat, par_space_mat);
@@ -890,7 +879,6 @@ static void new_particle_duplilist(ListBase *lb, ID *id, Object *par, float par_
                                                        Mat4CpyMat4(mat, tmat);
 
                                                dob= new_dupli_object(lb, go->ob, mat, par->lay, counter, OB_DUPLIPARTS, animated);
-                                               Mat4CpyMat4(dob->omat, oldobmat);
                                                if(G.rendering)
                                                        psys_get_dupli_texture(par, part, psmd, pa, cpa, dob->uv, dob->orco);
                                        }
@@ -916,27 +904,16 @@ static void new_particle_duplilist(ListBase *lb, ID *id, Object *par, float par_
                                                Mat4CpyMat4(mat, tmat);
 
                                        dob= new_dupli_object(lb, ob, mat, par->lay, counter, OB_DUPLIPARTS, animated);
-                                       Mat4CpyMat4(dob->omat, oldobmat);
                                        if(G.rendering)
                                                psys_get_dupli_texture(par, part, psmd, pa, cpa, dob->uv, dob->orco);
                                }
                        }
                }
-
-               /* restore objects since they were changed in where_is_object_time */
-               if(part->draw_as==PART_DRAW_GR) {
-                       for(a=0; a<totgroup; a++)
-                               *(oblist[a])= obcopylist[a];
-               }
-               else
-                       *ob= obcopy;
        }
-
-       /* clean up */
        if(oblist)
                MEM_freeN(oblist);
-       if(obcopylist)
-               MEM_freeN(obcopylist);
+       if(obmatlist)
+               MEM_freeN(obmatlist);
 
        if(psys->lattice) {
                end_latt_deform();
index 80f450000bbc7356b5a24419ba9f955b87485369..1331c9a7d126808e4a995883a55236683d562e48 100644 (file)
@@ -346,24 +346,6 @@ static void dag_add_driver_relation(Ipo *ipo, DagForest *dag, DagNode *node, int
        }
 }
 
-static void dag_add_collision_field_relation(DagForest *dag, Object *ob, DagNode *node)
-{
-       Base *base;
-       DagNode *node2;
-
-       // would be nice to have a list of colliders here
-       // so for now walk all objects in scene check 'same layer rule'
-       for(base = G.scene->base.first; base; base= base->next) {
-               if((base->lay & ob->lay) && base->object->pd) {
-                       Object *ob1= base->object;
-                       if((ob1->pd->deflect || ob1->pd->forcefield) && (ob1 != ob))  {
-                               node2 = dag_get_node(dag, ob1);                                 
-                               dag_add_relation(dag, node2, node, DAG_RL_DATA_DATA|DAG_RL_OB_DATA, "Field Collision");
-                       }
-               }
-       }
-}
-
 static void build_dag_object(DagForest *dag, DagNode *scenenode, Object *ob, int mask)
 {
        bConstraint *con;
@@ -541,9 +523,22 @@ static void build_dag_object(DagForest *dag, DagNode *scenenode, Object *ob, int
        }
     
        /* softbody collision  */
-       if((ob->type==OB_MESH) || (ob->type==OB_CURVE) || (ob->type==OB_LATTICE))
-               if(modifiers_isSoftbodyEnabled(ob) || modifiers_isClothEnabled(ob))
-                       dag_add_collision_field_relation(dag, ob, node);
+       if((ob->type==OB_MESH) || (ob->type==OB_CURVE) || (ob->type==OB_LATTICE)) {
+               Base *base;
+               if(modifiers_isSoftbodyEnabled(ob)){
+                       // would be nice to have a list of colliders here
+                       // so for now walk all objects in scene check 'same layer rule'
+                       for(base = G.scene->base.first; base; base= base->next) {
+                               if( (base->lay & ob->lay) && base->object->pd) {
+                                       Object *ob1= base->object;
+                                       if((ob1->pd->deflect) && (ob1 != ob))  {
+                                               node2 = dag_get_node(dag, ob1);                                 
+                                               dag_add_relation(dag, node2, node, DAG_RL_DATA_DATA|DAG_RL_OB_DATA, "Softbody Collision");
+                                       }
+                               }
+                       }
+               }
+       }
                
        if (ob->type==OB_MBALL) {
                Object *mom= find_basis_mball(ob);
@@ -1696,7 +1691,7 @@ static void flush_update_node(DagNode *node, unsigned int layer, int curtime)
                for(itA = node->child; itA; itA= itA->next) {
                        all_layer |= itA->lay;
                        /* the relationship is visible */
-                       if((itA->lay & layer) || (itA->node->ob == G.obedit)) {
+                       if(itA->lay & layer) {
                                if(itA->node->type==ID_OB) {
                                        obc= itA->node->ob;
                                        oldflag= obc->recalc;
@@ -1727,7 +1722,7 @@ static void flush_update_node(DagNode *node, unsigned int layer, int curtime)
                        }
                }
                /* even nicer, we can clear recalc flags...  */
-               if((all_layer & layer)==0 && (ob != G.obedit)) {
+               if((all_layer & layer)==0) {
                        /* but existing displaylists or derivedmesh should be freed */
                        if(ob->recalc & OB_RECALC_DATA)
                                object_free_display(ob);
@@ -1741,7 +1736,7 @@ static void flush_update_node(DagNode *node, unsigned int layer, int curtime)
        /* could merge this in with loop above...? (ton) */
        for(itA = node->child; itA; itA= itA->next) {
                /* the relationship is visible */
-               if((itA->lay & layer) || (itA->node->ob == G.obedit)) {
+               if(itA->lay & layer) {
                        if(itA->node->type==ID_OB) {
                                obc= itA->node->ob;
                                /* child moves */
index ff0b2e6db0a4c6df216fb28d1c22907694feb7d0..b493f98b7fb2e118d70961b4dbe2a59baaab6004 100644 (file)
@@ -281,19 +281,15 @@ static Image *image_alloc(const char *name, short source, short type)
 /* get the ibuf from an image cache, local use here only */
 static ImBuf *image_get_ibuf(Image *ima, int index, int frame)
 {
-       /* this function is intended to be thread safe. with IMA_NO_INDEX this
-        * should be OK, but when iterating over the list this is more tricky
-        * */
        if(index==IMA_NO_INDEX)
                return ima->ibufs.first;
        else {
                ImBuf *ibuf;
-
+               
                index= IMA_MAKE_INDEX(frame, index);
                for(ibuf= ima->ibufs.first; ibuf; ibuf= ibuf->next)
                        if(ibuf->index==index)
                                return ibuf;
-
                return NULL;
        }
 }
@@ -321,16 +317,19 @@ static void image_assign_ibuf(Image *ima, ImBuf *ibuf, int index, int frame)
                for(link= ima->ibufs.first; link; link= link->next)
                        if(link->index>=index)
                                break;
-
-               ibuf->index= index;
-
-               /* this function accepts link==NULL */
-               BLI_insertlinkbefore(&ima->ibufs, link, ibuf);
-
                /* now we don't want copies? */
-               if(link && ibuf->index==link->index)
+               if(link && ibuf->index==link->index) {
+                       ImBuf *prev= ibuf->prev;
                        image_remove_ibuf(ima, link);
+                       link= prev;
+               }
+               
+               /* this function accepts link==NULL */
+               BLI_insertlinkbefore(&ima->ibufs, link, ibuf);
+               
+               ibuf->index= index;
        }
+       
 }
 
 /* checks if image was already loaded, then returns same image */
@@ -1502,12 +1501,12 @@ static ImBuf *image_load_sequence_file(Image *ima, ImageUser *iuser, int frame)
                        ibuf= NULL;
                }
                else {
-                       image_initialize_after_load(ima, ibuf);
                        image_assign_ibuf(ima, ibuf, 0, frame);
+                       image_initialize_after_load(ima, ibuf);
                }
 #else
-               image_initialize_after_load(ima, ibuf);
                image_assign_ibuf(ima, ibuf, 0, frame);
+               image_initialize_after_load(ima, ibuf);
 #endif
        }
        else
@@ -1543,9 +1542,8 @@ static ImBuf *image_load_sequence_multilayer(Image *ima, ImageUser *iuser, int f
                        // if(oldrr) printf("freed previous result %p\n", oldrr);
                        if(oldrr) RE_FreeRenderResult(oldrr);
                }
-               else {
+               else
                        ima->rr= oldrr;
-               }
 
        }
        if(ima->rr) {
@@ -1560,8 +1558,8 @@ static ImBuf *image_load_sequence_multilayer(Image *ima, ImageUser *iuser, int f
                        ibuf->mall= IB_rectfloat;
                        ibuf->channels= rpass->channels;
                        
-                       image_initialize_after_load(ima, ibuf);
                        image_assign_ibuf(ima, ibuf, iuser->multi_index, frame);
+                       image_initialize_after_load(ima, ibuf);
                        
                }
                // else printf("pass not found\n");
@@ -1607,8 +1605,8 @@ static ImBuf *image_load_movie_file(Image *ima, ImageUser *iuser, int frame)
                ibuf = IMB_anim_absolute(ima->anim, fra);
                
                if(ibuf) {
-                       image_initialize_after_load(ima, ibuf);
                        image_assign_ibuf(ima, ibuf, 0, frame);
+                       image_initialize_after_load(ima, ibuf);
                }
                else
                        ima->ok= 0;
@@ -1627,7 +1625,6 @@ static ImBuf *image_load_image_file(Image *ima, ImageUser *iuser, int cfra)
 {
        struct ImBuf *ibuf;
        char str[FILE_MAX];
-       int assign = 0;
        
        /* always ensure clean ima */
        image_free_buffers(ima);
@@ -1660,8 +1657,8 @@ static ImBuf *image_load_image_file(Image *ima, ImageUser *iuser, int cfra)
                        ibuf= NULL;
                }
                else {
+                       image_assign_ibuf(ima, ibuf, IMA_NO_INDEX, 0);
                        image_initialize_after_load(ima, ibuf);
-                       assign= 1;
 
                        /* check if the image is a font image... */
                        detectBitmapFont(ibuf);
@@ -1677,9 +1674,6 @@ static ImBuf *image_load_image_file(Image *ima, ImageUser *iuser, int cfra)
        else
                ima->ok= 0;
        
-       if(assign)
-               image_assign_ibuf(ima, ibuf, IMA_NO_INDEX, 0);
-
        if(iuser)
                iuser->ok= ima->ok;
        
@@ -1703,13 +1697,12 @@ static ImBuf *image_get_ibuf_multilayer(Image *ima, ImageUser *iuser)
                if(rpass) {
                        ibuf= IMB_allocImBuf(ima->rr->rectx, ima->rr->recty, 32, 0, 0);
                        
+                       image_assign_ibuf(ima, ibuf, iuser?iuser->multi_index:IMA_NO_INDEX, 0);
                        image_initialize_after_load(ima, ibuf);
                        
                        ibuf->rect_float= rpass->rect;
                        ibuf->flags |= IB_rectfloat;
                        ibuf->channels= rpass->channels;
-
-                       image_assign_ibuf(ima, ibuf, iuser?iuser->multi_index:IMA_NO_INDEX, 0);
                }
        }
        
@@ -1788,171 +1781,118 @@ static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser)
        return NULL;
 }
 
-static ImBuf *image_get_ibuf_threadsafe(Image *ima, ImageUser *iuser, int *frame_r, int *index_r)
+/* Checks optional ImageUser and verifies/creates ImBuf. */
+/* returns ibuf */
+ImBuf *BKE_image_get_ibuf(Image *ima, ImageUser *iuser)
 {
-       ImBuf *ibuf = NULL;
-       int frame = 0, index = 0;
+       ImBuf *ibuf= NULL;
+       float color[] = {0, 0, 0, 1};
 
-       /* see if we already have an appropriate ibuf, with image source and type */
+       /* quick reject tests */
+       if(ima==NULL) 
+               return NULL;
+       if(iuser) {
+               if(iuser->ok==0)
+                       return NULL;
+       }
+       else if(ima->ok==0)
+               return NULL;
+       
+       BLI_lock_thread(LOCK_IMAGE);
+       
+       /* handle image source and types */
        if(ima->source==IMA_SRC_MOVIE) {
-               frame= iuser?iuser->framenr:ima->lastframe;
+               /* source is from single file, use flipbook to store ibuf */
+               int frame= iuser?iuser->framenr:ima->lastframe;
+               
                ibuf= image_get_ibuf(ima, 0, frame);
+               if(ibuf==NULL)
+                       ibuf= image_load_movie_file(ima, iuser, frame);
        }
        else if(ima->source==IMA_SRC_SEQUENCE) {
+               
                if(ima->type==IMA_TYPE_IMAGE) {
-                       frame= iuser?iuser->framenr:ima->lastframe;
+                       /* regular files, ibufs in flipbook, allows saving */
+                       int frame= iuser?iuser->framenr:ima->lastframe;
+                       
                        ibuf= image_get_ibuf(ima, 0, frame);
+                       if(ibuf==NULL)
+                               ibuf= image_load_sequence_file(ima, iuser, frame);
+                       else
+                               BLI_strncpy(ima->name, ibuf->name, sizeof(ima->name));
                }
-               else if(ima->type==IMA_TYPE_MULTILAYER) {
-                       frame= iuser?iuser->framenr:ima->lastframe;
-                       index= iuser?iuser->multi_index:IMA_NO_INDEX;
+               /* no else; on load the ima type can change */
+               if(ima->type==IMA_TYPE_MULTILAYER) {
+                       /* only 1 layer/pass stored in imbufs, no exrhandle anim storage, no saving */
+                       int frame= iuser?iuser->framenr:ima->lastframe;
+                       int index= iuser?iuser->multi_index:IMA_NO_INDEX;
+                       
                        ibuf= image_get_ibuf(ima, index, frame);
+                       if(G.rt) printf("seq multi fra %d id %d ibuf %p %s\n", frame, index, ibuf, ima->id.name);
+                       if(ibuf==NULL)
+                               ibuf= image_load_sequence_multilayer(ima, iuser, frame);
+                       else
+                               BLI_strncpy(ima->name, ibuf->name, sizeof(ima->name));
                }
+
        }
        else if(ima->source==IMA_SRC_FILE) {
-               if(ima->type==IMA_TYPE_IMAGE)
+               
+               if(ima->type==IMA_TYPE_IMAGE) {
                        ibuf= image_get_ibuf(ima, IMA_NO_INDEX, 0);
-               else if(ima->type==IMA_TYPE_MULTILAYER)
+                       if(ibuf==NULL)
+                               ibuf= image_load_image_file(ima, iuser, G.scene->r.cfra);       /* cfra only for '#', this global is OK */
+               }
+               /* no else; on load the ima type can change */
+               if(ima->type==IMA_TYPE_MULTILAYER) {
+                       /* keeps render result, stores ibufs in listbase, allows saving */
                        ibuf= image_get_ibuf(ima, iuser?iuser->multi_index:IMA_NO_INDEX, 0);
+                       if(ibuf==NULL)
+                               ibuf= image_get_ibuf_multilayer(ima, iuser);
+               }
+                       
        }
        else if(ima->source == IMA_SRC_GENERATED) {
+               /* generated is: ibuf is allocated dynamically */
                ibuf= image_get_ibuf(ima, IMA_NO_INDEX, 0);
+               
+               if(ibuf==NULL) {
+                       if(ima->type==IMA_TYPE_VERSE) {
+                               /* todo */
+                       }
+                       else { /* always fall back to IMA_TYPE_UV_TEST */
+                               /* UV testgrid or black or solid etc */
+                               if(ima->gen_x==0) ima->gen_x= 256;
+                               if(ima->gen_y==0) ima->gen_y= 256;
+                               ibuf= add_ibuf_size(ima->gen_x, ima->gen_y, ima->name, 0, ima->gen_type, color);
+                               image_assign_ibuf(ima, ibuf, IMA_NO_INDEX, 0);
+                               ima->ok= IMA_OK_LOADED;
+                       }
+               }
        }
        else if(ima->source == IMA_SRC_VIEWER) {
                if(ima->type==IMA_TYPE_R_RESULT) {
-                       /* always verify entirely, not that this shouldn't happen
-                        * during render anyway */
+                       /* always verify entirely */
+                       ibuf= image_get_render_result(ima, iuser);
                }
                else if(ima->type==IMA_TYPE_COMPOSITE) {
-                       frame= iuser?iuser->framenr:0;
+                       int frame= iuser?iuser->framenr:0;
+                       
+                       /* Composite Viewer, all handled in compositor */
                        ibuf= image_get_ibuf(ima, 0, frame);
-               }
-       }
-
-       *frame_r = frame;
-       *index_r = index;
-
-       return ibuf;
-}
-
-/* Checks optional ImageUser and verifies/creates ImBuf. */
-/* returns ibuf */
-ImBuf *BKE_image_get_ibuf(Image *ima, ImageUser *iuser)
-{
-       ImBuf *ibuf= NULL;
-       float color[] = {0, 0, 0, 1};
-       int frame= 0, index= 0;
-
-       /* This function is intended to be thread-safe. It postpones the mutex lock
-        * until it needs to load the image, if the image is already there it
-        * should just get the pointer and return. The reason is that a lot of mutex
-        * locks appears to be very slow on certain multicore macs, causing a render
-        * with image textures to actually slow down as more threads are used.
-        *
-        * Note that all the image loading functions should also make sure they do
-        * things in a threadsafe way for image_get_ibuf_threadsafe to work correct.
-        * That means, the last two steps must be, 1) add the ibuf to the list and
-        * 2) set ima/iuser->ok to 0 to IMA_OK_LOADED */
-
-       /* quick reject tests */
-       if(ima==NULL) 
-               return NULL;
-       if(iuser) {
-               if(iuser->ok==0)
-                       return NULL;
-       }
-       else if(ima->ok==0)
-               return NULL;
-       
-       /* try to get the ibuf without locking */
-       ibuf= image_get_ibuf_threadsafe(ima, iuser, &frame, &index);
-
-       if(ibuf == NULL) {
-               /* couldn't get ibuf and image is not ok, so let's lock and try to
-                * load the image */
-               BLI_lock_thread(LOCK_IMAGE);
-
-               /* need to check ok flag and loading ibuf again, because the situation
-                * might have changed in the meantime */
-               if(iuser) {
-                       if(iuser->ok==0) {
-                               BLI_unlock_thread(LOCK_IMAGE);
-                               return NULL;
-                       }
-               }
-               else if(ima->ok==0) {
-                       BLI_unlock_thread(LOCK_IMAGE);
-                       return NULL;
-               }
-
-               ibuf= image_get_ibuf_threadsafe(ima, iuser, &frame, &index);
-
-               if(ibuf == NULL) {
-                       /* we are sure we have to load the ibuf, using source and type */
-                       if(ima->source==IMA_SRC_MOVIE) {
-                               /* source is from single file, use flipbook to store ibuf */
-                               ibuf= image_load_movie_file(ima, iuser, frame);
-                       }
-                       else if(ima->source==IMA_SRC_SEQUENCE) {
-                               if(ima->type==IMA_TYPE_IMAGE) {
-                                       /* regular files, ibufs in flipbook, allows saving */
-                                       ibuf= image_load_sequence_file(ima, iuser, frame);
-                               }
-                               /* no else; on load the ima type can change */
-                               if(ima->type==IMA_TYPE_MULTILAYER) {
-                                       /* only 1 layer/pass stored in imbufs, no exrhandle anim storage, no saving */
-                                       ibuf= image_load_sequence_multilayer(ima, iuser, frame);
-                               }
-
-                               if(ibuf)
-                                       BLI_strncpy(ima->name, ibuf->name, sizeof(ima->name));
-                       }
-                       else if(ima->source==IMA_SRC_FILE) {
-                               
-                               if(ima->type==IMA_TYPE_IMAGE)
-                                       ibuf= image_load_image_file(ima, iuser, G.scene->r.cfra);       /* cfra only for '#', this global is OK */
-                               /* no else; on load the ima type can change */
-                               if(ima->type==IMA_TYPE_MULTILAYER)
-                                       /* keeps render result, stores ibufs in listbase, allows saving */
-                                       ibuf= image_get_ibuf_multilayer(ima, iuser);
-                                       
-                       }
-                       else if(ima->source == IMA_SRC_GENERATED) {
-                               /* generated is: ibuf is allocated dynamically */
-                               if(ima->type==IMA_TYPE_VERSE) {
-                                       /* todo */
-                               }
-                               else { /* always fall back to IMA_TYPE_UV_TEST */
-                                       /* UV testgrid or black or solid etc */
-                                       if(ima->gen_x==0) ima->gen_x= 256;
-                                       if(ima->gen_y==0) ima->gen_y= 256;
-                                       ibuf= add_ibuf_size(ima->gen_x, ima->gen_y, ima->name, 0, ima->gen_type, color);
-                                       image_assign_ibuf(ima, ibuf, IMA_NO_INDEX, 0);
-                                       ima->ok= IMA_OK_LOADED;
-                               }
-                       }
-                       else if(ima->source == IMA_SRC_VIEWER) {
-                               if(ima->type==IMA_TYPE_R_RESULT) {
-                                       /* always verify entirely */
-                                       ibuf= image_get_render_result(ima, iuser);
-                               }
-                               else if(ima->type==IMA_TYPE_COMPOSITE) {
-                                       /* Composite Viewer, all handled in compositor */
-                                       /* fake ibuf, will be filled in compositor */
-                                       ibuf= IMB_allocImBuf(256, 256, 32, IB_rect, 0);
-                                       image_assign_ibuf(ima, ibuf, 0, frame);
-                               }
+                       if(ibuf==NULL) {
+                               /* fake ibuf, will be filled in compositor */
+                               ibuf= IMB_allocImBuf(256, 256, 32, IB_rect, 0);
+                               image_assign_ibuf(ima, ibuf, 0, frame);
                        }
                }
-
-               BLI_unlock_thread(LOCK_IMAGE);
        }
 
-       /* we assuming that if it is not rendering, it's also not multithreaded
-        * (a somewhat weak assumption) */
        if(G.rendering==0)
                tag_image_time(ima);
 
+       BLI_unlock_thread(LOCK_IMAGE);
+
        return ibuf;
 }
 
index 0cd7736f6c3f694b47ee711bc8104a6d9cf161a9..16916381c95b74c364d2b7e4bc46be29264d706a 100644 (file)
@@ -1363,9 +1363,8 @@ void find_first_points(PROCESS *mbproc, MetaBall *mb, int a)
                                        out_v = mbproc->function(out.x, out.y, out.z);
 
                                        /* find "first points" on Implicit Surface of MetaElemnt ml */
-                                       workp.x = in.x;
-                                       workp.y = in.y;
-                                       workp.z = in.z;
+                                       //converge(&in, &out, in_v, out_v, mbproc->function, &mbproc->start, mb, 0);
+                                       workp = in;
                                        workp_v = in_v;
                                        max_len = sqrt((out.x-in.x)*(out.x-in.x) + (out.y-in.y)*(out.y-in.y) + (out.z-in.z)*(out.z-in.z));
 
index c8a2d8521911bcf0c34a520df839556e671a8cc7..2a8ba878c4170dae69a8b28a860740348e05a340 100644 (file)
@@ -5875,8 +5875,6 @@ static void explodeModifier_copyData(ModifierData *md, ModifierData *target)
 
        temd->facepa = 0;
        temd->flag = emd->flag;
-       temd->protect = emd->protect;
-       temd->vgroup = emd->vgroup;
 }
 static int explodeModifier_dependsOnTime(ModifierData *md) 
 {
index a2a7894e3ce024af8f219327ce5abcb4bcd641af..bd8e0da3232e703c1741b4091537972535a663f9 100644 (file)
@@ -1219,7 +1219,6 @@ Object *copy_object(Object *ob)
 void expand_local_object(Object *ob)
 {
        bActionStrip *strip;
-       ParticleSystem *psys;
        int a;
        
        id_lib_extern((ID *)ob->action);
@@ -1233,8 +1232,7 @@ void expand_local_object(Object *ob)
        for (strip=ob->nlastrips.first; strip; strip=strip->next) {
                id_lib_extern((ID *)strip->act);
        }
-       for(psys=ob->particlesystem.first; psys; psys=psys->next)
-               id_lib_extern((ID *)psys->part);
+
 }
 
 void make_local_object(Object *ob)
@@ -1377,7 +1375,7 @@ void object_make_proxy(Object *ob, Object *target, Object *gob)
                ob->mat = MEM_dupallocN(target->mat);
                for(i=0; i<target->totcol; i++) {
                        /* dont need to run test_object_materials since we know this object is new and not used elsewhere */
-                       id_us_plus((ID *)ob->mat[i]); 
+                       id_us_plus(ob->mat[i]); 
                }
        }
        
index fec3da752ff6bdb576b88be4c04649bcf29236dc..d0152de3091cd657d0b814f48b30ed1ce082f1a0 100644 (file)
@@ -3016,7 +3016,7 @@ ParticleSettings *psys_copy_settings(ParticleSettings *part)
        return partn;
 }
 
-void make_local_particlesettings(ParticleSettings *part)
+void psys_make_local_settings(ParticleSettings *part)
 {
        Object *ob;
        ParticleSettings *par;
index 9ed23bc32b6bc35e020bb4033be428d96eea48eb..5b4e380f88ea6853869c7f5591c75df4143cf114 100644 (file)
@@ -96,7 +96,7 @@ float CalcNormFloat4(float *v1, float *v2, float *v3, float *v4, float *n);
 void CalcNormLong(int *v1, int *v2, int *v3, float *n);
 /* CalcNormShort: is ook uitprodukt - (translates as 'is also out/cross product') */
 void CalcNormShort(short *v1, short *v2, short *v3, float *n);
-float power_of_2(float val);
+
 
 /**
  * @section Euler conversion routines
index 9c192ba8b096b3fa56890bc90d9b2d8e4d696446..54d70626dd580b9938c06a556524f27f0344f5c2 100644 (file)
@@ -110,8 +110,7 @@ void RegisterBlendExtension(char * str);
 DIR *opendir (const char *path);
 struct dirent *readdir(DIR *dp);
 int closedir (DIR *dp);
-void get_default_root(char *root);
-int check_file_chars(char *filename);
+void get_default_root(char* root);
 
 #endif /* __WINSTUFF_H__ */
 
index 48a149f4b3a1c2e49894eca3be2ab31589e3165b..19a8d4f51527e9b533f05c5b6a4ffd08edddc744 100644 (file)
@@ -4345,8 +4345,3 @@ void tangent_from_uv(float *uv1, float *uv2, float *uv3, float *co1, float *co2,
        if ((ct[0]*n[0] + ct[1]*n[1] + ct[2]*n[2]) < 0.0f)
                VecMulf(tang, -1.0f);
 }
-
-/* used for zoom values*/
-float power_of_2(float val) {
-       return pow(2, ceil(log(val) / log(2)));
-}
index 0bd30a69d0505842a8394943cf2e33a93576e77e..a678c44d4bf864b63669977de0f783fe37906884 100644 (file)
@@ -387,521 +387,55 @@ static char p[512+2]= {
 
 
 float g[512+2][3]= {
-       {0.33783, 0.715698, -0.611206},
-       {-0.944031, -0.326599, -0.045624},
-       {-0.101074, -0.416443, -0.903503},
-       {0.799286, 0.49411, -0.341949},
-       {-0.854645, 0.518036, 0.033936},
-       {0.42514, -0.437866, -0.792114},
-       {-0.358948, 0.597046, 0.717377},
-       {-0.985413, 0.144714, 0.089294},
-       {-0.601776, -0.33728, -0.723907},
-       {-0.449921, 0.594513, 0.666382},
-       {0.208313, -0.10791, 0.972076},
-       {0.575317, 0.060425, 0.815643},
-       {0.293365, -0.875702, -0.383453},
-       {0.293762, 0.465759, 0.834686},
-       {-0.846008, -0.233398, -0.47934},
-       {-0.115814, 0.143036, -0.98291},
-       {0.204681, -0.949036, -0.239532},
-       {0.946716, -0.263947, 0.184326},
-       {-0.235596, 0.573822, 0.784332},
-       {0.203705, -0.372253, -0.905487},
-       {0.756989, -0.651031, 0.055298},
-       {0.497803, 0.814697, -0.297363},
-       {-0.16214, 0.063995, -0.98468},
-       {-0.329254, 0.834381, 0.441925},
-       {0.703827, -0.527039, -0.476227},
-       {0.956421, 0.266113, 0.119781},
-       {0.480133, 0.482849, 0.7323},
-       {-0.18631, 0.961212, -0.203125},
-       {-0.748474, -0.656921, -0.090393},
-       {-0.085052, -0.165253, 0.982544},
-       {-0.76947, 0.628174, -0.115234},
-       {0.383148, 0.537659, 0.751068},
-       {0.616486, -0.668488, -0.415924},
-       {-0.259979, -0.630005, 0.73175},
-       {0.570953, -0.087952, 0.816223},
-       {-0.458008, 0.023254, 0.888611},
-       {-0.196167, 0.976563, -0.088287},
-       {-0.263885, -0.69812, -0.665527},
-       {0.437134, -0.892273, -0.112793},
-       {-0.621674, -0.230438, 0.748566},
-       {0.232422, 0.900574, -0.367249},
-       {0.22229, -0.796143, 0.562744},
-       {-0.665497, -0.73764, 0.11377},
-       {0.670135, 0.704803, 0.232605},
-       {0.895599, 0.429749, -0.114655},
-       {-0.11557, -0.474243, 0.872742},
-       {0.621826, 0.604004, -0.498444},
-       {-0.832214, 0.012756, 0.55426},
-       {-0.702484, 0.705994, -0.089661},
-       {-0.692017, 0.649292, 0.315399},
-       {-0.175995, -0.977997, 0.111877},
-       {0.096954, -0.04953, 0.994019},
-       {0.635284, -0.606689, -0.477783},
-       {-0.261261, -0.607422, -0.750153},
-       {0.983276, 0.165436, 0.075958},
-       {-0.29837, 0.404083, -0.864655},
-       {-0.638672, 0.507721, 0.578156},
-       {0.388214, 0.412079, 0.824249},
-       {0.556183, -0.208832, 0.804352},
-       {0.778442, 0.562012, 0.27951},
-       {-0.616577, 0.781921, -0.091522},
-       {0.196289, 0.051056, 0.979187},
-       {-0.121216, 0.207153, -0.970734},
-       {-0.173401, -0.384735, 0.906555},
-       {0.161499, -0.723236, -0.671387},
-       {0.178497, -0.006226, -0.983887},
-       {-0.126038, 0.15799, 0.97934},
-       {0.830475, -0.024811, 0.556458},
-       {-0.510132, -0.76944, 0.384247},
-       {0.81424, 0.200104, -0.544891},
-       {-0.112549, -0.393311, -0.912445},
-       {0.56189, 0.152222, -0.813049},
-       {0.198914, -0.254517, -0.946381},
-       {-0.41217, 0.690979, -0.593811},
-       {-0.407257, 0.324524, 0.853668},
-       {-0.690186, 0.366119, -0.624115},
-       {-0.428345, 0.844147, -0.322296},
-       {-0.21228, -0.297546, -0.930756},
-       {-0.273071, 0.516113, 0.811798},
-       {0.928314, 0.371643, 0.007233},
-       {0.785828, -0.479218, -0.390778},
-       {-0.704895, 0.058929, 0.706818},
-       {0.173248, 0.203583, 0.963562},
-       {0.422211, -0.904297, -0.062469},
-       {-0.363312, -0.182465, 0.913605},
-       {0.254028, -0.552307, -0.793945},
-       {-0.28891, -0.765747, -0.574554},
-       {0.058319, 0.291382, 0.954803},
-       {0.946136, -0.303925, 0.111267},
-       {-0.078156, 0.443695, -0.892731},
-       {0.182098, 0.89389, 0.409515},
-       {-0.680298, -0.213318, 0.701141},
-       {0.062469, 0.848389, -0.525635},
-       {-0.72879, -0.641846, 0.238342},
-       {-0.88089, 0.427673, 0.202637},
-       {-0.532501, -0.21405, 0.818878},
-       {0.948975, -0.305084, 0.07962},
-       {0.925446, 0.374664, 0.055817},
-       {0.820923, 0.565491, 0.079102},
-       {0.25882, 0.099792, -0.960724},
-       {-0.294617, 0.910522, 0.289978},
-       {0.137115, 0.320038, -0.937408},
-       {-0.908386, 0.345276, -0.235718},
-       {-0.936218, 0.138763, 0.322754},
-       {0.366577, 0.925934, -0.090637},
-       {0.309296, -0.686829, -0.657684},
-       {0.66983, 0.024445, 0.742065},
-       {-0.917999, -0.059113, -0.392059},
-       {0.365509, 0.462158, -0.807922},
-       {0.083374, 0.996399, -0.014801},
-       {0.593842, 0.253143, -0.763672},
-       {0.974976, -0.165466, 0.148285},
-       {0.918976, 0.137299, 0.369537},
-       {0.294952, 0.694977, 0.655731},
-       {0.943085, 0.152618, -0.295319},
-       {0.58783, -0.598236, 0.544495},
-       {0.203796, 0.678223, 0.705994},
-       {-0.478821, -0.661011, 0.577667},
-       {0.719055, -0.1698, -0.673828},
-       {-0.132172, -0.965332, 0.225006},
-       {-0.981873, -0.14502, 0.121979},
-       {0.763458, 0.579742, 0.284546},
-       {-0.893188, 0.079681, 0.442474},
-       {-0.795776, -0.523804, 0.303802},
-       {0.734955, 0.67804, -0.007446},
-       {0.15506, 0.986267, -0.056183},
-       {0.258026, 0.571503, -0.778931},
-       {-0.681549, -0.702087, -0.206116},
-       {-0.96286, -0.177185, 0.203613},
-       {-0.470978, -0.515106, 0.716095},
-       {-0.740326, 0.57135, 0.354095},
-       {-0.56012, -0.824982, -0.074982},
-       {-0.507874, 0.753204, 0.417969},
-       {-0.503113, 0.038147, 0.863342},
-       {0.594025, 0.673553, -0.439758},
-       {-0.119873, -0.005524, -0.992737},
-       {0.098267, -0.213776, 0.971893},
-       {-0.615631, 0.643951, 0.454163},
-       {0.896851, -0.441071, 0.032166},
-       {-0.555023, 0.750763, -0.358093},
-       {0.398773, 0.304688, 0.864929},
-       {-0.722961, 0.303589, 0.620544},
-       {-0.63559, -0.621948, -0.457306},
-       {-0.293243, 0.072327, 0.953278},
-       {-0.491638, 0.661041, -0.566772},
-       {-0.304199, -0.572083, -0.761688},
-       {0.908081, -0.398956, 0.127014},
-       {-0.523621, -0.549683, -0.650848},
-       {-0.932922, -0.19986, 0.299408},
-       {0.099426, 0.140869, 0.984985},
-       {-0.020325, -0.999756, -0.002319},
-       {0.952667, 0.280853, -0.11615},
-       {-0.971893, 0.082581, 0.220337},
-       {0.65921, 0.705292, -0.260651},
-       {0.733063, -0.175537, 0.657043},
-       {-0.555206, 0.429504, -0.712189},
-       {0.400421, -0.89859, 0.179352},
-       {0.750885, -0.19696, 0.630341},
-       {0.785675, -0.569336, 0.241821},
-       {-0.058899, -0.464111, 0.883789},
-       {0.129608, -0.94519, 0.299622},
-       {-0.357819, 0.907654, 0.219238},
-       {-0.842133, -0.439117, -0.312927},
-       {-0.313477, 0.84433, 0.434479},
-       {-0.241211, 0.053253, 0.968994},
-       {0.063873, 0.823273, 0.563965},
-       {0.476288, 0.862152, -0.172516},
-       {0.620941, -0.298126, 0.724915},
-       {0.25238, -0.749359, -0.612122},
-       {-0.577545, 0.386566, 0.718994},
-       {-0.406342, -0.737976, 0.538696},
-       {0.04718, 0.556305, 0.82959},
-       {-0.802856, 0.587463, 0.101166},
-       {-0.707733, -0.705963, 0.026428},
-       {0.374908, 0.68457, 0.625092},
-       {0.472137, 0.208405, -0.856506},
-       {-0.703064, -0.581085, -0.409821},
-       {-0.417206, -0.736328, 0.532623},
-       {-0.447876, -0.20285, -0.870728},
-       {0.086945, -0.990417, 0.107086},
-       {0.183685, 0.018341, -0.982788},
-       {0.560638, -0.428864, 0.708282},
-       {0.296722, -0.952576, -0.0672},
-       {0.135773, 0.990265, 0.030243},
-       {-0.068787, 0.654724, 0.752686},
-       {0.762604, -0.551758, 0.337585},
-       {-0.819611, -0.407684, 0.402466},
-       {-0.727844, -0.55072, -0.408539},
-       {-0.855774, -0.480011, 0.19281},
-       {0.693176, -0.079285, 0.716339},
-       {0.226013, 0.650116, -0.725433},
-       {0.246704, 0.953369, -0.173553},
-       {-0.970398, -0.239227, -0.03244},
-       {0.136383, -0.394318, 0.908752},
-       {0.813232, 0.558167, 0.164368},
-       {0.40451, 0.549042, -0.731323},
-       {-0.380249, -0.566711, 0.730865},
-       {0.022156, 0.932739, 0.359741},
-       {0.00824, 0.996552, -0.082306},
-       {0.956635, -0.065338, -0.283722},
-       {-0.743561, 0.008209, 0.668579},
-       {-0.859589, -0.509674, 0.035767},
-       {-0.852234, 0.363678, -0.375977},
-       {-0.201965, -0.970795, -0.12915},
-       {0.313477, 0.947327, 0.06546},
-       {-0.254028, -0.528259, 0.81015},
-       {0.628052, 0.601105, 0.49411},
-       {-0.494385, 0.868378, 0.037933},
-       {0.275635, -0.086426, 0.957336},
-       {-0.197937, 0.468903, -0.860748},
-       {0.895599, 0.399384, 0.195801},
-       {0.560791, 0.825012, -0.069214},
-       {0.304199, -0.849487, 0.43103},
-       {0.096375, 0.93576, 0.339111},
-       {-0.051422, 0.408966, -0.911072},
-       {0.330444, 0.942841, -0.042389},
-       {-0.452362, -0.786407, 0.420563},
-       {0.134308, -0.933472, -0.332489},
-       {0.80191, -0.566711, -0.188934},
-       {-0.987946, -0.105988, 0.112518},
-       {-0.24408, 0.892242, -0.379791},
-       {-0.920502, 0.229095, -0.316376},
-       {0.7789, 0.325958, 0.535706},
-       {-0.912872, 0.185211, -0.36377},
-       {-0.184784, 0.565369, -0.803833},
-       {-0.018463, 0.119537, 0.992615},
-       {-0.259247, -0.935608, 0.239532},
-       {-0.82373, -0.449127, -0.345947},
-       {-0.433105, 0.659515, 0.614349},
-       {-0.822754, 0.378845, -0.423676},
-       {0.687195, -0.674835, -0.26889},
-       {-0.246582, -0.800842, 0.545715},
-       {-0.729187, -0.207794, 0.651978},
-       {0.653534, -0.610443, -0.447388},
-       {0.492584, -0.023346, 0.869934},
-       {0.609039, 0.009094, -0.79306},
-       {0.962494, -0.271088, -0.00885},
-       {0.2659, -0.004913, 0.963959},
-       {0.651245, 0.553619, -0.518951},
-       {0.280548, -0.84314, 0.458618},
-       {-0.175293, -0.983215, 0.049805},
-       {0.035339, -0.979919, 0.196045},
-       {-0.982941, 0.164307, -0.082245},
-       {0.233734, -0.97226, -0.005005},
-       {-0.747253, -0.611328, 0.260437},
-       {0.645599, 0.592773, 0.481384},
-       {0.117706, -0.949524, -0.29068},
-       {-0.535004, -0.791901, -0.294312},
-       {-0.627167, -0.214447, 0.748718},
-       {-0.047974, -0.813477, -0.57959},
-       {-0.175537, 0.477264, -0.860992},
-       {0.738556, -0.414246, -0.53183},
-       {0.562561, -0.704071, 0.433289},
-       {-0.754944, 0.64801, -0.100586},
-       {0.114716, 0.044525, -0.992371},
-       {0.966003, 0.244873, -0.082764},
-       {0.33783, 0.715698, -0.611206},
-       {-0.944031, -0.326599, -0.045624},
-       {-0.101074, -0.416443, -0.903503},
-       {0.799286, 0.49411, -0.341949},
-       {-0.854645, 0.518036, 0.033936},
-       {0.42514, -0.437866, -0.792114},
-       {-0.358948, 0.597046, 0.717377},
-       {-0.985413, 0.144714, 0.089294},
-       {-0.601776, -0.33728, -0.723907},
-       {-0.449921, 0.594513, 0.666382},
-       {0.208313, -0.10791, 0.972076},
-       {0.575317, 0.060425, 0.815643},
-       {0.293365, -0.875702, -0.383453},
-       {0.293762, 0.465759, 0.834686},
-       {-0.846008, -0.233398, -0.47934},
-       {-0.115814, 0.143036, -0.98291},
-       {0.204681, -0.949036, -0.239532},
-       {0.946716, -0.263947, 0.184326},
-       {-0.235596, 0.573822, 0.784332},
-       {0.203705, -0.372253, -0.905487},
-       {0.756989, -0.651031, 0.055298},
-       {0.497803, 0.814697, -0.297363},
-       {-0.16214, 0.063995, -0.98468},
-       {-0.329254, 0.834381, 0.441925},
-       {0.703827, -0.527039, -0.476227},
-       {0.956421, 0.266113, 0.119781},
-       {0.480133, 0.482849, 0.7323},
-       {-0.18631, 0.961212, -0.203125},
-       {-0.748474, -0.656921, -0.090393},
-       {-0.085052, -0.165253, 0.982544},
-       {-0.76947, 0.628174, -0.115234},
-       {0.383148, 0.537659, 0.751068},
-       {0.616486, -0.668488, -0.415924},
-       {-0.259979, -0.630005, 0.73175},
-       {0.570953, -0.087952, 0.816223},
-       {-0.458008, 0.023254, 0.888611},
-       {-0.196167, 0.976563, -0.088287},
-       {-0.263885, -0.69812, -0.665527},
-       {0.437134, -0.892273, -0.112793},
-       {-0.621674, -0.230438, 0.748566},
-       {0.232422, 0.900574, -0.367249},
-       {0.22229, -0.796143, 0.562744},
-       {-0.665497, -0.73764, 0.11377},
-       {0.670135, 0.704803, 0.232605},
-       {0.895599, 0.429749, -0.114655},
-       {-0.11557, -0.474243, 0.872742},
-       {0.621826, 0.604004, -0.498444},
-       {-0.832214, 0.012756, 0.55426},
-       {-0.702484, 0.705994, -0.089661},
-       {-0.692017, 0.649292, 0.315399},
-       {-0.175995, -0.977997, 0.111877},
-       {0.096954, -0.04953, 0.994019},
-       {0.635284, -0.606689, -0.477783},
-       {-0.261261, -0.607422, -0.750153},
-       {0.983276, 0.165436, 0.075958},
-       {-0.29837, 0.404083, -0.864655},
-       {-0.638672, 0.507721, 0.578156},
-       {0.388214, 0.412079, 0.824249},
-       {0.556183, -0.208832, 0.804352},
-       {0.778442, 0.562012, 0.27951},
-       {-0.616577, 0.781921, -0.091522},
-       {0.196289, 0.051056, 0.979187},
-       {-0.121216, 0.207153, -0.970734},
-       {-0.173401, -0.384735, 0.906555},
-       {0.161499, -0.723236, -0.671387},
-       {0.178497, -0.006226, -0.983887},
-       {-0.126038, 0.15799, 0.97934},
-       {0.830475, -0.024811, 0.556458},
-       {-0.510132, -0.76944, 0.384247},
-       {0.81424, 0.200104, -0.544891},
-       {-0.112549, -0.393311, -0.912445},
-       {0.56189, 0.152222, -0.813049},
-       {0.198914, -0.254517, -0.946381},
-       {-0.41217, 0.690979, -0.593811},
-       {-0.407257, 0.324524, 0.853668},
-       {-0.690186, 0.366119, -0.624115},
-       {-0.428345, 0.844147, -0.322296},
-       {-0.21228, -0.297546, -0.930756},
-       {-0.273071, 0.516113, 0.811798},
-       {0.928314, 0.371643, 0.007233},
-       {0.785828, -0.479218, -0.390778},
-       {-0.704895, 0.058929, 0.706818},
-       {0.173248, 0.203583, 0.963562},
-       {0.422211, -0.904297, -0.062469},
-       {-0.363312, -0.182465, 0.913605},
-       {0.254028, -0.552307, -0.793945},
-       {-0.28891, -0.765747, -0.574554},
-       {0.058319, 0.291382, 0.954803},
-       {0.946136, -0.303925, 0.111267},
-       {-0.078156, 0.443695, -0.892731},
-       {0.182098, 0.89389, 0.409515},
-       {-0.680298, -0.213318, 0.701141},
-       {0.062469, 0.848389, -0.525635},
-       {-0.72879, -0.641846, 0.238342},
-       {-0.88089, 0.427673, 0.202637},
-       {-0.532501, -0.21405, 0.818878},
-       {0.948975, -0.305084, 0.07962},
-       {0.925446, 0.374664, 0.055817},
-       {0.820923, 0.565491, 0.079102},
-       {0.25882, 0.099792, -0.960724},
-       {-0.294617, 0.910522, 0.289978},
-       {0.137115, 0.320038, -0.937408},
-       {-0.908386, 0.345276, -0.235718},
-       {-0.936218, 0.138763, 0.322754},
-       {0.366577, 0.925934, -0.090637},
-       {0.309296, -0.686829, -0.657684},
-       {0.66983, 0.024445, 0.742065},
-       {-0.917999, -0.059113, -0.392059},
-       {0.365509, 0.462158, -0.807922},
-       {0.083374, 0.996399, -0.014801},
-       {0.593842, 0.253143, -0.763672},
-       {0.974976, -0.165466, 0.148285},
-       {0.918976, 0.137299, 0.369537},
-       {0.294952, 0.694977, 0.655731},
-       {0.943085, 0.152618, -0.295319},
-       {0.58783, -0.598236, 0.544495},
-       {0.203796, 0.678223, 0.705994},
-       {-0.478821, -0.661011, 0.577667},
-       {0.719055, -0.1698, -0.673828},
-       {-0.132172, -0.965332, 0.225006},
-       {-0.981873, -0.14502, 0.121979},
-       {0.763458, 0.579742, 0.284546},
-       {-0.893188, 0.079681, 0.442474},
-       {-0.795776, -0.523804, 0.303802},
-       {0.734955, 0.67804, -0.007446},
-       {0.15506, 0.986267, -0.056183},
-       {0.258026, 0.571503, -0.778931},
-       {-0.681549, -0.702087, -0.206116},
-       {-0.96286, -0.177185, 0.203613},
-       {-0.470978, -0.515106, 0.716095},
-       {-0.740326, 0.57135, 0.354095},
-       {-0.56012, -0.824982, -0.074982},
-       {-0.507874, 0.753204, 0.417969},
-       {-0.503113, 0.038147, 0.863342},
-       {0.594025, 0.673553, -0.439758},
-       {-0.119873, -0.005524, -0.992737},
-       {0.098267, -0.213776, 0.971893},
-       {-0.615631, 0.643951, 0.454163},
-       {0.896851, -0.441071, 0.032166},
-       {-0.555023, 0.750763, -0.358093},
-       {0.398773, 0.304688, 0.864929},
-       {-0.722961, 0.303589, 0.620544},
-       {-0.63559, -0.621948, -0.457306},
-       {-0.293243, 0.072327, 0.953278},
-       {-0.491638, 0.661041, -0.566772},
-       {-0.304199, -0.572083, -0.761688},
-       {0.908081, -0.398956, 0.127014},
-       {-0.523621, -0.549683, -0.650848},
-       {-0.932922, -0.19986, 0.299408},
-       {0.099426, 0.140869, 0.984985},
-       {-0.020325, -0.999756, -0.002319},
-       {0.952667, 0.280853, -0.11615},
-       {-0.971893, 0.082581, 0.220337},
-       {0.65921, 0.705292, -0.260651},
-       {0.733063, -0.175537, 0.657043},
-       {-0.555206, 0.429504, -0.712189},
-       {0.400421, -0.89859, 0.179352},
-       {0.750885, -0.19696, 0.630341},
-       {0.785675, -0.569336, 0.241821},
-       {-0.058899, -0.464111, 0.883789},
-       {0.129608, -0.94519, 0.299622},
-       {-0.357819, 0.907654, 0.219238},
-       {-0.842133, -0.439117, -0.312927},
-       {-0.313477, 0.84433, 0.434479},
-       {-0.241211, 0.053253, 0.968994},
-       {0.063873, 0.823273, 0.563965},
-       {0.476288, 0.862152, -0.172516},
-       {0.620941, -0.298126, 0.724915},
-       {0.25238, -0.749359, -0.612122},
-       {-0.577545, 0.386566, 0.718994},
-       {-0.406342, -0.737976, 0.538696},
-       {0.04718, 0.556305, 0.82959},
-       {-0.802856, 0.587463, 0.101166},
-       {-0.707733, -0.705963, 0.026428},
-       {0.374908, 0.68457, 0.625092},
-       {0.472137, 0.208405, -0.856506},
-       {-0.703064, -0.581085, -0.409821},
-       {-0.417206, -0.736328, 0.532623},
-       {-0.447876, -0.20285, -0.870728},
-       {0.086945, -0.990417, 0.107086},
-       {0.183685, 0.018341, -0.982788},
-       {0.560638, -0.428864, 0.708282},
-       {0.296722, -0.952576, -0.0672},
-       {0.135773, 0.990265, 0.030243},
-       {-0.068787, 0.654724, 0.752686},
-       {0.762604, -0.551758, 0.337585},
-       {-0.819611, -0.407684, 0.402466},
-       {-0.727844, -0.55072, -0.408539},
-       {-0.855774, -0.480011, 0.19281},
-       {0.693176, -0.079285, 0.716339},
-       {0.226013, 0.650116, -0.725433},
-       {0.246704, 0.953369, -0.173553},
-       {-0.970398, -0.239227, -0.03244},
-       {0.136383, -0.394318, 0.908752},
-       {0.813232, 0.558167, 0.164368},
-       {0.40451, 0.549042, -0.731323},
-       {-0.380249, -0.566711, 0.730865},
-       {0.022156, 0.932739, 0.359741},
-       {0.00824, 0.996552, -0.082306},
-       {0.956635, -0.065338, -0.283722},
-       {-0.743561, 0.008209, 0.668579},
-       {-0.859589, -0.509674, 0.035767},
-       {-0.852234, 0.363678, -0.375977},
-       {-0.201965, -0.970795, -0.12915},
-       {0.313477, 0.947327, 0.06546},
-       {-0.254028, -0.528259, 0.81015},
-       {0.628052, 0.601105, 0.49411},
-       {-0.494385, 0.868378, 0.037933},
-       {0.275635, -0.086426, 0.957336},
-       {-0.197937, 0.468903, -0.860748},
-       {0.895599, 0.399384, 0.195801},
-       {0.560791, 0.825012, -0.069214},
-       {0.304199, -0.849487, 0.43103},
-       {0.096375, 0.93576, 0.339111},
-       {-0.051422, 0.408966, -0.911072},
-       {0.330444, 0.942841, -0.042389},
-       {-0.452362, -0.786407, 0.420563},
-       {0.134308, -0.933472, -0.332489},
-       {0.80191, -0.566711, -0.188934},
-       {-0.987946, -0.105988, 0.112518},
-       {-0.24408, 0.892242, -0.379791},
-       {-0.920502, 0.229095, -0.316376},
-       {0.7789, 0.325958, 0.535706},
-       {-0.912872, 0.185211, -0.36377},
-       {-0.184784, 0.565369, -0.803833},
-       {-0.018463, 0.119537, 0.992615},
-       {-0.259247, -0.935608, 0.239532},
-       {-0.82373, -0.449127, -0.345947},
-       {-0.433105, 0.659515, 0.614349},
-       {-0.822754, 0.378845, -0.423676},
-       {0.687195, -0.674835, -0.26889},
-       {-0.246582, -0.800842, 0.545715},
-       {-0.729187, -0.207794, 0.651978},
-       {0.653534, -0.610443, -0.447388},
-       {0.492584, -0.023346, 0.869934},
-       {0.609039, 0.009094, -0.79306},
-       {0.962494, -0.271088, -0.00885},
-       {0.2659, -0.004913, 0.963959},
-       {0.651245, 0.553619, -0.518951},
-       {0.280548, -0.84314, 0.458618},
-       {-0.175293, -0.983215, 0.049805},
-       {0.035339, -0.979919, 0.196045},
-       {-0.982941, 0.164307, -0.082245},
-       {0.233734, -0.97226, -0.005005},
-       {-0.747253, -0.611328, 0.260437},
-       {0.645599, 0.592773, 0.481384},
-       {0.117706, -0.949524, -0.29068},
-       {-0.535004, -0.791901, -0.294312},
-       {-0.627167, -0.214447, 0.748718},
-       {-0.047974, -0.813477, -0.57959},
-       {-0.175537, 0.477264, -0.860992},
-       {0.738556, -0.414246, -0.53183},
-       {0.562561, -0.704071, 0.433289},
-       {-0.754944, 0.64801, -0.100586},
-       {0.114716, 0.044525, -0.992371},
-       {0.966003, 0.244873, -0.082764},
-       {0.33783, 0.715698, -0.611206},
-       {-0.944031, -0.326599, -0.045624},
-};
+0.33783,0.715698,-0.611206,-0.944031,-0.326599,-0.045624,-0.101074,-0.416443,-0.903503,0.799286,0.49411,-0.341949,-0.854645,0.518036,0.033936,0.42514,-0.437866,-0.792114,-0.358948,0.597046,0.717377,-0.985413,0.144714,0.089294,-0.601776,-0.33728,-0.723907,-0.449921,0.594513,0.666382,0.208313,-0.10791,
+0.972076,0.575317,0.060425,0.815643,0.293365,-0.875702,-0.383453,0.293762,0.465759,0.834686,-0.846008,-0.233398,-0.47934,-0.115814,0.143036,-0.98291,0.204681,-0.949036,-0.239532,0.946716,-0.263947,0.184326,-0.235596,0.573822,0.784332,0.203705,-0.372253,-0.905487,0.756989,-0.651031,0.055298,0.497803,
+0.814697,-0.297363,-0.16214,0.063995,-0.98468,-0.329254,0.834381,0.441925,0.703827,-0.527039,-0.476227,0.956421,0.266113,0.119781,0.480133,0.482849,0.7323,-0.18631,0.961212,-0.203125,-0.748474,-0.656921,-0.090393,-0.085052,-0.165253,0.982544,-0.76947,0.628174,-0.115234,0.383148,0.537659,0.751068,
+0.616486,-0.668488,-0.415924,-0.259979,-0.630005,0.73175,0.570953,-0.087952,0.816223,-0.458008,0.023254,0.888611,-0.196167,0.976563,-0.088287,-0.263885,-0.69812,-0.665527,0.437134,-0.892273,-0.112793,-0.621674,-0.230438,0.748566,0.232422,0.900574,-0.367249,0.22229,-0.796143,0.562744,-0.665497,-0.73764,
+0.11377,0.670135,0.704803,0.232605,0.895599,0.429749,-0.114655,-0.11557,-0.474243,0.872742,0.621826,0.604004,-0.498444,-0.832214,0.012756,0.55426,-0.702484,0.705994,-0.089661,-0.692017,0.649292,0.315399,-0.175995,-0.977997,0.111877,0.096954,-0.04953,0.994019,0.635284,-0.606689,-0.477783,-0.261261,
+-0.607422,-0.750153,0.983276,0.165436,0.075958,-0.29837,0.404083,-0.864655,-0.638672,0.507721,0.578156,0.388214,0.412079,0.824249,0.556183,-0.208832,0.804352,0.778442,0.562012,0.27951,-0.616577,0.781921,-0.091522,0.196289,0.051056,0.979187,-0.121216,0.207153,-0.970734,-0.173401,-0.384735,0.906555,
+0.161499,-0.723236,-0.671387,0.178497,-0.006226,-0.983887,-0.126038,0.15799,0.97934,0.830475,-0.024811,0.556458,-0.510132,-0.76944,0.384247,0.81424,0.200104,-0.544891,-0.112549,-0.393311,-0.912445,0.56189,0.152222,-0.813049,0.198914,-0.254517,-0.946381,-0.41217,0.690979,-0.593811,-0.407257,0.324524,
+0.853668,-0.690186,0.366119,-0.624115,-0.428345,0.844147,-0.322296,-0.21228,-0.297546,-0.930756,-0.273071,0.516113,0.811798,0.928314,0.371643,0.007233,0.785828,-0.479218,-0.390778,-0.704895,0.058929,0.706818,0.173248,0.203583,0.963562,0.422211,-0.904297,-0.062469,-0.363312,-0.182465,0.913605,0.254028,
+-0.552307,-0.793945,-0.28891,-0.765747,-0.574554,0.058319,0.291382,0.954803,0.946136,-0.303925,0.111267,-0.078156,0.443695,-0.892731,0.182098,0.89389,0.409515,-0.680298,-0.213318,0.701141,0.062469,0.848389,-0.525635,-0.72879,-0.641846,0.238342,-0.88089,0.427673,0.202637,-0.532501,-0.21405,0.818878,
+0.948975,-0.305084,0.07962,0.925446,0.374664,0.055817,0.820923,0.565491,0.079102,0.25882,0.099792,-0.960724,-0.294617,0.910522,0.289978,0.137115,0.320038,-0.937408,-0.908386,0.345276,-0.235718,-0.936218,0.138763,0.322754,0.366577,0.925934,-0.090637,0.309296,-0.686829,-0.657684,0.66983,0.024445,
+0.742065,-0.917999,-0.059113,-0.392059,0.365509,0.462158,-0.807922,0.083374,0.996399,-0.014801,0.593842,0.253143,-0.763672,0.974976,-0.165466,0.148285,0.918976,0.137299,0.369537,0.294952,0.694977,0.655731,0.943085,0.152618,-0.295319,0.58783,-0.598236,0.544495,0.203796,0.678223,0.705994,-0.478821,
+-0.661011,0.577667,0.719055,-0.1698,-0.673828,-0.132172,-0.965332,0.225006,-0.981873,-0.14502,0.121979,0.763458,0.579742,0.284546,-0.893188,0.079681,0.442474,-0.795776,-0.523804,0.303802,0.734955,0.67804,-0.007446,0.15506,0.986267,-0.056183,0.258026,0.571503,-0.778931,-0.681549,-0.702087,-0.206116,
+-0.96286,-0.177185,0.203613,-0.470978,-0.515106,0.716095,-0.740326,0.57135,0.354095,-0.56012,-0.824982,-0.074982,-0.507874,0.753204,0.417969,-0.503113,0.038147,0.863342,0.594025,0.673553,-0.439758,-0.119873,-0.005524,-0.992737,0.098267,-0.213776,0.971893,-0.615631,0.643951,0.454163,0.896851,-0.441071,
+0.032166,-0.555023,0.750763,-0.358093,0.398773,0.304688,0.864929,-0.722961,0.303589,0.620544,-0.63559,-0.621948,-0.457306,-0.293243,0.072327,0.953278,-0.491638,0.661041,-0.566772,-0.304199,-0.572083,-0.761688,0.908081,-0.398956,0.127014,-0.523621,-0.549683,-0.650848,-0.932922,-0.19986,0.299408,0.099426,
+0.140869,0.984985,-0.020325,-0.999756,-0.002319,0.952667,0.280853,-0.11615,-0.971893,0.082581,0.220337,0.65921,0.705292,-0.260651,0.733063,-0.175537,0.657043,-0.555206,0.429504,-0.712189,0.400421,-0.89859,0.179352,0.750885,-0.19696,0.630341,0.785675,-0.569336,0.241821,-0.058899,-0.464111,0.883789,
+0.129608,-0.94519,0.299622,-0.357819,0.907654,0.219238,-0.842133,-0.439117,-0.312927,-0.313477,0.84433,0.434479,-0.241211,0.053253,0.968994,0.063873,0.823273,0.563965,0.476288,0.862152,-0.172516,0.620941,-0.298126,0.724915,0.25238,-0.749359,-0.612122,-0.577545,0.386566,0.718994,-0.406342,-0.737976,
+0.538696,0.04718,0.556305,0.82959,-0.802856,0.587463,0.101166,-0.707733,-0.705963,0.026428,0.374908,0.68457,0.625092,0.472137,0.208405,-0.856506,-0.703064,-0.581085,-0.409821,-0.417206,-0.736328,0.532623,-0.447876,-0.20285,-0.870728,0.086945,-0.990417,0.107086,0.183685,0.018341,-0.982788,0.560638,
+-0.428864,0.708282,0.296722,-0.952576,-0.0672,0.135773,0.990265,0.030243,-0.068787,0.654724,0.752686,0.762604,-0.551758,0.337585,-0.819611,-0.407684,0.402466,-0.727844,-0.55072,-0.408539,-0.855774,-0.480011,0.19281,0.693176,-0.079285,0.716339,0.226013,0.650116,-0.725433,0.246704,0.953369,-0.173553,
+-0.970398,-0.239227,-0.03244,0.136383,-0.394318,0.908752,0.813232,0.558167,0.164368,0.40451,0.549042,-0.731323,-0.380249,-0.566711,0.730865,0.022156,0.932739,0.359741,0.00824,0.996552,-0.082306,0.956635,-0.065338,-0.283722,-0.743561,0.008209,0.668579,-0.859589,-0.509674,0.035767,-0.852234,0.363678,
+-0.375977,-0.201965,-0.970795,-0.12915,0.313477,0.947327,0.06546,-0.254028,-0.528259,0.81015,0.628052,0.601105,0.49411,-0.494385,0.868378,0.037933,0.275635,-0.086426,0.957336,-0.197937,0.468903,-0.860748,0.895599,0.399384,0.195801,0.560791,0.825012,-0.069214,0.304199,-0.849487,0.43103,0.096375,
+0.93576,0.339111,-0.051422,0.408966,-0.911072,0.330444,0.942841,-0.042389,-0.452362,-0.786407,0.420563,0.134308,-0.933472,-0.332489,0.80191,-0.566711,-0.188934,-0.987946,-0.105988,0.112518,-0.24408,0.892242,-0.379791,-0.920502,0.229095,-0.316376,0.7789,0.325958,0.535706,-0.912872,0.185211,-0.36377,
+-0.184784,0.565369,-0.803833,-0.018463,0.119537,0.992615,-0.259247,-0.935608,0.239532,-0.82373,-0.449127,-0.345947,-0.433105,0.659515,0.614349,-0.822754,0.378845,-0.423676,0.687195,-0.674835,-0.26889,-0.246582,-0.800842,0.545715,-0.729187,-0.207794,0.651978,0.653534,-0.610443,-0.447388,0.492584,-0.023346,
+0.869934,0.609039,0.009094,-0.79306,0.962494,-0.271088,-0.00885,0.2659,-0.004913,0.963959,0.651245,0.553619,-0.518951,0.280548,-0.84314,0.458618,-0.175293,-0.983215,0.049805,0.035339,-0.979919,0.196045,-0.982941,0.164307,-0.082245,0.233734,-0.97226,-0.005005,-0.747253,-0.611328,0.260437,0.645599,
+0.592773,0.481384,0.117706,-0.949524,-0.29068,-0.535004,-0.791901,-0.294312,-0.627167,-0.214447,0.748718,-0.047974,-0.813477,-0.57959,-0.175537,0.477264,-0.860992,0.738556,-0.414246,-0.53183,0.562561,-0.704071,0.433289,-0.754944,0.64801,-0.100586,0.114716,0.044525,-0.992371,0.966003,0.244873,-0.082764,
+0.33783,0.715698,-0.611206,-0.944031,-0.326599,-0.045624,-0.101074,-0.416443,-0.903503,0.799286,0.49411,-0.341949,-0.854645,0.518036,0.033936,0.42514,-0.437866,-0.792114,-0.358948,0.597046,0.717377,-0.985413,0.144714,0.089294,-0.601776,-0.33728,-0.723907,-0.449921,0.594513,0.666382,0.208313,-0.10791,
+0.972076,0.575317,0.060425,0.815643,0.293365,-0.875702,-0.383453,0.293762,0.465759,0.834686,-0.846008,-0.233398,-0.47934,-0.115814,0.143036,-0.98291,0.204681,-0.949036,-0.239532,0.946716,-0.263947,0.184326,-0.235596,0.573822,0.784332,0.203705,-0.372253,-0.905487,0.756989,-0.651031,0.055298,0.497803,
+0.814697,-0.297363,-0.16214,0.063995,-0.98468,-0.329254,0.834381,0.441925,0.703827,-0.527039,-0.476227,0.956421,0.266113,0.119781,0.480133,0.482849,0.7323,-0.18631,0.961212,-0.203125,-0.748474,-0.656921,-0.090393,-0.085052,-0.165253,0.982544,-0.76947,0.628174,-0.115234,0.383148,0.537659,0.751068,
+0.616486,-0.668488,-0.415924,-0.259979,-0.630005,0.73175,0.570953,-0.087952,0.816223,-0.458008,0.023254,0.888611,-0.196167,0.976563,-0.088287,-0.263885,-0.69812,-0.665527,0.437134,-0.892273,-0.112793,-0.621674,-0.230438,0.748566,0.232422,0.900574,-0.367249,0.22229,-0.796143,0.562744,-0.665497,-0.73764,
+0.11377,0.670135,0.704803,0.232605,0.895599,0.429749,-0.114655,-0.11557,-0.474243,0.872742,0.621826,0.604004,-0.498444,-0.832214,0.012756,0.55426,-0.702484,0.705994,-0.089661,-0.692017,0.649292,0.315399,-0.175995,-0.977997,0.111877,0.096954,-0.04953,0.994019,0.635284,-0.606689,-0.477783,-0.261261,
+-0.607422,-0.750153,0.983276,0.165436,0.075958,-0.29837,0.404083,-0.864655,-0.638672,0.507721,0.578156,0.388214,0.412079,0.824249,0.556183,-0.208832,0.804352,0.778442,0.562012,0.27951,-0.616577,0.781921,-0.091522,0.196289,0.051056,0.979187,-0.121216,0.207153,-0.970734,-0.173401,-0.384735,0.906555,
+0.161499,-0.723236,-0.671387,0.178497,-0.006226,-0.983887,-0.126038,0.15799,0.97934,0.830475,-0.024811,0.556458,-0.510132,-0.76944,0.384247,0.81424,0.200104,-0.544891,-0.112549,-0.393311,-0.912445,0.56189,0.152222,-0.813049,0.198914,-0.254517,-0.946381,-0.41217,0.690979,-0.593811,-0.407257,0.324524,
+0.853668,-0.690186,0.366119,-0.624115,-0.428345,0.844147,-0.322296,-0.21228,-0.297546,-0.930756,-0.273071,0.516113,0.811798,0.928314,0.371643,0.007233,0.785828,-0.479218,-0.390778,-0.704895,0.058929,0.706818,0.173248,0.203583,0.963562,0.422211,-0.904297,-0.062469,-0.363312,-0.182465,0.913605,0.254028,
+-0.552307,-0.793945,-0.28891,-0.765747,-0.574554,0.058319,0.291382,0.954803,0.946136,-0.303925,0.111267,-0.078156,0.443695,-0.892731,0.182098,0.89389,0.409515,-0.680298,-0.213318,0.701141,0.062469,0.848389,-0.525635,-0.72879,-0.641846,0.238342,-0.88089,0.427673,0.202637,-0.532501,-0.21405,0.818878,
+0.948975,-0.305084,0.07962,0.925446,0.374664,0.055817,0.820923,0.565491,0.079102,0.25882,0.099792,-0.960724,-0.294617,0.910522,0.289978,0.137115,0.320038,-0.937408,-0.908386,0.345276,-0.235718,-0.936218,0.138763,0.322754,0.366577,0.925934,-0.090637,0.309296,-0.686829,-0.657684,0.66983,0.024445,
+0.742065,-0.917999,-0.059113,-0.392059,0.365509,0.462158,-0.807922,0.083374,0.996399,-0.014801,0.593842,0.253143,-0.763672,0.974976,-0.165466,0.148285,0.918976,0.137299,0.369537,0.294952,0.694977,0.655731,0.943085,0.152618,-0.295319,0.58783,-0.598236,0.544495,0.203796,0.678223,0.705994,-0.478821,
+-0.661011,0.577667,0.719055,-0.1698,-0.673828,-0.132172,-0.965332,0.225006,-0.981873,-0.14502,0.121979,0.763458,0.579742,0.284546,-0.893188,0.079681,0.442474,-0.795776,-0.523804,0.303802,0.734955,0.67804,-0.007446,0.15506,0.986267,-0.056183,0.258026,0.571503,-0.778931,-0.681549,-0.702087,-0.206116,
+-0.96286,-0.177185,0.203613,-0.470978,-0.515106,0.716095,-0.740326,0.57135,0.354095,-0.56012,-0.824982,-0.074982,-0.507874,0.753204,0.417969,-0.503113,0.038147,0.863342,0.594025,0.673553,-0.439758,-0.119873,-0.005524,-0.992737,0.098267,-0.213776,0.971893,-0.615631,0.643951,0.454163,0.896851,-0.441071,
+0.032166,-0.555023,0.750763,-0.358093,0.398773,0.304688,0.864929,-0.722961,0.303589,0.620544,-0.63559,-0.621948,-0.457306,-0.293243,0.072327,0.953278,-0.491638,0.661041,-0.566772,-0.304199,-0.572083,-0.761688,0.908081,-0.398956,0.127014,-0.523621,-0.549683,-0.650848,-0.932922,-0.19986,0.299408,0.099426,
+0.140869,0.984985,-0.020325,-0.999756,-0.002319,0.952667,0.280853,-0.11615,-0.971893,0.082581,0.220337,0.65921,0.705292,-0.260651,0.733063,-0.175537,0.657043,-0.555206,0.429504,-0.712189,0.400421,-0.89859,0.179352,0.750885,-0.19696,0.630341,0.785675,-0.569336,0.241821,-0.058899,-0.464111,0.883789,
+0.129608,-0.94519,0.299622,-0.357819,0.907654,0.219238,-0.842133,-0.439117,-0.312927,-0.313477,0.84433,0.434479,-0.241211,0.053253,0.968994,0.063873,0.823273,0.563965,0.476288,0.862152,-0.172516,0.620941,-0.298126,0.724915,0.25238,-0.749359,-0.612122,-0.577545,0.386566,0.718994,-0.406342,-0.737976,
+0.538696,0.04718,0.556305,0.82959,-0.802856,0.587463,0.101166,-0.707733,-0.705963,0.026428,0.374908,0.68457,0.625092,0.472137,0.208405,-0.856506,-0.703064,-0.581085,-0.409821,-0.417206,-0.736328,0.532623,-0.447876,-0.20285,-0.870728,0.086945,-0.990417,0.107086,0.183685,0.018341,-0.982788,0.560638,
+-0.428864,0.708282,0.296722,-0.952576,-0.0672,0.135773,0.990265,0.030243,-0.068787,0.654724,0.752686,0.762604,-0.551758,0.337585,-0.819611,-0.407684,0.402466,-0.727844,-0.55072,-0.408539,-0.855774,-0.480011,0.19281,0.693176,-0.079285,0.716339,0.226013,0.650116,-0.725433,0.246704,0.953369,-0.173553,
+-0.970398,-0.239227,-0.03244,0.136383,-0.394318,0.908752,0.813232,0.558167,0.164368,0.40451,0.549042,-0.731323,-0.380249,-0.566711,0.730865,0.022156,0.932739,0.359741,0.00824,0.996552,-0.082306,0.956635,-0.065338,-0.283722,-0.743561,0.008209,0.668579,-0.859589,-0.509674,0.035767,-0.852234,0.363678,
+-0.375977,-0.201965,-0.970795,-0.12915,0.313477,0.947327,0.06546,-0.254028,-0.528259,0.81015,0.628052,0.601105,0.49411,-0.494385,0.868378,0.037933,0.275635,-0.086426,0.957336,-0.197937,0.468903,-0.860748,0.895599,0.399384,0.195801,0.560791,0.825012,-0.069214,0.304199,-0.849487,0.43103,0.096375,
+0.93576,0.339111,-0.051422,0.408966,-0.911072,0.330444,0.942841,-0.042389,-0.452362,-0.786407,0.420563,0.134308,-0.933472,-0.332489,0.80191,-0.566711,-0.188934,-0.987946,-0.105988,0.112518,-0.24408,0.892242,-0.379791,-0.920502,0.229095,-0.316376,0.7789,0.325958,0.535706,-0.912872,0.185211,-0.36377,
+-0.184784,0.565369,-0.803833,-0.018463,0.119537,0.992615,-0.259247,-0.935608,0.239532,-0.82373,-0.449127,-0.345947,-0.433105,0.659515,0.614349,-0.822754,0.378845,-0.423676,0.687195,-0.674835,-0.26889,-0.246582,-0.800842,0.545715,-0.729187,-0.207794,0.651978,0.653534,-0.610443,-0.447388,0.492584,-0.023346,
+0.869934,0.609039,0.009094,-0.79306,0.962494,-0.271088,-0.00885,0.2659,-0.004913,0.963959,0.651245,0.553619,-0.518951,0.280548,-0.84314,0.458618,-0.175293,-0.983215,0.049805,0.035339,-0.979919,0.196045,-0.982941,0.164307,-0.082245,0.233734,-0.97226,-0.005005,-0.747253,-0.611328,0.260437,0.645599,
+0.592773,0.481384,0.117706,-0.949524,-0.29068,-0.535004,-0.791901,-0.294312,-0.627167,-0.214447,0.748718,-0.047974,-0.813477,-0.57959,-0.175537,0.477264,-0.860992,0.738556,-0.414246,-0.53183,0.562561,-0.704071,0.433289,-0.754944,0.64801,-0.100586,0.114716,0.044525,-0.992371,0.966003,0.244873,-0.082764,
+0.33783,0.715698,-0.611206,-0.944031,-0.326599,-0.045624};
 
 
 
index 8cdc0601c7e5ed5da3aa8409c52ff8f43addc68b..441484fc88b7cc84f39284e97272a825bd91b69e 100644 (file)
@@ -256,290 +256,290 @@ static int sp;
 static int savesplines = 1;
 
 static pschar ISOcharlist[NASCII] = {
-       {"/space",                      040,    0},
-           {"/exclam",         041,    0},
-           {"/quotedbl",       042,    0},
-           {"/numbersign", 043,        0},
-           {"/dollar",         044,    0},
-           {"/percent",        045,    0},
-           {"/ampersand",      046,    0},
-           {"/quoteright", 047,        0},
-
-           {"/parenleft",      050,    0},
-           {"/parenright", 051,        0},
-           {"/asterisk",       052,    0},
-           {"/plus",           053,    0},
-           {"/comma",          054,    0},
-           {"/hyphen",         055,    0},
-           {"/period",         056,    0},
-           {"/slash",          057,    0},
-
-           {"/zero",           060,    0},
-           {"/one",            061,    0},
-           {"/two",            062,    0},
-           {"/three",          063,    0},
-           {"/four",           064,    0},
-           {"/five",           065,    0},
-           {"/six",            066,    0},
-           {"/seven",          067,    0},
-
-           {"/eight",          070,    0},
-           {"/nine",           071,    0},
-           {"/colon",          072,    0},
-           {"/semicolon",      073,    0},
-           {"/less",           074,    0},
-           {"/equal",          075,    0},
-           {"/greater",        076,    0},
-           {"/question",       077,    0},
-
-           {"/at",             0100,   0},
-           {"/A",              0101,   0},
-           {"/B",              0102,   0},
-           {"/C",              0103,   0},
-           {"/D",              0104,   0},
-           {"/E",              0105,   0},
-           {"/F",              0106,   0},
-           {"/G",              0107,   0},
-
-           {"/H",              0110,   0},
-           {"/I",              0111,   0},
-           {"/J",              0112,   0},
-           {"/K",              0113,   0},
-           {"/L",              0114,   0},
-           {"/M",              0115,   0},
-           {"/N",              0116,   0},
-           {"/O",              0117,   0},
-
-           {"/P",              0120,   0},
-           {"/Q",              0121,   0},
-           {"/R",              0122,   0},
-           {"/S",              0123,   0},
-           {"/T",              0124,   0},
-           {"/U",              0125,   0},
-           {"/V",              0126,   0},
-           {"/W",              0127,   0},
-
-           {"/X",                              0130,   0},
-           {"/Y",                              0131,   0},
-           {"/Z",                              0132,   0},
-           {"/bracketleft",    0133,   0},
-           {"/backslash",              0134,   0},
-           {"/bracketright",   0135,   0},
-           {"/asciicircum",    0136,   0},
-           {"/underscore",     0137,   0},
-
-           {"/quoteleft",      0140,   0},
-           {"/a",                      0141,   0},
-           {"/b",                      0142,   0},
-           {"/c",                      0143,   0},
-           {"/d",                      0144,   0},
-           {"/e",                      0145,   0},
-           {"/f",                      0146,   0},
-           {"/g",                      0147,   0},
-
-           {"/h",              0150,   0},
-           {"/i",              0151,   0},
-           {"/j",              0152,   0},
-           {"/k",              0153,   0},
-           {"/l",              0154,   0},
-           {"/m",              0155,   0},
-           {"/n",              0156,   0},
-           {"/o",              0157,   0},
-
-           {"/p",              0160,   0},
-           {"/q",              0161,   0},
-           {"/r",              0162,   0},
-           {"/s",              0163,   0},
-           {"/t",              0164,   0},
-           {"/u",              0165,   0},
-           {"/v",              0166,   0},
-           {"/w",              0167,   0},
-
-           {"/x",                      0170,   0},
-           {"/y",                      0171,   0},
-           {"/z",                      0172,   0},
-           {"/braceleft",      0173,   0},
-           {"/bar",            0174,   0},
-           {"/braceright",     0175,   0},
-           {"/asciitilde", 0176,       0},
-           {"/",                       0177,   0},
+       "/space",               040,    0,
+           "/exclam",          041,    0,
+           "/quotedbl",        042,    0,
+           "/numbersign",      043,    0,
+           "/dollar",          044,    0,
+           "/percent",         045,    0,
+           "/ampersand",       046,    0,
+           "/quoteright",      047,    0,
+
+           "/parenleft",       050,    0,
+           "/parenright",      051,    0,
+           "/asterisk",        052,    0,
+           "/plus",            053,    0,
+           "/comma",           054,    0,
+           "/hyphen",          055,    0,
+           "/period",          056,    0,
+           "/slash",           057,    0,
+
+           "/zero",            060,    0,
+           "/one",             061,    0,
+           "/two",             062,    0,
+           "/three",           063,    0,
+           "/four",            064,    0,
+           "/five",            065,    0,
+           "/six",             066,    0,
+           "/seven",           067,    0,
+
+           "/eight",           070,    0,
+           "/nine",            071,    0,
+           "/colon",           072,    0,
+           "/semicolon",       073,    0,
+           "/less",            074,    0,
+           "/equal",           075,    0,
+           "/greater",         076,    0,
+           "/question",        077,    0,
+
+           "/at",              0100,   0,
+           "/A",               0101,   0,
+           "/B",               0102,   0,
+           "/C",               0103,   0,
+           "/D",               0104,   0,
+           "/E",               0105,   0,
+           "/F",               0106,   0,
+           "/G",               0107,   0,
+
+           "/H",               0110,   0,
+           "/I",               0111,   0,
+           "/J",               0112,   0,
+           "/K",               0113,   0,
+           "/L",               0114,   0,
+           "/M",               0115,   0,
+           "/N",               0116,   0,
+           "/O",               0117,   0,
+
+           "/P",               0120,   0,
+           "/Q",               0121,   0,
+           "/R",               0122,   0,
+           "/S",               0123,   0,
+           "/T",               0124,   0,
+           "/U",               0125,   0,
+           "/V",               0126,   0,
+           "/W",               0127,   0,
+
+           "/X",               0130,   0,
+           "/Y",               0131,   0,
+           "/Z",               0132,   0,
+           "/bracketleft",     0133,   0,
+           "/backslash",       0134,   0,
+           "/bracketright",    0135,   0,
+           "/asciicircum",     0136,   0,
+           "/underscore",      0137,   0,
+
+           "/quoteleft",       0140,   0,
+           "/a",               0141,   0,
+           "/b",               0142,   0,
+           "/c",               0143,   0,
+           "/d",               0144,   0,
+           "/e",               0145,   0,
+           "/f",               0146,   0,
+           "/g",               0147,   0,
+
+           "/h",               0150,   0,
+           "/i",               0151,   0,
+           "/j",               0152,   0,
+           "/k",               0153,   0,
+           "/l",               0154,   0,
+           "/m",               0155,   0,
+           "/n",               0156,   0,
+           "/o",               0157,   0,
+
+           "/p",               0160,   0,
+           "/q",               0161,   0,
+           "/r",               0162,   0,
+           "/s",               0163,   0,
+           "/t",               0164,   0,
+           "/u",               0165,   0,
+           "/v",               0166,   0,
+           "/w",               0167,   0,
+
+           "/x",               0170,   0,
+           "/y",               0171,   0,
+           "/z",               0172,   0,
+           "/braceleft",       0173,   0,
+           "/bar",             0174,   0,
+           "/braceright",      0175,   0,
+           "/asciitilde",      0176,   0,
+           "/",                0177,   0,
 
 
            /* nonstandard defs */
 
-       {"/quotedblleft",               0200,   0},
-           {"/quotedblright",  0201,   0},
-           {"/quotedblbase",   0202,   0},
-           {"/quotesinglbase", 0203,   0},
-           {"/guilsinglleft",  0204,   0},
-           {"/guilsinglright", 0205,   0},
-           {"/endash",                 0206,   0},
-           {"/dagger",                 0207,   0},
-
-           {"/daggerdbl",              0210,   0},
-           {"/trademark",              0211,   0},
-           {"/bullet",                 0212,   0},
-           {"/perthousand",    0213,   0},
-           {"/Lslash",                 0214,   0},
-           {"/OE",                             0215,   0},
-           {"/lslash",                 0216,   0},
-           {"/oe",                             0217,   0},
+       "/quotedblleft",        0200,   0,
+           "/quotedblright",   0201,   0,
+           "/quotedblbase",    0202,   0,
+           "/quotesinglbase",  0203,   0,
+           "/guilsinglleft",   0204,   0,
+           "/guilsinglright",  0205,   0,
+           "/endash",          0206,   0,
+           "/dagger",          0207,   0,
+
+           "/daggerdbl",       0210,   0,
+           "/trademark",       0211,   0,
+           "/bullet",          0212,   0,
+           "/perthousand",     0213,   0,
+           "/Lslash",          0214,   0,
+           "/OE",              0215,   0,
+           "/lslash",          0216,   0,
+           "/oe",              0217,   0,
 
            /* endnonstandard defs */
 
-       {"/dotlessi",           0220,   0},
-           {"/grave",          0221,   0},
-           {"/acute",          0222,   0},
-           {"/circumflex",     0223,   0},
-           {"/tilde",          0224,   0},
-           {"/",                       0225,   0},
-           {"/breve",          0226,   0},
-           {"/dotaccent",      0227,   0},
-
-           {"/",                               0230,   0},
-           {"/",                               0231,   0},
-           {"/ring",                   0232,   0},
-           {"/",                               0233,   0},
-           {"/",                               0234,   0},
-           {"/hungarumlaut",   0235,   0},
-           {"/ogonek",                 0236,   0},
-           {"/caron",                  0237,   0},
-
-           {"/",                       0240,   0},
-           {"/exclamdown",     0241,   0},
-           {"/cent",           0242,   0},
-           {"/sterling",       0243,   0},
-           {"/florin",         0244,   0},
-           {"/yen",            0245,   0},
-           {"/brokenbar",      0246,   0},
-           {"/section",        0247,   0},
-
-           {"/dieresis",               0250,   0},
-           {"/copyright",              0251,   0},
-           {"/ordfeminine",    0252,   0},
-           {"/guillemotleft",  0253,   0},
-           {"/logicalnot",             0254,   0},
-           {"/hyphen",                 0255,   0},
-           {"/registered",             0256,   0},
-           {"/macron",                 0257,   0},
-
-           {"/degree",                 0260,   0},
-           {"/plusminus",              0261,   0},
-           {"/twosuperior",    0262,   0},
-           {"/threesuperior",  0263,   0},
-           {"/acute",                  0264,   0},
-           {"/mu",                             0265,   0},
-           {"/paragraph",              0266,   0},
-           {"/periodcentered", 0267,   0},
-
-           {"/cedilla",                0270,   0},
-           {"/onesuperior",    0271,   0},
-           {"/ordmasculine",   0272,   0},
-           {"/guillemotright", 0273,   0},
-           {"/onequarter",             0274,   0},
-           {"/onehalf",                0275,   0},
-           {"/threequarters",  0276,   0},
-           {"/questiondown",   0277,   0},
-
-           {"/Agrave",                 0300,   0},
-           {"/Aacute",                 0301,   0},
-           {"/Acircumflex",    0302,   0},
-           {"/Atilde",                 0303,   0},
-           {"/Adieresis",              0304,   0},
-           {"/Aring",                  0305,   0},
-           {"/AE",                             0306,   0},
-           {"/Ccedilla",               0307,   0},
-
-           {"/Egrave",                 0310,   0},
-           {"/Eacute",                 0311,   0},
-           {"/Ecircumflex",    0312,   0},
-           {"/Edieresis",              0313,   0},
-           {"/Igrave",                 0314,   0},
-           {"/Iacute",                 0315,   0},
-           {"/Icircumflex",    0316,   0},
-           {"/Idieresis",              0317,   0},
-
-           {"/Eth",                    0320,   0},
-           {"/Ntilde",                 0321,   0},
-           {"/Ograve",                 0322,   0},
-           {"/Oacute",                 0323,   0},
-           {"/Ocircumflex",    0324,   0},
-           {"/Otilde",                 0325,   0},
-           {"/Odieresis",              0326,   0},
-           {"/multiply",               0327,   0},
-
-           {"/Oslash",         0330,   0},
-           {"/Ugrave",         0331,   0},
-           {"/Uacute",         0332,   0},
-           {"/Ucircumflex",0333,       0},
-           {"/Udieresis",      0334,   0},
-           {"/Yacute",         0335,   0},
-           {"/Thorn",          0336,   0},
-           {"/germandbls",     0337,   0},
-
-           {"/agrave",         0340,   0},
-           {"/aacute",         0341,   0},
-           {"/acircumflex",0342,       0},
-           {"/atilde",         0343,   0},
-           {"/adieresis",      0344,   0},
-           {"/aring",          0345,   0},
-           {"/ae",                     0346,   0},
-           {"/ccedilla",       0347,   0},
-
-           {"/egrave",                 0350,   0},
-           {"/eacute",                 0351,   0},
-           {"/ecircumflex",    0352,   0},
-           {"/edieresis",              0353,   0},
-           {"/igrave",                 0354,   0},
-           {"/iacute",                 0355,   0},
-           {"/icircumflex",    0356,   0},
-           {"/idieresis",              0357,   0},
-
-           {"/eth",            0360,   0},
-           {"/ntilde",         0361,   0},
-           {"/ograve",         0362,   0},
-           {"/oacute",         0363,   0},
-           {"/ocircumflex",0364,       0},
-           {"/otilde",         0365,   0},
-           {"/odieresis",      0366,   0},
-           {"/divide",         0367,   0},
-
-           {"/oslash",         0370,   0},
-           {"/ugrave",         0371,   0},
-           {"/uacute",         0372,   0},
-           {"/ucircumflex",0373,       0},
-           {"/udieresis",      0374,   0},
-           {"/yacute",         0375,   0},
-           {"/thorn",          0376,   0},
-           {"/ydieresis",      0377,   0},
+       "/dotlessi",    0220,   0,
+           "/grave",           0221,   0,
+           "/acute",           0222,   0,
+           "/circumflex",      0223,   0,
+           "/tilde",           0224,   0,
+           "/",                0225,   0,
+           "/breve",           0226,   0,
+           "/dotaccent",       0227,   0,
+
+           "/",                0230,   0,
+           "/",                0231,   0,
+           "/ring",            0232,   0,
+           "/",                0233,   0,
+           "/",                0234,   0,
+           "/hungarumlaut",    0235,   0,
+           "/ogonek",          0236,   0,
+           "/caron",           0237,   0,
+
+           "/",                0240,   0,
+           "/exclamdown",      0241,   0,
+           "/cent",            0242,   0,
+           "/sterling",        0243,   0,
+           "/florin",          0244,   0,
+           "/yen",             0245,   0,
+           "/brokenbar",       0246,   0,
+           "/section",         0247,   0,
+
+           "/dieresis",        0250,   0,
+           "/copyright",       0251,   0,
+           "/ordfeminine",     0252,   0,
+           "/guillemotleft",   0253,   0,
+           "/logicalnot",      0254,   0,
+           "/hyphen",          0255,   0,
+           "/registered",      0256,   0,
+           "/macron",          0257,   0,
+
+           "/degree",          0260,   0,
+           "/plusminus",       0261,   0,
+           "/twosuperior",     0262,   0,
+           "/threesuperior",   0263,   0,
+           "/acute",           0264,   0,
+           "/mu",              0265,   0,
+           "/paragraph",       0266,   0,
+           "/periodcentered",  0267,   0,
+
+           "/cedilla",         0270,   0,
+           "/onesuperior",     0271,   0,
+           "/ordmasculine",    0272,   0,
+           "/guillemotright",  0273,   0,
+           "/onequarter",      0274,   0,
+           "/onehalf",         0275,   0,
+           "/threequarters",   0276,   0,
+           "/questiondown",    0277,   0,
+
+           "/Agrave",          0300,   0,
+           "/Aacute",          0301,   0,
+           "/Acircumflex",     0302,   0,
+           "/Atilde",          0303,   0,
+           "/Adieresis",       0304,   0,
+           "/Aring",           0305,   0,
+           "/AE",              0306,   0,
+           "/Ccedilla",        0307,   0,
+
+           "/Egrave",          0310,   0,
+           "/Eacute",          0311,   0,
+           "/Ecircumflex",     0312,   0,
+           "/Edieresis",       0313,   0,
+           "/Igrave",          0314,   0,
+           "/Iacute",          0315,   0,
+           "/Icircumflex",     0316,   0,
+           "/Idieresis",       0317,   0,
+
+           "/Eth",             0320,   0,
+           "/Ntilde",          0321,   0,
+           "/Ograve",          0322,   0,
+           "/Oacute",          0323,   0,
+           "/Ocircumflex",     0324,   0,
+           "/Otilde",          0325,   0,
+           "/Odieresis",       0326,   0,
+           "/multiply",        0327,   0,
+
+           "/Oslash",          0330,   0,
+           "/Ugrave",          0331,   0,
+           "/Uacute",          0332,   0,
+           "/Ucircumflex",     0333,   0,
+           "/Udieresis",       0334,   0,
+           "/Yacute",          0335,   0,
+           "/Thorn",           0336,   0,
+           "/germandbls",      0337,   0,
+
+           "/agrave",          0340,   0,
+           "/aacute",          0341,   0,
+           "/acircumflex",     0342,   0,
+           "/atilde",          0343,   0,
+           "/adieresis",       0344,   0,
+           "/aring",           0345,   0,
+           "/ae",              0346,   0,
+           "/ccedilla",        0347,   0,
+
+           "/egrave",          0350,   0,
+           "/eacute",          0351,   0,
+           "/ecircumflex",     0352,   0,
+           "/edieresis",       0353,   0,
+           "/igrave",          0354,   0,
+           "/iacute",          0355,   0,
+           "/icircumflex",     0356,   0,
+           "/idieresis",       0357,   0,
+
+           "/eth",             0360,   0,
+           "/ntilde",          0361,   0,
+           "/ograve",          0362,   0,
+           "/oacute",          0363,   0,
+           "/ocircumflex",     0364,   0,
+           "/otilde",          0365,   0,
+           "/odieresis",       0366,   0,
+           "/divide",          0367,   0,
+
+           "/oslash",          0370,   0,
+           "/ugrave",          0371,   0,
+           "/uacute",          0372,   0,
+           "/ucircumflex",     0373,   0,
+           "/udieresis",       0374,   0,
+           "/yacute",          0375,   0,
+           "/thorn",           0376,   0,
+           "/ydieresis",       0377,   0,
 };
 
 
 static short STDvsISO [][2] = {
-       {0341, 0306}, /* AE */
-       {0351, 0330}, /* Oslash */
-       {0302, 0222}, /* acute */
-       {0361, 0346}, /* ae */
-       {0306, 0226}, /* breve */
-       {0317, 0237}, /* caron */
-       {0313, 0270}, /* cedilla */
-       {0303, 0223}, /* circumflex */
-       {0250, 0244}, /* currency */
-       {0310, 0250}, /* dieresis */
-       {0307, 0227}, /* dotaccent */
-       {0365, 0220}, /* dotlessi */
-       {0373, 0337}, /* germandbls */
-       {0301, 0221}, /* grave */
-       {0315, 0235}, /* hungarumlaut */
-       {0055, 0255}, /* hyphen */
-       {0305, 0257}, /* macron */
-       {0316, 0236}, /* ogenek */
-       {0343, 0252}, /* ordfeminine */
-       {0353, 0272}, /* ordmasculine */
-       {0371, 0370}, /* oslash */
-       {0264, 0267}, /* periodcentered */
-       {0312, 0232}, /* ring */
-       {0304, 0224}, /* tilde */
+       0341, 0306, /* AE */
+       0351, 0330, /* Oslash */
+       0302, 0222, /* acute */
+       0361, 0346, /* ae */
+       0306, 0226, /* breve */
+       0317, 0237, /* caron */
+       0313, 0270, /* cedilla */
+       0303, 0223, /* circumflex */
+       0250, 0244, /* currency */
+       0310, 0250, /* dieresis */
+       0307, 0227, /* dotaccent */
+       0365, 0220, /* dotlessi */
+       0373, 0337, /* germandbls */
+       0301, 0221, /* grave */
+       0315, 0235, /* hungarumlaut */
+       0055, 0255, /* hyphen */
+       0305, 0257, /* macron */
+       0316, 0236, /* ogenek */
+       0343, 0252, /* ordfeminine */
+       0353, 0272, /* ordmasculine */
+       0371, 0370, /* oslash */
+       0264, 0267, /* periodcentered */
+       0312, 0232, /* ring */
+       0304, 0224, /* tilde */
 };
 
 /* from objfont.c, rest is in lfm_s !!*/
index c85849b5ed4be35af35c35c406011801e8ef005f..04c4e97aef9b09ff625fe9972a70f07696f52b3b 100644 (file)
@@ -858,8 +858,6 @@ int BLI_strcaseeq(char *a, char *b) {
  * take the dir name, make it absolute, and clean it up, replacing
  * excess file entry stuff (like /tmp/../tmp/../)
  * note that dir isn't protected for max string names... 
- * 
- * If relbase is NULL then its ignored
  */
 
 void BLI_cleanup_dir(const char *relabase, char *dir)
@@ -876,9 +874,11 @@ void BLI_cleanup_file(const char *relabase, char *dir)
 {
        short a;
        char *start, *eind;
+
        if (relabase) {
                BLI_convertstringcode(dir, relabase);
        }
+
 #ifdef WIN32
        if(dir[0]=='.') {       /* happens for example in FILE_MAIN */
           get_default_root(dir);
@@ -956,7 +956,7 @@ void BLI_makestringcode(const char *relfile, char *file)
        char * lslash;
        char temp[FILE_MAXDIR+FILE_MAXFILE];
        char res[FILE_MAXDIR+FILE_MAXFILE];
-       
+
        /* if file is already relative, bail out */
        if(file[0]=='/' && file[1]=='/') return;
        
@@ -988,11 +988,7 @@ void BLI_makestringcode(const char *relfile, char *file)
 
        BLI_char_switch(temp, '\\', '/');
        BLI_char_switch(file, '\\', '/');
-       
-       /* remove /./ which confuse the following slash counting... */
-       BLI_cleanup_file(NULL, file);
-       BLI_cleanup_file(NULL, temp);
-       
+
        /* the last slash in the file indicates where the path part ends */
        lslash = BLI_last_slash(temp);
 
@@ -1139,8 +1135,6 @@ int BLI_convertstringcode(char *path, const char *basepath)
 
        BLI_strncpy(base, basepath, FILE_MAX);
        
-       BLI_cleanup_file(NULL, base);
-       
        /* push slashes into unix mode - strings entering this part are
           potentially messed up: having both back- and forward slashes.
           Here we push into one conform direction, and at the end we
@@ -1177,7 +1171,7 @@ int BLI_convertstringcode(char *path, const char *basepath)
        */
        BLI_char_switch(path+2, '/', '\\');
 #endif
-       
+
        return wasrelative;
 }
 
index 666a54b54cc99e20be4d8dbc0e5a210ef466849a..ace677e6045b132d4e0400bdc0866669517a8b01 100644 (file)
@@ -196,27 +196,6 @@ void get_default_root(char* root) {
        }
 }
 
-int check_file_chars(char *filename)
-{
-       char *p = filename;
-       while (*p) {
-               switch (*p) {
-                       case ':':
-                       case '?':
-                       case '*':
-                       case '|':
-                       case '\\':
-                       case '/':
-                       case '\"':
-                               return 0;
-                               break;
-               }
-
-               p++;
-       }
-       return 1;
-}
-
 #else
 
 static void BLI_WINSTUFF_C_IS_EMPTY_FOR_UNIX(void) 
index 8d315ba37e132973942a3263fc9a3ee5119536ac..e69b2fb0326c4de720dd10a56fe7663ed41de344 100644 (file)
@@ -720,7 +720,7 @@ BHead *blo_firstbhead(FileData *fd)
 
 BHead *blo_prevbhead(FileData *fd, BHead *thisblock)
 {
-       BHeadN *bheadn= (BHeadN *) (((char *) thisblock) - GET_INT_FROM_POINTER( &((BHeadN*)0)->bhead) );
+       BHeadN *bheadn= (BHeadN *) (((char *) thisblock) - (int) (&((BHeadN*)0)->b