diff options
author | Maxime Curioni <maxime.curioni@gmail.com> | 2008-05-08 23:16:40 +0400 |
---|---|---|
committer | Maxime Curioni <maxime.curioni@gmail.com> | 2008-05-08 23:16:40 +0400 |
commit | 64e4a3ec9aed6c8abe095e2cd1fe1552f7cde51c (patch) | |
tree | 6c77358bd447b6c2d215324ef48fc12d1f5ae5ca /source | |
parent | cf2e1e2857cfc5b3c2848c7fc6c9d919ac72fabb (diff) | |
parent | 106974a9d2d5caa5188322507980e3d57d2e3517 (diff) |
soc-2008-mxcurioni: merged changes to revision 14747, cosmetic changes for source/blender/freestyle
Diffstat (limited to 'source')
-rw-r--r-- | source/Makefile | 10 | ||||
-rw-r--r-- | source/blender/blenkernel/bad_level_call_stubs/stubs.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/action.c | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/blender.c | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/constraint.c | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/ipo.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/modifier.c | 12 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/particle.c | 92 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 3 | ||||
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/AUTHORS.TXT (renamed from source/blender/freestyle/AUTHORS.TXT) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/BUGS.TXT (renamed from source/blender/freestyle/BUGS.TXT) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/CHANGELOG.TXT (renamed from source/blender/freestyle/CHANGELOG.TXT) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/COPYRIGHT.TXT (renamed from source/blender/freestyle/COPYRIGHT.TXT) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/Config.pri (renamed from source/blender/freestyle/src/Config.pri) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/Freestyle-vc7-debug.sln (renamed from source/blender/freestyle/src/Freestyle-vc7-debug.sln) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/Freestyle-vc7-release.sln (renamed from source/blender/freestyle/src/Freestyle-vc7-release.sln) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/Freestyle-vc8-debug.sln (renamed from source/blender/freestyle/src/Freestyle-vc8-debug.sln) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/Freestyle-vc8-release.sln (renamed from source/blender/freestyle/src/Freestyle-vc8-release.sln) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/INSTALL.TXT (renamed from source/blender/freestyle/INSTALL.TXT) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/LICENSE.TXT (renamed from source/blender/freestyle/LICENSE.TXT) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/Makefile.pro (renamed from source/blender/freestyle/src/Makefile.pro) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/README.TXT (renamed from source/blender/freestyle/README.TXT) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/THANKS.TXT (renamed from source/blender/freestyle/THANKS.TXT) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/TODO.TXT (renamed from source/blender/freestyle/TODO.TXT) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/AppAboutWindow.cpp (renamed from source/blender/freestyle/src/app/AppAboutWindow.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/AppAboutWindow.h (renamed from source/blender/freestyle/src/app/AppAboutWindow.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/AppCanvas.cpp (renamed from source/blender/freestyle/src/app/AppCanvas.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/AppCanvas.h (renamed from source/blender/freestyle/src/app/AppCanvas.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/AppConfig.cpp (renamed from source/blender/freestyle/src/app/AppConfig.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/AppConfig.h (renamed from source/blender/freestyle/src/app/AppConfig.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/AppDensityCurvesWindow.cpp (renamed from source/blender/freestyle/src/app/AppDensityCurvesWindow.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/AppDensityCurvesWindow.h (renamed from source/blender/freestyle/src/app/AppDensityCurvesWindow.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/AppGL2DCurvesViewer.cpp (renamed from source/blender/freestyle/src/app/AppGL2DCurvesViewer.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/AppGL2DCurvesViewer.h (renamed from source/blender/freestyle/src/app/AppGL2DCurvesViewer.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/AppGLWidget.cpp (renamed from source/blender/freestyle/src/app/AppGLWidget.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/AppGLWidget.h (renamed from source/blender/freestyle/src/app/AppGLWidget.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/AppInteractiveShaderWindow.cpp (renamed from source/blender/freestyle/src/app/AppInteractiveShaderWindow.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/AppInteractiveShaderWindow.h (renamed from source/blender/freestyle/src/app/AppInteractiveShaderWindow.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/AppMainWindow.cpp (renamed from source/blender/freestyle/src/app/AppMainWindow.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/AppMainWindow.h (renamed from source/blender/freestyle/src/app/AppMainWindow.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/AppOptionsWindow.cpp (renamed from source/blender/freestyle/src/app/AppOptionsWindow.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/AppOptionsWindow.h (renamed from source/blender/freestyle/src/app/AppOptionsWindow.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/AppProgressBar.cpp (renamed from source/blender/freestyle/src/app/AppProgressBar.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/AppProgressBar.h (renamed from source/blender/freestyle/src/app/AppProgressBar.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/AppStyleWindow.cpp (renamed from source/blender/freestyle/src/app/AppStyleWindow.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/AppStyleWindow.h (renamed from source/blender/freestyle/src/app/AppStyleWindow.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/ConfigIO.cpp (renamed from source/blender/freestyle/src/app/ConfigIO.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/ConfigIO.h (renamed from source/blender/freestyle/src/app/ConfigIO.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/Controller.cpp (renamed from source/blender/freestyle/src/app/Controller.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/Controller.h (renamed from source/blender/freestyle/src/app/Controller.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/Main.cpp (renamed from source/blender/freestyle/src/app/Main.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/QGLBasicWidget.cpp (renamed from source/blender/freestyle/src/app/QGLBasicWidget.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/QGLBasicWidget.h (renamed from source/blender/freestyle/src/app/QGLBasicWidget.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/QStyleModuleSyntaxHighlighter.cpp (renamed from source/blender/freestyle/src/app/QStyleModuleSyntaxHighlighter.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/QStyleModuleSyntaxHighlighter.h (renamed from source/blender/freestyle/src/app/QStyleModuleSyntaxHighlighter.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/app.pro (renamed from source/blender/freestyle/src/app/app.pro) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/appmainwindowbase4.ui (renamed from source/blender/freestyle/src/app/appmainwindowbase4.ui) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/densitycurveswindow4.ui (renamed from source/blender/freestyle/src/app/densitycurveswindow4.ui) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/freestyle.qrc (renamed from source/blender/freestyle/src/app/freestyle.qrc) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/icons/add.png (renamed from source/blender/freestyle/src/app/icons/add.png) | bin | 400 -> 400 bytes | |||
-rwxr-xr-x | source/blender/freestyle/intern/app/icons/arrow_down.png (renamed from source/blender/freestyle/src/app/icons/arrow_down.png) | bin | 813 -> 813 bytes | |||
-rwxr-xr-x | source/blender/freestyle/intern/app/icons/arrow_left.png (renamed from source/blender/freestyle/src/app/icons/arrow_left.png) | bin | 776 -> 776 bytes | |||
-rwxr-xr-x | source/blender/freestyle/intern/app/icons/arrow_right.png (renamed from source/blender/freestyle/src/app/icons/arrow_right.png) | bin | 773 -> 773 bytes | |||
-rwxr-xr-x | source/blender/freestyle/intern/app/icons/arrow_up.png (renamed from source/blender/freestyle/src/app/icons/arrow_up.png) | bin | 782 -> 782 bytes | |||
-rwxr-xr-x | source/blender/freestyle/intern/app/icons/clear.png (renamed from source/blender/freestyle/src/app/icons/clear.png) | bin | 1057 -> 1057 bytes | |||
-rwxr-xr-x | source/blender/freestyle/intern/app/icons/close.png (renamed from source/blender/freestyle/src/app/icons/close.png) | bin | 1437 -> 1437 bytes | |||
-rwxr-xr-x | source/blender/freestyle/intern/app/icons/edit.png (renamed from source/blender/freestyle/src/app/icons/edit.png) | bin | 896 -> 896 bytes | |||
-rwxr-xr-x | source/blender/freestyle/intern/app/icons/eye0.png (renamed from source/blender/freestyle/src/app/icons/eye0.png) | bin | 406 -> 406 bytes | |||
-rwxr-xr-x | source/blender/freestyle/intern/app/icons/eye1.png (renamed from source/blender/freestyle/src/app/icons/eye1.png) | bin | 402 -> 402 bytes | |||
-rwxr-xr-x | source/blender/freestyle/intern/app/icons/folder.png (renamed from source/blender/freestyle/src/app/icons/folder.png) | bin | 1015 -> 1015 bytes | |||
-rwxr-xr-x | source/blender/freestyle/intern/app/icons/home.png (renamed from source/blender/freestyle/src/app/icons/home.png) | bin | 1050 -> 1050 bytes | |||
-rwxr-xr-x | source/blender/freestyle/intern/app/icons/mod0.png (renamed from source/blender/freestyle/src/app/icons/mod0.png) | bin | 910 -> 910 bytes | |||
-rwxr-xr-x | source/blender/freestyle/intern/app/icons/mod1.png (renamed from source/blender/freestyle/src/app/icons/mod1.png) | bin | 1051 -> 1051 bytes | |||
-rwxr-xr-x | source/blender/freestyle/intern/app/icons/ok.png (renamed from source/blender/freestyle/src/app/icons/ok.png) | bin | 769 -> 769 bytes | |||
-rwxr-xr-x | source/blender/freestyle/intern/app/icons/reload.png (renamed from source/blender/freestyle/src/app/icons/reload.png) | bin | 1113 -> 1113 bytes | |||
-rwxr-xr-x | source/blender/freestyle/intern/app/icons/remove.png (renamed from source/blender/freestyle/src/app/icons/remove.png) | bin | 375 -> 375 bytes | |||
-rwxr-xr-x | source/blender/freestyle/intern/app/icons/save.png (renamed from source/blender/freestyle/src/app/icons/save.png) | bin | 1329 -> 1329 bytes | |||
-rwxr-xr-x | source/blender/freestyle/intern/app/icons/save_as.png (renamed from source/blender/freestyle/src/app/icons/save_as.png) | bin | 1024 -> 1024 bytes | |||
-rwxr-xr-x | source/blender/freestyle/intern/app/interactiveshaderwindow4.ui (renamed from source/blender/freestyle/src/app/interactiveshaderwindow4.ui) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/optionswindow4.ui (renamed from source/blender/freestyle/src/app/optionswindow4.ui) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/progressdialog4.ui (renamed from source/blender/freestyle/src/app/progressdialog4.ui) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/src.pri (renamed from source/blender/freestyle/src/app/src.pri) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/app/stylewindow4.ui (renamed from source/blender/freestyle/src/app/stylewindow4.ui) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/build_bundle.macosx.py (renamed from source/blender/freestyle/src/build_bundle.macosx.py) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/geometry/BBox.h (renamed from source/blender/freestyle/src/geometry/BBox.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/geometry/Bezier.cpp (renamed from source/blender/freestyle/src/geometry/Bezier.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/geometry/Bezier.h (renamed from source/blender/freestyle/src/geometry/Bezier.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/geometry/FastGrid.cpp (renamed from source/blender/freestyle/src/geometry/FastGrid.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/geometry/FastGrid.h (renamed from source/blender/freestyle/src/geometry/FastGrid.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/geometry/FitCurve.cpp (renamed from source/blender/freestyle/src/geometry/FitCurve.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/geometry/FitCurve.h (renamed from source/blender/freestyle/src/geometry/FitCurve.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/geometry/Geom.h (renamed from source/blender/freestyle/src/geometry/Geom.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/geometry/GeomCleaner.cpp (renamed from source/blender/freestyle/src/geometry/GeomCleaner.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/geometry/GeomCleaner.h (renamed from source/blender/freestyle/src/geometry/GeomCleaner.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/geometry/GeomUtils.cpp (renamed from source/blender/freestyle/src/geometry/GeomUtils.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/geometry/GeomUtils.h (renamed from source/blender/freestyle/src/geometry/GeomUtils.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/geometry/Grid.cpp (renamed from source/blender/freestyle/src/geometry/Grid.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/geometry/Grid.h (renamed from source/blender/freestyle/src/geometry/Grid.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/geometry/HashGrid.cpp (renamed from source/blender/freestyle/src/geometry/HashGrid.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/geometry/HashGrid.h (renamed from source/blender/freestyle/src/geometry/HashGrid.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/geometry/Noise.cpp (renamed from source/blender/freestyle/src/geometry/Noise.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/geometry/Noise.h (renamed from source/blender/freestyle/src/geometry/Noise.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/geometry/Polygon.h (renamed from source/blender/freestyle/src/geometry/Polygon.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/geometry/SweepLine.h (renamed from source/blender/freestyle/src/geometry/SweepLine.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/geometry/VecMat.h (renamed from source/blender/freestyle/src/geometry/VecMat.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/geometry/geometry.pro (renamed from source/blender/freestyle/src/geometry/geometry.pro) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/geometry/matrix_util.cpp (renamed from source/blender/freestyle/src/geometry/matrix_util.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/geometry/matrix_util.h (renamed from source/blender/freestyle/src/geometry/matrix_util.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/geometry/normal_cycle.cpp (renamed from source/blender/freestyle/src/geometry/normal_cycle.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/geometry/normal_cycle.h (renamed from source/blender/freestyle/src/geometry/normal_cycle.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/geometry/src.pri (renamed from source/blender/freestyle/src/geometry/src.pri) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/image/GaussianFilter.cpp (renamed from source/blender/freestyle/src/image/GaussianFilter.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/image/GaussianFilter.h (renamed from source/blender/freestyle/src/image/GaussianFilter.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/image/Image.h (renamed from source/blender/freestyle/src/image/Image.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/image/ImagePyramid.cpp (renamed from source/blender/freestyle/src/image/ImagePyramid.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/image/ImagePyramid.h (renamed from source/blender/freestyle/src/image/ImagePyramid.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/image/image.pro (renamed from source/blender/freestyle/src/image/image.pro) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/image/src.pri (renamed from source/blender/freestyle/src/image/src.pri) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/libconfig.pri (renamed from source/blender/freestyle/src/libconfig.pri) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/makedsp.vcnet.debug.bat (renamed from source/blender/freestyle/src/makedsp.vcnet.debug.bat) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/makedsp.vcnet.release.bat (renamed from source/blender/freestyle/src/makedsp.vcnet.release.bat) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/rendering/GLBBoxRenderer.cpp (renamed from source/blender/freestyle/src/rendering/GLBBoxRenderer.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/rendering/GLBBoxRenderer.h (renamed from source/blender/freestyle/src/rendering/GLBBoxRenderer.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/rendering/GLDebugRenderer.cpp (renamed from source/blender/freestyle/src/rendering/GLDebugRenderer.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/rendering/GLDebugRenderer.h (renamed from source/blender/freestyle/src/rendering/GLDebugRenderer.h) | 0 | ||||
-rw-r--r-- | source/blender/freestyle/intern/rendering/GLFreeMemoryVisitor.cpp (renamed from source/blender/freestyle/src/rendering/GLFreeMemoryVisitor.cpp) | 0 | ||||
-rw-r--r-- | source/blender/freestyle/intern/rendering/GLFreeMemoryVisitor.h (renamed from source/blender/freestyle/src/rendering/GLFreeMemoryVisitor.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/rendering/GLMonoColorRenderer.cpp (renamed from source/blender/freestyle/src/rendering/GLMonoColorRenderer.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/rendering/GLMonoColorRenderer.h (renamed from source/blender/freestyle/src/rendering/GLMonoColorRenderer.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/rendering/GLRenderer.cpp (renamed from source/blender/freestyle/src/rendering/GLRenderer.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/rendering/GLRenderer.h (renamed from source/blender/freestyle/src/rendering/GLRenderer.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/rendering/GLSelectRenderer.cpp (renamed from source/blender/freestyle/src/rendering/GLSelectRenderer.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/rendering/GLSelectRenderer.h (renamed from source/blender/freestyle/src/rendering/GLSelectRenderer.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/rendering/GLStrokeRenderer.cpp (renamed from source/blender/freestyle/src/rendering/GLStrokeRenderer.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/rendering/GLStrokeRenderer.h (renamed from source/blender/freestyle/src/rendering/GLStrokeRenderer.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/rendering/GLUtils.cpp (renamed from source/blender/freestyle/src/rendering/GLUtils.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/rendering/GLUtils.h (renamed from source/blender/freestyle/src/rendering/GLUtils.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/rendering/GLXOffscreenViewer.cpp (renamed from source/blender/freestyle/src/rendering/GLXOffscreenViewer.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/rendering/GLXOffscreenViewer.h (renamed from source/blender/freestyle/src/rendering/GLXOffscreenViewer.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/rendering/extgl.cpp (renamed from source/blender/freestyle/src/rendering/extgl.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/rendering/extgl.h (renamed from source/blender/freestyle/src/rendering/extgl.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/rendering/pbuffer.cpp (renamed from source/blender/freestyle/src/rendering/pbuffer.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/rendering/pbuffer.h (renamed from source/blender/freestyle/src/rendering/pbuffer.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/rendering/rendering.pro (renamed from source/blender/freestyle/src/rendering/rendering.pro) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/rendering/src.pri (renamed from source/blender/freestyle/src/rendering/src.pri) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/scene_graph/DrawingStyle.h (renamed from source/blender/freestyle/src/scene_graph/DrawingStyle.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp (renamed from source/blender/freestyle/src/scene_graph/IndexedFaceSet.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h (renamed from source/blender/freestyle/src/scene_graph/IndexedFaceSet.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/scene_graph/LineRep.cpp (renamed from source/blender/freestyle/src/scene_graph/LineRep.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/scene_graph/LineRep.h (renamed from source/blender/freestyle/src/scene_graph/LineRep.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/scene_graph/Material.h (renamed from source/blender/freestyle/src/scene_graph/Material.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/scene_graph/MaxFileLoader.cpp (renamed from source/blender/freestyle/src/scene_graph/MaxFileLoader.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/scene_graph/MaxFileLoader.h (renamed from source/blender/freestyle/src/scene_graph/MaxFileLoader.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/scene_graph/Node.h (renamed from source/blender/freestyle/src/scene_graph/Node.h) | 0 | ||||
-rw-r--r-- | source/blender/freestyle/intern/scene_graph/NodeCamera.cpp (renamed from source/blender/freestyle/src/scene_graph/NodeCamera.cpp) | 0 | ||||
-rw-r--r-- | source/blender/freestyle/intern/scene_graph/NodeCamera.h (renamed from source/blender/freestyle/src/scene_graph/NodeCamera.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.cpp (renamed from source/blender/freestyle/src/scene_graph/NodeDrawingStyle.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h (renamed from source/blender/freestyle/src/scene_graph/NodeDrawingStyle.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/scene_graph/NodeGroup.cpp (renamed from source/blender/freestyle/src/scene_graph/NodeGroup.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/scene_graph/NodeGroup.h (renamed from source/blender/freestyle/src/scene_graph/NodeGroup.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/scene_graph/NodeLight.cpp (renamed from source/blender/freestyle/src/scene_graph/NodeLight.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/scene_graph/NodeLight.h (renamed from source/blender/freestyle/src/scene_graph/NodeLight.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/scene_graph/NodeShape.cpp (renamed from source/blender/freestyle/src/scene_graph/NodeShape.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/scene_graph/NodeShape.h (renamed from source/blender/freestyle/src/scene_graph/NodeShape.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/scene_graph/NodeTransform.cpp (renamed from source/blender/freestyle/src/scene_graph/NodeTransform.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/scene_graph/NodeTransform.h (renamed from source/blender/freestyle/src/scene_graph/NodeTransform.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/scene_graph/OrientedLineRep.cpp (renamed from source/blender/freestyle/src/scene_graph/OrientedLineRep.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/scene_graph/OrientedLineRep.h (renamed from source/blender/freestyle/src/scene_graph/OrientedLineRep.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/scene_graph/Rep.cpp (renamed from source/blender/freestyle/src/scene_graph/Rep.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/scene_graph/Rep.h (renamed from source/blender/freestyle/src/scene_graph/Rep.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/scene_graph/ScenePrettyPrinter.cpp (renamed from source/blender/freestyle/src/scene_graph/ScenePrettyPrinter.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/scene_graph/ScenePrettyPrinter.h (renamed from source/blender/freestyle/src/scene_graph/ScenePrettyPrinter.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/scene_graph/SceneVisitor.cpp (renamed from source/blender/freestyle/src/scene_graph/SceneVisitor.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/scene_graph/SceneVisitor.h (renamed from source/blender/freestyle/src/scene_graph/SceneVisitor.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/scene_graph/TriangleRep.cpp (renamed from source/blender/freestyle/src/scene_graph/TriangleRep.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/scene_graph/TriangleRep.h (renamed from source/blender/freestyle/src/scene_graph/TriangleRep.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/scene_graph/VertexRep.cpp (renamed from source/blender/freestyle/src/scene_graph/VertexRep.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/scene_graph/VertexRep.h (renamed from source/blender/freestyle/src/scene_graph/VertexRep.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/scene_graph/scene_graph.pro (renamed from source/blender/freestyle/src/scene_graph/scene_graph.pro) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/scene_graph/src.pri (renamed from source/blender/freestyle/src/scene_graph/src.pri) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/AdvancedFunctions0D.cpp (renamed from source/blender/freestyle/src/stroke/AdvancedFunctions0D.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/AdvancedFunctions0D.h (renamed from source/blender/freestyle/src/stroke/AdvancedFunctions0D.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/AdvancedFunctions1D.cpp (renamed from source/blender/freestyle/src/stroke/AdvancedFunctions1D.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h (renamed from source/blender/freestyle/src/stroke/AdvancedFunctions1D.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/AdvancedPredicates1D.h (renamed from source/blender/freestyle/src/stroke/AdvancedPredicates1D.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp (renamed from source/blender/freestyle/src/stroke/AdvancedStrokeShaders.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h (renamed from source/blender/freestyle/src/stroke/AdvancedStrokeShaders.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp (renamed from source/blender/freestyle/src/stroke/BasicStrokeShaders.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/BasicStrokeShaders.h (renamed from source/blender/freestyle/src/stroke/BasicStrokeShaders.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/Canvas.cpp (renamed from source/blender/freestyle/src/stroke/Canvas.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/Canvas.h (renamed from source/blender/freestyle/src/stroke/Canvas.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/Chain.cpp (renamed from source/blender/freestyle/src/stroke/Chain.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/Chain.h (renamed from source/blender/freestyle/src/stroke/Chain.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/ChainingIterators.cpp (renamed from source/blender/freestyle/src/stroke/ChainingIterators.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/ChainingIterators.h (renamed from source/blender/freestyle/src/stroke/ChainingIterators.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/ContextFunctions.cpp (renamed from source/blender/freestyle/src/stroke/ContextFunctions.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/ContextFunctions.h (renamed from source/blender/freestyle/src/stroke/ContextFunctions.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/Curve.cpp (renamed from source/blender/freestyle/src/stroke/Curve.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/Curve.h (renamed from source/blender/freestyle/src/stroke/Curve.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/CurveAdvancedIterators.h (renamed from source/blender/freestyle/src/stroke/CurveAdvancedIterators.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/CurveIterators.h (renamed from source/blender/freestyle/src/stroke/CurveIterators.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/Modifiers.h (renamed from source/blender/freestyle/src/stroke/Modifiers.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/Module.h (renamed from source/blender/freestyle/src/stroke/Module.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/Operators.cpp (renamed from source/blender/freestyle/src/stroke/Operators.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/Operators.h (renamed from source/blender/freestyle/src/stroke/Operators.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/PSStrokeRenderer.cpp (renamed from source/blender/freestyle/src/stroke/PSStrokeRenderer.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/PSStrokeRenderer.h (renamed from source/blender/freestyle/src/stroke/PSStrokeRenderer.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/Predicates0D.h (renamed from source/blender/freestyle/src/stroke/Predicates0D.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/Predicates1D.h (renamed from source/blender/freestyle/src/stroke/Predicates1D.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/QInformationMap.h (renamed from source/blender/freestyle/src/stroke/QInformationMap.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/Stroke.cpp (renamed from source/blender/freestyle/src/stroke/Stroke.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/Stroke.h (renamed from source/blender/freestyle/src/stroke/Stroke.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/StrokeAdvancedIterators.h (renamed from source/blender/freestyle/src/stroke/StrokeAdvancedIterators.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/StrokeIO.cpp (renamed from source/blender/freestyle/src/stroke/StrokeIO.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/StrokeIO.h (renamed from source/blender/freestyle/src/stroke/StrokeIO.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/StrokeIterators.h (renamed from source/blender/freestyle/src/stroke/StrokeIterators.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/StrokeLayer.cpp (renamed from source/blender/freestyle/src/stroke/StrokeLayer.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/StrokeLayer.h (renamed from source/blender/freestyle/src/stroke/StrokeLayer.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/StrokeRenderer.cpp (renamed from source/blender/freestyle/src/stroke/StrokeRenderer.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/StrokeRenderer.h (renamed from source/blender/freestyle/src/stroke/StrokeRenderer.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/StrokeRep.cpp (renamed from source/blender/freestyle/src/stroke/StrokeRep.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/StrokeRep.h (renamed from source/blender/freestyle/src/stroke/StrokeRep.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/StrokeShader.h (renamed from source/blender/freestyle/src/stroke/StrokeShader.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/StrokeTesselator.cpp (renamed from source/blender/freestyle/src/stroke/StrokeTesselator.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/StrokeTesselator.h (renamed from source/blender/freestyle/src/stroke/StrokeTesselator.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/StyleModule.h (renamed from source/blender/freestyle/src/stroke/StyleModule.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/TextStrokeRenderer.cpp (renamed from source/blender/freestyle/src/stroke/TextStrokeRenderer.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/TextStrokeRenderer.h (renamed from source/blender/freestyle/src/stroke/TextStrokeRenderer.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/src.pri (renamed from source/blender/freestyle/src/stroke/src.pri) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/stroke/stroke.pro (renamed from source/blender/freestyle/src/stroke/stroke.pro) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/swig/Freestyle.i (renamed from source/blender/freestyle/src/swig/Freestyle.i) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/swig/FreestyleWrapper.vc7.vcproj (renamed from source/blender/freestyle/src/swig/FreestyleWrapper.vc7.vcproj) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/swig/FreestyleWrapper.vc8.vcproj (renamed from source/blender/freestyle/src/swig/FreestyleWrapper.vc8.vcproj) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/swig/Makefile (renamed from source/blender/freestyle/src/swig/Makefile) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/swig/Makefile.cygwin (renamed from source/blender/freestyle/src/swig/Makefile.cygwin) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/swig/Makefile.linux (renamed from source/blender/freestyle/src/swig/Makefile.linux) | 0 | ||||
-rw-r--r-- | source/blender/freestyle/intern/swig/Makefile.mac (renamed from source/blender/freestyle/src/swig/Makefile.mac) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/swig/Makefile.noswig (renamed from source/blender/freestyle/src/swig/Makefile.noswig) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/swig/ModuleWrapper.cpp (renamed from source/blender/freestyle/src/swig/ModuleWrapper.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/swig/ModuleWrapper.h (renamed from source/blender/freestyle/src/swig/ModuleWrapper.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/system/BaseIterator.h (renamed from source/blender/freestyle/src/system/BaseIterator.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/system/BaseObject.cpp (renamed from source/blender/freestyle/src/system/BaseObject.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/system/BaseObject.h (renamed from source/blender/freestyle/src/system/BaseObject.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/system/Cast.h (renamed from source/blender/freestyle/src/system/Cast.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/system/Exception.cpp (renamed from source/blender/freestyle/src/system/Exception.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/system/Exception.h (renamed from source/blender/freestyle/src/system/Exception.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/system/FreestyleConfig.h (renamed from source/blender/freestyle/src/system/FreestyleConfig.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/system/Id.h (renamed from source/blender/freestyle/src/system/Id.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/system/Interpreter.h (renamed from source/blender/freestyle/src/system/Interpreter.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/system/Precision.h (renamed from source/blender/freestyle/src/system/Precision.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/system/ProgressBar.h (renamed from source/blender/freestyle/src/system/ProgressBar.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/system/PseudoNoise.cpp (renamed from source/blender/freestyle/src/system/PseudoNoise.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/system/PseudoNoise.h (renamed from source/blender/freestyle/src/system/PseudoNoise.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/system/PythonInterpreter.cpp (renamed from source/blender/freestyle/src/system/PythonInterpreter.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/system/PythonInterpreter.h (renamed from source/blender/freestyle/src/system/PythonInterpreter.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/system/RandGen.cpp (renamed from source/blender/freestyle/src/system/RandGen.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/system/RandGen.h (renamed from source/blender/freestyle/src/system/RandGen.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/system/StringUtils.cpp (renamed from source/blender/freestyle/src/system/StringUtils.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/system/StringUtils.h (renamed from source/blender/freestyle/src/system/StringUtils.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/system/TimeStamp.cpp (renamed from source/blender/freestyle/src/system/TimeStamp.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/system/TimeStamp.h (renamed from source/blender/freestyle/src/system/TimeStamp.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/system/TimeUtils.h (renamed from source/blender/freestyle/src/system/TimeUtils.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/system/src.pri (renamed from source/blender/freestyle/src/system/src.pri) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/system/system.pro (renamed from source/blender/freestyle/src/system/system.pro) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp (renamed from source/blender/freestyle/src/view_map/FEdgeXDetector.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/view_map/FEdgeXDetector.h (renamed from source/blender/freestyle/src/view_map/FEdgeXDetector.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/view_map/Functions0D.cpp (renamed from source/blender/freestyle/src/view_map/Functions0D.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/view_map/Functions0D.h (renamed from source/blender/freestyle/src/view_map/Functions0D.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/view_map/Functions1D.cpp (renamed from source/blender/freestyle/src/view_map/Functions1D.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/view_map/Functions1D.h (renamed from source/blender/freestyle/src/view_map/Functions1D.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/view_map/Interface0D.h (renamed from source/blender/freestyle/src/view_map/Interface0D.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/view_map/Interface1D.h (renamed from source/blender/freestyle/src/view_map/Interface1D.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/view_map/Silhouette.cpp (renamed from source/blender/freestyle/src/view_map/Silhouette.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/view_map/Silhouette.h (renamed from source/blender/freestyle/src/view_map/Silhouette.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp (renamed from source/blender/freestyle/src/view_map/SilhouetteGeomEngine.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.h (renamed from source/blender/freestyle/src/view_map/SilhouetteGeomEngine.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/view_map/SteerableViewMap.cpp (renamed from source/blender/freestyle/src/view_map/SteerableViewMap.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/view_map/SteerableViewMap.h (renamed from source/blender/freestyle/src/view_map/SteerableViewMap.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp (renamed from source/blender/freestyle/src/view_map/ViewEdgeXBuilder.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h (renamed from source/blender/freestyle/src/view_map/ViewEdgeXBuilder.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/view_map/ViewMap.cpp (renamed from source/blender/freestyle/src/view_map/ViewMap.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/view_map/ViewMap.h (renamed from source/blender/freestyle/src/view_map/ViewMap.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h (renamed from source/blender/freestyle/src/view_map/ViewMapAdvancedIterators.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp (renamed from source/blender/freestyle/src/view_map/ViewMapBuilder.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/view_map/ViewMapBuilder.h (renamed from source/blender/freestyle/src/view_map/ViewMapBuilder.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/view_map/ViewMapIO.cpp (renamed from source/blender/freestyle/src/view_map/ViewMapIO.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/view_map/ViewMapIO.h (renamed from source/blender/freestyle/src/view_map/ViewMapIO.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/view_map/ViewMapIterators.h (renamed from source/blender/freestyle/src/view_map/ViewMapIterators.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/view_map/ViewMapTesselator.cpp (renamed from source/blender/freestyle/src/view_map/ViewMapTesselator.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/view_map/ViewMapTesselator.h (renamed from source/blender/freestyle/src/view_map/ViewMapTesselator.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/view_map/src.pri (renamed from source/blender/freestyle/src/view_map/src.pri) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/view_map/view_map.pro (renamed from source/blender/freestyle/src/view_map/view_map.pro) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/winged_edge/Curvature.cpp (renamed from source/blender/freestyle/src/winged_edge/Curvature.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/winged_edge/Curvature.h (renamed from source/blender/freestyle/src/winged_edge/Curvature.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/winged_edge/Nature.h (renamed from source/blender/freestyle/src/winged_edge/Nature.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/winged_edge/WEdge.cpp (renamed from source/blender/freestyle/src/winged_edge/WEdge.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/winged_edge/WEdge.h (renamed from source/blender/freestyle/src/winged_edge/WEdge.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/winged_edge/WFillGrid.cpp (renamed from source/blender/freestyle/src/winged_edge/WFillGrid.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/winged_edge/WFillGrid.h (renamed from source/blender/freestyle/src/winged_edge/WFillGrid.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/winged_edge/WSFillGrid.cpp (renamed from source/blender/freestyle/src/winged_edge/WSFillGrid.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/winged_edge/WSFillGrid.h (renamed from source/blender/freestyle/src/winged_edge/WSFillGrid.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/winged_edge/WXEdge.cpp (renamed from source/blender/freestyle/src/winged_edge/WXEdge.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/winged_edge/WXEdge.h (renamed from source/blender/freestyle/src/winged_edge/WXEdge.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp (renamed from source/blender/freestyle/src/winged_edge/WXEdgeBuilder.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h (renamed from source/blender/freestyle/src/winged_edge/WXEdgeBuilder.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp (renamed from source/blender/freestyle/src/winged_edge/WingedEdgeBuilder.cpp) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h (renamed from source/blender/freestyle/src/winged_edge/WingedEdgeBuilder.h) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/winged_edge/src.pri (renamed from source/blender/freestyle/src/winged_edge/src.pri) | 0 | ||||
-rwxr-xr-x | source/blender/freestyle/intern/winged_edge/winged_edge.pro (renamed from source/blender/freestyle/src/winged_edge/winged_edge.pro) | 0 | ||||
-rw-r--r-- | source/blender/imbuf/intern/util.c | 2 | ||||
-rw-r--r-- | source/blender/include/BDR_editface.h | 5 | ||||
-rw-r--r-- | source/blender/include/BIF_imasel.h | 1 | ||||
-rw-r--r-- | source/blender/include/BIF_interface.h | 1 | ||||
-rw-r--r-- | source/blender/include/BSE_drawview.h | 2 | ||||
-rw-r--r-- | source/blender/include/BSE_filesel.h | 1 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_particle_types.h | 22 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 11 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 5 | ||||
-rw-r--r-- | source/blender/python/api2_2x/Blender.c | 11 | ||||
-rw-r--r-- | source/blender/python/api2_2x/Material.c | 88 | ||||
-rw-r--r-- | source/blender/python/api2_2x/Sys.c | 28 | ||||
-rw-r--r-- | source/blender/python/api2_2x/doc/Material.py | 12 | ||||
-rw-r--r-- | source/blender/python/api2_2x/doc/Sys.py | 11 | ||||
-rw-r--r-- | source/blender/python/api2_2x/doc/epy_docgen-3.sh | 12 | ||||
-rw-r--r-- | source/blender/python/api2_2x/doc/epy_docgen.sh | 5 | ||||
-rw-r--r-- | source/blender/render/intern/source/envmap.c | 2 | ||||
-rw-r--r-- | source/blender/render/intern/source/rendercore.c | 12 | ||||
-rw-r--r-- | source/blender/render/intern/source/shadeoutput.c | 8 | ||||
-rw-r--r-- | source/blender/src/buttons_editing.c | 4 | ||||
-rw-r--r-- | source/blender/src/buttons_object.c | 18 | ||||
-rw-r--r-- | source/blender/src/drawnla.c | 39 | ||||
-rw-r--r-- | source/blender/src/drawobject.c | 14 | ||||
-rw-r--r-- | source/blender/src/drawview.c | 33 | ||||
-rw-r--r-- | source/blender/src/editface.c | 205 | ||||
-rw-r--r-- | source/blender/src/editmesh_mods.c | 118 | ||||
-rw-r--r-- | source/blender/src/editnla.c | 9 | ||||
-rw-r--r-- | source/blender/src/editobject.c | 27 | ||||
-rw-r--r-- | source/blender/src/filesel.c | 21 | ||||
-rw-r--r-- | source/blender/src/headerbuttons.c | 2 | ||||
-rw-r--r-- | source/blender/src/imasel.c | 23 | ||||
-rw-r--r-- | source/blender/src/interface.c | 60 | ||||
-rw-r--r-- | source/blender/src/interface_draw.c | 8 | ||||
-rw-r--r-- | source/blender/src/space.c | 81 | ||||
-rw-r--r-- | source/blender/src/transform_conversions.c | 4 | ||||
-rw-r--r-- | source/creator/creator.c | 1 | ||||
-rw-r--r-- | source/gameengine/BlenderRoutines/Makefile | 1 | ||||
-rw-r--r-- | source/gameengine/Converter/BL_BlenderDataConversion.cpp | 103 | ||||
-rw-r--r-- | source/gameengine/GamePlayer/Makefile | 2 | ||||
-rw-r--r-- | source/gameengine/GamePlayer/common/Makefile | 1 | ||||
-rw-r--r-- | source/gameengine/GamePlayer/ghost/Makefile | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_CameraActuator.cpp | 15 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_GameObject.cpp | 29 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_GameObject.h | 3 | ||||
-rw-r--r-- | source/gameengine/PyDoc/KX_GameObject.py | 10 | ||||
-rw-r--r-- | source/gameengine/Rasterizer/Makefile | 2 | ||||
-rw-r--r-- | source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile | 1 | ||||
-rw-r--r-- | source/nan_definitions.mk | 6 |
358 files changed, 814 insertions, 407 deletions
diff --git a/source/Makefile b/source/Makefile index e5dffbf532d..5ebff3bbbf5 100644 --- a/source/Makefile +++ b/source/Makefile @@ -315,12 +315,10 @@ ifeq ($(WITH_BF_BLENDERPLAYER), true) endif ifeq ($(WITH_BF_WEBPLUGIN), true) - ifneq ($(NAN_NO_PLUGIN), true) - BINTARGETS += plugin - ifeq ($(OS),linux) - ifeq ($(CPU),i386) - BINTARGETS += xplink - endif + BINTARGETS += plugin + ifeq ($(OS),linux) + ifeq ($(CPU),i386) + BINTARGETS += xplink endif endif endif diff --git a/source/blender/blenkernel/bad_level_call_stubs/stubs.c b/source/blender/blenkernel/bad_level_call_stubs/stubs.c index 291dd70c801..c913820205b 100644 --- a/source/blender/blenkernel/bad_level_call_stubs/stubs.c +++ b/source/blender/blenkernel/bad_level_call_stubs/stubs.c @@ -355,7 +355,7 @@ TimeMarker *get_frame_marker(int frame){return 0;}; /* editseq.c */ Sequence *get_forground_frame_seq(int frame){return 0;}; -void set_last_seq(Sequence *seq){return 0;}; +void set_last_seq(Sequence *seq){}; /* modifier.c stub */ void harmonic_coordinates_bind(struct MeshDeformModifierData *mmd, diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c index c4df1db7627..5fb3d6f869a 100644 --- a/source/blender/blenkernel/intern/action.c +++ b/source/blender/blenkernel/intern/action.c @@ -489,11 +489,11 @@ static float get_actionstrip_frame(bActionStrip *strip, float cframe, int invert { float length, actlength, repeat, scale; - if(strip->repeat == 0.0f) strip->repeat = 1.0f; + if (strip->repeat == 0.0f) strip->repeat = 1.0f; repeat = (strip->flag & ACTSTRIP_USESTRIDE) ? (1.0f) : (strip->repeat); - if(strip->scale == 0.0f) strip->scale= 1.0f; - scale = abs(strip->scale); /* scale must be positive (for now) */ + if (strip->scale == 0.0f) strip->scale= 1.0f; + scale = fabs(strip->scale); /* scale must be positive (for now) */ actlength = strip->actend-strip->actstart; if (actlength == 0.0f) actlength = 1.0f; diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index 230b7080b38..81f496e97d6 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -383,7 +383,8 @@ static void setup_app_data(BlendFileData *bfd, char *filename) /* special cases, override loaded flags: */ if (G.f & G_DEBUG) bfd->globalf |= G_DEBUG; else bfd->globalf &= ~G_DEBUG; - if (!(G.f & G_DOSCRIPTLINKS)) bfd->globalf &= ~G_DOSCRIPTLINKS; + + if ((U.flag & USER_DONT_DOSCRIPTLINKS)) bfd->globalf &= ~G_DOSCRIPTLINKS; G.f= bfd->globalf; diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 88ae02cd418..f60e39769a2 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -1104,9 +1104,9 @@ static void vectomat (float *vec, float *target_up, short axis, short upflag, sh /* identity matrix - don't do anything if the two axes are the same */ else { m[0][0]= m[1][1]= m[2][2]= 1.0; - m[0][1]= m[0][2]= m[0][3]= 0.0; - m[1][0]= m[1][2]= m[1][3]= 0.0; - m[2][0]= m[2][1]= m[2][3]= 0.0; + m[0][1]= m[0][2]= 0.0; + m[1][0]= m[1][2]= 0.0; + m[2][0]= m[2][1]= 0.0; } } diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c index 0b9f7615bfa..321d4f1d37e 100644 --- a/source/blender/blenkernel/intern/ipo.c +++ b/source/blender/blenkernel/intern/ipo.c @@ -1917,6 +1917,9 @@ void set_icu_vars(IpoCurve *icu) icu->ymin= 0.0; break; case PART_CLUMP: + icu->ymin= -1.0; + icu->ymax= 1.0; + break; case PART_DRAG: case PART_DAMP: case PART_LENGTH: @@ -1926,6 +1929,7 @@ void set_icu_vars(IpoCurve *icu) case PART_KINK_SHAPE: icu->ymin= -0.999; icu->ymax= 0.999; + break; } } else if(icu->blocktype==ID_CO) { diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 0cd6035b9dc..2a8ba878c41 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -1506,7 +1506,8 @@ static DerivedMesh *mirrorModifier_applyModifier( result = mirrorModifier__doMirror(mmd, ob, derivedData, 0); - CDDM_calc_normals(result); + if(result != derivedData) + CDDM_calc_normals(result); return result; } @@ -5514,6 +5515,7 @@ static void particleSystemModifier_deformVerts( DerivedMesh *dm = derivedData; ParticleSystemModifierData *psmd= (ParticleSystemModifierData*) md; ParticleSystem * psys=0; + Mesh *me; int needsFree=0; if(ob->particlesystem.first) @@ -5521,6 +5523,14 @@ static void particleSystemModifier_deformVerts( else return; + /* multires check */ + if(ob->type == OB_MESH) { + me= (Mesh*)ob->data; + if(me->mr && me->mr->current != 1) + modifier_setError(md, + "Particles only supported on first multires level."); + } + if(!psys_check_enabled(ob, psys)) return; diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 207ab56de9b..d0152de3091 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -152,6 +152,49 @@ char *psys_menu_string(Object *ob, int for_sb) return str; } + +/* we allocate path cache memory in chunks instead of a big continguous + * chunk, windows' memory allocater fails to find big blocks of memory often */ + +#define PATH_CACHE_BUF_SIZE 1024 + +static ParticleCacheKey **psys_alloc_path_cache_buffers(ListBase *bufs, int tot, int steps) +{ + LinkData *buf; + ParticleCacheKey **cache; + int i, totkey, totbufkey; + + tot= MAX2(tot, 1); + totkey = 0; + cache = MEM_callocN(tot*sizeof(void*), "PathCacheArray"); + + while(totkey < tot) { + totbufkey= MIN2(tot-totkey, PATH_CACHE_BUF_SIZE); + buf= MEM_callocN(sizeof(LinkData), "PathCacheLinkData"); + buf->data= MEM_callocN(sizeof(ParticleCacheKey)*totbufkey*steps, "ParticleCacheKey"); + + for(i=0; i<totbufkey; i++) + cache[totkey+i] = ((ParticleCacheKey*)buf->data) + i*steps; + + totkey += totbufkey; + BLI_addtail(bufs, buf); + } + + return cache; +} + +static void psys_free_path_cache_buffers(ParticleCacheKey **cache, ListBase *bufs) +{ + LinkData *buf; + + if(cache) + MEM_freeN(cache); + + for(buf= bufs->first; buf; buf=buf->next) + MEM_freeN(buf->data); + BLI_freelistN(bufs); +} + /************************************************/ /* Getting stuff */ /************************************************/ @@ -250,10 +293,17 @@ int psys_in_edit_mode(ParticleSystem *psys) int psys_check_enabled(Object *ob, ParticleSystem *psys) { ParticleSystemModifierData *psmd; + Mesh *me; if(psys->flag & PSYS_DISABLED) return 0; + if(ob->type == OB_MESH) { + me= (Mesh*)ob->data; + if(me->mr && me->mr->current != 1) + return 0; + } + psmd= psys_get_modifier(ob, psys); if(psys->renderdata) { if(!(psmd->modifier.mode & eModifierMode_Render)) @@ -299,27 +349,16 @@ void free_keyed_keys(ParticleSystem *psys) } void free_child_path_cache(ParticleSystem *psys) { - if(psys->childcache){ - if(psys->childcache[0]) - MEM_freeN(psys->childcache[0]); - - MEM_freeN(psys->childcache); - - psys->childcache = NULL; - psys->totchildcache = 0; - } + psys_free_path_cache_buffers(psys->childcache, &psys->childcachebufs); + psys->childcache = NULL; + psys->totchildcache = 0; } void psys_free_path_cache(ParticleSystem *psys) { - if(psys->pathcache){ - if(psys->pathcache[0]) - MEM_freeN(psys->pathcache[0]); - - MEM_freeN(psys->pathcache); + psys_free_path_cache_buffers(psys->pathcache, &psys->pathcachebufs); + psys->pathcache= NULL; + psys->totcached= 0; - psys->pathcache = NULL; - psys->totcached = 0; - } free_child_path_cache(psys); } void psys_free_children(ParticleSystem *psys) @@ -2250,10 +2289,9 @@ void psys_cache_child_paths(Object *ob, ParticleSystem *psys, float cfra, int ed ParticleSettings *part = psys->part; ParticleThread *pthreads; ParticleThreadContext *ctx; - ParticleCacheKey **cache, *tcache; + ParticleCacheKey **cache; ListBase threads; int i, totchild, totparent, totthread; - unsigned long totchildstep; pthreads= psys_threads_create(ob, psys); @@ -2272,13 +2310,7 @@ void psys_cache_child_paths(Object *ob, ParticleSystem *psys, float cfra, int ed else { /* clear out old and create new empty path cache */ free_child_path_cache(psys); - - cache = psys->childcache = MEM_callocN(totchild*sizeof(void *), "Child path cache array"); - totchildstep= totchild*(ctx->steps + 1); - tcache = MEM_callocN(totchildstep*sizeof(ParticleCacheKey), "Child path cache"); - for(i=0; i<totchild; i++) - cache[i] = tcache + i * (ctx->steps + 1); - + psys->childcache= psys_alloc_path_cache_buffers(&psys->childcachebufs, totchild, ctx->steps+1); psys->totchildcache = totchild; } @@ -2365,12 +2397,8 @@ void psys_cache_paths(Object *ob, ParticleSystem *psys, float cfra, int editupda else { /* clear out old and create new empty path cache */ psys_free_path_cache(psys); - - /* allocate cache array for fast access and set pointers to contiguous mem block */ - cache = psys->pathcache = MEM_callocN(MAX2(1, totpart) * sizeof(void *), "Path cache array"); - cache[0] = MEM_callocN(totpart * (steps + 1) * sizeof(ParticleCacheKey), "Path cache"); - for(i=1; i<totpart; i++) - cache[i] = cache[0] + i * (steps + 1); + cache= psys_alloc_path_cache_buffers(&psys->pathcachebufs, totpart, steps+1); + psys->pathcache= cache; } if(edit==NULL && psys->soft && psys->softflag & OB_SB_ENABLE) diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 9dd21cdda4e..596c381b896 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -4763,6 +4763,9 @@ static void system_step(Object *ob, ParticleSystem *psys, ParticleSystemModifier psys_update_path_cache(ob,psmd,psys,framenr); } + cache->simframe= framenr; + cache->flag |= PTCACHE_SIMULATION_VALID; + return; } else if(ob->id.lib || (cache->flag & PTCACHE_BAKED)) { diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 007aaf5b48d..e69b2fb0326 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -2615,6 +2615,8 @@ static void direct_link_particlesystems(FileData *fd, ListBase *particles) psys->edit = 0; psys->pathcache = 0; psys->childcache = 0; + psys->pathcachebufs.first = psys->pathcachebufs.last = 0; + psys->childcachebufs.first = psys->childcachebufs.last = 0; psys->reactevents.first = psys->reactevents.last = 0; psys->pointcache= newdataadr(fd, psys->pointcache); diff --git a/source/blender/freestyle/AUTHORS.TXT b/source/blender/freestyle/intern/AUTHORS.TXT index 27cdb70d5ec..27cdb70d5ec 100755 --- a/source/blender/freestyle/AUTHORS.TXT +++ b/source/blender/freestyle/intern/AUTHORS.TXT diff --git a/source/blender/freestyle/BUGS.TXT b/source/blender/freestyle/intern/BUGS.TXT index c5bad029a47..c5bad029a47 100755 --- a/source/blender/freestyle/BUGS.TXT +++ b/source/blender/freestyle/intern/BUGS.TXT diff --git a/source/blender/freestyle/CHANGELOG.TXT b/source/blender/freestyle/intern/CHANGELOG.TXT index cb9f088bc1f..cb9f088bc1f 100755 --- a/source/blender/freestyle/CHANGELOG.TXT +++ b/source/blender/freestyle/intern/CHANGELOG.TXT diff --git a/source/blender/freestyle/COPYRIGHT.TXT b/source/blender/freestyle/intern/COPYRIGHT.TXT index cd37bd16786..cd37bd16786 100755 --- a/source/blender/freestyle/COPYRIGHT.TXT +++ b/source/blender/freestyle/intern/COPYRIGHT.TXT diff --git a/source/blender/freestyle/src/Config.pri b/source/blender/freestyle/intern/Config.pri index 68763dba502..68763dba502 100755 --- a/source/blender/freestyle/src/Config.pri +++ b/source/blender/freestyle/intern/Config.pri diff --git a/source/blender/freestyle/src/Freestyle-vc7-debug.sln b/source/blender/freestyle/intern/Freestyle-vc7-debug.sln index 937f3f9faf9..937f3f9faf9 100755 --- a/source/blender/freestyle/src/Freestyle-vc7-debug.sln +++ b/source/blender/freestyle/intern/Freestyle-vc7-debug.sln diff --git a/source/blender/freestyle/src/Freestyle-vc7-release.sln b/source/blender/freestyle/intern/Freestyle-vc7-release.sln index 74d5dc77f86..74d5dc77f86 100755 --- a/source/blender/freestyle/src/Freestyle-vc7-release.sln +++ b/source/blender/freestyle/intern/Freestyle-vc7-release.sln diff --git a/source/blender/freestyle/src/Freestyle-vc8-debug.sln b/source/blender/freestyle/intern/Freestyle-vc8-debug.sln index 097ca30a174..097ca30a174 100755 --- a/source/blender/freestyle/src/Freestyle-vc8-debug.sln +++ b/source/blender/freestyle/intern/Freestyle-vc8-debug.sln diff --git a/source/blender/freestyle/src/Freestyle-vc8-release.sln b/source/blender/freestyle/intern/Freestyle-vc8-release.sln index 82b22ff0c3e..82b22ff0c3e 100755 --- a/source/blender/freestyle/src/Freestyle-vc8-release.sln +++ b/source/blender/freestyle/intern/Freestyle-vc8-release.sln diff --git a/source/blender/freestyle/INSTALL.TXT b/source/blender/freestyle/intern/INSTALL.TXT index 4fab1275116..4fab1275116 100755 --- a/source/blender/freestyle/INSTALL.TXT +++ b/source/blender/freestyle/intern/INSTALL.TXT diff --git a/source/blender/freestyle/LICENSE.TXT b/source/blender/freestyle/intern/LICENSE.TXT index 5b6e7c66c27..5b6e7c66c27 100755 --- a/source/blender/freestyle/LICENSE.TXT +++ b/source/blender/freestyle/intern/LICENSE.TXT diff --git a/source/blender/freestyle/src/Makefile.pro b/source/blender/freestyle/intern/Makefile.pro index 0e64bb342c3..0e64bb342c3 100755 --- a/source/blender/freestyle/src/Makefile.pro +++ b/source/blender/freestyle/intern/Makefile.pro diff --git a/source/blender/freestyle/README.TXT b/source/blender/freestyle/intern/README.TXT index b0d026c8b9b..b0d026c8b9b 100755 --- a/source/blender/freestyle/README.TXT +++ b/source/blender/freestyle/intern/README.TXT diff --git a/source/blender/freestyle/THANKS.TXT b/source/blender/freestyle/intern/THANKS.TXT index 3147715a63f..3147715a63f 100755 --- a/source/blender/freestyle/THANKS.TXT +++ b/source/blender/freestyle/intern/THANKS.TXT diff --git a/source/blender/freestyle/TODO.TXT b/source/blender/freestyle/intern/TODO.TXT index 2e24752e026..2e24752e026 100755 --- a/source/blender/freestyle/TODO.TXT +++ b/source/blender/freestyle/intern/TODO.TXT diff --git a/source/blender/freestyle/src/app/AppAboutWindow.cpp b/source/blender/freestyle/intern/app/AppAboutWindow.cpp index d20e3f4e1ac..d20e3f4e1ac 100755 --- a/source/blender/freestyle/src/app/AppAboutWindow.cpp +++ b/source/blender/freestyle/intern/app/AppAboutWindow.cpp diff --git a/source/blender/freestyle/src/app/AppAboutWindow.h b/source/blender/freestyle/intern/app/AppAboutWindow.h index ee04d27ae71..ee04d27ae71 100755 --- a/source/blender/freestyle/src/app/AppAboutWindow.h +++ b/source/blender/freestyle/intern/app/AppAboutWindow.h diff --git a/source/blender/freestyle/src/app/AppCanvas.cpp b/source/blender/freestyle/intern/app/AppCanvas.cpp index 60d36880c12..60d36880c12 100755 --- a/source/blender/freestyle/src/app/AppCanvas.cpp +++ b/source/blender/freestyle/intern/app/AppCanvas.cpp diff --git a/source/blender/freestyle/src/app/AppCanvas.h b/source/blender/freestyle/intern/app/AppCanvas.h index 703970c0fb1..703970c0fb1 100755 --- a/source/blender/freestyle/src/app/AppCanvas.h +++ b/source/blender/freestyle/intern/app/AppCanvas.h diff --git a/source/blender/freestyle/src/app/AppConfig.cpp b/source/blender/freestyle/intern/app/AppConfig.cpp index 217f58ee806..217f58ee806 100755 --- a/source/blender/freestyle/src/app/AppConfig.cpp +++ b/source/blender/freestyle/intern/app/AppConfig.cpp diff --git a/source/blender/freestyle/src/app/AppConfig.h b/source/blender/freestyle/intern/app/AppConfig.h index 54e00571275..54e00571275 100755 --- a/source/blender/freestyle/src/app/AppConfig.h +++ b/source/blender/freestyle/intern/app/AppConfig.h diff --git a/source/blender/freestyle/src/app/AppDensityCurvesWindow.cpp b/source/blender/freestyle/intern/app/AppDensityCurvesWindow.cpp index fe2ae994f77..fe2ae994f77 100755 --- a/source/blender/freestyle/src/app/AppDensityCurvesWindow.cpp +++ b/source/blender/freestyle/intern/app/AppDensityCurvesWindow.cpp diff --git a/source/blender/freestyle/src/app/AppDensityCurvesWindow.h b/source/blender/freestyle/intern/app/AppDensityCurvesWindow.h index d7091440e06..d7091440e06 100755 --- a/source/blender/freestyle/src/app/AppDensityCurvesWindow.h +++ b/source/blender/freestyle/intern/app/AppDensityCurvesWindow.h diff --git a/source/blender/freestyle/src/app/AppGL2DCurvesViewer.cpp b/source/blender/freestyle/intern/app/AppGL2DCurvesViewer.cpp index 0915a4c3cbd..0915a4c3cbd 100755 --- a/source/blender/freestyle/src/app/AppGL2DCurvesViewer.cpp +++ b/source/blender/freestyle/intern/app/AppGL2DCurvesViewer.cpp diff --git a/source/blender/freestyle/src/app/AppGL2DCurvesViewer.h b/source/blender/freestyle/intern/app/AppGL2DCurvesViewer.h index c0bb8b4109c..c0bb8b4109c 100755 --- a/source/blender/freestyle/src/app/AppGL2DCurvesViewer.h +++ b/source/blender/freestyle/intern/app/AppGL2DCurvesViewer.h diff --git a/source/blender/freestyle/src/app/AppGLWidget.cpp b/source/blender/freestyle/intern/app/AppGLWidget.cpp index d59ad716c18..d59ad716c18 100755 --- a/source/blender/freestyle/src/app/AppGLWidget.cpp +++ b/source/blender/freestyle/intern/app/AppGLWidget.cpp diff --git a/source/blender/freestyle/src/app/AppGLWidget.h b/source/blender/freestyle/intern/app/AppGLWidget.h index 24bb2c7229b..24bb2c7229b 100755 --- a/source/blender/freestyle/src/app/AppGLWidget.h +++ b/source/blender/freestyle/intern/app/AppGLWidget.h diff --git a/source/blender/freestyle/src/app/AppInteractiveShaderWindow.cpp b/source/blender/freestyle/intern/app/AppInteractiveShaderWindow.cpp index b074c85f9f9..b074c85f9f9 100755 --- a/source/blender/freestyle/src/app/AppInteractiveShaderWindow.cpp +++ b/source/blender/freestyle/intern/app/AppInteractiveShaderWindow.cpp diff --git a/source/blender/freestyle/src/app/AppInteractiveShaderWindow.h b/source/blender/freestyle/intern/app/AppInteractiveShaderWindow.h index 58f2aa1f01a..58f2aa1f01a 100755 --- a/source/blender/freestyle/src/app/AppInteractiveShaderWindow.h +++ b/source/blender/freestyle/intern/app/AppInteractiveShaderWindow.h diff --git a/source/blender/freestyle/src/app/AppMainWindow.cpp b/source/blender/freestyle/intern/app/AppMainWindow.cpp index 03b4f3a28ea..03b4f3a28ea 100755 --- a/source/blender/freestyle/src/app/AppMainWindow.cpp +++ b/source/blender/freestyle/intern/app/AppMainWindow.cpp diff --git a/source/blender/freestyle/src/app/AppMainWindow.h b/source/blender/freestyle/intern/app/AppMainWindow.h index 750283f85ba..750283f85ba 100755 --- a/source/blender/freestyle/src/app/AppMainWindow.h +++ b/source/blender/freestyle/intern/app/AppMainWindow.h diff --git a/source/blender/freestyle/src/app/AppOptionsWindow.cpp b/source/blender/freestyle/intern/app/AppOptionsWindow.cpp index 6c3dc9a83aa..6c3dc9a83aa 100755 --- a/source/blender/freestyle/src/app/AppOptionsWindow.cpp +++ b/source/blender/freestyle/intern/app/AppOptionsWindow.cpp diff --git a/source/blender/freestyle/src/app/AppOptionsWindow.h b/source/blender/freestyle/intern/app/AppOptionsWindow.h index aaa964739a6..aaa964739a6 100755 --- a/source/blender/freestyle/src/app/AppOptionsWindow.h +++ b/source/blender/freestyle/intern/app/AppOptionsWindow.h diff --git a/source/blender/freestyle/src/app/AppProgressBar.cpp b/source/blender/freestyle/intern/app/AppProgressBar.cpp index a4d18d07dd3..a4d18d07dd3 100755 --- a/source/blender/freestyle/src/app/AppProgressBar.cpp +++ b/source/blender/freestyle/intern/app/AppProgressBar.cpp diff --git a/source/blender/freestyle/src/app/AppProgressBar.h b/source/blender/freestyle/intern/app/AppProgressBar.h index 09cc500a981..09cc500a981 100755 --- a/source/blender/freestyle/src/app/AppProgressBar.h +++ b/source/blender/freestyle/intern/app/AppProgressBar.h diff --git a/source/blender/freestyle/src/app/AppStyleWindow.cpp b/source/blender/freestyle/intern/app/AppStyleWindow.cpp index d8be753b498..d8be753b498 100755 --- a/source/blender/freestyle/src/app/AppStyleWindow.cpp +++ b/source/blender/freestyle/intern/app/AppStyleWindow.cpp diff --git a/source/blender/freestyle/src/app/AppStyleWindow.h b/source/blender/freestyle/intern/app/AppStyleWindow.h index a9339abf9c8..a9339abf9c8 100755 --- a/source/blender/freestyle/src/app/AppStyleWindow.h +++ b/source/blender/freestyle/intern/app/AppStyleWindow.h diff --git a/source/blender/freestyle/src/app/ConfigIO.cpp b/source/blender/freestyle/intern/app/ConfigIO.cpp index 8165deb07fd..8165deb07fd 100755 --- a/source/blender/freestyle/src/app/ConfigIO.cpp +++ b/source/blender/freestyle/intern/app/ConfigIO.cpp diff --git a/source/blender/freestyle/src/app/ConfigIO.h b/source/blender/freestyle/intern/app/ConfigIO.h index 15f3cd07575..15f3cd07575 100755 --- a/source/blender/freestyle/src/app/ConfigIO.h +++ b/source/blender/freestyle/intern/app/ConfigIO.h diff --git a/source/blender/freestyle/src/app/Controller.cpp b/source/blender/freestyle/intern/app/Controller.cpp index ac41b31ac78..ac41b31ac78 100755 --- a/source/blender/freestyle/src/app/Controller.cpp +++ b/source/blender/freestyle/intern/app/Controller.cpp diff --git a/source/blender/freestyle/src/app/Controller.h b/source/blender/freestyle/intern/app/Controller.h index 95b97ebcda3..95b97ebcda3 100755 --- a/source/blender/freestyle/src/app/Controller.h +++ b/source/blender/freestyle/intern/app/Controller.h diff --git a/source/blender/freestyle/src/app/Main.cpp b/source/blender/freestyle/intern/app/Main.cpp index ae4d28017c5..ae4d28017c5 100755 --- a/source/blender/freestyle/src/app/Main.cpp +++ b/source/blender/freestyle/intern/app/Main.cpp diff --git a/source/blender/freestyle/src/app/QGLBasicWidget.cpp b/source/blender/freestyle/intern/app/QGLBasicWidget.cpp index 44b5e0de224..44b5e0de224 100755 --- a/source/blender/freestyle/src/app/QGLBasicWidget.cpp +++ b/source/blender/freestyle/intern/app/QGLBasicWidget.cpp diff --git a/source/blender/freestyle/src/app/QGLBasicWidget.h b/source/blender/freestyle/intern/app/QGLBasicWidget.h index 9b29a641f28..9b29a641f28 100755 --- a/source/blender/freestyle/src/app/QGLBasicWidget.h +++ b/source/blender/freestyle/intern/app/QGLBasicWidget.h diff --git a/source/blender/freestyle/src/app/QStyleModuleSyntaxHighlighter.cpp b/source/blender/freestyle/intern/app/QStyleModuleSyntaxHighlighter.cpp index 16ea53f157c..16ea53f157c 100755 --- a/source/blender/freestyle/src/app/QStyleModuleSyntaxHighlighter.cpp +++ b/source/blender/freestyle/intern/app/QStyleModuleSyntaxHighlighter.cpp diff --git a/source/blender/freestyle/src/app/QStyleModuleSyntaxHighlighter.h b/source/blender/freestyle/intern/app/QStyleModuleSyntaxHighlighter.h index ff3591ac45d..ff3591ac45d 100755 --- a/source/blender/freestyle/src/app/QStyleModuleSyntaxHighlighter.h +++ b/source/blender/freestyle/intern/app/QStyleModuleSyntaxHighlighter.h diff --git a/source/blender/freestyle/src/app/app.pro b/source/blender/freestyle/intern/app/app.pro index e2ba9aec6f7..e2ba9aec6f7 100755 --- a/source/blender/freestyle/src/app/app.pro +++ b/source/blender/freestyle/intern/app/app.pro diff --git a/source/blender/freestyle/src/app/appmainwindowbase4.ui b/source/blender/freestyle/intern/app/appmainwindowbase4.ui index 13e758d49dd..13e758d49dd 100755 --- a/source/blender/freestyle/src/app/appmainwindowbase4.ui +++ b/source/blender/freestyle/intern/app/appmainwindowbase4.ui diff --git a/source/blender/freestyle/src/app/densitycurveswindow4.ui b/source/blender/freestyle/intern/app/densitycurveswindow4.ui index 1a35e3247d1..1a35e3247d1 100755 --- a/source/blender/freestyle/src/app/densitycurveswindow4.ui +++ b/source/blender/freestyle/intern/app/densitycurveswindow4.ui diff --git a/source/blender/freestyle/src/app/freestyle.qrc b/source/blender/freestyle/intern/app/freestyle.qrc index b37a6702af6..b37a6702af6 100755 --- a/source/blender/freestyle/src/app/freestyle.qrc +++ b/source/blender/freestyle/intern/app/freestyle.qrc diff --git a/source/blender/freestyle/src/app/icons/add.png b/source/blender/freestyle/intern/app/icons/add.png Binary files differindex d3388dcb3a9..d3388dcb3a9 100755 --- a/source/blender/freestyle/src/app/icons/add.png +++ b/source/blender/freestyle/intern/app/icons/add.png diff --git a/source/blender/freestyle/src/app/icons/arrow_down.png b/source/blender/freestyle/intern/app/icons/arrow_down.png Binary files differindex 6cf2e9bba26..6cf2e9bba26 100755 --- a/source/blender/freestyle/src/app/icons/arrow_down.png +++ b/source/blender/freestyle/intern/app/icons/arrow_down.png diff --git a/source/blender/freestyle/src/app/icons/arrow_left.png b/source/blender/freestyle/intern/app/icons/arrow_left.png Binary files differindex 72a5c462af6..72a5c462af6 100755 --- a/source/blender/freestyle/src/app/icons/arrow_left.png +++ b/source/blender/freestyle/intern/app/icons/arrow_left.png diff --git a/source/blender/freestyle/src/app/icons/arrow_right.png b/source/blender/freestyle/intern/app/icons/arrow_right.png Binary files differindex f7e5c3b37e3..f7e5c3b37e3 100755 --- a/source/blender/freestyle/src/app/icons/arrow_right.png +++ b/source/blender/freestyle/intern/app/icons/arrow_right.png diff --git a/source/blender/freestyle/src/app/icons/arrow_up.png b/source/blender/freestyle/intern/app/icons/arrow_up.png Binary files differindex 993a574b15a..993a574b15a 100755 --- a/source/blender/freestyle/src/app/icons/arrow_up.png +++ b/source/blender/freestyle/intern/app/icons/arrow_up.png diff --git a/source/blender/freestyle/src/app/icons/clear.png b/source/blender/freestyle/intern/app/icons/clear.png Binary files differindex 1e3b2e37bd9..1e3b2e37bd9 100755 --- a/source/blender/freestyle/src/app/icons/clear.png +++ b/source/blender/freestyle/intern/app/icons/clear.png diff --git a/source/blender/freestyle/src/app/icons/close.png b/source/blender/freestyle/intern/app/icons/close.png Binary files differindex 2042ec3d1ba..2042ec3d1ba 100755 --- a/source/blender/freestyle/src/app/icons/close.png +++ b/source/blender/freestyle/intern/app/icons/close.png diff --git a/source/blender/freestyle/src/app/icons/edit.png b/source/blender/freestyle/intern/app/icons/edit.png Binary files differindex 244751b1933..244751b1933 100755 --- a/source/blender/freestyle/src/app/icons/edit.png +++ b/source/blender/freestyle/intern/app/icons/edit.png diff --git a/source/blender/freestyle/src/app/icons/eye0.png b/source/blender/freestyle/intern/app/icons/eye0.png Binary files differindex 5f6d873cb0c..5f6d873cb0c 100755 --- a/source/blender/freestyle/src/app/icons/eye0.png +++ b/source/blender/freestyle/intern/app/icons/eye0.png diff --git a/source/blender/freestyle/src/app/icons/eye1.png b/source/blender/freestyle/intern/app/icons/eye1.png Binary files differindex f762b66b482..f762b66b482 100755 --- a/source/blender/freestyle/src/app/icons/eye1.png +++ b/source/blender/freestyle/intern/app/icons/eye1.png diff --git a/source/blender/freestyle/src/app/icons/folder.png b/source/blender/freestyle/intern/app/icons/folder.png Binary files differindex 3a99ad5ee92..3a99ad5ee92 100755 --- a/source/blender/freestyle/src/app/icons/folder.png +++ b/source/blender/freestyle/intern/app/icons/folder.png diff --git a/source/blender/freestyle/src/app/icons/home.png b/source/blender/freestyle/intern/app/icons/home.png Binary files differindex ec4b22098b2..ec4b22098b2 100755 --- a/source/blender/freestyle/src/app/icons/home.png +++ b/source/blender/freestyle/intern/app/icons/home.png diff --git a/source/blender/freestyle/src/app/icons/mod0.png b/source/blender/freestyle/intern/app/icons/mod0.png Binary files differindex 816d814528a..816d814528a 100755 --- a/source/blender/freestyle/src/app/icons/mod0.png +++ b/source/blender/freestyle/intern/app/icons/mod0.png diff --git a/source/blender/freestyle/src/app/icons/mod1.png b/source/blender/freestyle/intern/app/icons/mod1.png Binary files differindex c7c66183800..c7c66183800 100755 --- a/source/blender/freestyle/src/app/icons/mod1.png +++ b/source/blender/freestyle/intern/app/icons/mod1.png diff --git a/source/blender/freestyle/src/app/icons/ok.png b/source/blender/freestyle/intern/app/icons/ok.png Binary files differindex 31c064ba922..31c064ba922 100755 --- a/source/blender/freestyle/src/app/icons/ok.png +++ b/source/blender/freestyle/intern/app/icons/ok.png diff --git a/source/blender/freestyle/src/app/icons/reload.png b/source/blender/freestyle/intern/app/icons/reload.png Binary files differindex d26c280f1ac..d26c280f1ac 100755 --- a/source/blender/freestyle/src/app/icons/reload.png +++ b/source/blender/freestyle/intern/app/icons/reload.png diff --git a/source/blender/freestyle/src/app/icons/remove.png b/source/blender/freestyle/intern/app/icons/remove.png Binary files differindex 86d8c38a7f8..86d8c38a7f8 100755 --- a/source/blender/freestyle/src/app/icons/remove.png +++ b/source/blender/freestyle/intern/app/icons/remove.png diff --git a/source/blender/freestyle/src/app/icons/save.png b/source/blender/freestyle/intern/app/icons/save.png Binary files differindex 932100d98e9..932100d98e9 100755 --- a/source/blender/freestyle/src/app/icons/save.png +++ b/source/blender/freestyle/intern/app/icons/save.png diff --git a/source/blender/freestyle/src/app/icons/save_as.png b/source/blender/freestyle/intern/app/icons/save_as.png Binary files differindex 2c8b3f3e7b4..2c8b3f3e7b4 100755 --- a/source/blender/freestyle/src/app/icons/save_as.png +++ b/source/blender/freestyle/intern/app/icons/save_as.png diff --git a/source/blender/freestyle/src/app/interactiveshaderwindow4.ui b/source/blender/freestyle/intern/app/interactiveshaderwindow4.ui index e17442ad43e..e17442ad43e 100755 --- a/source/blender/freestyle/src/app/interactiveshaderwindow4.ui +++ b/source/blender/freestyle/intern/app/interactiveshaderwindow4.ui diff --git a/source/blender/freestyle/src/app/optionswindow4.ui b/source/blender/freestyle/intern/app/optionswindow4.ui index 48c322c6d84..48c322c6d84 100755 --- a/source/blender/freestyle/src/app/optionswindow4.ui +++ b/source/blender/freestyle/intern/app/optionswindow4.ui diff --git a/source/blender/freestyle/src/app/progressdialog4.ui b/source/blender/freestyle/intern/app/progressdialog4.ui index 78cc67ed440..78cc67ed440 100755 --- a/source/blender/freestyle/src/app/progressdialog4.ui +++ b/source/blender/freestyle/intern/app/progressdialog4.ui diff --git a/source/blender/freestyle/src/app/src.pri b/source/blender/freestyle/intern/app/src.pri index 2fcc9146216..2fcc9146216 100755 --- a/source/blender/freestyle/src/app/src.pri +++ b/source/blender/freestyle/intern/app/src.pri diff --git a/source/blender/freestyle/src/app/stylewindow4.ui b/source/blender/freestyle/intern/app/stylewindow4.ui index c4ff5f656ae..c4ff5f656ae 100755 --- a/source/blender/freestyle/src/app/stylewindow4.ui +++ b/source/blender/freestyle/intern/app/stylewindow4.ui diff --git a/source/blender/freestyle/src/build_bundle.macosx.py b/source/blender/freestyle/intern/build_bundle.macosx.py index e97153f269c..e97153f269c 100755 --- a/source/blender/freestyle/src/build_bundle.macosx.py +++ b/source/blender/freestyle/intern/build_bundle.macosx.py diff --git a/source/blender/freestyle/src/geometry/BBox.h b/source/blender/freestyle/intern/geometry/BBox.h index 9c46d7918e2..9c46d7918e2 100755 --- a/source/blender/freestyle/src/geometry/BBox.h +++ b/source/blender/freestyle/intern/geometry/BBox.h diff --git a/source/blender/freestyle/src/geometry/Bezier.cpp b/source/blender/freestyle/intern/geometry/Bezier.cpp index 8f9771f29d3..8f9771f29d3 100755 --- a/source/blender/freestyle/src/geometry/Bezier.cpp +++ b/source/blender/freestyle/intern/geometry/Bezier.cpp diff --git a/source/blender/freestyle/src/geometry/Bezier.h b/source/blender/freestyle/intern/geometry/Bezier.h index acae71bbb2c..acae71bbb2c 100755 --- a/source/blender/freestyle/src/geometry/Bezier.h +++ b/source/blender/freestyle/intern/geometry/Bezier.h diff --git a/source/blender/freestyle/src/geometry/FastGrid.cpp b/source/blender/freestyle/intern/geometry/FastGrid.cpp index b090a3df67f..b090a3df67f 100755 --- a/source/blender/freestyle/src/geometry/FastGrid.cpp +++ b/source/blender/freestyle/intern/geometry/FastGrid.cpp diff --git a/source/blender/freestyle/src/geometry/FastGrid.h b/source/blender/freestyle/intern/geometry/FastGrid.h index e620ff24385..e620ff24385 100755 --- a/source/blender/freestyle/src/geometry/FastGrid.h +++ b/source/blender/freestyle/intern/geometry/FastGrid.h diff --git a/source/blender/freestyle/src/geometry/FitCurve.cpp b/source/blender/freestyle/intern/geometry/FitCurve.cpp index ade40b050ca..ade40b050ca 100755 --- a/source/blender/freestyle/src/geometry/FitCurve.cpp +++ b/source/blender/freestyle/intern/geometry/FitCurve.cpp diff --git a/source/blender/freestyle/src/geometry/FitCurve.h b/source/blender/freestyle/intern/geometry/FitCurve.h index ed7cbe34780..ed7cbe34780 100755 --- a/source/blender/freestyle/src/geometry/FitCurve.h +++ b/source/blender/freestyle/intern/geometry/FitCurve.h diff --git a/source/blender/freestyle/src/geometry/Geom.h b/source/blender/freestyle/intern/geometry/Geom.h index ac94213fe98..ac94213fe98 100755 --- a/source/blender/freestyle/src/geometry/Geom.h +++ b/source/blender/freestyle/intern/geometry/Geom.h diff --git a/source/blender/freestyle/src/geometry/GeomCleaner.cpp b/source/blender/freestyle/intern/geometry/GeomCleaner.cpp index c148c521a46..c148c521a46 100755 --- a/source/blender/freestyle/src/geometry/GeomCleaner.cpp +++ b/source/blender/freestyle/intern/geometry/GeomCleaner.cpp diff --git a/source/blender/freestyle/src/geometry/GeomCleaner.h b/source/blender/freestyle/intern/geometry/GeomCleaner.h index d78d90ccb4a..d78d90ccb4a 100755 --- a/source/blender/freestyle/src/geometry/GeomCleaner.h +++ b/source/blender/freestyle/intern/geometry/GeomCleaner.h diff --git a/source/blender/freestyle/src/geometry/GeomUtils.cpp b/source/blender/freestyle/intern/geometry/GeomUtils.cpp index fd36e81ca77..fd36e81ca77 100755 --- a/source/blender/freestyle/src/geometry/GeomUtils.cpp +++ b/source/blender/freestyle/intern/geometry/GeomUtils.cpp diff --git a/source/blender/freestyle/src/geometry/GeomUtils.h b/source/blender/freestyle/intern/geometry/GeomUtils.h index 53c94c22f8b..53c94c22f8b 100755 --- a/source/blender/freestyle/src/geometry/GeomUtils.h +++ b/source/blender/freestyle/intern/geometry/GeomUtils.h diff --git a/source/blender/freestyle/src/geometry/Grid.cpp b/source/blender/freestyle/intern/geometry/Grid.cpp index 59b730358bc..59b730358bc 100755 --- a/source/blender/freestyle/src/geometry/Grid.cpp +++ b/source/blender/freestyle/intern/geometry/Grid.cpp diff --git a/source/blender/freestyle/src/geometry/Grid.h b/source/blender/freestyle/intern/geometry/Grid.h index 6197721bb45..6197721bb45 100755 --- a/source/blender/freestyle/src/geometry/Grid.h +++ b/source/blender/freestyle/intern/geometry/Grid.h diff --git a/source/blender/freestyle/src/geometry/HashGrid.cpp b/source/blender/freestyle/intern/geometry/HashGrid.cpp index 3cf845d57ef..3cf845d57ef 100755 --- a/source/blender/freestyle/src/geometry/HashGrid.cpp +++ b/source/blender/freestyle/intern/geometry/HashGrid.cpp diff --git a/source/blender/freestyle/src/geometry/HashGrid.h b/source/blender/freestyle/intern/geometry/HashGrid.h index f6605957676..f6605957676 100755 --- a/source/blender/freestyle/src/geometry/HashGrid.h +++ b/source/blender/freestyle/intern/geometry/HashGrid.h diff --git a/source/blender/freestyle/src/geometry/Noise.cpp b/source/blender/freestyle/intern/geometry/Noise.cpp index 396fc3bbb47..396fc3bbb47 100755 --- a/source/blender/freestyle/src/geometry/Noise.cpp +++ b/source/blender/freestyle/intern/geometry/Noise.cpp diff --git a/source/blender/freestyle/src/geometry/Noise.h b/source/blender/freestyle/intern/geometry/Noise.h index 00cebbb451e..00cebbb451e 100755 --- a/source/blender/freestyle/src/geometry/Noise.h +++ b/source/blender/freestyle/intern/geometry/Noise.h diff --git a/source/blender/freestyle/src/geometry/Polygon.h b/source/blender/freestyle/intern/geometry/Polygon.h index f9c4c78d424..f9c4c78d424 100755 --- a/source/blender/freestyle/src/geometry/Polygon.h +++ b/source/blender/freestyle/intern/geometry/Polygon.h diff --git a/source/blender/freestyle/src/geometry/SweepLine.h b/source/blender/freestyle/intern/geometry/SweepLine.h index e3fb4ad8c0c..e3fb4ad8c0c 100755 --- a/source/blender/freestyle/src/geometry/SweepLine.h +++ b/source/blender/freestyle/intern/geometry/SweepLine.h diff --git a/source/blender/freestyle/src/geometry/VecMat.h b/source/blender/freestyle/intern/geometry/VecMat.h index 9bbec3b1349..9bbec3b1349 100755 --- a/source/blender/freestyle/src/geometry/VecMat.h +++ b/source/blender/freestyle/intern/geometry/VecMat.h diff --git a/source/blender/freestyle/src/geometry/geometry.pro b/source/blender/freestyle/intern/geometry/geometry.pro index a63aa6483b4..a63aa6483b4 100755 --- a/source/blender/freestyle/src/geometry/geometry.pro +++ b/source/blender/freestyle/intern/geometry/geometry.pro diff --git a/source/blender/freestyle/src/geometry/matrix_util.cpp b/source/blender/freestyle/intern/geometry/matrix_util.cpp index 2117b06e62f..2117b06e62f 100755 --- a/source/blender/freestyle/src/geometry/matrix_util.cpp +++ b/source/blender/freestyle/intern/geometry/matrix_util.cpp diff --git a/source/blender/freestyle/src/geometry/matrix_util.h b/source/blender/freestyle/intern/geometry/matrix_util.h index a990413c403..a990413c403 100755 --- a/source/blender/freestyle/src/geometry/matrix_util.h +++ b/source/blender/freestyle/intern/geometry/matrix_util.h diff --git a/source/blender/freestyle/src/geometry/normal_cycle.cpp b/source/blender/freestyle/intern/geometry/normal_cycle.cpp index b456ced8331..b456ced8331 100755 --- a/source/blender/freestyle/src/geometry/normal_cycle.cpp +++ b/source/blender/freestyle/intern/geometry/normal_cycle.cpp diff --git a/source/blender/freestyle/src/geometry/normal_cycle.h b/source/blender/freestyle/intern/geometry/normal_cycle.h index 41fbf7b3fab..41fbf7b3fab 100755 --- a/source/blender/freestyle/src/geometry/normal_cycle.h +++ b/source/blender/freestyle/intern/geometry/normal_cycle.h diff --git a/source/blender/freestyle/src/geometry/src.pri b/source/blender/freestyle/intern/geometry/src.pri index a35760fe892..a35760fe892 100755 --- a/source/blender/freestyle/src/geometry/src.pri +++ b/source/blender/freestyle/intern/geometry/src.pri diff --git a/source/blender/freestyle/src/image/GaussianFilter.cpp b/source/blender/freestyle/intern/image/GaussianFilter.cpp index 97c2aedc62e..97c2aedc62e 100755 --- a/source/blender/freestyle/src/image/GaussianFilter.cpp +++ b/source/blender/freestyle/intern/image/GaussianFilter.cpp diff --git a/source/blender/freestyle/src/image/GaussianFilter.h b/source/blender/freestyle/intern/image/GaussianFilter.h index c75177541d3..c75177541d3 100755 --- a/source/blender/freestyle/src/image/GaussianFilter.h +++ b/source/blender/freestyle/intern/image/GaussianFilter.h diff --git a/source/blender/freestyle/src/image/Image.h b/source/blender/freestyle/intern/image/Image.h index 83d6785e32f..83d6785e32f 100755 --- a/source/blender/freestyle/src/image/Image.h +++ b/source/blender/freestyle/intern/image/Image.h diff --git a/source/blender/freestyle/src/image/ImagePyramid.cpp b/source/blender/freestyle/intern/image/ImagePyramid.cpp index 45c02004d1c..45c02004d1c 100755 --- a/source/blender/freestyle/src/image/ImagePyramid.cpp +++ b/source/blender/freestyle/intern/image/ImagePyramid.cpp diff --git a/source/blender/freestyle/src/image/ImagePyramid.h b/source/blender/freestyle/intern/image/ImagePyramid.h index 9e326757f02..9e326757f02 100755 --- a/source/blender/freestyle/src/image/ImagePyramid.h +++ b/source/blender/freestyle/intern/image/ImagePyramid.h diff --git a/source/blender/freestyle/src/image/image.pro b/source/blender/freestyle/intern/image/image.pro index 133b6cf4f35..133b6cf4f35 100755 --- a/source/blender/freestyle/src/image/image.pro +++ b/source/blender/freestyle/intern/image/image.pro diff --git a/source/blender/freestyle/src/image/src.pri b/source/blender/freestyle/intern/image/src.pri index c047929b49f..c047929b49f 100755 --- a/source/blender/freestyle/src/image/src.pri +++ b/source/blender/freestyle/intern/image/src.pri diff --git a/source/blender/freestyle/src/libconfig.pri b/source/blender/freestyle/intern/libconfig.pri index 6fec8878694..6fec8878694 100755 --- a/source/blender/freestyle/src/libconfig.pri +++ b/source/blender/freestyle/intern/libconfig.pri diff --git a/source/blender/freestyle/src/makedsp.vcnet.debug.bat b/source/blender/freestyle/intern/makedsp.vcnet.debug.bat index e19ca52b4f7..e19ca52b4f7 100755 --- a/source/blender/freestyle/src/makedsp.vcnet.debug.bat +++ b/source/blender/freestyle/intern/makedsp.vcnet.debug.bat diff --git a/source/blender/freestyle/src/makedsp.vcnet.release.bat b/source/blender/freestyle/intern/makedsp.vcnet.release.bat index 3050a2fe4ea..3050a2fe4ea 100755 --- a/source/blender/freestyle/src/makedsp.vcnet.release.bat +++ b/source/blender/freestyle/intern/makedsp.vcnet.release.bat diff --git a/source/blender/freestyle/src/rendering/GLBBoxRenderer.cpp b/source/blender/freestyle/intern/rendering/GLBBoxRenderer.cpp index 464779d6a43..464779d6a43 100755 --- a/source/blender/freestyle/src/rendering/GLBBoxRenderer.cpp +++ b/source/blender/freestyle/intern/rendering/GLBBoxRenderer.cpp diff --git a/source/blender/freestyle/src/rendering/GLBBoxRenderer.h b/source/blender/freestyle/intern/rendering/GLBBoxRenderer.h index 4bb72ba80b0..4bb72ba80b0 100755 --- a/source/blender/freestyle/src/rendering/GLBBoxRenderer.h +++ b/source/blender/freestyle/intern/rendering/GLBBoxRenderer.h diff --git a/source/blender/freestyle/src/rendering/GLDebugRenderer.cpp b/source/blender/freestyle/intern/rendering/GLDebugRenderer.cpp index b396a0ce6d3..b396a0ce6d3 100755 --- a/source/blender/freestyle/src/rendering/GLDebugRenderer.cpp +++ b/source/blender/freestyle/intern/rendering/GLDebugRenderer.cpp diff --git a/source/blender/freestyle/src/rendering/GLDebugRenderer.h b/source/blender/freestyle/intern/rendering/GLDebugRenderer.h index abf76d079da..abf76d079da 100755 --- a/source/blender/freestyle/src/rendering/GLDebugRenderer.h +++ b/source/blender/freestyle/intern/rendering/GLDebugRenderer.h diff --git a/source/blender/freestyle/src/rendering/GLFreeMemoryVisitor.cpp b/source/blender/freestyle/intern/rendering/GLFreeMemoryVisitor.cpp index b5a835f5104..b5a835f5104 100644 --- a/source/blender/freestyle/src/rendering/GLFreeMemoryVisitor.cpp +++ b/source/blender/freestyle/intern/rendering/GLFreeMemoryVisitor.cpp diff --git a/source/blender/freestyle/src/rendering/GLFreeMemoryVisitor.h b/source/blender/freestyle/intern/rendering/GLFreeMemoryVisitor.h index dd6412b1bb7..dd6412b1bb7 100644 --- a/source/blender/freestyle/src/rendering/GLFreeMemoryVisitor.h +++ b/source/blender/freestyle/intern/rendering/GLFreeMemoryVisitor.h diff --git a/source/blender/freestyle/src/rendering/GLMonoColorRenderer.cpp b/source/blender/freestyle/intern/rendering/GLMonoColorRenderer.cpp index 792846fa020..792846fa020 100755 --- a/source/blender/freestyle/src/rendering/GLMonoColorRenderer.cpp +++ b/source/blender/freestyle/intern/rendering/GLMonoColorRenderer.cpp diff --git a/source/blender/freestyle/src/rendering/GLMonoColorRenderer.h b/source/blender/freestyle/intern/rendering/GLMonoColorRenderer.h index d8e3cf536ec..d8e3cf536ec 100755 --- a/source/blender/freestyle/src/rendering/GLMonoColorRenderer.h +++ b/source/blender/freestyle/intern/rendering/GLMonoColorRenderer.h diff --git a/source/blender/freestyle/src/rendering/GLRenderer.cpp b/source/blender/freestyle/intern/rendering/GLRenderer.cpp index d566060dfc7..d566060dfc7 100755 --- a/source/blender/freestyle/src/rendering/GLRenderer.cpp +++ b/source/blender/freestyle/intern/rendering/GLRenderer.cpp diff --git a/source/blender/freestyle/src/rendering/GLRenderer.h b/source/blender/freestyle/intern/rendering/GLRenderer.h index ddbf082038b..ddbf082038b 100755 --- a/source/blender/freestyle/src/rendering/GLRenderer.h +++ b/source/blender/freestyle/intern/rendering/GLRenderer.h diff --git a/source/blender/freestyle/src/rendering/GLSelectRenderer.cpp b/source/blender/freestyle/intern/rendering/GLSelectRenderer.cpp index b4a2406c644..b4a2406c644 100755 --- a/source/blender/freestyle/src/rendering/GLSelectRenderer.cpp +++ b/source/blender/freestyle/intern/rendering/GLSelectRenderer.cpp diff --git a/source/blender/freestyle/src/rendering/GLSelectRenderer.h b/source/blender/freestyle/intern/rendering/GLSelectRenderer.h index bf8a334aebb..bf8a334aebb 100755 --- a/source/blender/freestyle/src/rendering/GLSelectRenderer.h +++ b/source/blender/freestyle/intern/rendering/GLSelectRenderer.h diff --git a/source/blender/freestyle/src/rendering/GLStrokeRenderer.cpp b/source/blender/freestyle/intern/rendering/GLStrokeRenderer.cpp index 7525807da47..7525807da47 100755 --- a/source/blender/freestyle/src/rendering/GLStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/rendering/GLStrokeRenderer.cpp diff --git a/source/blender/freestyle/src/rendering/GLStrokeRenderer.h b/source/blender/freestyle/intern/rendering/GLStrokeRenderer.h index bef95996444..bef95996444 100755 --- a/source/blender/freestyle/src/rendering/GLStrokeRenderer.h +++ b/source/blender/freestyle/intern/rendering/GLStrokeRenderer.h diff --git a/source/blender/freestyle/src/rendering/GLUtils.cpp b/source/blender/freestyle/intern/rendering/GLUtils.cpp index 5e9ba2a5bf4..5e9ba2a5bf4 100755 --- a/source/blender/freestyle/src/rendering/GLUtils.cpp +++ b/source/blender/freestyle/intern/rendering/GLUtils.cpp diff --git a/source/blender/freestyle/src/rendering/GLUtils.h b/source/blender/freestyle/intern/rendering/GLUtils.h index 453b3f31259..453b3f31259 100755 --- a/source/blender/freestyle/src/rendering/GLUtils.h +++ b/source/blender/freestyle/intern/rendering/GLUtils.h diff --git a/source/blender/freestyle/src/rendering/GLXOffscreenViewer.cpp b/source/blender/freestyle/intern/rendering/GLXOffscreenViewer.cpp index 7135cedd7ad..7135cedd7ad 100755 --- a/source/blender/freestyle/src/rendering/GLXOffscreenViewer.cpp +++ b/source/blender/freestyle/intern/rendering/GLXOffscreenViewer.cpp diff --git a/source/blender/freestyle/src/rendering/GLXOffscreenViewer.h b/source/blender/freestyle/intern/rendering/GLXOffscreenViewer.h index c09a23f500b..c09a23f500b 100755 --- a/source/blender/freestyle/src/rendering/GLXOffscreenViewer.h +++ b/source/blender/freestyle/intern/rendering/GLXOffscreenViewer.h diff --git a/source/blender/freestyle/src/rendering/extgl.cpp b/source/blender/freestyle/intern/rendering/extgl.cpp index d7207f21299..d7207f21299 100755 --- a/source/blender/freestyle/src/rendering/extgl.cpp +++ b/source/blender/freestyle/intern/rendering/extgl.cpp diff --git a/source/blender/freestyle/src/rendering/extgl.h b/source/blender/freestyle/intern/rendering/extgl.h index 68c13dea3d2..68c13dea3d2 100755 --- a/source/blender/freestyle/src/rendering/extgl.h +++ b/source/blender/freestyle/intern/rendering/extgl.h diff --git a/source/blender/freestyle/src/rendering/pbuffer.cpp b/source/blender/freestyle/intern/rendering/pbuffer.cpp index ec73fc52ae4..ec73fc52ae4 100755 --- a/source/blender/freestyle/src/rendering/pbuffer.cpp +++ b/source/blender/freestyle/intern/rendering/pbuffer.cpp diff --git a/source/blender/freestyle/src/rendering/pbuffer.h b/source/blender/freestyle/intern/rendering/pbuffer.h index 7f11f461b1c..7f11f461b1c 100755 --- a/source/blender/freestyle/src/rendering/pbuffer.h +++ b/source/blender/freestyle/intern/rendering/pbuffer.h diff --git a/source/blender/freestyle/src/rendering/rendering.pro b/source/blender/freestyle/intern/rendering/rendering.pro index 0bbca195b6b..0bbca195b6b 100755 --- a/source/blender/freestyle/src/rendering/rendering.pro +++ b/source/blender/freestyle/intern/rendering/rendering.pro diff --git a/source/blender/freestyle/src/rendering/src.pri b/source/blender/freestyle/intern/rendering/src.pri index aee4cdb2782..aee4cdb2782 100755 --- a/source/blender/freestyle/src/rendering/src.pri +++ b/source/blender/freestyle/intern/rendering/src.pri diff --git a/source/blender/freestyle/src/scene_graph/DrawingStyle.h b/source/blender/freestyle/intern/scene_graph/DrawingStyle.h index e2be6fa8264..e2be6fa8264 100755 --- a/source/blender/freestyle/src/scene_graph/DrawingStyle.h +++ b/source/blender/freestyle/intern/scene_graph/DrawingStyle.h diff --git a/source/blender/freestyle/src/scene_graph/IndexedFaceSet.cpp b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp index ec3d3ad748c..ec3d3ad748c 100755 --- a/source/blender/freestyle/src/scene_graph/IndexedFaceSet.cpp +++ b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp diff --git a/source/blender/freestyle/src/scene_graph/IndexedFaceSet.h b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h index c6951942dbb..c6951942dbb 100755 --- a/source/blender/freestyle/src/scene_graph/IndexedFaceSet.h +++ b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h diff --git a/source/blender/freestyle/src/scene_graph/LineRep.cpp b/source/blender/freestyle/intern/scene_graph/LineRep.cpp index 9dec2ec803f..9dec2ec803f 100755 --- a/source/blender/freestyle/src/scene_graph/LineRep.cpp +++ b/source/blender/freestyle/intern/scene_graph/LineRep.cpp diff --git a/source/blender/freestyle/src/scene_graph/LineRep.h b/source/blender/freestyle/intern/scene_graph/LineRep.h index 1bbba130ba3..1bbba130ba3 100755 --- a/source/blender/freestyle/src/scene_graph/LineRep.h +++ b/source/blender/freestyle/intern/scene_graph/LineRep.h diff --git a/source/blender/freestyle/src/scene_graph/Material.h b/source/blender/freestyle/intern/scene_graph/Material.h index 09557ad3473..09557ad3473 100755 --- a/source/blender/freestyle/src/scene_graph/Material.h +++ b/source/blender/freestyle/intern/scene_graph/Material.h diff --git a/source/blender/freestyle/src/scene_graph/MaxFileLoader.cpp b/source/blender/freestyle/intern/scene_graph/MaxFileLoader.cpp index 515874c4021..515874c4021 100755 --- a/source/blender/freestyle/src/scene_graph/MaxFileLoader.cpp +++ b/source/blender/freestyle/intern/scene_graph/MaxFileLoader.cpp diff --git a/source/blender/freestyle/src/scene_graph/MaxFileLoader.h b/source/blender/freestyle/intern/scene_graph/MaxFileLoader.h index ab31e656d46..ab31e656d46 100755 --- a/source/blender/freestyle/src/scene_graph/MaxFileLoader.h +++ b/source/blender/freestyle/intern/scene_graph/MaxFileLoader.h diff --git a/source/blender/freestyle/src/scene_graph/Node.h b/source/blender/freestyle/intern/scene_graph/Node.h index 1726dd3c853..1726dd3c853 100755 --- a/source/blender/freestyle/src/scene_graph/Node.h +++ b/source/blender/freestyle/intern/scene_graph/Node.h diff --git a/source/blender/freestyle/src/scene_graph/NodeCamera.cpp b/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp index 2d850287ae5..2d850287ae5 100644 --- a/source/blender/freestyle/src/scene_graph/NodeCamera.cpp +++ b/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp diff --git a/source/blender/freestyle/src/scene_graph/NodeCamera.h b/source/blender/freestyle/intern/scene_graph/NodeCamera.h index 76ccf465d38..76ccf465d38 100644 --- a/source/blender/freestyle/src/scene_graph/NodeCamera.h +++ b/source/blender/freestyle/intern/scene_graph/NodeCamera.h diff --git a/source/blender/freestyle/src/scene_graph/NodeDrawingStyle.cpp b/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.cpp index acd740ee055..acd740ee055 100755 --- a/source/blender/freestyle/src/scene_graph/NodeDrawingStyle.cpp +++ b/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.cpp diff --git a/source/blender/freestyle/src/scene_graph/NodeDrawingStyle.h b/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h index 18442ae10f9..18442ae10f9 100755 --- a/source/blender/freestyle/src/scene_graph/NodeDrawingStyle.h +++ b/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h diff --git a/source/blender/freestyle/src/scene_graph/NodeGroup.cpp b/source/blender/freestyle/intern/scene_graph/NodeGroup.cpp index 3d2aa2c8694..3d2aa2c8694 100755 --- a/source/blender/freestyle/src/scene_graph/NodeGroup.cpp +++ b/source/blender/freestyle/intern/scene_graph/NodeGroup.cpp diff --git a/source/blender/freestyle/src/scene_graph/NodeGroup.h b/source/blender/freestyle/intern/scene_graph/NodeGroup.h index a1bd2b57e56..a1bd2b57e56 100755 --- a/source/blender/freestyle/src/scene_graph/NodeGroup.h +++ b/source/blender/freestyle/intern/scene_graph/NodeGroup.h diff --git a/source/blender/freestyle/src/scene_graph/NodeLight.cpp b/source/blender/freestyle/intern/scene_graph/NodeLight.cpp index 61a46155cfa..61a46155cfa 100755 --- a/source/blender/freestyle/src/scene_graph/NodeLight.cpp +++ b/source/blender/freestyle/intern/scene_graph/NodeLight.cpp diff --git a/source/blender/freestyle/src/scene_graph/NodeLight.h b/source/blender/freestyle/intern/scene_graph/NodeLight.h index 0689505fb24..0689505fb24 100755 --- a/source/blender/freestyle/src/scene_graph/NodeLight.h +++ b/source/blender/freestyle/intern/scene_graph/NodeLight.h diff --git a/source/blender/freestyle/src/scene_graph/NodeShape.cpp b/source/blender/freestyle/intern/scene_graph/NodeShape.cpp index 2012ef83b9f..2012ef83b9f 100755 --- a/source/blender/freestyle/src/scene_graph/NodeShape.cpp +++ b/source/blender/freestyle/intern/scene_graph/NodeShape.cpp diff --git a/source/blender/freestyle/src/scene_graph/NodeShape.h b/source/blender/freestyle/intern/scene_graph/NodeShape.h index 3e963beec38..3e963beec38 100755 --- a/source/blender/freestyle/src/scene_graph/NodeShape.h +++ b/source/blender/freestyle/intern/scene_graph/NodeShape.h diff --git a/source/blender/freestyle/src/scene_graph/NodeTransform.cpp b/source/blender/freestyle/intern/scene_graph/NodeTransform.cpp index 64e9b7a4dd6..64e9b7a4dd6 100755 --- a/source/blender/freestyle/src/scene_graph/NodeTransform.cpp +++ b/source/blender/freestyle/intern/scene_graph/NodeTransform.cpp diff --git a/source/blender/freestyle/src/scene_graph/NodeTransform.h b/source/blender/freestyle/intern/scene_graph/NodeTransform.h index 3929c60996b..3929c60996b 100755 --- a/source/blender/freestyle/src/scene_graph/NodeTransform.h +++ b/source/blender/freestyle/intern/scene_graph/NodeTransform.h diff --git a/source/blender/freestyle/src/scene_graph/OrientedLineRep.cpp b/source/blender/freestyle/intern/scene_graph/OrientedLineRep.cpp index 2d0205308b9..2d0205308b9 100755 --- a/source/blender/freestyle/src/scene_graph/OrientedLineRep.cpp +++ b/source/blender/freestyle/intern/scene_graph/OrientedLineRep.cpp diff --git a/source/blender/freestyle/src/scene_graph/OrientedLineRep.h b/source/blender/freestyle/intern/scene_graph/OrientedLineRep.h index 4274581e39a..4274581e39a 100755 --- a/source/blender/freestyle/src/scene_graph/OrientedLineRep.h +++ b/source/blender/freestyle/intern/scene_graph/OrientedLineRep.h diff --git a/source/blender/freestyle/src/scene_graph/Rep.cpp b/source/blender/freestyle/intern/scene_graph/Rep.cpp index 520d3c41e2e..520d3c41e2e 100755 --- a/source/blender/freestyle/src/scene_graph/Rep.cpp +++ b/source/blender/freestyle/intern/scene_graph/Rep.cpp diff --git a/source/blender/freestyle/src/scene_graph/Rep.h b/source/blender/freestyle/intern/scene_graph/Rep.h index 6ccc2152c48..6ccc2152c48 100755 --- a/source/blender/freestyle/src/scene_graph/Rep.h +++ b/source/blender/freestyle/intern/scene_graph/Rep.h diff --git a/source/blender/freestyle/src/scene_graph/ScenePrettyPrinter.cpp b/source/blender/freestyle/intern/scene_graph/ScenePrettyPrinter.cpp index aeee87f8222..aeee87f8222 100755 --- a/source/blender/freestyle/src/scene_graph/ScenePrettyPrinter.cpp +++ b/source/blender/freestyle/intern/scene_graph/ScenePrettyPrinter.cpp diff --git a/source/blender/freestyle/src/scene_graph/ScenePrettyPrinter.h b/source/blender/freestyle/intern/scene_graph/ScenePrettyPrinter.h index 4e83825ff55..4e83825ff55 100755 --- a/source/blender/freestyle/src/scene_graph/ScenePrettyPrinter.h +++ b/source/blender/freestyle/intern/scene_graph/ScenePrettyPrinter.h diff --git a/source/blender/freestyle/src/scene_graph/SceneVisitor.cpp b/source/blender/freestyle/intern/scene_graph/SceneVisitor.cpp index 9cfb9d40d24..9cfb9d40d24 100755 --- a/source/blender/freestyle/src/scene_graph/SceneVisitor.cpp +++ b/source/blender/freestyle/intern/scene_graph/SceneVisitor.cpp diff --git a/source/blender/freestyle/src/scene_graph/SceneVisitor.h b/source/blender/freestyle/intern/scene_graph/SceneVisitor.h index c57bd2e0f6e..c57bd2e0f6e 100755 --- a/source/blender/freestyle/src/scene_graph/SceneVisitor.h +++ b/source/blender/freestyle/intern/scene_graph/SceneVisitor.h diff --git a/source/blender/freestyle/src/scene_graph/TriangleRep.cpp b/source/blender/freestyle/intern/scene_graph/TriangleRep.cpp index 215124b0676..215124b0676 100755 --- a/source/blender/freestyle/src/scene_graph/TriangleRep.cpp +++ b/source/blender/freestyle/intern/scene_graph/TriangleRep.cpp diff --git a/source/blender/freestyle/src/scene_graph/TriangleRep.h b/source/blender/freestyle/intern/scene_graph/TriangleRep.h index 20df12cfd8f..20df12cfd8f 100755 --- a/source/blender/freestyle/src/scene_graph/TriangleRep.h +++ b/source/blender/freestyle/intern/scene_graph/TriangleRep.h diff --git a/source/blender/freestyle/src/scene_graph/VertexRep.cpp b/source/blender/freestyle/intern/scene_graph/VertexRep.cpp index 1ecb5f141e1..1ecb5f141e1 100755 --- a/source/blender/freestyle/src/scene_graph/VertexRep.cpp +++ b/source/blender/freestyle/intern/scene_graph/VertexRep.cpp diff --git a/source/blender/freestyle/src/scene_graph/VertexRep.h b/source/blender/freestyle/intern/scene_graph/VertexRep.h index 9dce7fbbe9c..9dce7fbbe9c 100755 --- a/source/blender/freestyle/src/scene_graph/VertexRep.h +++ b/source/blender/freestyle/intern/scene_graph/VertexRep.h diff --git a/source/blender/freestyle/src/scene_graph/scene_graph.pro b/source/blender/freestyle/intern/scene_graph/scene_graph.pro index 5736104a597..5736104a597 100755 --- a/source/blender/freestyle/src/scene_graph/scene_graph.pro +++ b/source/blender/freestyle/intern/scene_graph/scene_graph.pro diff --git a/source/blender/freestyle/src/scene_graph/src.pri b/source/blender/freestyle/intern/scene_graph/src.pri index 994db200812..994db200812 100755 --- a/source/blender/freestyle/src/scene_graph/src.pri +++ b/source/blender/freestyle/intern/scene_graph/src.pri diff --git a/source/blender/freestyle/src/stroke/AdvancedFunctions0D.cpp b/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.cpp index c22e183eccb..c22e183eccb 100755 --- a/source/blender/freestyle/src/stroke/AdvancedFunctions0D.cpp +++ b/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.cpp diff --git a/source/blender/freestyle/src/stroke/AdvancedFunctions0D.h b/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.h index d92575cf110..d92575cf110 100755 --- a/source/blender/freestyle/src/stroke/AdvancedFunctions0D.h +++ b/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.h diff --git a/source/blender/freestyle/src/stroke/AdvancedFunctions1D.cpp b/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.cpp index cf2982606e0..cf2982606e0 100755 --- a/source/blender/freestyle/src/stroke/AdvancedFunctions1D.cpp +++ b/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.cpp diff --git a/source/blender/freestyle/src/stroke/AdvancedFunctions1D.h b/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h index 65b0eec36fd..65b0eec36fd 100755 --- a/source/blender/freestyle/src/stroke/AdvancedFunctions1D.h +++ b/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h diff --git a/source/blender/freestyle/src/stroke/AdvancedPredicates1D.h b/source/blender/freestyle/intern/stroke/AdvancedPredicates1D.h index f348f8593e5..f348f8593e5 100755 --- a/source/blender/freestyle/src/stroke/AdvancedPredicates1D.h +++ b/source/blender/freestyle/intern/stroke/AdvancedPredicates1D.h diff --git a/source/blender/freestyle/src/stroke/AdvancedStrokeShaders.cpp b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp index b1c5317c5f1..b1c5317c5f1 100755 --- a/source/blender/freestyle/src/stroke/AdvancedStrokeShaders.cpp +++ b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp diff --git a/source/blender/freestyle/src/stroke/AdvancedStrokeShaders.h b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h index b624ccd3e6b..b624ccd3e6b 100755 --- a/source/blender/freestyle/src/stroke/AdvancedStrokeShaders.h +++ b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h diff --git a/source/blender/freestyle/src/stroke/BasicStrokeShaders.cpp b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp index c3827ae3e36..c3827ae3e36 100755 --- a/source/blender/freestyle/src/stroke/BasicStrokeShaders.cpp +++ b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp diff --git a/source/blender/freestyle/src/stroke/BasicStrokeShaders.h b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h index f68971a3966..f68971a3966 100755 --- a/source/blender/freestyle/src/stroke/BasicStrokeShaders.h +++ b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h diff --git a/source/blender/freestyle/src/stroke/Canvas.cpp b/source/blender/freestyle/intern/stroke/Canvas.cpp index ecb76c4a015..ecb76c4a015 100755 --- a/source/blender/freestyle/src/stroke/Canvas.cpp +++ b/source/blender/freestyle/intern/stroke/Canvas.cpp diff --git a/source/blender/freestyle/src/stroke/Canvas.h b/source/blender/freestyle/intern/stroke/Canvas.h index cae50162933..cae50162933 100755 --- a/source/blender/freestyle/src/stroke/Canvas.h +++ b/source/blender/freestyle/intern/stroke/Canvas.h diff --git a/source/blender/freestyle/src/stroke/Chain.cpp b/source/blender/freestyle/intern/stroke/Chain.cpp index 3776cd58a03..3776cd58a03 100755 --- a/source/blender/freestyle/src/stroke/Chain.cpp +++ b/source/blender/freestyle/intern/stroke/Chain.cpp diff --git a/source/blender/freestyle/src/stroke/Chain.h b/source/blender/freestyle/intern/stroke/Chain.h index 042437a4154..042437a4154 100755 --- a/source/blender/freestyle/src/stroke/Chain.h +++ b/source/blender/freestyle/intern/stroke/Chain.h diff --git a/source/blender/freestyle/src/stroke/ChainingIterators.cpp b/source/blender/freestyle/intern/stroke/ChainingIterators.cpp index 206b6eb7364..206b6eb7364 100755 --- a/source/blender/freestyle/src/stroke/ChainingIterators.cpp +++ b/source/blender/freestyle/intern/stroke/ChainingIterators.cpp diff --git a/source/blender/freestyle/src/stroke/ChainingIterators.h b/source/blender/freestyle/intern/stroke/ChainingIterators.h index 1e946855dce..1e946855dce 100755 --- a/source/blender/freestyle/src/stroke/ChainingIterators.h +++ b/source/blender/freestyle/intern/stroke/ChainingIterators.h diff --git a/source/blender/freestyle/src/stroke/ContextFunctions.cpp b/source/blender/freestyle/intern/stroke/ContextFunctions.cpp index b55da1fb0f8..b55da1fb0f8 100755 --- a/source/blender/freestyle/src/stroke/ContextFunctions.cpp +++ b/source/blender/freestyle/intern/stroke/ContextFunctions.cpp diff --git a/source/blender/freestyle/src/stroke/ContextFunctions.h b/source/blender/freestyle/intern/stroke/ContextFunctions.h index 37c98656fa7..37c98656fa7 100755 --- a/source/blender/freestyle/src/stroke/ContextFunctions.h +++ b/source/blender/freestyle/intern/stroke/ContextFunctions.h diff --git a/source/blender/freestyle/src/stroke/Curve.cpp b/source/blender/freestyle/intern/stroke/Curve.cpp index f7b255c3ef4..f7b255c3ef4 100755 --- a/source/blender/freestyle/src/stroke/Curve.cpp +++ b/source/blender/freestyle/intern/stroke/Curve.cpp diff --git a/source/blender/freestyle/src/stroke/Curve.h b/source/blender/freestyle/intern/stroke/Curve.h index 400f27e5d5a..400f27e5d5a 100755 --- a/source/blender/freestyle/src/stroke/Curve.h +++ b/source/blender/freestyle/intern/stroke/Curve.h diff --git a/source/blender/freestyle/src/stroke/CurveAdvancedIterators.h b/source/blender/freestyle/intern/stroke/CurveAdvancedIterators.h index dfc9f2719f8..dfc9f2719f8 100755 --- a/source/blender/freestyle/src/stroke/CurveAdvancedIterators.h +++ b/source/blender/freestyle/intern/stroke/CurveAdvancedIterators.h diff --git a/source/blender/freestyle/src/stroke/CurveIterators.h b/source/blender/freestyle/intern/stroke/CurveIterators.h index 92f8bf065f4..92f8bf065f4 100755 --- a/source/blender/freestyle/src/stroke/CurveIterators.h +++ b/source/blender/freestyle/intern/stroke/CurveIterators.h diff --git a/source/blender/freestyle/src/stroke/Modifiers.h b/source/blender/freestyle/intern/stroke/Modifiers.h index c3be65ffc89..c3be65ffc89 100755 --- a/source/blender/freestyle/src/stroke/Modifiers.h +++ b/source/blender/freestyle/intern/stroke/Modifiers.h diff --git a/source/blender/freestyle/src/stroke/Module.h b/source/blender/freestyle/intern/stroke/Module.h index 591bb157392..591bb157392 100755 --- a/source/blender/freestyle/src/stroke/Module.h +++ b/source/blender/freestyle/intern/stroke/Module.h diff --git a/source/blender/freestyle/src/stroke/Operators.cpp b/source/blender/freestyle/intern/stroke/Operators.cpp index 121dee3ba26..121dee3ba26 100755 --- a/source/blender/freestyle/src/stroke/Operators.cpp +++ b/source/blender/freestyle/intern/stroke/Operators.cpp diff --git a/source/blender/freestyle/src/stroke/Operators.h b/source/blender/freestyle/intern/stroke/Operators.h index 96ecd0aa75b..96ecd0aa75b 100755 --- a/source/blender/freestyle/src/stroke/Operators.h +++ b/source/blender/freestyle/intern/stroke/Operators.h diff --git a/source/blender/freestyle/src/stroke/PSStrokeRenderer.cpp b/source/blender/freestyle/intern/stroke/PSStrokeRenderer.cpp index dc9c94e0e11..dc9c94e0e11 100755 --- a/source/blender/freestyle/src/stroke/PSStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/stroke/PSStrokeRenderer.cpp diff --git a/source/blender/freestyle/src/stroke/PSStrokeRenderer.h b/source/blender/freestyle/intern/stroke/PSStrokeRenderer.h index 821c016ab91..821c016ab91 100755 --- a/source/blender/freestyle/src/stroke/PSStrokeRenderer.h +++ b/source/blender/freestyle/intern/stroke/PSStrokeRenderer.h diff --git a/source/blender/freestyle/src/stroke/Predicates0D.h b/source/blender/freestyle/intern/stroke/Predicates0D.h index 4c2dfacdf98..4c2dfacdf98 100755 --- a/source/blender/freestyle/src/stroke/Predicates0D.h +++ b/source/blender/freestyle/intern/stroke/Predicates0D.h diff --git a/source/blender/freestyle/src/stroke/Predicates1D.h b/source/blender/freestyle/intern/stroke/Predicates1D.h index cf9a3283ae4..cf9a3283ae4 100755 --- a/source/blender/freestyle/src/stroke/Predicates1D.h +++ b/source/blender/freestyle/intern/stroke/Predicates1D.h diff --git a/source/blender/freestyle/src/stroke/QInformationMap.h b/source/blender/freestyle/intern/stroke/QInformationMap.h index 2542bdba147..2542bdba147 100755 --- a/source/blender/freestyle/src/stroke/QInformationMap.h +++ b/source/blender/freestyle/intern/stroke/QInformationMap.h diff --git a/source/blender/freestyle/src/stroke/Stroke.cpp b/source/blender/freestyle/intern/stroke/Stroke.cpp index d6ff4d255c4..d6ff4d255c4 100755 --- a/source/blender/freestyle/src/stroke/Stroke.cpp +++ b/source/blender/freestyle/intern/stroke/Stroke.cpp diff --git a/source/blender/freestyle/src/stroke/Stroke.h b/source/blender/freestyle/intern/stroke/Stroke.h index a5cf51f8224..a5cf51f8224 100755 --- a/source/blender/freestyle/src/stroke/Stroke.h +++ b/source/blender/freestyle/intern/stroke/Stroke.h diff --git a/source/blender/freestyle/src/stroke/StrokeAdvancedIterators.h b/source/blender/freestyle/intern/stroke/StrokeAdvancedIterators.h index 279a0b12089..279a0b12089 100755 --- a/source/blender/freestyle/src/stroke/StrokeAdvancedIterators.h +++ b/source/blender/freestyle/intern/stroke/StrokeAdvancedIterators.h diff --git a/source/blender/freestyle/src/stroke/StrokeIO.cpp b/source/blender/freestyle/intern/stroke/StrokeIO.cpp index 7f540939fa1..7f540939fa1 100755 --- a/source/blender/freestyle/src/stroke/StrokeIO.cpp +++ b/source/blender/freestyle/intern/stroke/StrokeIO.cpp diff --git a/source/blender/freestyle/src/stroke/StrokeIO.h b/source/blender/freestyle/intern/stroke/StrokeIO.h index 42b99420f4a..42b99420f4a 100755 --- a/source/blender/freestyle/src/stroke/StrokeIO.h +++ b/source/blender/freestyle/intern/stroke/StrokeIO.h diff --git a/source/blender/freestyle/src/stroke/StrokeIterators.h b/source/blender/freestyle/intern/stroke/StrokeIterators.h index 9cc08a0532a..9cc08a0532a 100755 --- a/source/blender/freestyle/src/stroke/StrokeIterators.h +++ b/source/blender/freestyle/intern/stroke/StrokeIterators.h diff --git a/source/blender/freestyle/src/stroke/StrokeLayer.cpp b/source/blender/freestyle/intern/stroke/StrokeLayer.cpp index 8b469399ca8..8b469399ca8 100755 --- a/source/blender/freestyle/src/stroke/StrokeLayer.cpp +++ b/source/blender/freestyle/intern/stroke/StrokeLayer.cpp diff --git a/source/blender/freestyle/src/stroke/StrokeLayer.h b/source/blender/freestyle/intern/stroke/StrokeLayer.h index b89b77a85a7..b89b77a85a7 100755 --- a/source/blender/freestyle/src/stroke/StrokeLayer.h +++ b/source/blender/freestyle/intern/stroke/StrokeLayer.h diff --git a/source/blender/freestyle/src/stroke/StrokeRenderer.cpp b/source/blender/freestyle/intern/stroke/StrokeRenderer.cpp index e747fb4f5cd..e747fb4f5cd 100755 --- a/source/blender/freestyle/src/stroke/StrokeRenderer.cpp +++ b/source/blender/freestyle/intern/stroke/StrokeRenderer.cpp diff --git a/source/blender/freestyle/src/stroke/StrokeRenderer.h b/source/blender/freestyle/intern/stroke/StrokeRenderer.h index d192fe30145..d192fe30145 100755 --- a/source/blender/freestyle/src/stroke/StrokeRenderer.h +++ b/source/blender/freestyle/intern/stroke/StrokeRenderer.h diff --git a/source/blender/freestyle/src/stroke/StrokeRep.cpp b/source/blender/freestyle/intern/stroke/StrokeRep.cpp index 055e1fb1be4..055e1fb1be4 100755 --- a/source/blender/freestyle/src/stroke/StrokeRep.cpp +++ b/source/blender/freestyle/intern/stroke/StrokeRep.cpp diff --git a/source/blender/freestyle/src/stroke/StrokeRep.h b/source/blender/freestyle/intern/stroke/StrokeRep.h index 129769e5489..129769e5489 100755 --- a/source/blender/freestyle/src/stroke/StrokeRep.h +++ b/source/blender/freestyle/intern/stroke/StrokeRep.h diff --git a/source/blender/freestyle/src/stroke/StrokeShader.h b/source/blender/freestyle/intern/stroke/StrokeShader.h index fa1289f6e0f..fa1289f6e0f 100755 --- a/source/blender/freestyle/src/stroke/StrokeShader.h +++ b/source/blender/freestyle/intern/stroke/StrokeShader.h diff --git a/source/blender/freestyle/src/stroke/StrokeTesselator.cpp b/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp index 6d0f5aa847c..6d0f5aa847c 100755 --- a/source/blender/freestyle/src/stroke/StrokeTesselator.cpp +++ b/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp diff --git a/source/blender/freestyle/src/stroke/StrokeTesselator.h b/source/blender/freestyle/intern/stroke/StrokeTesselator.h index 767d82d3d98..767d82d3d98 100755 --- a/source/blender/freestyle/src/stroke/StrokeTesselator.h +++ b/source/blender/freestyle/intern/stroke/StrokeTesselator.h diff --git a/source/blender/freestyle/src/stroke/StyleModule.h b/source/blender/freestyle/intern/stroke/StyleModule.h index 3d39e53515b..3d39e53515b 100755 --- a/source/blender/freestyle/src/stroke/StyleModule.h +++ b/source/blender/freestyle/intern/stroke/StyleModule.h diff --git a/source/blender/freestyle/src/stroke/TextStrokeRenderer.cpp b/source/blender/freestyle/intern/stroke/TextStrokeRenderer.cpp index ea5af287bbe..ea5af287bbe 100755 --- a/source/blender/freestyle/src/stroke/TextStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/stroke/TextStrokeRenderer.cpp diff --git a/source/blender/freestyle/src/stroke/TextStrokeRenderer.h b/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h index ef610d63bdd..ef610d63bdd 100755 --- a/source/blender/freestyle/src/stroke/TextStrokeRenderer.h +++ b/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h diff --git a/source/blender/freestyle/src/stroke/src.pri b/source/blender/freestyle/intern/stroke/src.pri index 09707f86dbc..09707f86dbc 100755 --- a/source/blender/freestyle/src/stroke/src.pri +++ b/source/blender/freestyle/intern/stroke/src.pri diff --git a/source/blender/freestyle/src/stroke/stroke.pro b/source/blender/freestyle/intern/stroke/stroke.pro index 90c0cc96592..90c0cc96592 100755 --- a/source/blender/freestyle/src/stroke/stroke.pro +++ b/source/blender/freestyle/intern/stroke/stroke.pro diff --git a/source/blender/freestyle/src/swig/Freestyle.i b/source/blender/freestyle/intern/swig/Freestyle.i index 37daddc4e11..37daddc4e11 100755 --- a/source/blender/freestyle/src/swig/Freestyle.i +++ b/source/blender/freestyle/intern/swig/Freestyle.i diff --git a/source/blender/freestyle/src/swig/FreestyleWrapper.vc7.vcproj b/source/blender/freestyle/intern/swig/FreestyleWrapper.vc7.vcproj index 060c1987ea1..060c1987ea1 100755 --- a/source/blender/freestyle/src/swig/FreestyleWrapper.vc7.vcproj +++ b/source/blender/freestyle/intern/swig/FreestyleWrapper.vc7.vcproj diff --git a/source/blender/freestyle/src/swig/FreestyleWrapper.vc8.vcproj b/source/blender/freestyle/intern/swig/FreestyleWrapper.vc8.vcproj index 833a4f89aca..833a4f89aca 100755 --- a/source/blender/freestyle/src/swig/FreestyleWrapper.vc8.vcproj +++ b/source/blender/freestyle/intern/swig/FreestyleWrapper.vc8.vcproj diff --git a/source/blender/freestyle/src/swig/Makefile b/source/blender/freestyle/intern/swig/Makefile index 01829434be0..01829434be0 100755 --- a/source/blender/freestyle/src/swig/Makefile +++ b/source/blender/freestyle/intern/swig/Makefile diff --git a/source/blender/freestyle/src/swig/Makefile.cygwin b/source/blender/freestyle/intern/swig/Makefile.cygwin index 1f5b3ce2a79..1f5b3ce2a79 100755 --- a/source/blender/freestyle/src/swig/Makefile.cygwin +++ b/source/blender/freestyle/intern/swig/Makefile.cygwin diff --git a/source/blender/freestyle/src/swig/Makefile.linux b/source/blender/freestyle/intern/swig/Makefile.linux index 2a93971ccd5..2a93971ccd5 100755 --- a/source/blender/freestyle/src/swig/Makefile.linux +++ b/source/blender/freestyle/intern/swig/Makefile.linux diff --git a/source/blender/freestyle/src/swig/Makefile.mac b/source/blender/freestyle/intern/swig/Makefile.mac index 2c46d74549e..2c46d74549e 100644 --- a/source/blender/freestyle/src/swig/Makefile.mac +++ b/source/blender/freestyle/intern/swig/Makefile.mac diff --git a/source/blender/freestyle/src/swig/Makefile.noswig b/source/blender/freestyle/intern/swig/Makefile.noswig index 368c4fb173b..368c4fb173b 100755 --- a/source/blender/freestyle/src/swig/Makefile.noswig +++ b/source/blender/freestyle/intern/swig/Makefile.noswig diff --git a/source/blender/freestyle/src/swig/ModuleWrapper.cpp b/source/blender/freestyle/intern/swig/ModuleWrapper.cpp index 36bd39b2b15..36bd39b2b15 100755 --- a/source/blender/freestyle/src/swig/ModuleWrapper.cpp +++ b/source/blender/freestyle/intern/swig/ModuleWrapper.cpp diff --git a/source/blender/freestyle/src/swig/ModuleWrapper.h b/source/blender/freestyle/intern/swig/ModuleWrapper.h index 06ca8c90f37..06ca8c90f37 100755 --- a/source/blender/freestyle/src/swig/ModuleWrapper.h +++ b/source/blender/freestyle/intern/swig/ModuleWrapper.h diff --git a/source/blender/freestyle/src/system/BaseIterator.h b/source/blender/freestyle/intern/system/BaseIterator.h index 45cc19df4fe..45cc19df4fe 100755 --- a/source/blender/freestyle/src/system/BaseIterator.h +++ b/source/blender/freestyle/intern/system/BaseIterator.h diff --git a/source/blender/freestyle/src/system/BaseObject.cpp b/source/blender/freestyle/intern/system/BaseObject.cpp index 21d8a77b268..21d8a77b268 100755 --- a/source/blender/freestyle/src/system/BaseObject.cpp +++ b/source/blender/freestyle/intern/system/BaseObject.cpp diff --git a/source/blender/freestyle/src/system/BaseObject.h b/source/blender/freestyle/intern/system/BaseObject.h index a8515f98385..a8515f98385 100755 --- a/source/blender/freestyle/src/system/BaseObject.h +++ b/source/blender/freestyle/intern/system/BaseObject.h diff --git a/source/blender/freestyle/src/system/Cast.h b/source/blender/freestyle/intern/system/Cast.h index 15af767443e..15af767443e 100755 --- a/source/blender/freestyle/src/system/Cast.h +++ b/source/blender/freestyle/intern/system/Cast.h diff --git a/source/blender/freestyle/src/system/Exception.cpp b/source/blender/freestyle/intern/system/Exception.cpp index d1d12d18297..d1d12d18297 100755 --- a/source/blender/freestyle/src/system/Exception.cpp +++ b/source/blender/freestyle/intern/system/Exception.cpp diff --git a/source/blender/freestyle/src/system/Exception.h b/source/blender/freestyle/intern/system/Exception.h index 378de6b558f..378de6b558f 100755 --- a/source/blender/freestyle/src/system/Exception.h +++ b/source/blender/freestyle/intern/system/Exception.h diff --git a/source/blender/freestyle/src/system/FreestyleConfig.h b/source/blender/freestyle/intern/system/FreestyleConfig.h index 45bd00a402e..45bd00a402e 100755 --- a/source/blender/freestyle/src/system/FreestyleConfig.h +++ b/source/blender/freestyle/intern/system/FreestyleConfig.h diff --git a/source/blender/freestyle/src/system/Id.h b/source/blender/freestyle/intern/system/Id.h index 1f2206ed337..1f2206ed337 100755 --- a/source/blender/freestyle/src/system/Id.h +++ b/source/blender/freestyle/intern/system/Id.h diff --git a/source/blender/freestyle/src/system/Interpreter.h b/source/blender/freestyle/intern/system/Interpreter.h index ce603b17238..ce603b17238 100755 --- a/source/blender/freestyle/src/system/Interpreter.h +++ b/source/blender/freestyle/intern/system/Interpreter.h diff --git a/source/blender/freestyle/src/system/Precision.h b/source/blender/freestyle/intern/system/Precision.h index 24327a280df..24327a280df 100755 --- a/source/blender/freestyle/src/system/Precision.h +++ b/source/blender/freestyle/intern/system/Precision.h diff --git a/source/blender/freestyle/src/system/ProgressBar.h b/source/blender/freestyle/intern/system/ProgressBar.h index 5b61f936c90..5b61f936c90 100755 --- a/source/blender/freestyle/src/system/ProgressBar.h +++ b/source/blender/freestyle/intern/system/ProgressBar.h diff --git a/source/blender/freestyle/src/system/PseudoNoise.cpp b/source/blender/freestyle/intern/system/PseudoNoise.cpp index 59332229ae2..59332229ae2 100755 --- a/source/blender/freestyle/src/system/PseudoNoise.cpp +++ b/source/blender/freestyle/intern/system/PseudoNoise.cpp diff --git a/source/blender/freestyle/src/system/PseudoNoise.h b/source/blender/freestyle/intern/system/PseudoNoise.h index 43143865600..43143865600 100755 --- a/source/blender/freestyle/src/system/PseudoNoise.h +++ b/source/blender/freestyle/intern/system/PseudoNoise.h diff --git a/source/blender/freestyle/src/system/PythonInterpreter.cpp b/source/blender/freestyle/intern/system/PythonInterpreter.cpp index 821bd32b40b..821bd32b40b 100755 --- a/source/blender/freestyle/src/system/PythonInterpreter.cpp +++ b/source/blender/freestyle/intern/system/PythonInterpreter.cpp diff --git a/source/blender/freestyle/src/system/PythonInterpreter.h b/source/blender/freestyle/intern/system/PythonInterpreter.h index f9a573ffb86..f9a573ffb86 100755 --- a/source/blender/freestyle/src/system/PythonInterpreter.h +++ b/source/blender/freestyle/intern/system/PythonInterpreter.h diff --git a/source/blender/freestyle/src/system/RandGen.cpp b/source/blender/freestyle/intern/system/RandGen.cpp index a328cb7f583..a328cb7f583 100755 --- a/source/blender/freestyle/src/system/RandGen.cpp +++ b/source/blender/freestyle/intern/system/RandGen.cpp diff --git a/source/blender/freestyle/src/system/RandGen.h b/source/blender/freestyle/intern/system/RandGen.h index 409d3b79609..409d3b79609 100755 --- a/source/blender/freestyle/src/system/RandGen.h +++ b/source/blender/freestyle/intern/system/RandGen.h diff --git a/source/blender/freestyle/src/system/StringUtils.cpp b/source/blender/freestyle/intern/system/StringUtils.cpp index 2af76feeb37..2af76feeb37 100755 --- a/source/blender/freestyle/src/system/StringUtils.cpp +++ b/source/blender/freestyle/intern/system/StringUtils.cpp diff --git a/source/blender/freestyle/src/system/StringUtils.h b/source/blender/freestyle/intern/system/StringUtils.h index 44adfc2b044..44adfc2b044 100755 --- a/source/blender/freestyle/src/system/StringUtils.h +++ b/source/blender/freestyle/intern/system/StringUtils.h diff --git a/source/blender/freestyle/src/system/TimeStamp.cpp b/source/blender/freestyle/intern/system/TimeStamp.cpp index c66e1131611..c66e1131611 100755 --- a/source/blender/freestyle/src/system/TimeStamp.cpp +++ b/source/blender/freestyle/intern/system/TimeStamp.cpp diff --git a/source/blender/freestyle/src/system/TimeStamp.h b/source/blender/freestyle/intern/system/TimeStamp.h index 568a7851e30..568a7851e30 100755 --- a/source/blender/freestyle/src/system/TimeStamp.h +++ b/source/blender/freestyle/intern/system/TimeStamp.h diff --git a/source/blender/freestyle/src/system/TimeUtils.h b/source/blender/freestyle/intern/system/TimeUtils.h index 99dd5b0a669..99dd5b0a669 100755 --- a/source/blender/freestyle/src/system/TimeUtils.h +++ b/source/blender/freestyle/intern/system/TimeUtils.h diff --git a/source/blender/freestyle/src/system/src.pri b/source/blender/freestyle/intern/system/src.pri index e7d69e142b4..e7d69e142b4 100755 --- a/source/blender/freestyle/src/system/src.pri +++ b/source/blender/freestyle/intern/system/src.pri diff --git a/source/blender/freestyle/src/system/system.pro b/source/blender/freestyle/intern/system/system.pro index 495cdf47105..495cdf47105 100755 --- a/source/blender/freestyle/src/system/system.pro +++ b/source/blender/freestyle/intern/system/system.pro diff --git a/source/blender/freestyle/src/view_map/FEdgeXDetector.cpp b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp index 628b3ad77aa..628b3ad77aa 100755 --- a/source/blender/freestyle/src/view_map/FEdgeXDetector.cpp +++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp diff --git a/source/blender/freestyle/src/view_map/FEdgeXDetector.h b/source/blender/freestyle/intern/view_map/FEdgeXDetector.h index 38d0f34e21f..38d0f34e21f 100755 --- a/source/blender/freestyle/src/view_map/FEdgeXDetector.h +++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.h diff --git a/source/blender/freestyle/src/view_map/Functions0D.cpp b/source/blender/freestyle/intern/view_map/Functions0D.cpp index c868510624c..c868510624c 100755 --- a/source/blender/freestyle/src/view_map/Functions0D.cpp +++ b/source/blender/freestyle/intern/view_map/Functions0D.cpp diff --git a/source/blender/freestyle/src/view_map/Functions0D.h b/source/blender/freestyle/intern/view_map/Functions0D.h index 3160546da2f..3160546da2f 100755 --- a/source/blender/freestyle/src/view_map/Functions0D.h +++ b/source/blender/freestyle/intern/view_map/Functions0D.h diff --git a/source/blender/freestyle/src/view_map/Functions1D.cpp b/source/blender/freestyle/intern/view_map/Functions1D.cpp index a34124ded31..a34124ded31 100755 --- a/source/blender/freestyle/src/view_map/Functions1D.cpp +++ b/source/blender/freestyle/intern/view_map/Functions1D.cpp diff --git a/source/blender/freestyle/src/view_map/Functions1D.h b/source/blender/freestyle/intern/view_map/Functions1D.h index c92d12ff330..c92d12ff330 100755 --- a/source/blender/freestyle/src/view_map/Functions1D.h +++ b/source/blender/freestyle/intern/view_map/Functions1D.h diff --git a/source/blender/freestyle/src/view_map/Interface0D.h b/source/blender/freestyle/intern/view_map/Interface0D.h index eec39d2f7bc..eec39d2f7bc 100755 --- a/source/blender/freestyle/src/view_map/Interface0D.h +++ b/source/blender/freestyle/intern/view_map/Interface0D.h diff --git a/source/blender/freestyle/src/view_map/Interface1D.h b/source/blender/freestyle/intern/view_map/Interface1D.h index 812187e5ec1..812187e5ec1 100755 --- a/source/blender/freestyle/src/view_map/Interface1D.h +++ b/source/blender/freestyle/intern/view_map/Interface1D.h diff --git a/source/blender/freestyle/src/view_map/Silhouette.cpp b/source/blender/freestyle/intern/view_map/Silhouette.cpp index db4f82d369e..db4f82d369e 100755 --- a/source/blender/freestyle/src/view_map/Silhouette.cpp +++ b/source/blender/freestyle/intern/view_map/Silhouette.cpp diff --git a/source/blender/freestyle/src/view_map/Silhouette.h b/source/blender/freestyle/intern/view_map/Silhouette.h index e88bf23b210..e88bf23b210 100755 --- a/source/blender/freestyle/src/view_map/Silhouette.h +++ b/source/blender/freestyle/intern/view_map/Silhouette.h diff --git a/source/blender/freestyle/src/view_map/SilhouetteGeomEngine.cpp b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp index 19b8a632ffe..19b8a632ffe 100755 --- a/source/blender/freestyle/src/view_map/SilhouetteGeomEngine.cpp +++ b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp diff --git a/source/blender/freestyle/src/view_map/SilhouetteGeomEngine.h b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.h index 159dda1afc0..159dda1afc0 100755 --- a/source/blender/freestyle/src/view_map/SilhouetteGeomEngine.h +++ b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.h diff --git a/source/blender/freestyle/src/view_map/SteerableViewMap.cpp b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp index b2604606aa7..b2604606aa7 100755 --- a/source/blender/freestyle/src/view_map/SteerableViewMap.cpp +++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp diff --git a/source/blender/freestyle/src/view_map/SteerableViewMap.h b/source/blender/freestyle/intern/view_map/SteerableViewMap.h index fe7c2493752..fe7c2493752 100755 --- a/source/blender/freestyle/src/view_map/SteerableViewMap.h +++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.h diff --git a/source/blender/freestyle/src/view_map/ViewEdgeXBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp index 20b3aeb144d..20b3aeb144d 100755 --- a/source/blender/freestyle/src/view_map/ViewEdgeXBuilder.cpp +++ b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp diff --git a/source/blender/freestyle/src/view_map/ViewEdgeXBuilder.h b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h index 9e2837b49a7..9e2837b49a7 100755 --- a/source/blender/freestyle/src/view_map/ViewEdgeXBuilder.h +++ b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h diff --git a/source/blender/freestyle/src/view_map/ViewMap.cpp b/source/blender/freestyle/intern/view_map/ViewMap.cpp index 9a2d262b703..9a2d262b703 100755 --- a/source/blender/freestyle/src/view_map/ViewMap.cpp +++ b/source/blender/freestyle/intern/view_map/ViewMap.cpp diff --git a/source/blender/freestyle/src/view_map/ViewMap.h b/source/blender/freestyle/intern/view_map/ViewMap.h index bdbb140e130..bdbb140e130 100755 --- a/source/blender/freestyle/src/view_map/ViewMap.h +++ b/source/blender/freestyle/intern/view_map/ViewMap.h diff --git a/source/blender/freestyle/src/view_map/ViewMapAdvancedIterators.h b/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h index bb2d916f2df..bb2d916f2df 100755 --- a/source/blender/freestyle/src/view_map/ViewMapAdvancedIterators.h +++ b/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h diff --git a/source/blender/freestyle/src/view_map/ViewMapBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp index 32f5283a63c..32f5283a63c 100755 --- a/source/blender/freestyle/src/view_map/ViewMapBuilder.cpp +++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp diff --git a/source/blender/freestyle/src/view_map/ViewMapBuilder.h b/source/blender/freestyle/intern/view_map/ViewMapBuilder.h index ec52d4fdd7e..ec52d4fdd7e 100755 --- a/source/blender/freestyle/src/view_map/ViewMapBuilder.h +++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.h diff --git a/source/blender/freestyle/src/view_map/ViewMapIO.cpp b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp index d68164973a1..d68164973a1 100755 --- a/source/blender/freestyle/src/view_map/ViewMapIO.cpp +++ b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp diff --git a/source/blender/freestyle/src/view_map/ViewMapIO.h b/source/blender/freestyle/intern/view_map/ViewMapIO.h index 33e168b537b..33e168b537b 100755 --- a/source/blender/freestyle/src/view_map/ViewMapIO.h +++ b/source/blender/freestyle/intern/view_map/ViewMapIO.h diff --git a/source/blender/freestyle/src/view_map/ViewMapIterators.h b/source/blender/freestyle/intern/view_map/ViewMapIterators.h index 004674ba758..004674ba758 100755 --- a/source/blender/freestyle/src/view_map/ViewMapIterators.h +++ b/source/blender/freestyle/intern/view_map/ViewMapIterators.h diff --git a/source/blender/freestyle/src/view_map/ViewMapTesselator.cpp b/source/blender/freestyle/intern/view_map/ViewMapTesselator.cpp index 6041f527d17..6041f527d17 100755 --- a/source/blender/freestyle/src/view_map/ViewMapTesselator.cpp +++ b/source/blender/freestyle/intern/view_map/ViewMapTesselator.cpp diff --git a/source/blender/freestyle/src/view_map/ViewMapTesselator.h b/source/blender/freestyle/intern/view_map/ViewMapTesselator.h index fc1ec8e373e..fc1ec8e373e 100755 --- a/source/blender/freestyle/src/view_map/ViewMapTesselator.h +++ b/source/blender/freestyle/intern/view_map/ViewMapTesselator.h diff --git a/source/blender/freestyle/src/view_map/src.pri b/source/blender/freestyle/intern/view_map/src.pri index 2faf6a81fea..2faf6a81fea 100755 --- a/source/blender/freestyle/src/view_map/src.pri +++ b/source/blender/freestyle/intern/view_map/src.pri diff --git a/source/blender/freestyle/src/view_map/view_map.pro b/source/blender/freestyle/intern/view_map/view_map.pro index ef629bcf6a7..ef629bcf6a7 100755 --- a/source/blender/freestyle/src/view_map/view_map.pro +++ b/source/blender/freestyle/intern/view_map/view_map.pro diff --git a/source/blender/freestyle/src/winged_edge/Curvature.cpp b/source/blender/freestyle/intern/winged_edge/Curvature.cpp index a890fb92c04..a890fb92c04 100755 --- a/source/blender/freestyle/src/winged_edge/Curvature.cpp +++ b/source/blender/freestyle/intern/winged_edge/Curvature.cpp diff --git a/source/blender/freestyle/src/winged_edge/Curvature.h b/source/blender/freestyle/intern/winged_edge/Curvature.h index 214a32ca922..214a32ca922 100755 --- a/source/blender/freestyle/src/winged_edge/Curvature.h +++ b/source/blender/freestyle/intern/winged_edge/Curvature.h diff --git a/source/blender/freestyle/src/winged_edge/Nature.h b/source/blender/freestyle/intern/winged_edge/Nature.h index 1f165e677f5..1f165e677f5 100755 --- a/source/blender/freestyle/src/winged_edge/Nature.h +++ b/source/blender/freestyle/intern/winged_edge/Nature.h diff --git a/source/blender/freestyle/src/winged_edge/WEdge.cpp b/source/blender/freestyle/intern/winged_edge/WEdge.cpp index 79b3a8dae26..79b3a8dae26 100755 --- a/source/blender/freestyle/src/winged_edge/WEdge.cpp +++ b/source/blender/freestyle/intern/winged_edge/WEdge.cpp diff --git a/source/blender/freestyle/src/winged_edge/WEdge.h b/source/blender/freestyle/intern/winged_edge/WEdge.h index 2369caf4566..2369caf4566 100755 --- a/source/blender/freestyle/src/winged_edge/WEdge.h +++ b/source/blender/freestyle/intern/winged_edge/WEdge.h diff --git a/source/blender/freestyle/src/winged_edge/WFillGrid.cpp b/source/blender/freestyle/intern/winged_edge/WFillGrid.cpp index 7d0a2d3c561..7d0a2d3c561 100755 --- a/source/blender/freestyle/src/winged_edge/WFillGrid.cpp +++ b/source/blender/freestyle/intern/winged_edge/WFillGrid.cpp diff --git a/source/blender/freestyle/src/winged_edge/WFillGrid.h b/source/blender/freestyle/intern/winged_edge/WFillGrid.h index 2ebbc2f359a..2ebbc2f359a 100755 --- a/source/blender/freestyle/src/winged_edge/WFillGrid.h +++ b/source/blender/freestyle/intern/winged_edge/WFillGrid.h diff --git a/source/blender/freestyle/src/winged_edge/WSFillGrid.cpp b/source/blender/freestyle/intern/winged_edge/WSFillGrid.cpp index cf3734b488e..cf3734b488e 100755 --- a/source/blender/freestyle/src/winged_edge/WSFillGrid.cpp +++ b/source/blender/freestyle/intern/winged_edge/WSFillGrid.cpp diff --git a/source/blender/freestyle/src/winged_edge/WSFillGrid.h b/source/blender/freestyle/intern/winged_edge/WSFillGrid.h index 976fdca8e46..976fdca8e46 100755 --- a/source/blender/freestyle/src/winged_edge/WSFillGrid.h +++ b/source/blender/freestyle/intern/winged_edge/WSFillGrid.h diff --git a/source/blender/freestyle/src/winged_edge/WXEdge.cpp b/source/blender/freestyle/intern/winged_edge/WXEdge.cpp index 115a4f61789..115a4f61789 100755 --- a/source/blender/freestyle/src/winged_edge/WXEdge.cpp +++ b/source/blender/freestyle/intern/winged_edge/WXEdge.cpp diff --git a/source/blender/freestyle/src/winged_edge/WXEdge.h b/source/blender/freestyle/intern/winged_edge/WXEdge.h index beacb1a9ca9..beacb1a9ca9 100755 --- a/source/blender/freestyle/src/winged_edge/WXEdge.h +++ b/source/blender/freestyle/intern/winged_edge/WXEdge.h diff --git a/source/blender/freestyle/src/winged_edge/WXEdgeBuilder.cpp b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp index 534c6e323a9..534c6e323a9 100755 --- a/source/blender/freestyle/src/winged_edge/WXEdgeBuilder.cpp +++ b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp diff --git a/source/blender/freestyle/src/winged_edge/WXEdgeBuilder.h b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h index b646d66a285..b646d66a285 100755 --- a/source/blender/freestyle/src/winged_edge/WXEdgeBuilder.h +++ b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h diff --git a/source/blender/freestyle/src/winged_edge/WingedEdgeBuilder.cpp b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp index 98e7c269248..98e7c269248 100755 --- a/source/blender/freestyle/src/winged_edge/WingedEdgeBuilder.cpp +++ b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp diff --git a/source/blender/freestyle/src/winged_edge/WingedEdgeBuilder.h b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h index fe033f2ea0b..fe033f2ea0b 100755 --- a/source/blender/freestyle/src/winged_edge/WingedEdgeBuilder.h +++ b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h diff --git a/source/blender/freestyle/src/winged_edge/src.pri b/source/blender/freestyle/intern/winged_edge/src.pri index 9cf40633dcf..9cf40633dcf 100755 --- a/source/blender/freestyle/src/winged_edge/src.pri +++ b/source/blender/freestyle/intern/winged_edge/src.pri diff --git a/source/blender/freestyle/src/winged_edge/winged_edge.pro b/source/blender/freestyle/intern/winged_edge/winged_edge.pro index e36d69454b6..e36d69454b6 100755 --- a/source/blender/freestyle/src/winged_edge/winged_edge.pro +++ b/source/blender/freestyle/intern/winged_edge/winged_edge.pro diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index 4f2a1da5580..632a471ecd0 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -305,13 +305,11 @@ static int isffmpeg (char *filename) { /* Find the decoder for the video stream */ pCodec=avcodec_find_decoder(pCodecCtx->codec_id); if(pCodec==NULL) { - avcodec_close(pCodecCtx); av_close_input_file(pFormatCtx); return 0; } if(avcodec_open(pCodecCtx, pCodec)<0) { - avcodec_close(pCodecCtx); av_close_input_file(pFormatCtx); return 0; } diff --git a/source/blender/include/BDR_editface.h b/source/blender/include/BDR_editface.h index fb6b65c3972..58b344981ca 100644 --- a/source/blender/include/BDR_editface.h +++ b/source/blender/include/BDR_editface.h @@ -32,6 +32,7 @@ struct MTFace; struct EditFace; +struct EditEdge; struct Mesh; struct MCol; @@ -53,6 +54,8 @@ void uv_autocalc_tface(void); void set_texturepaint(void); void get_same_uv(void); void seam_mark_clear_tface(short mode); - +int edgetag_shortest_path(struct EditEdge *source, struct EditEdge *target); +void edgetag_context_set(struct EditEdge *eed, int val); +int edgetag_context_check(struct EditEdge *eed); #endif /* BDR_EDITFACE_H */ diff --git a/source/blender/include/BIF_imasel.h b/source/blender/include/BIF_imasel.h index a3a3b7531d6..cbd547602e1 100644 --- a/source/blender/include/BIF_imasel.h +++ b/source/blender/include/BIF_imasel.h @@ -34,6 +34,7 @@ struct ScrArea; struct ID; void free_imasel(struct SpaceImaSel *simasel); +void reset_imaselspace(struct ScrArea *sa); void clever_numbuts_imasel(void); diff --git a/source/blender/include/BIF_interface.h b/source/blender/include/BIF_interface.h index 24747b9f220..fbd4e4ecd91 100644 --- a/source/blender/include/BIF_interface.h +++ b/source/blender/include/BIF_interface.h @@ -164,6 +164,7 @@ struct AutoComplete; #define BUT_TOGDUAL (33<<9) #define ICONTOGN (34<<9) #define FTPREVIEW (35<<9) +#define NUMABS (36<<9) #define BUTTYPE (63<<9) diff --git a/source/blender/include/BSE_drawview.h b/source/blender/include/BSE_drawview.h index 09ce87015d9..be1f5581be7 100644 --- a/source/blender/include/BSE_drawview.h +++ b/source/blender/include/BSE_drawview.h @@ -46,7 +46,7 @@ void do_viewbuts(unsigned short event); /* View3DAfter->type */ #define V3D_XRAY 1 #define V3D_TRANSP 2 -void add_view3d_after(struct View3D *v3d, struct Base *base, int type); +void add_view3d_after(struct View3D *v3d, struct Base *base, int type, int flag); void backdrawview3d(int test); void check_backbuf(void); diff --git a/source/blender/include/BSE_filesel.h b/source/blender/include/BSE_filesel.h index 13e38d50c47..b46b2328ea4 100644 --- a/source/blender/include/BSE_filesel.h +++ b/source/blender/include/BSE_filesel.h @@ -54,6 +54,7 @@ void activate_databrowse(struct ID *id, int idcode, int fromcode, int retval, sh void activate_databrowse_args(struct ID *id, int idcode, int fromcode, short *menup, void (*func)(char *, void *, void *), void *arg1, void *arg2); void filesel_prevspace(void); +void reset_filespace(struct ScrArea *sa); void free_filesel_spec(char *dir); void winqreadfilespace(struct ScrArea *sa, void *spacedata, struct BWinEvent *evt); void main_to_filelist(struct SpaceFile *sfile); diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h index 8122cdd9cc7..e5f781a3365 100644 --- a/source/blender/makesdna/DNA_particle_types.h +++ b/source/blender/makesdna/DNA_particle_types.h @@ -171,24 +171,24 @@ typedef struct ParticleSettings { typedef struct ParticleSystem{ struct ParticleSystem *next, *prev; - ParticleSettings *part; + ParticleSettings *part; /* particle settings */ - ParticleData *particles; + ParticleData *particles; /* (parent) particles */ + ChildParticle *child; /* child particles */ - ChildParticle *child; + struct ParticleEdit *edit; /* particle editmode (runtime) */ - struct ParticleEdit *edit; + struct ParticleCacheKey **pathcache; /* path cache (runtime) */ + struct ParticleCacheKey **childcache; /* child cache (runtime) */ + ListBase pathcachebufs, childcachebufs; /* buffers for the above */ - struct ParticleCacheKey **pathcache; - struct ParticleCacheKey **childcache; - - struct SoftBody *soft; + struct SoftBody *soft; /* hair softbody */ struct Object *target_ob; struct Object *keyed_ob; struct Object *lattice; - struct ListBase effectors, reactevents; + struct ListBase effectors, reactevents; /* runtime */ float imat[4][4]; /* used for duplicators */ float cfra; @@ -196,10 +196,10 @@ typedef struct ParticleSystem{ int flag, totpart, totchild, totcached, totchildcache, rt; short recalc, target_psys, keyed_psys, totkeyed, softflag, bakespace; - char bb_uvname[3][32]; + char bb_uvname[3][32]; /* billboard uv name */ /* if you change these remember to update array lengths to PSYS_TOT_VG! */ - short vgroup[11], vg_neg, rt3[2]; + short vgroup[11], vg_neg, rt3[2]; /* vertex groups */ /* temporary storage during render */ void *renderdata; diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index e0e8c351d2c..45833695ffe 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -437,7 +437,9 @@ typedef struct ToolSettings { char skgen_postpro_passes; char skgen_subdivisions[3]; - char pad3[5]; + /* Alt+RMB option */ + char edge_mode; + char pad3[4]; } ToolSettings; /* Used by all brushes to store their properties, which can be directly set @@ -783,6 +785,13 @@ typedef struct Scene { #define UVCALC_FILLHOLES 1 #define UVCALC_NO_ASPECT_CORRECT 2 /* would call this UVCALC_ASPECT_CORRECT, except it should be default with old file */ +/* toolsettings->edge_mode */ +#define EDGE_MODE_SELECT 0 +#define EDGE_MODE_TAG_SEAM 1 +#define EDGE_MODE_TAG_SHARP 2 +#define EDGE_MODE_TAG_CREASE 3 +#define EDGE_MODE_TAG_BEVEL 4 + /* toolsettings->particle flag */ #define PE_KEEP_LENGTHS 1 #define PE_LOCK_FIRST 2 diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index c45571cb583..acc1651e9fa 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -224,7 +224,7 @@ extern UserDef U; /* from usiblender.c !!!! */ #define USER_DUPLILINK (1 << 6) #define USER_FSCOLLUM (1 << 7) #define USER_MAT_ON_OB (1 << 8) -#define USER_NO_CAPSLOCK (1 << 9) +/*#define USER_NO_CAPSLOCK (1 << 9)*/ /* not used anywhere */ #define USER_VIEWMOVE (1 << 10) #define USER_TOOLTIPS (1 << 11) #define USER_TWOBUTTONMOUSE (1 << 12) @@ -236,7 +236,8 @@ extern UserDef U; /* from usiblender.c !!!! */ #define USER_ADD_EDITMODE (1 << 18) #define USER_ADD_VIEWALIGNED (1 << 19) #define USER_RELPATHS (1 << 20) -#define USER_DRAGIMMEDIATE (1 << 21) +#define USER_DRAGIMMEDIATE (1 << 21) +#define USER_DONT_DOSCRIPTLINKS (1 << 22) /* viewzom */ #define USER_ZOOM_CONT 0 diff --git a/source/blender/python/api2_2x/Blender.c b/source/blender/python/api2_2x/Blender.c index daba0c36fdf..4fc68d138e0 100644 --- a/source/blender/python/api2_2x/Blender.c +++ b/source/blender/python/api2_2x/Blender.c @@ -246,7 +246,8 @@ static PyObject *Blender_Set( PyObject * self, PyObject * args ) return EXPP_ReturnPyObjError( PyExc_ValueError, "expected an integer" ); - G.scene->r.cfra = (short)PyInt_AsLong( arg ) ; + G.scene->r.cfra = (int)PyInt_AsLong( arg ) ; + CLAMP(G.scene->r.cfra, 1, MAXFRAME); /* update all objects, so python scripts can export all objects in a scene without worrying about the view layers */ @@ -545,8 +546,12 @@ static PyObject *Blender_Get( PyObject * self, PyObject * value ) else if(StringEqual( str, "compressfile" )) ret = PyInt_FromLong( (U.flag & USER_FILECOMPRESS) >> 15 ); else if(StringEqual( str, "mipmap" )) - ret = PyInt_FromLong( (U.gameflags & USER_DISABLE_MIPMAP) == 0 ); - else + ret = PyInt_FromLong( (U.gameflags & USER_DISABLE_MIPMAP)!=0 ); + else if(StringEqual( str, "add_view_align" )) + ret = PyInt_FromLong( ((U.flag & USER_ADD_VIEWALIGNED)!=0) ); + else if(StringEqual( str, "add_editmode" )) + ret = PyInt_FromLong( ((U.flag & USER_ADD_EDITMODE)!=0) ); + else return EXPP_ReturnPyObjError( PyExc_AttributeError, "unknown attribute" ); if (ret) return ret; diff --git a/source/blender/python/api2_2x/Material.c b/source/blender/python/api2_2x/Material.c index 79deb29bafa..818c58109f3 100644 --- a/source/blender/python/api2_2x/Material.c +++ b/source/blender/python/api2_2x/Material.c @@ -128,6 +128,14 @@ #define EXPP_MAT_FRESNELMIRR_MAX 5.0 #define EXPP_MAT_FRESNELMIRRFAC_MIN 1.0 #define EXPP_MAT_FRESNELMIRRFAC_MAX 5.0 +#define EXPP_MAT_RAYMIRRGLOSS_MIN 0.0 +#define EXPP_MAT_RAYMIRRGLOSS_MAX 1.0 +#define EXPP_MAT_RAYMIRRGLOSSSAMPLES_MIN 0 +#define EXPP_MAT_RAYMIRRGLOSSSAMPLES_MAX 255 +#define EXPP_MAT_RAYTRANSPGLOSS_MIN 0.0 +#define EXPP_MAT_RAYTRANSPGLOSS_MAX 1.0 +#define EXPP_MAT_RAYTRANSPGLOSSSAMPLES_MIN 0 +#define EXPP_MAT_RAYTRANSPGLOSSSAMPLES_MAX 255 #define EXPP_MAT_FILTER_MIN 0.0 #define EXPP_MAT_FILTER_MAX 1.0 #define EXPP_MAT_TRANSLUCENCY_MIN 0.0 @@ -516,6 +524,10 @@ static int Material_setIOR( BPy_Material * self, PyObject * value ); static int Material_setTransDepth( BPy_Material * self, PyObject * value ); static int Material_setFresnelTrans( BPy_Material * self, PyObject * value ); static int Material_setFresnelTransFac( BPy_Material * self, PyObject * value ); +static int Material_setGlossMirr( BPy_Material * self, PyObject * value ); +static int Material_setGlossMirrSamples( BPy_Material * self, PyObject * value ); +static int Material_setGlossTrans( BPy_Material * self, PyObject * value ); +static int Material_setGlossTransSamples( BPy_Material * self, PyObject * value ); static int Material_setRigidBodyFriction( BPy_Material * self, PyObject * value ); static int Material_setRigidBodyRestitution( BPy_Material * self, PyObject * value ); @@ -600,6 +612,10 @@ static PyObject *Material_getIOR( BPy_Material * self ); static PyObject *Material_getTransDepth( BPy_Material * self ); static PyObject *Material_getFresnelTrans( BPy_Material * self ); static PyObject *Material_getFresnelTransFac( BPy_Material * self ); +static PyObject *Material_getGlossMirr( BPy_Material * self ); +static PyObject *Material_getGlossMirrSamples( BPy_Material * self ); +static PyObject *Material_getGlossTrans( BPy_Material * self ); +static PyObject *Material_getGlossTransSamples( BPy_Material * self ); static PyObject *Material_getRigidBodyFriction( BPy_Material * self ); static PyObject *Material_getRigidBodyRestitution( BPy_Material * self ); @@ -720,6 +736,10 @@ static PyMethodDef BPy_Material_methods[] = { "() - Return fresnel power for refractions"}, {"getFresnelMirrFac", ( PyCFunction ) Material_getFresnelMirrFac, METH_NOARGS, "() - Return fresnel power for refractions factor"}, + {"getRayTransGloss", ( PyCFunction ) Material_getGlossTrans, METH_NOARGS, + "() - Return amount refraction glossiness"}, + {"getRayMirrGlossSamples", ( PyCFunction ) Material_getGlossMirrSamples, METH_NOARGS, + "() - Return amount mirror glossiness"}, {"getFilter", ( PyCFunction ) Material_getFilter, METH_NOARGS, "() - Return the amount of filtering when transparent raytrace is enabled"}, {"getTranslucency", ( PyCFunction ) Material_getTranslucency, METH_NOARGS, @@ -825,6 +845,10 @@ static PyMethodDef BPy_Material_methods[] = { "(f) - Set fresnel power for mirror - [0.0, 5.0]"}, {"setFresnelMirrFac", ( PyCFunction ) Matr_oldsetFresnelMirrFac, METH_VARARGS, "(f) - Set blend fac for mirror fresnel - [1.0, 5.0]"}, + {"setRayTransGloss", ( PyCFunction ) Material_setGlossTrans, METH_VARARGS, + "(f) - Set amount refraction glossiness - [0.0, 1.0]"}, + {"setRayMirrGlossSamples", ( PyCFunction ) Material_setGlossMirrSamples, METH_VARARGS, + "(f) - Set amount mirror glossiness - [0.0, 1.0]"}, {"setFilter", ( PyCFunction ) Matr_oldsetFilter, METH_VARARGS, "(f) - Set the amount of filtering when transparent raytrace is enabled"}, {"setTranslucency", ( PyCFunction ) Matr_oldsetTranslucency, METH_VARARGS, @@ -1030,6 +1054,22 @@ static PyGetSetDef BPy_Material_getseters[] = { (getter)Material_getRefracIndex, (setter)Material_setRefracIndex, "Material's Index of Refraction (applies to the \"Blinn\" Specular Shader only", NULL}, + {"glossMir", + (getter)Material_getGlossMirr, (setter)Material_setGlossMirr, + "Reflection glossiness", + NULL}, + {"sampGlossMir", + (getter)Material_getGlossMirrSamples, (setter)Material_setGlossMirrSamples, + "Reflection glossiness", + NULL}, + {"glossTra", + (getter)Material_getGlossTrans, (setter)Material_setGlossTrans, + "Refraction glossiness", + NULL}, + {"sampGlossTra", + (getter)Material_getGlossMirrSamples, (setter)Material_setGlossMirrSamples, + "Refraction glossiness", + NULL}, {"rgbCol", (getter)Material_getRGBCol, (setter)Material_setRGBCol, "Diffuse RGB color triplet", @@ -1578,6 +1618,26 @@ static PyObject *Material_getFresnelTransFac( BPy_Material * self ) return PyFloat_FromDouble( ( double ) self->material->fresnel_tra_i ); } +static PyObject *Material_getGlossMirr( BPy_Material * self ) +{ + return PyFloat_FromDouble( ( double ) self->material->gloss_mir ); +} + +static PyObject *Material_getGlossMirrSamples( BPy_Material * self ) +{ + return PyInt_FromLong( ( long ) self->material->samp_gloss_mir ); +} + +static PyObject *Material_getGlossTrans( BPy_Material * self ) +{ + return PyFloat_FromDouble( ( double ) self->material->gloss_tra ); +} + +static PyObject *Material_getGlossTransSamples( BPy_Material * self ) +{ + return PyInt_FromLong( ( long ) self->material->samp_gloss_tra ); +} + static PyObject* Material_getRigidBodyFriction( BPy_Material * self ) { return PyFloat_FromDouble( ( double ) self->material->friction ); @@ -2058,6 +2118,34 @@ static int Material_setFresnelTransFac( BPy_Material * self, PyObject * value ) EXPP_MAT_FRESNELTRANSFAC_MAX ); } +static int Material_setGlossMirr( BPy_Material * self, PyObject * value ) +{ + return EXPP_setFloatClamped ( value, &self->material->gloss_mir, + EXPP_MAT_RAYMIRRGLOSS_MIN, + EXPP_MAT_RAYMIRRGLOSS_MAX ); +} + +static int Material_setGlossMirrSamples( BPy_Material * self, PyObject * value ) +{ + return EXPP_setIValueClamped ( value, &self->material->samp_gloss_mir, + EXPP_MAT_RAYMIRRGLOSSSAMPLES_MIN, + EXPP_MAT_RAYMIRRGLOSSSAMPLES_MAX, 'h' ); +} + +static int Material_setGlossTrans( BPy_Material * self, PyObject * value ) +{ + return EXPP_setFloatClamped ( value, &self->material->gloss_tra, + EXPP_MAT_RAYTRANSPGLOSS_MIN, + EXPP_MAT_RAYTRANSPGLOSS_MAX ); +} + +static int Material_setGlossTransSamples( BPy_Material * self, PyObject * value ) +{ + return EXPP_setIValueClamped ( value, &self->material->samp_gloss_tra, + EXPP_MAT_RAYTRANSPGLOSSSAMPLES_MIN, + EXPP_MAT_RAYTRANSPGLOSSSAMPLES_MAX, 'h' ); +} + static int Material_setRigidBodyFriction( BPy_Material * self, PyObject * value ) { return EXPP_setFloatClamped ( value, &self->material->friction, diff --git a/source/blender/python/api2_2x/Sys.c b/source/blender/python/api2_2x/Sys.c index 9de4e344e8c..3863cc12227 100644 --- a/source/blender/python/api2_2x/Sys.c +++ b/source/blender/python/api2_2x/Sys.c @@ -58,6 +58,7 @@ static PyObject *M_sys_exists( PyObject * self, PyObject * value ); static PyObject *M_sys_time( PyObject * self ); static PyObject *M_sys_sleep( PyObject * self, PyObject * args ); static PyObject *M_sys_expandpath( PyObject *self, PyObject *value); +static PyObject *M_sys_cleanpath( PyObject *self, PyObject *value); /*****************************************************************************/ /* The following string definitions are used for documentation strings. */ @@ -120,10 +121,13 @@ static char M_sys_expandpath_doc[] = (path) - the string path to convert.\n\n\ Note: internally Blender paths can contain two special character sequences:\n\ - '//' (at start) for base path directory (the current .blend's dir path);\n\ -- '#' (at ending) for current frame number.\n\n\ +- '#' characters in the filename will be replaced by the frame number.\n\n\ This function expands these to their actual content, returning a valid path.\n\ If the special chars are not found in the given path, it is simply returned."; +static char M_sys_cleanpath_doc[] = +"(path) - Removes parts of a path that are not needed paths such as '../foo/../bar/' and '//./././'"; + /*****************************************************************************/ /* Python method structure definition for Blender.sys module: */ /*****************************************************************************/ @@ -139,6 +143,7 @@ struct PyMethodDef M_sys_methods[] = { {"sleep", M_sys_sleep, METH_VARARGS, M_sys_sleep_doc}, {"time", ( PyCFunction ) M_sys_time, METH_NOARGS, M_sys_time_doc}, {"expandpath", M_sys_expandpath, METH_O, M_sys_expandpath_doc}, + {"cleanpath", M_sys_cleanpath, METH_O, M_sys_cleanpath_doc}, {NULL, NULL, 0, NULL} }; @@ -396,3 +401,24 @@ static PyObject *M_sys_expandpath( PyObject * self, PyObject * value ) return PyString_FromString(expanded); } + +static PyObject *M_sys_cleanpath( PyObject * self, PyObject * value ) +{ + char *path = PyString_AsString(value); + char cleaned[FILE_MAXDIR + FILE_MAXFILE]; + int trailing_slash = 0; + if (!path) + return EXPP_ReturnPyObjError( PyExc_TypeError, + "expected string argument" ); + if (strstr(path, "/") || strstr(path, "\\")) { + trailing_slash = 1; + } + BLI_strncpy(cleaned, path, FILE_MAXDIR + FILE_MAXFILE); + BLI_cleanup_file(NULL, cleaned); + + if (trailing_slash) { + BLI_add_slash(cleaned); + } + + return PyString_FromString(cleaned); +} diff --git a/source/blender/python/api2_2x/doc/Material.py b/source/blender/python/api2_2x/doc/Material.py index edcdbbb959b..a3496164cd1 100644 --- a/source/blender/python/api2_2x/doc/Material.py +++ b/source/blender/python/api2_2x/doc/Material.py @@ -237,6 +237,18 @@ class Material: @ivar rayMirr: Mirror reflection amount for raytrace. Value is clamped to the range [0.0,1.0]. @type rayMirr: float + @ivar glossMir: Amount of reflection glossy. + Value is clamped to the range [0.0,1.0]. + @type glossMir: float + @ivar sampGloss_mir: Reflection glossy samples. + Value is clamped to the range [1,1024]. + @type sampGloss_mir: int + @ivar glossTra: Amount of refraction glossy. + Value is clamped to the range [0.0,1.0]. + @type glossTra: float + @ivar sampGlossTra: Refraction glossy samples. + Value is clamped to the range [1,1024]. + @type sampGlossTra: int @ivar rayMirrDepth: Amount of raytrace inter-reflections. Value is clamped to the range [0,10]. @type rayMirrDepth: int diff --git a/source/blender/python/api2_2x/doc/Sys.py b/source/blender/python/api2_2x/doc/Sys.py index f1efeeb2344..d7c62f2cb02 100644 --- a/source/blender/python/api2_2x/doc/Sys.py +++ b/source/blender/python/api2_2x/doc/Sys.py @@ -153,7 +153,7 @@ def expandpath (path): Internally, Blender recognizes two special character sequences in paths: - '//' (used at the beginning): means base path -- the current .blend file's dir; - - '#' (used at the end): means current frame number. + - '#' characters in the filename will be replaced by the frame number. The expanded string can be passed to generic python functions that don't understand Blender's internal relative paths. @note: this function is also useful for obtaining the name of the image @@ -165,3 +165,12 @@ def expandpath (path): @rtype: string @return: the expanded (if necessary) path. """ + +def cleanpath (path): + """ + Clean the given 'path' by removing unneeded components such as "/./" and "/test/../" + @type path: string + @param path: a path name. + @rtype: string + @return: the cleaned (if necessary) path. + """ diff --git a/source/blender/python/api2_2x/doc/epy_docgen-3.sh b/source/blender/python/api2_2x/doc/epy_docgen-3.sh deleted file mode 100644 index ce2bdfef0f8..00000000000 --- a/source/blender/python/api2_2x/doc/epy_docgen-3.sh +++ /dev/null @@ -1,12 +0,0 @@ -# epy_docgen.sh -# generates blender python doc using epydoc -# requires epydoc in your PATH. -# run from the doc directory containing the .py files -# usage: sh epy_docgen.sh - -# set posix locale so regex works properly for [A-Z]*.py -LC_ALL=POSIX - -epydoc -v -o BPY_API --url "http://www.blender.org" --top API_intro \ - --name "Blender" --no-private --no-frames \ -$( ls [A-Z]*.py ) diff --git a/source/blender/python/api2_2x/doc/epy_docgen.sh b/source/blender/python/api2_2x/doc/epy_docgen.sh index d709ee73190..8cbebf82f8d 100644 --- a/source/blender/python/api2_2x/doc/epy_docgen.sh +++ b/source/blender/python/api2_2x/doc/epy_docgen.sh @@ -7,6 +7,5 @@ # set posix locale so regex works properly for [A-Z]*.py LC_ALL=POSIX -epydoc -o BPY_API --url "http://www.blender.org" -t API_intro.py \ - -n "Blender" --no-private --no-frames \ -$( ls [A-Z]*.py ) +epydoc -v -o BPY_API --url "http://www.blender.org" --top API_intro \ + --name "Blender" --no-private --no-frames [A-Z]*.py diff --git a/source/blender/render/intern/source/envmap.c b/source/blender/render/intern/source/envmap.c index 26151ff8b91..12d0efa59e8 100644 --- a/source/blender/render/intern/source/envmap.c +++ b/source/blender/render/intern/source/envmap.c @@ -158,6 +158,7 @@ static Render *envmap_render_copy(Render *re, EnvMap *env) envre->totinstance= re->totinstance; envre->instancetable= re->instancetable; envre->objectinstance= re->objectinstance; + envre->qmcsamplers= re->qmcsamplers; return envre; } @@ -178,6 +179,7 @@ static void envmap_free_render_copy(Render *envre) envre->raytree= NULL; envre->instancetable.first= envre->instancetable.last= NULL; envre->objectinstance= NULL; + envre->qmcsamplers= NULL; RE_FreeRender(envre); } diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c index 2088ebb3674..8956359b784 100644 --- a/source/blender/render/intern/source/rendercore.c +++ b/source/blender/render/intern/source/rendercore.c @@ -785,7 +785,7 @@ static void convert_to_key_alpha(RenderPart *pa, float *rectf) } /* adds only alpha values */ -void edge_enhance_tile(RenderPart *pa, float *rectf) +void edge_enhance_tile(RenderPart *pa, float *rectf, int *rectz) { /* use zbuffer to define edges, add it to the image */ int y, x, col, *rz, *rz1, *rz2, *rz3; @@ -793,13 +793,13 @@ void edge_enhance_tile(RenderPart *pa, float *rectf) float *rf; /* shift values in zbuffer 4 to the right (anti overflows), for filter we need multiplying with 12 max */ - rz= pa->rectz; + rz= rectz; if(rz==NULL) return; for(y=0; y<pa->recty; y++) for(x=0; x<pa->rectx; x++, rz++) (*rz)>>= 4; - rz1= pa->rectz; + rz1= rectz; rz2= rz1+pa->rectx; rz3= rz2+pa->rectx; @@ -839,7 +839,7 @@ void edge_enhance_tile(RenderPart *pa, float *rectf) } /* shift back zbuf values, we might need it still */ - rz= pa->rectz; + rz= rectz; for(y=0; y<pa->recty; y++) for(x=0; x<pa->rectx; x++, rz++) (*rz)<<= 4; @@ -948,7 +948,7 @@ void make_pixelstructs(RenderPart *pa, ZSpan *zspan, int sample, void *data) if(sdata->rl->layflag & SCE_LAY_EDGE) if(R.r.mode & R_EDGE) - edge_enhance_tile(pa, sdata->edgerect); + edge_enhance_tile(pa, sdata->edgerect, zspan->rectz); } /* main call for shading Delta Accum, for OSA */ @@ -1125,7 +1125,7 @@ void zbufshade_tile(RenderPart *pa) if(rl->layflag & SCE_LAY_EDGE) { if(R.r.mode & R_EDGE) { edgerect= MEM_callocN(sizeof(float)*pa->rectx*pa->recty, "rectedge"); - edge_enhance_tile(pa, edgerect); + edge_enhance_tile(pa, edgerect, pa->rectz); } } diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c index 629d60bdffc..aa4c7ae4f11 100644 --- a/source/blender/render/intern/source/shadeoutput.c +++ b/source/blender/render/intern/source/shadeoutput.c @@ -477,8 +477,12 @@ static float area_lamp_energy_multisample(LampRen *lar, float *co, float *vn) float *jitlamp= lar->jitter, vec[3]; float area[4][3], intens= 0.0f; int a= lar->ray_totsamp; - - + + /* test if co is behind lamp */ + VECSUB(vec, co, lar->co); + if(INPR(vec, lar->vec) < 0.0f) + return 0.0f; + while(a--) { vec[0]= jitlamp[0]; vec[1]= jitlamp[1]; diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c index b02e89233e5..94a715162a0 100644 --- a/source/blender/src/buttons_editing.c +++ b/source/blender/src/buttons_editing.c @@ -5070,6 +5070,10 @@ static void editing_panel_mesh_tools1(Object *ob, Mesh *me) uiBlockEndAlign(block); + uiDefButBitS(block, TOG, B_MESH_X_MIRROR, B_DIFF, "X-axis mirror",1125,0,150,19, &G.scene->toolsettings->editbutflag, 0, 0, 0, 0, "While using transforms, mirrors the transformation"); + + uiDefButC(block, MENU, REDRAWBUTSEDIT, "Edge Alt-Select Mode%t|Loop Select%x0|Tag Edges (Seam)%x1|Tag Edges (Sharp)%x2|Tag Edges (Sharp)%x3|Tag Edges (Bevel)%x4",1125,88,150,19, &G.scene->toolsettings->edge_mode, 0, 0, 0, 0, "Operation to use when Alt+RMB on edges, Use Alt+Shift+RMB to tag the shortest path from the active edge"); + uiBlockBeginAlign(block); uiDefButBitI(block, TOG, G_ALLEDGES, 0, "All Edges", 1125, 22,150,19, &G.f, 0, 0, 0, 0, "Displays all edges in object mode without optimization"); uiDefButBitS(block, TOG, B_MESH_X_MIRROR, B_DIFF, "X-axis mirror",1125,0,150,19, &G.scene->toolsettings->editbutflag, 0, 0, 0, 0, "While using transforms, mirrors the transformation"); diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c index 6190f1f0a73..0e21c39fd4b 100644 --- a/source/blender/src/buttons_object.c +++ b/source/blender/src/buttons_object.c @@ -3003,6 +3003,16 @@ void do_effects_panels(unsigned short event) case B_PART_INIT_CHILD: case B_PART_RECALC_CHILD: if(psys) { + nr=0; + for(psys=ob->particlesystem.first; psys; psys=psys->next){ + if(ELEM(psys->part->draw_as,PART_DRAW_OB,PART_DRAW_GR)) + nr++; + } + if(nr) + ob->transflag |= OB_DUPLIPARTS; + else + ob->transflag &= ~OB_DUPLIPARTS; + DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA); allqueue(REDRAWVIEW3D, 0); allqueue(REDRAWBUTSOBJECT, 0); @@ -3405,9 +3415,9 @@ static void object_panel_fields(Object *ob) uiBlockEndAlign(block); } else{ - uiDefButS(block, MENU, B_FIELD_DEP, "Fall-off%t|Cone%x2|Tube%x1|Sphere%x0", 160,180,140,20, &pd->falloff, 0.0, 0.0, 0, 0, tipstr); + uiDefButS(block, MENU, B_FIELD_DEP, "Fall-off%t|Cone%x2|Tube%x1|Sphere%x0", 160,180,140,20, &pd->falloff, 0.0, 0.0, 0, 0, "Fall-off shape"); if(pd->falloff==PFIELD_FALL_TUBE) - uiDefBut(block, LABEL, 0, "Lognitudinal", 160,160,70,20, NULL, 0.0, 0, 0, 0, ""); + uiDefBut(block, LABEL, 0, "Longitudinal", 160,160,140,20, NULL, 0.0, 0, 0, 0, ""); uiBlockBeginAlign(block); uiDefButBitS(block, TOG, PFIELD_POSZ, B_FIELD_CHANGE, "Pos", 160,140,40,20, &pd->flag, 0.0, 0, 0, 0, "Effect only in direction of positive Z axis"); uiDefButF(block, NUM, B_FIELD_CHANGE, "Fall-off: ", 200,140,100,20, &pd->f_power, 0, 10, 10, 0, "Falloff power (real gravitational falloff = 2)"); @@ -4398,8 +4408,8 @@ static void object_panel_particle_visual(Object *ob) uiDefButS(block, NUM, B_PART_RECALC, "Steps:", butx,(buty+=buth),butw,buth, &part->draw_step, 0.0, 7.0, 0, 0, "How many steps paths are drawn with (power of 2)"); uiDefButS(block, NUM, B_PART_REDRAW, "Render:", butx,(buty-=buth),butw,buth, &part->ren_step, 0.0, 9.0, 0, 0, "How many steps paths are rendered with (power of 2)"); - uiDefButBitI(block, TOG, PART_ABS_LENGTH, B_PART_RECALC, "Abs Length", butx,(buty-=buth),butw,buth, &part->flag, 0, 0, 0, 0, "Use maximum length in absolute blender units"); - uiDefButF(block, NUM, B_PART_RECALC, "Max Length:", butx,(buty-=buth),butw,buth, &part->abslength, 0.0, 10000.0, 1, 3, "Absolute path length"); + uiDefButBitI(block, TOG, PART_ABS_LENGTH, B_PART_RECALC, "Abs Length", butx,(buty-=buth),butw,buth, &part->flag, 0, 0, 0, 0, "Use maximum length for children"); + uiDefButF(block, NUM, B_PART_RECALC, "Max Length:", butx,(buty-=buth),butw,buth, &part->abslength, 0.0, 10000.0, 1, 3, "Absolute maximum path length for children, in blender units"); uiDefButF(block, NUMSLI, B_PART_RECALC, "RLength:", butx,(buty-=buth),butw,buth, &part->randlength, 0.0, 1.0, 1, 3, "Give path length a random variation"); uiBlockEndAlign(block); diff --git a/source/blender/src/drawnla.c b/source/blender/src/drawnla.c index fba55f7f308..083d10fd484 100644 --- a/source/blender/src/drawnla.c +++ b/source/blender/src/drawnla.c @@ -490,39 +490,42 @@ void do_nlabuts(unsigned short event) allqueue (REDRAWNLA, 0); allqueue (REDRAWVIEW3D, 0); break; - case B_NLA_SCALE: + case B_NLA_SCALE: /* adjust end-frame when scale is changed */ { float actlen= strip->actend - strip->actstart; float mapping= strip->scale * strip->repeat; - strip->end = (actlen * mapping) + strip->start; + if (mapping != 0.0f) + strip->end = (actlen * mapping) + strip->start; + else + printf("NLA Scale Error: Scale = %0.4f, Repeat = %0.4f \n", strip->scale, strip->repeat); - allqueue (REDRAWNLA, 0); - allqueue (REDRAWIPO, 0); - allqueue (REDRAWACTION, 0); - allqueue (REDRAWVIEW3D, 0); + allqueue(REDRAWNLA, 0); + allqueue(REDRAWIPO, 0); + allqueue(REDRAWACTION, 0); + allqueue(REDRAWVIEW3D, 0); } break; - case B_NLA_SCALE2: + case B_NLA_SCALE2: /* adjust scale when end-frame is changed */ { float actlen= strip->actend - strip->actstart; float len= strip->end - strip->start; strip->scale= len / (actlen * strip->repeat); - allqueue (REDRAWNLA, 0); - allqueue (REDRAWIPO, 0); - allqueue (REDRAWACTION, 0); - allqueue (REDRAWVIEW3D, 0); + allqueue(REDRAWNLA, 0); + allqueue(REDRAWIPO, 0); + allqueue(REDRAWACTION, 0); + allqueue(REDRAWVIEW3D, 0); } break; case B_NLA_LOCK: synchronize_action_strips(); - allqueue (REDRAWNLA, 0); - allqueue (REDRAWIPO, 0); - allqueue (REDRAWACTION, 0); - allqueue (REDRAWVIEW3D, 0); + allqueue(REDRAWNLA, 0); + allqueue(REDRAWIPO, 0); + allqueue(REDRAWACTION, 0); + allqueue(REDRAWVIEW3D, 0); break; case B_NLA_MOD_ADD: @@ -635,14 +638,14 @@ static void nla_panel_properties(short cntrl) // NLA_HANDLER_PROPERTIES uiBlockBeginAlign(block); // FIXME: repeat and scale are too cramped! - uiDefButF(block, NUM, B_NLA_SCALE, "Repeat:", 160,100,75,19, &strip->repeat, 0.001, 1000.0f, 100, 0, "Number of times the action should repeat"); + uiDefButF(block, NUMABS, B_NLA_SCALE, "Repeat:", 160,100,75,19, &strip->repeat, 0.001, 1000.0f, 100, 0, "Number of times the action should repeat"); if ((strip->actend - strip->actstart) < 1.0f) { uiBlockSetCol(block, TH_REDALERT); - uiDefButF(block, NUM, B_NLA_SCALE, "Scale:", 235,100,75,19, &strip->scale, 0.001, 1000.0f, 100, 0, "Please run Alt-S to fix up this error"); + uiDefButF(block, NUMABS, B_NLA_SCALE, "Scale:", 235,100,75,19, &strip->scale, 0.001, 1000.0f, 100, 0, "Please run Alt-S to fix up this error"); uiBlockSetCol(block, TH_AUTO); } else - uiDefButF(block, NUM, B_NLA_SCALE, "Scale:", 235,100,75,19, &strip->scale, 0.001, 1000.0f, 100, 0, "Amount the action should be scaled by"); + uiDefButF(block, NUMABS, B_NLA_SCALE, "Scale:", 235,100,75,19, &strip->scale, 0.001, 1000.0f, 100, 0, "Amount the action should be scaled by"); but= uiDefButC(block, TEX, B_NLA_PANEL, "OffsBone:", 160,80,150,19, strip->offs_bone, 0, 31.0f, 0, 0, "Name of Bone that defines offset for repeat"); uiButSetCompleteFunc(but, autocomplete_bone, (void *)ob); uiDefButBitS(block, TOG, ACTSTRIP_HOLDLASTFRAME, B_NLA_PANEL, "Hold", 160,60,75,19, &strip->flag, 0, 0, 0, 0, "Toggles whether to continue displaying the last frame past the end of the strip"); diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c index aec0e112b32..561024fb74b 100644 --- a/source/blender/src/drawobject.c +++ b/source/blender/src/drawobject.c @@ -2425,19 +2425,23 @@ static void draw_mesh_fancy(Base *base, int dt, int flag) if (draw_wire) { /* If drawing wire and drawtype is not OB_WIRE then we are * overlaying the wires. + * + * UPDATE bug #10290 - With this wire-only objects can draw + * behind other objects depending on their order in the scene. 2x if 0's below. undo'ing zr's commit: r4059 */ - +#if 0 if (dt!=OB_WIRE) { bglPolygonOffset(1.0); glDepthMask(0); // disable write in zbuffer, selected edge wires show better } - +#endif dm->drawEdges(dm, (dt==OB_WIRE || totface==0)); - +#if 0 if (dt!=OB_WIRE) { glDepthMask(1); bglPolygonOffset(0.0); } +#endif } dm->release(dm); @@ -2485,7 +2489,7 @@ static int draw_mesh_object(Base *base, int dt, int flag) } /* init_gl_materials did the proper checking if this is needed */ - if(has_alpha) add_view3d_after(G.vd, base, V3D_TRANSP); + if(has_alpha) add_view3d_after(G.vd, base, V3D_TRANSP, flag); return retval; } @@ -4663,7 +4667,7 @@ void draw_object(Base *base, int flag) if(!(G.f & G_PARTICLEEDIT)) { /* xray and transp are set when it is drawing the 2nd/3rd pass */ if(!G.vd->xray && !G.vd->transp && (ob->dtx & OB_DRAWXRAY)) { - add_view3d_after(G.vd, base, V3D_XRAY); + add_view3d_after(G.vd, base, V3D_XRAY, flag); return; } } diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c index b01b7bc151c..be009536022 100644 --- a/source/blender/src/drawview.c +++ b/source/blender/src/drawview.c @@ -2663,21 +2663,22 @@ static void view3d_blockhandlers(ScrArea *sa) typedef struct View3DAfter { struct View3DAfter *next, *prev; struct Base *base; - int type; + int type, flag; } View3DAfter; /* temp storage of Objects that need to be drawn as last */ -void add_view3d_after(View3D *v3d, Base *base, int type) +void add_view3d_after(View3D *v3d, Base *base, int type, int flag) { View3DAfter *v3da= MEM_callocN(sizeof(View3DAfter), "View 3d after"); BLI_addtail(&v3d->afterdraw, v3da); v3da->base= base; v3da->type= type; + v3da->flag= flag; } /* clears zbuffer and draws it over */ -static void view3d_draw_xray(View3D *v3d, int flag) +static void view3d_draw_xray(View3D *v3d) { View3DAfter *v3da, *next; int doit= 0; @@ -2692,7 +2693,7 @@ static void view3d_draw_xray(View3D *v3d, int flag) for(v3da= v3d->afterdraw.first; v3da; v3da= next) { next= v3da->next; if(v3da->type==V3D_XRAY) { - draw_object(v3da->base, flag); + draw_object(v3da->base, v3da->flag); BLI_remlink(&v3d->afterdraw, v3da); MEM_freeN(v3da); } @@ -2702,7 +2703,7 @@ static void view3d_draw_xray(View3D *v3d, int flag) } /* disables write in zbuffer and draws it over */ -static void view3d_draw_transp(View3D *v3d, int flag) +static void view3d_draw_transp(View3D *v3d) { View3DAfter *v3da, *next; @@ -2712,7 +2713,7 @@ static void view3d_draw_transp(View3D *v3d, int flag) for(v3da= v3d->afterdraw.first; v3da; v3da= next) { next= v3da->next; if(v3da->type==V3D_TRANSP) { - draw_object(v3da->base, flag); + draw_object(v3da->base, v3da->flag); BLI_remlink(&v3d->afterdraw, v3da); MEM_freeN(v3da); } @@ -3102,9 +3103,7 @@ void drawview3dspace(ScrArea *sa, void *spacedata) } } - /* Transp and X-ray afterdraw stuff */ - view3d_draw_xray(v3d, DRAW_CONSTCOLOR); // clears zbuffer if it is used! - view3d_draw_transp(v3d, DRAW_CONSTCOLOR); + /* Transp and X-ray afterdraw stuff for sets is done later */ } /* then draw not selected and the duplis, but skip editmode object */ @@ -3150,8 +3149,8 @@ void drawview3dspace(ScrArea *sa, void *spacedata) if(G.scene->radio) RAD_drawall(v3d->drawtype>=OB_SOLID); /* Transp and X-ray afterdraw stuff */ - view3d_draw_xray(v3d, 0); // clears zbuffer if it is used! - view3d_draw_transp(v3d, 0); + view3d_draw_xray(v3d); // clears zbuffer if it is used! + view3d_draw_transp(v3d); if(!retopo && sculptparticle && (obact && (OBACT->dtx & OB_DRAWXRAY))) { if(G.f & G_SCULPTMODE) @@ -3327,9 +3326,7 @@ void drawview3d_render(struct View3D *v3d, int winx, int winy, float winmat[][4] } } - /* Transp and X-ray afterdraw stuff */ - view3d_draw_xray(v3d, DRAW_CONSTCOLOR); // clears zbuffer if it is used! - view3d_draw_transp(v3d, DRAW_CONSTCOLOR); + /* Transp and X-ray afterdraw stuff for sets is done later */ } /* first not selected and duplis */ @@ -3367,8 +3364,8 @@ void drawview3d_render(struct View3D *v3d, int winx, int winy, float winmat[][4] if(G.scene->radio) RAD_drawall(v3d->drawtype>=OB_SOLID); /* Transp and X-ray afterdraw stuff */ - view3d_draw_xray(v3d, 0); // clears zbuffer if it is used! - view3d_draw_transp(v3d, 0); + view3d_draw_xray(v3d); // clears zbuffer if it is used! + view3d_draw_transp(v3d); if(v3d->flag & V3D_CLIPPING) view3d_clr_clipping(); @@ -3424,7 +3421,7 @@ static void draw_viewport_fps(ScrArea *sa) char printable[16]; int i, tot; - if (lredrawtime == redrawtime) + if (!lredrawtime || !redrawtime) return; printable[0] = '\0'; @@ -3572,7 +3569,7 @@ void inner_play_anim_loop(int init, int mode) last_cfra = -1; cached = cached_dynamics(PSFRA,PEFRA); - redrawtime = 1.0/FPS; + redrawtime = 0.0; redrawtime_index = REDRAW_FRAME_AVERAGE; while(redrawtime_index--) { diff --git a/source/blender/src/editface.c b/source/blender/src/editface.c index c1665332be8..e74401cb622 100644 --- a/source/blender/src/editface.c +++ b/source/blender/src/editface.c @@ -870,14 +870,14 @@ int minmax_tface(float *min, float *max) return ok; } -#define ME_SEAM_DONE ME_SEAM_LAST /* reuse this flag */ +#define ME_SEAM_DONE 2 /* reuse this flag */ -static float seam_cut_cost(Mesh *me, int e1, int e2, int vert) +static float edgetag_cut_cost(EditMesh *em, int e1, int e2, int vert) { - MVert *v = me->mvert + vert; - MEdge *med1 = me->medge + e1, *med2 = me->medge + e2; - MVert *v1 = me->mvert + ((med1->v1 == vert)? med1->v2: med1->v1); - MVert *v2 = me->mvert + ((med2->v1 == vert)? med2->v2: med2->v1); + EditVert *v = EM_get_vert_for_index(vert); + EditEdge *eed1 = EM_get_edge_for_index(e1), *eed2 = EM_get_edge_for_index(e2); + EditVert *v1 = EM_get_vert_for_index( (eed1->v1->tmp.l == vert)? eed1->v2->tmp.l: eed1->v1->tmp.l ); + EditVert *v2 = EM_get_vert_for_index( (eed2->v1->tmp.l == vert)? eed2->v2->tmp.l: eed2->v1->tmp.l ); float cost, d1[3], d2[3]; cost = VecLenf(v1->co, v->co); @@ -891,19 +891,19 @@ static float seam_cut_cost(Mesh *me, int e1, int e2, int vert) return cost; } -static void seam_add_adjacent(Mesh *me, Heap *heap, int mednum, int vertnum, int *nedges, int *edges, int *prevedge, float *cost) +static void edgetag_add_adjacent(EditMesh *em, Heap *heap, int mednum, int vertnum, int *nedges, int *edges, int *prevedge, float *cost) { int startadj, endadj = nedges[vertnum+1]; for (startadj = nedges[vertnum]; startadj < endadj; startadj++) { int adjnum = edges[startadj]; - MEdge *medadj = me->medge + adjnum; + EditEdge *eedadj = EM_get_edge_for_index(adjnum); float newcost; - if (medadj->flag & ME_SEAM_DONE) + if (eedadj->f2 & ME_SEAM_DONE) continue; - newcost = cost[mednum] + seam_cut_cost(me, mednum, adjnum, vertnum); + newcost = cost[mednum] + edgetag_cut_cost(em, mednum, adjnum, vertnum); if (cost[adjnum] > newcost) { cost[adjnum] = newcost; @@ -913,59 +913,93 @@ static void seam_add_adjacent(Mesh *me, Heap *heap, int mednum, int vertnum, int } } -static int seam_shortest_path(Mesh *me, int source, int target) +void edgetag_context_set(EditEdge *eed, int val) { + switch (G.scene->toolsettings->edge_mode) { + case EDGE_MODE_TAG_SEAM: + if (val) {eed->seam = 255;} + else {eed->seam = 0;} + break; + case EDGE_MODE_TAG_SHARP: + if (val) {eed->sharp = 1;} + else {eed->sharp = 0;} + break; + case EDGE_MODE_TAG_CREASE: + if (val) {eed->crease = 1.0f;} + else {eed->crease = 0.0f;} + break; + case EDGE_MODE_TAG_BEVEL: + if (val) {eed->bweight = 1.0f;} + else {eed->bweight = 0.0f;} + break; + } +} + +int edgetag_context_check(EditEdge *eed) +{ + switch (G.scene->toolsettings->edge_mode) { + case EDGE_MODE_TAG_SEAM: + return eed->seam ? 1 : 0; + case EDGE_MODE_TAG_SHARP: + return eed->sharp ? 1 : 0; + case EDGE_MODE_TAG_CREASE: + return eed->crease ? 1 : 0; + case EDGE_MODE_TAG_BEVEL: + return eed->bweight ? 1 : 0; + } + return 0; +} + + +int edgetag_shortest_path(EditEdge *source, EditEdge *target) +{ + EditMesh *em = G.editMesh; + EditEdge *eed; + EditVert *ev; + Heap *heap; EdgeHash *ehash; float *cost; - MEdge *med; - int a, *nedges, *edges, *prevedge, mednum = -1, nedgeswap = 0; - MFace *mf; + int a, totvert=0, totedge=0, *nedges, *edges, *prevedge, mednum = -1, nedgeswap = 0; - /* mark hidden edges as done, so we don't use them */ - ehash = BLI_edgehash_new(); - for (a=0, mf=me->mface; a<me->totface; a++, mf++) { - if (!(mf->flag & ME_HIDE)) { - BLI_edgehash_insert(ehash, mf->v1, mf->v2, NULL); - BLI_edgehash_insert(ehash, mf->v2, mf->v3, NULL); - if (mf->v4) { - BLI_edgehash_insert(ehash, mf->v3, mf->v4, NULL); - BLI_edgehash_insert(ehash, mf->v4, mf->v1, NULL); - } - else - BLI_edgehash_insert(ehash, mf->v3, mf->v1, NULL); - } + /* we need the vert */ + for (ev= em->verts.first, totvert=0; ev; ev= ev->next) { + ev->tmp.l = totvert; + totvert++; } - for (a=0, med=me->medge; a<me->totedge; a++, med++) - if (!BLI_edgehash_haskey(ehash, med->v1, med->v2)) - med->flag |= ME_SEAM_DONE; - - BLI_edgehash_free(ehash, NULL); + for (eed= em->edges.first; eed; eed = eed->next) { + eed->f2 = 0; + if (eed->h) { + eed->f2 |= ME_SEAM_DONE; + } + eed->tmp.l = totedge; + totedge++; + } /* alloc */ - nedges = MEM_callocN(sizeof(*nedges)*me->totvert+1, "SeamPathNEdges"); - edges = MEM_mallocN(sizeof(*edges)*me->totedge*2, "SeamPathEdges"); - prevedge = MEM_mallocN(sizeof(*prevedge)*me->totedge, "SeamPathPrevious"); - cost = MEM_mallocN(sizeof(*cost)*me->totedge, "SeamPathCost"); + nedges = MEM_callocN(sizeof(*nedges)*totvert+1, "SeamPathNEdges"); + edges = MEM_mallocN(sizeof(*edges)*totedge*2, "SeamPathEdges"); + prevedge = MEM_mallocN(sizeof(*prevedge)*totedge, "SeamPathPrevious"); + cost = MEM_mallocN(sizeof(*cost)*totedge, "SeamPathCost"); /* count edges, compute adjacent edges offsets and fill adjacent edges */ - for (a=0, med=me->medge; a<me->totedge; a++, med++) { - nedges[med->v1+1]++; - nedges[med->v2+1]++; + for (eed= em->edges.first; eed; eed = eed->next) { + nedges[eed->v1->tmp.l+1]++; + nedges[eed->v2->tmp.l+1]++; } - for (a=1; a<me->totvert; a++) { + for (a=1; a<totvert; a++) { int newswap = nedges[a+1]; nedges[a+1] = nedgeswap + nedges[a]; nedgeswap = newswap; } nedges[0] = nedges[1] = 0; - for (a=0, med=me->medge; a<me->totedge; a++, med++) { - edges[nedges[med->v1+1]++] = a; - edges[nedges[med->v2+1]++] = a; + for (a=0, eed= em->edges.first; eed; a++, eed = eed->next) { + edges[nedges[eed->v1->tmp.l+1]++] = a; + edges[nedges[eed->v2->tmp.l+1]++] = a; cost[a] = 1e20f; prevedge[a] = -1; @@ -973,100 +1007,74 @@ static int seam_shortest_path(Mesh *me, int source, int target) /* regular dijkstra shortest path, but over edges instead of vertices */ heap = BLI_heap_new(); - BLI_heap_insert(heap, 0.0f, SET_INT_IN_POINTER(source)); - cost[source] = 0.0f; + BLI_heap_insert(heap, 0.0f, SET_INT_IN_POINTER(source->tmp.l)); + cost[source->tmp.l] = 0.0f; + + EM_init_index_arrays(1, 1, 0); + while (!BLI_heap_empty(heap)) { mednum = GET_INT_FROM_POINTER(BLI_heap_popmin(heap)); - med = me->medge + mednum; + eed = EM_get_edge_for_index( mednum ); - if (mednum == target) + if (mednum == target->tmp.l) break; - if (med->flag & ME_SEAM_DONE) + if (eed->f2 & ME_SEAM_DONE) continue; - med->flag |= ME_SEAM_DONE; + eed->f2 |= ME_SEAM_DONE; - seam_add_adjacent(me, heap, mednum, med->v1, nedges, edges, prevedge, cost); - seam_add_adjacent(me, heap, mednum, med->v2, nedges, edges, prevedge, cost); + edgetag_add_adjacent(em, heap, mednum, eed->v1->tmp.l, nedges, edges, prevedge, cost); + edgetag_add_adjacent(em, heap, mednum, eed->v2->tmp.l, nedges, edges, prevedge, cost); } + MEM_freeN(nedges); MEM_freeN(edges); MEM_freeN(cost); BLI_heap_free(heap, NULL); - for (a=0, med=me->medge; a<me->totedge; a++, med++) - med->flag &= ~ME_SEAM_DONE; + for (eed= em->edges.first; eed; eed = eed->next) { + eed->f2 &= ~ME_SEAM_DONE; + } - if (mednum != target) { + if (mednum != target->tmp.l) { MEM_freeN(prevedge); + EM_free_index_arrays(); return 0; } /* follow path back to source and mark as seam */ - if (mednum == target) { + if (mednum == target->tmp.l) { short allseams = 1; - mednum = target; + mednum = target->tmp.l; do { - med = me->medge + mednum; - if (!(med->flag & ME_SEAM)) { + eed = EM_get_edge_for_index( mednum ); + if (!edgetag_context_check(eed)) { allseams = 0; break; } mednum = prevedge[mednum]; - } while (mednum != source); + } while (mednum != source->tmp.l); - mednum = target; + mednum = target->tmp.l; do { - med = me->medge + mednum; + eed = EM_get_edge_for_index( mednum ); if (allseams) - med->flag &= ~ME_SEAM; + edgetag_context_set(eed, 0); else - med->flag |= ME_SEAM; + edgetag_context_set(eed, 1); mednum = prevedge[mednum]; } while (mednum != -1); } MEM_freeN(prevedge); + EM_free_index_arrays(); return 1; } -static void seam_select(Mesh *me, short *mval, short path) -{ - unsigned int index = 0; - MEdge *medge, *med; - int a, lastindex = -1; - - if (!facesel_edge_pick(me, mval, &index)) - return; - - for (a=0, med=me->medge; a<me->totedge; a++, med++) { - if (med->flag & ME_SEAM_LAST) { - lastindex = a; - med->flag &= ~ME_SEAM_LAST; - break; - } - } - - medge = me->medge + index; - if (!path || (lastindex == -1) || (index == lastindex) || - !seam_shortest_path(me, lastindex, index)) - medge->flag ^= ME_SEAM; - medge->flag |= ME_SEAM_LAST; - - G.f |= G_DRAWSEAMS; - - if (G.rt == 8) - unwrap_lscm(1); - - BIF_undo_push("Mark Seam"); - - object_tface_flags_changed(OBACT, 1); -} - void seam_edgehash_insert_face(EdgeHash *ehash, MFace *mf) { BLI_edgehash_insert(ehash, mf->v1, mf->v2, NULL); @@ -1154,11 +1162,6 @@ void face_select() me = get_mesh(ob); getmouseco_areawin(mval); - if (G.qual & LR_ALTKEY) { - seam_select(me, mval, (G.qual & LR_SHIFTKEY) != 0); - return; - } - if (!facesel_face_pick(me, mval, &index, 1)) return; msel= (((MFace*)me->mface)+index); diff --git a/source/blender/src/editmesh_mods.c b/source/blender/src/editmesh_mods.c index d1873d1fe56..84971e8ce0b 100644 --- a/source/blender/src/editmesh_mods.c +++ b/source/blender/src/editmesh_mods.c @@ -92,6 +92,7 @@ editmesh_mods.c, UI level access, no geometry changes #include "BDR_drawobject.h" #include "BDR_editobject.h" +#include "BDR_editface.h" #include "BSE_drawview.h" #include "BSE_edit.h" @@ -2062,6 +2063,7 @@ void loop_multiselect(int looptype) /* ***************** MAIN MOUSE SELECTION ************** */ /* just to have the functions nice together */ + static void mouse_mesh_loop(void) { EditEdge *eed; @@ -2070,36 +2072,100 @@ static void mouse_mesh_loop(void) eed= findnearestedge(&dist); if(eed) { + if (G.scene->toolsettings->edge_mode == EDGE_MODE_SELECT) { + if((G.qual & LR_SHIFTKEY)==0) EM_clear_flag_all(SELECT); - if((G.qual & LR_SHIFTKEY)==0) EM_clear_flag_all(SELECT); - - if((eed->f & SELECT)==0) select=1; - else if(G.qual & LR_SHIFTKEY) select=0; + if((eed->f & SELECT)==0) select=1; + else if(G.qual & LR_SHIFTKEY) select=0; - if(G.scene->selectmode & SCE_SELECT_FACE) { - faceloop_select(eed, select); - } - else if(G.scene->selectmode & SCE_SELECT_EDGE) { - if(G.qual == (LR_CTRLKEY | LR_ALTKEY) || G.qual == (LR_CTRLKEY | LR_ALTKEY |LR_SHIFTKEY)) - edgering_select(eed, select); - else if(G.qual & LR_ALTKEY) - edgeloop_select(eed, select); - } - else if(G.scene->selectmode & SCE_SELECT_VERTEX) { - if(G.qual == (LR_CTRLKEY | LR_ALTKEY) || G.qual == (LR_CTRLKEY | LR_ALTKEY |LR_SHIFTKEY)) - edgering_select(eed, select); - else if(G.qual & LR_ALTKEY) - edgeloop_select(eed, select); - } + if(G.scene->selectmode & SCE_SELECT_FACE) { + faceloop_select(eed, select); + } + else if(G.scene->selectmode & SCE_SELECT_EDGE) { + if(G.qual == (LR_CTRLKEY | LR_ALTKEY) || G.qual == (LR_CTRLKEY | LR_ALTKEY |LR_SHIFTKEY)) + edgering_select(eed, select); + else if(G.qual & LR_ALTKEY) + edgeloop_select(eed, select); + } + else if(G.scene->selectmode & SCE_SELECT_VERTEX) { + if(G.qual == (LR_CTRLKEY | LR_ALTKEY) || G.qual == (LR_CTRLKEY | LR_ALTKEY |LR_SHIFTKEY)) + edgering_select(eed, select); + else if(G.qual & LR_ALTKEY) + edgeloop_select(eed, select); + } - /* frontbuffer draw of last selected only */ - unified_select_draw(NULL, eed, NULL); + /* frontbuffer draw of last selected only */ + unified_select_draw(NULL, eed, NULL); - EM_selectmode_flush(); - countall(); - allqueue(REDRAWVIEW3D, 0); - if (EM_texFaceCheck()) - allqueue(REDRAWIMAGE, 0); + EM_selectmode_flush(); + countall(); + allqueue(REDRAWVIEW3D, 0); + if (EM_texFaceCheck()) + allqueue(REDRAWIMAGE, 0); + } else { /*(G.scene->toolsettings->edge_mode == EDGE_MODE_TAG_*)*/ + int act = (edgetag_context_check(eed)==0); + int path = 0; + + if (G.qual == (LR_SHIFTKEY | LR_ALTKEY) && G.editMesh->selected.last) { + EditSelection *ese = G.editMesh->selected.last; + + if(ese && ese->type == EDITEDGE) { + EditEdge *eed_act; + eed_act = (EditEdge*)ese->data; + if (eed_act != eed) { + /* If shift is pressed we need to use the last active edge, (if it exists) */ + if (edgetag_shortest_path(eed_act, eed)) { + EM_remove_selection(eed_act, EDITEDGE); + EM_select_edge(eed_act, 0); + path = 1; + } + } + } + } + if (path==0) { + edgetag_context_set(eed, act); /* switch the edge option */ + } + + if (act) { + if ((eed->f & SELECT)==0) { + EM_select_edge(eed, 1); + EM_selectmode_flush(); + countall(); + } + /* even if this is selected it may not be in the selection list */ + EM_store_selection(eed, EDITEDGE); + } else { + if (eed->f & SELECT) { + EM_select_edge(eed, 0); + /* logic is differnt from above here since if this was selected we dont know if its in the selection list or not */ + EM_remove_selection(eed, EDITEDGE); + + EM_selectmode_flush(); + countall(); + } + } + + switch (G.scene->toolsettings->edge_mode) { + case EDGE_MODE_TAG_SEAM: + G.f |= G_DRAWSEAMS; + break; + case EDGE_MODE_TAG_SHARP: + G.f |= G_DRAWSHARP; + break; + case EDGE_MODE_TAG_CREASE: + G.f |= G_DRAWCREASES; + break; + case EDGE_MODE_TAG_BEVEL: + G.f |= G_DRAWBWEIGHTS; + break; + } + + unified_select_draw(NULL, eed, NULL); + + DAG_object_flush_update(G.scene, G.obedit, OB_RECALC_DATA); + allqueue(REDRAWVIEW3D, 0); + } + } } diff --git a/source/blender/src/editnla.c b/source/blender/src/editnla.c index 6d9adda85d0..d758f34949a 100644 --- a/source/blender/src/editnla.c +++ b/source/blender/src/editnla.c @@ -188,11 +188,16 @@ void shift_nlastrips_down(void) { void synchronize_action_strips(void) { Base *base; + Object *ob; bActionStrip *strip; for (base=G.scene->base.first; base; base=base->next) { + /* get object first */ + ob= base->object; + /* step 1: adjust strip-lengths */ - for (strip = base->object->nlastrips.last; strip; strip=strip->prev) { + // FIXME: this seems very buggy + for (strip = ob->nlastrips.last; strip; strip=strip->prev) { if (strip->flag & ACTSTRIP_LOCK_ACTION) { float actstart, actend; @@ -212,7 +217,7 @@ void synchronize_action_strips(void) } /* step 2: adjust blendin/out values for each strip if option is turned on */ - for (strip= base->object->nlastrips.first; strip; strip=strip->next) { + for (strip= ob->nlastrips.first; strip; strip=strip->next) { if (strip->flag & ACTSTRIP_AUTO_BLENDS) { bActionStrip *prev= strip->prev; bActionStrip *next= strip->next; diff --git a/source/blender/src/editobject.c b/source/blender/src/editobject.c index a412a7945ee..721fae8512f 100644 --- a/source/blender/src/editobject.c +++ b/source/blender/src/editobject.c @@ -1887,6 +1887,7 @@ void docenter(int centermode) recalc_editnormals(); tot_change++; + DAG_object_flush_update(G.scene, G.obedit, OB_RECALC_DATA); } } @@ -3133,9 +3134,15 @@ void flip_subdivison(int level) mode= eModifierMode_Render|eModifierMode_Realtime; if(level == -1) { - for(base= G.scene->base.first; base; base= base->next) - if(((level==-1) && (TESTBASE(base))) || (TESTBASELIB(base))) - object_has_subdivision_particles(base->object, &havesubdiv, &havepart, 0); + if (G.obedit) { + object_has_subdivision_particles(G.obedit, &havesubdiv, &havepart, 0); + } else { + for(base= G.scene->base.first; base; base= base->next) { + if(((level==-1) && (TESTBASE(base))) || (TESTBASELIB(base))) { + object_has_subdivision_particles(base->object, &havesubdiv, &havepart, 0); + } + } + } } else havesubdiv= 1; @@ -3149,10 +3156,16 @@ void flip_subdivison(int level) } else if(havepart) particles= 1; - - for(base= G.scene->base.first; base; base= base->next) - if(((level==-1) && (TESTBASE(base))) || (TESTBASELIB(base))) - object_flip_subdivison_particles(base->object, &set, level, mode, particles, 0); + + if (G.obedit) { + object_flip_subdivison_particles(G.obedit, &set, level, mode, particles, 0); + } else { + for(base= G.scene->base.first; base; base= base->next) { + if(((level==-1) && (TESTBASE(base))) || (TESTBASELIB(base))) { + object_flip_subdivison_particles(base->object, &set, level, mode, particles, 0); + } + } + } countall(); allqueue(REDRAWVIEW3D, 0); diff --git a/source/blender/src/filesel.c b/source/blender/src/filesel.c index 74fcc081229..3d5e39fe942 100644 --- a/source/blender/src/filesel.c +++ b/source/blender/src/filesel.c @@ -1299,6 +1299,27 @@ void activate_databrowse_args(struct ID *id, int idcode, int fromcode, short *me sfile->ipotype= fromcode; } +/* resets a previous file space type */ +/* is used when opening a filebrowser directly from windowtype_pupmenu, + since in that case we don't want any load/save/append/link action +*/ +void reset_filespace(ScrArea *sa) +{ + if (sa->spacetype == SPACE_FILE) { + SpaceFile *sfile= sa->spacedata.first; + + if(sfile->type==FILE_MAIN) { + freefilelist(sfile); + } else { + sfile->type= FILE_UNIX; + } + + sfile->returnfunc= NULL; + sfile->title[0]= 0; + if(sfile->filelist) test_flags_file(sfile); + } +} + void filesel_prevspace() { SpaceFile *sfile= curarea->spacedata.first; diff --git a/source/blender/src/headerbuttons.c b/source/blender/src/headerbuttons.c index fcc1dcb42b4..035468d89c0 100644 --- a/source/blender/src/headerbuttons.c +++ b/source/blender/src/headerbuttons.c @@ -1434,6 +1434,8 @@ void do_global_buttons(unsigned short event) break; case B_NEWSPACE: newspace(curarea, curarea->butspacetype); + reset_filespace(curarea); + reset_imaselspace(curarea); break; case B_LOADTEMP: /* is button from space.c */ BIF_read_autosavefile(); diff --git a/source/blender/src/imasel.c b/source/blender/src/imasel.c index be9f489ea49..f502445d329 100644 --- a/source/blender/src/imasel.c +++ b/source/blender/src/imasel.c @@ -80,3 +80,26 @@ void free_imasel(SpaceImaSel *simasel) } } +/* resets a previous imagebrowser space type */ +/* is used when opening an imagebrowser directly from windowtype_pupmenu, + since in that case we don't want any load/save/append/link action +*/ +void reset_imaselspace(ScrArea *sa) +{ + if(sa->spacetype==SPACE_IMASEL) { + SpaceImaSel *simasel= sa->spacedata.first; + if(simasel->type==FILE_MAIN) { + if (simasel->files) { + BIF_filelist_free(simasel->files); + BIF_filelist_settype(simasel->files, FILE_MAIN); + } + } else { + if (simasel->files) { + simasel->type= FILE_UNIX; + BIF_filelist_settype(simasel->files, simasel->type); + } + } + simasel->returnfunc= NULL; + simasel->title[0]= 0; + } +} diff --git a/source/blender/src/interface.c b/source/blender/src/interface.c index fb5b5e2f187..7af6b67bfa3 100644 --- a/source/blender/src/interface.c +++ b/source/blender/src/interface.c @@ -472,7 +472,7 @@ static int ui_but_copy_paste(uiBut *but, char mode) if(mode=='v' && but->lock) return 0; poin= but->poin; - if ELEM3(but->type, NUM, NUMSLI, HSVSLI) { + if ELEM4(but->type, NUM, NUMABS, NUMSLI, HSVSLI) { if(poin==NULL); else if(mode=='c') { @@ -2100,7 +2100,8 @@ static int ui_act_as_text_but(uiBut *but) } if(but->pointype!=FLO) value= (int)value; - + + if(but->type==NUMABS) value= fabs(value); if(value<min) value= min; if(value>max) value= max; @@ -2328,6 +2329,7 @@ static int ui_do_but_ICONROW(uiBut *but) ListBase listb= {NULL, NULL}; uiBlock *block; int a; + short event; but->flag |= UI_SELECT; ui_draw_but(but); @@ -2348,13 +2350,17 @@ static int ui_do_but_ICONROW(uiBut *but) this is needs better implementation */ block->win= G.curscreen->mainwin; - uiDoBlocks(&listb, 0, 1); + event= uiDoBlocks(&listb, 0, 1); but->flag &= ~UI_SELECT; ui_check_but(but); ui_draw_but(but); - - return but->retval; + + if (event & UI_RETURN_OK) { + return but->retval; + } else { + return 0; + } } static int ui_do_but_ICONTEXTROW(uiBut *but) @@ -2363,7 +2369,7 @@ static int ui_do_but_ICONTEXTROW(uiBut *but) ListBase listb={NULL, NULL}; int width, a, xmax, ypos; MenuData *md; - + short event; but->flag |= UI_SELECT; ui_draw_but(but); ui_block_flush_back(but->block); // flush because this button creates own blocks loop @@ -2421,7 +2427,7 @@ static int ui_do_but_ICONTEXTROW(uiBut *but) uiBoundsBlock(block, 3); - uiDoBlocks(&listb, 0, 1); + event = uiDoBlocks(&listb, 0, 1); menudata_free(md); @@ -2429,10 +2435,12 @@ static int ui_do_but_ICONTEXTROW(uiBut *but) ui_check_but(but); ui_draw_but(but); - uibut_do_func(but); - - return but->retval; - + if (event & UI_RETURN_OK) { + uibut_do_func(but); + return but->retval; + } else { + return 0; + } } static int ui_do_but_IDPOIN(uiBut *but) @@ -3927,6 +3935,7 @@ static int ui_do_button(uiBlock *block, uiBut *but, uiEvent *uevent) break; case NUM: + case NUMABS: if(uevent->val) retval= ui_do_but_NUM(but); break; @@ -4246,13 +4255,13 @@ static void ui_but_next_edittext(uiBlock *block) but->flag &= ~(UI_ACTIVE|UI_SELECT); for(but= actbut->next; but; but= but->next) { - if(ELEM4(but->type, TEX, NUM, NUMSLI, HSVSLI)) { + if(ELEM5(but->type, TEX, NUM, NUMABS, NUMSLI, HSVSLI)) { but->flag |= UI_ACTIVE; return; } } for(but= block->buttons.first; but!=actbut; but= but->next) { - if(ELEM4(but->type, TEX, NUM, NUMSLI, HSVSLI)) { + if(ELEM5(but->type, TEX, NUM, NUMABS, NUMSLI, HSVSLI)) { but->flag |= UI_ACTIVE; return; } @@ -4275,13 +4284,13 @@ static void ui_but_prev_edittext(uiBlock *block) but->flag &= ~(UI_ACTIVE|UI_SELECT); for(but= actbut->prev; but; but= but->prev) { - if(ELEM4(but->type, TEX, NUM, NUMSLI, HSVSLI)) { + if(ELEM5(but->type, TEX, NUM, NUMABS, NUMSLI, HSVSLI)) { but->flag |= UI_ACTIVE; return; } } for(but= block->buttons.last; but!=actbut; but= but->prev) { - if(ELEM4(but->type, TEX, NUM, NUMSLI, HSVSLI)) { + if(ELEM5(but->type, TEX, NUM, NUMABS, NUMSLI, HSVSLI)) { but->flag |= UI_ACTIVE; return; } @@ -4636,7 +4645,7 @@ static int ui_do_block(uiBlock *block, uiEvent *uevent, int movemouse_quit) //Really nasty... to update the num button from the same butblock for(bt= block->buttons.first; bt; bt= bt->next) { - if(bt->type == NUM) { + if(ELEM(bt->type, NUM, NUMABS)) { ui_check_but(bt); ui_draw_but(bt); } @@ -4662,7 +4671,7 @@ static int ui_do_block(uiBlock *block, uiEvent *uevent, int movemouse_quit) for(bt= block->buttons.first; bt; bt= bt->next) { - if(bt->type == NUM) { + if(ELEM(bt->type, NUM, NUMABS)) { ui_check_but(bt); ui_draw_but(bt); } @@ -5435,8 +5444,15 @@ void ui_check_but(uiBut *but) case HSVSLI: value= ui_get_but_val(but); if(value < but->min) value= but->min; - if(value > but->max) value= but->max; - ui_set_but_val(but, value); + if(value > but->max) value= but->max; + ui_set_but_val(but, value); + break; + + case NUMABS: + value= fabs( ui_get_but_val(but) ); + if(value < but->min) value= but->min; + if(value > but->max) value= but->max; + ui_set_but_val(but, value); break; case ICONTOG: @@ -5478,6 +5494,7 @@ void ui_check_but(uiBut *but) case NUM: case NUMSLI: case HSVSLI: + case NUMABS: value= ui_get_but_val(but); @@ -5567,7 +5584,7 @@ void ui_check_but(uiBut *but) but->ofs= 0; while(but->strwidth > (int)okwidth ) { - if ELEM(but->type, NUM, TEX) { // only these cut off left + if ELEM3(but->type, NUM, NUMABS, TEX) { // only these cut off left but->ofs++; but->strwidth= but->aspect*BIF_GetStringWidth(but->font, but->drawstr+but->ofs, transopts); @@ -5611,6 +5628,7 @@ static int ui_auto_themecol(uiBut *but) case SLI: case NUM: case NUMSLI: + case NUMABS: case HSVSLI: return TH_BUT_NUM; case TEX: @@ -5887,7 +5905,7 @@ static uiBut *ui_def_but(uiBlock *block, int type, int retval, char *str, short but->pos= -1; /* cursor invisible */ - if(but->type==NUM) { /* add a space to name */ + if(ELEM(but->type, NUM, NUMABS)) { /* add a space to name */ slen= strlen(but->str); if(slen>0 && slen<UI_MAX_NAME_STR-2) { if(but->str[slen-1]!=' ') { diff --git a/source/blender/src/interface_draw.c b/source/blender/src/interface_draw.c index 83a3c12bae7..83f1221b1fb 100644 --- a/source/blender/src/interface_draw.c +++ b/source/blender/src/interface_draw.c @@ -846,6 +846,7 @@ static void ui_default_flat(int type, int colorid, float asp, float x1, float y1 /* *** EXTRA DRAWING FOR SPECIFIC CONTROL TYPES *** */ switch(type) { case NUM: + case NUMABS: /* SIDE ARROWS */ /* left */ if(flag & UI_SELECT) { @@ -872,11 +873,12 @@ static void ui_default_slider(int colorid, float fac, float aspect, float x1, fl if(flag & UI_SELECT) BIF_ThemeColorShade(TH_BUT_NUM, -5); - else + else { if(flag & UI_ACTIVE) BIF_ThemeColorShade(TH_BUT_NUM, +35); else BIF_ThemeColorShade(TH_BUT_NUM, +25); + } glRectf(x1, ymid-yc, x2, ymid+yc); @@ -943,6 +945,7 @@ static void ui_draw_default(int type, int colorid, float aspect, float x1, float case TEX: case IDPOIN: case NUM: + case NUMABS: ui_default_flat(type, colorid, aspect, x1, y1, x2, y2, flag); break; case ICONROW: @@ -1026,6 +1029,7 @@ static void ui_draw_oldskool(int type, int colorid, float asp, float x1, float y /* special type decorations */ switch(type) { case NUM: + case NUMABS: if(flag & UI_SELECT) BIF_ThemeColorShade(colorid, -60); else BIF_ThemeColorShade(colorid, -30); ui_default_num_arrows(x1, y1, x2, y2); @@ -1176,6 +1180,7 @@ static void ui_draw_round(int type, int colorid, float asp, float x1, float y1, /* special type decorations */ switch(type) { case NUM: + case NUMABS: BIF_ThemeColorShade(colorid, curshade-60); ui_default_num_arrows(x1, y1, x2, y2); break; @@ -1285,6 +1290,7 @@ static void ui_draw_minimal(int type, int colorid, float asp, float x1, float y1 /* special type decorations */ switch(type) { case NUM: + case NUMABS: if(flag & UI_SELECT) BIF_ThemeColorShade(colorid, -60); else BIF_ThemeColorShade(colorid, -30); ui_default_num_arrows(x1, y1, x2, y2); diff --git a/source/blender/src/space.c b/source/blender/src/space.c index 41e539c3d1a..63836101d49 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -1745,25 +1745,42 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt) if ( (G.obedit) && (G.obedit->type==OB_MESH) ) select_faces_by_numverts(5); } + + else if(G.qual==LR_CTRLKEY) {} else do_layer_buttons(4); break; case SIXKEY: - do_layer_buttons(5); break; + if(G.qual==LR_CTRLKEY) {} + else do_layer_buttons(5); + break; case SEVENKEY: - do_layer_buttons(6); break; + if(G.qual==LR_CTRLKEY) {} + else do_layer_buttons(6); + break; case EIGHTKEY: - do_layer_buttons(7); break; + if(G.qual==LR_CTRLKEY) {} + else do_layer_buttons(7); + break; case NINEKEY: - do_layer_buttons(8); break; + if(G.qual==LR_CTRLKEY) {} + else do_layer_buttons(8); + break; case ZEROKEY: - do_layer_buttons(9); break; + if(G.qual==LR_CTRLKEY) {} + else do_layer_buttons(9); + break; case MINUSKEY: - do_layer_buttons(10); break; + if(G.qual==LR_CTRLKEY) {} + else do_layer_buttons(10); + break; case EQUALKEY: - do_layer_buttons(11); break; + if(G.qual==LR_CTRLKEY) {} + else do_layer_buttons(11); + break; case ACCENTGRAVEKEY: - do_layer_buttons(-1); break; + do_layer_buttons(-1); + break; case SPACEKEY: if(G.qual == LR_CTRLKEY) { @@ -4158,21 +4175,22 @@ void drawinfospace(ScrArea *sa, void *spacedata) (xpos+edgsp+(1*midsp)+(1*mpref)),y6label,mpref,buth, 0, 0, 0, 0, 0, ""); - uiDefButBitI(block, TOG, G_DOSCRIPTLINKS, REDRAWBUTSSCRIPT, "Enabled by Default", + uiDefButBitI(block, TOGN, USER_DONT_DOSCRIPTLINKS, REDRAWBUTSSCRIPT, "Enabled by Default", (xpos+edgsp+(1*mpref)+(1*midsp)),y5,mpref,buth, - &(G.f), 0, 0, 0, 0, "Allow any .blend file to run scripts automatically (unsafe with blend files from an untrusted source)"); + &(U.flag), 0, 0, 0, 0, "Allow any .blend file to run scripts automatically (unsafe with blend files from an untrusted source)"); uiDefBut(block, LABEL,0,"Keyboard:", - (xpos+edgsp+(3*midsp)+(3*mpref)),y3label,mpref,buth, + (xpos+edgsp+(3*midsp)+(3*mpref)),y2label,mpref,buth, 0, 0, 0, 0, 0, ""); - + /* Not actually used anywhere! */ + /* uiDefButBitI(block, TOG, USER_NO_CAPSLOCK, B_U_CAPSLOCK, "Disable Caps Lock", (xpos+edgsp+(3*midsp)+(3*mpref)),y1,mpref,buth, &(U.flag), 0, 0, 0, 0, "Disables the Caps Lock key when entering text"); - + */ uiDefButBitI(block, TOG, USER_NONUMPAD, 0, "Emulate Numpad", - (xpos+edgsp+(3*midsp)+(3*mpref)),y2,mpref,buth, + (xpos+edgsp+(3*midsp)+(3*mpref)),y1,mpref,buth, &(U.flag), 0, 0, 0, 0, "Causes the 1 to 0 keys to act as the numpad (useful for laptops)"); @@ -5611,6 +5629,7 @@ static void init_imaselspace(ScrArea *sa) simasel->files = BIF_filelist_new(); } + /* ******************** SPACE: OOPS ********************** */ extern void drawoopsspace(ScrArea *sa, void *spacedata); @@ -6155,39 +6174,7 @@ void newspace(ScrArea *sa, int type) } } - - /* exception: filespace */ - if(sa->spacetype==SPACE_FILE) { - SpaceFile *sfile= sa->spacedata.first; - - if(sfile->type==FILE_MAIN) { - freefilelist(sfile); - } else { - sfile->type= FILE_UNIX; - } - - sfile->returnfunc= NULL; - sfile->title[0]= 0; - if(sfile->filelist) test_flags_file(sfile); - } - /* exception: imasel space */ - else if(sa->spacetype==SPACE_IMASEL) { - SpaceImaSel *simasel= sa->spacedata.first; - if(simasel->type==FILE_MAIN) { - if (simasel->files) { - BIF_filelist_free(simasel->files); - BIF_filelist_settype(simasel->files, FILE_MAIN); - } - } else { - if (simasel->files) { - simasel->type= FILE_UNIX; - BIF_filelist_settype(simasel->files, simasel->type); - } - } - simasel->returnfunc= NULL; - simasel->title[0]= 0; - } - else if(sa->spacetype==SPACE_OOPS) { + if(sa->spacetype==SPACE_OOPS) { SpaceOops *so= sa->spacedata.first; if(xtra && so->type!=SO_OUTLINER) { so->type= SO_OUTLINER; diff --git a/source/blender/src/transform_conversions.c b/source/blender/src/transform_conversions.c index f3fec3cfec7..8859194ff9c 100644 --- a/source/blender/src/transform_conversions.c +++ b/source/blender/src/transform_conversions.c @@ -3072,6 +3072,10 @@ static void set_trans_object_base_flags(TransInfo *t) */ Base *base; + /* don't do it if we're not actually going to recalculate anything */ + if(t->mode == TFM_DUMMY) + return; + /* makes sure base flags and object flags are identical */ copy_baseflags(); diff --git a/source/creator/creator.c b/source/creator/creator.c index 2fd3a482a27..a4588bb4597 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -451,6 +451,7 @@ int main(int argc, char **argv) sizx= atoi(argv[a]); a++; sizy= atoi(argv[a]); + G.windowstate = G_WINDOWSTATE_BORDER; break; case 'd': diff --git a/source/gameengine/BlenderRoutines/Makefile b/source/gameengine/BlenderRoutines/Makefile index 2339b840679..64a17f44a84 100644 --- a/source/gameengine/BlenderRoutines/Makefile +++ b/source/gameengine/BlenderRoutines/Makefile @@ -65,6 +65,7 @@ CPPFLAGS += -I../Network CPPFLAGS += -I../Network/LoopBackNetwork CPPFLAGS += -I../Physics/common CPPFLAGS += -I../Physics/Sumo +CPPFLAGS += -I. ifeq ($(OS),windows) CPPFLAGS += -I../../blender diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp index 08e9e36c048..089af9a68e7 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp +++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp @@ -2176,70 +2176,71 @@ void BL_ConvertBlenderObjects(struct Main* maggie, { KX_GameObject* gameobj = (KX_GameObject*) sumolist->GetValue(i); struct Object* blenderobject = converter->FindBlenderObject(gameobj); - int nummeshes = gameobj->GetMeshCount(); - RAS_MeshObject* meshobj = 0; - ListBase *conlist; - bConstraint *curcon; - conlist = get_active_constraints2(blenderobject); - if (conlist) { - for (curcon = (bConstraint *)conlist->first; curcon; curcon=(bConstraint *)curcon->next) { - if (curcon->type==CONSTRAINT_TYPE_RIGIDBODYJOINT){ - bRigidBodyJointConstraint *dat=(bRigidBodyJointConstraint *)curcon->data; - //if (dat->tar) - if (!dat->child){ - PHY_IPhysicsController* physctr2 = 0; - if (dat->tar) - { - KX_GameObject *gotar=getGameOb(dat->tar->id.name,sumolist); - if (gotar && gotar->GetPhysicsController()) - physctr2 = (PHY_IPhysicsController*) gotar->GetPhysicsController()->GetUserData(); - } + ListBase *conlist; + bConstraint *curcon; + conlist = get_active_constraints2(blenderobject); - if (gameobj->GetPhysicsController()) - { - float radsPerDeg = 6.283185307179586232f / 360.f; + if (conlist) { + for (curcon = (bConstraint *)conlist->first; curcon; curcon=(bConstraint *)curcon->next) { + if (curcon->type==CONSTRAINT_TYPE_RIGIDBODYJOINT){ + + bRigidBodyJointConstraint *dat=(bRigidBodyJointConstraint *)curcon->data; + + if (!dat->child){ + + PHY_IPhysicsController* physctr2 = 0; + + if (dat->tar) + { + KX_GameObject *gotar=getGameOb(dat->tar->id.name,sumolist); + if (gotar && gotar->GetPhysicsController()) + physctr2 = (PHY_IPhysicsController*) gotar->GetPhysicsController()->GetUserData(); + } - PHY_IPhysicsController* physctrl = (PHY_IPhysicsController*) gameobj->GetPhysicsController()->GetUserData(); - //we need to pass a full constraint frame, not just axis + if (gameobj->GetPhysicsController()) + { + float radsPerDeg = 6.283185307179586232f / 360.f; + + PHY_IPhysicsController* physctrl = (PHY_IPhysicsController*) gameobj->GetPhysicsController()->GetUserData(); + //we need to pass a full constraint frame, not just axis - //localConstraintFrameBasis - MT_Matrix3x3 localCFrame(MT_Vector3(radsPerDeg*dat->axX,radsPerDeg*dat->axY,radsPerDeg*dat->axZ)); - MT_Vector3 axis0 = localCFrame.getColumn(0); - MT_Vector3 axis1 = localCFrame.getColumn(1); - MT_Vector3 axis2 = localCFrame.getColumn(2); + //localConstraintFrameBasis + MT_Matrix3x3 localCFrame(MT_Vector3(radsPerDeg*dat->axX,radsPerDeg*dat->axY,radsPerDeg*dat->axZ)); + MT_Vector3 axis0 = localCFrame.getColumn(0); + MT_Vector3 axis1 = localCFrame.getColumn(1); + MT_Vector3 axis2 = localCFrame.getColumn(2); - int constraintId = kxscene->GetPhysicsEnvironment()->createConstraint(physctrl,physctr2,(PHY_ConstraintType)dat->type,(float)dat->pivX,(float)dat->pivY,(float)dat->pivZ, + int constraintId = kxscene->GetPhysicsEnvironment()->createConstraint(physctrl,physctr2,(PHY_ConstraintType)dat->type,(float)dat->pivX, + (float)dat->pivY,(float)dat->pivZ, (float)axis0.x(),(float)axis0.y(),(float)axis0.z(), (float)axis1.x(),(float)axis1.y(),(float)axis1.z(), - (float)axis2.x(),(float)axis2.y(),(float)axis2.z() - ); - if (constraintId) + (float)axis2.x(),(float)axis2.y(),(float)axis2.z()); + if (constraintId) + { + //if it is a generic 6DOF constraint, set all the limits accordingly + if (dat->type == PHY_GENERIC_6DOF_CONSTRAINT) { - //if it is a generic 6DOF constraint, set all the limits accordingly - if (dat->type == PHY_GENERIC_6DOF_CONSTRAINT) + int dof; + int dofbit=1; + for (dof=0;dof<6;dof++) { - int dof; - int dofbit=1; - for (dof=0;dof<6;dof++) + if (dat->flag & dofbit) { - if (dat->flag & dofbit) - { - kxscene->GetPhysicsEnvironment()->setConstraintParam(constraintId,dof,dat->minLimit[dof],dat->maxLimit[dof]); - } else - { - //minLimit > maxLimit means free(disabled limit) for this degree of freedom - kxscene->GetPhysicsEnvironment()->setConstraintParam(constraintId,dof,1,-1); - } - dofbit<<=1; + kxscene->GetPhysicsEnvironment()->setConstraintParam(constraintId,dof,dat->minLimit[dof],dat->maxLimit[dof]); + } else + { + //minLimit > maxLimit means free(disabled limit) for this degree of freedom + kxscene->GetPhysicsEnvironment()->setConstraintParam(constraintId,dof,1,-1); } + dofbit<<=1; } } } - } - } - } - } - + } + } + } + } + } } templist->Release(); diff --git a/source/gameengine/GamePlayer/Makefile b/source/gameengine/GamePlayer/Makefile index 747a82fc333..c4f78f23117 100644 --- a/source/gameengine/GamePlayer/Makefile +++ b/source/gameengine/GamePlayer/Makefile @@ -34,7 +34,7 @@ SOURCEDIR = source/gameengine/GamePlayer DIR = $(OCGDIR)/gameengine/GamePlayer DIRS = common ghost -ifneq ($(NAN_NO_PLUGIN),true) +ifeq ($(WITH_BF_WEBPLUGIN),true) ifeq ($(OS),$(findstring $(OS), "freebsd irix windows")) ifneq ($(FREE_WINDOWS),true) DIRS += netscape diff --git a/source/gameengine/GamePlayer/common/Makefile b/source/gameengine/GamePlayer/common/Makefile index 254896e60e5..508dee18755 100644 --- a/source/gameengine/GamePlayer/common/Makefile +++ b/source/gameengine/GamePlayer/common/Makefile @@ -60,6 +60,7 @@ CPPFLAGS += -I../../../gameengine/Converter CPPFLAGS += -I../../../gameengine/Expressions CPPFLAGS += -I../../../gameengine/GameLogic CPPFLAGS += -I../../../gameengine/Converter +CPPFLAGS += -I../../../gameengine/BlenderRoutines CPPFLAGS += -I../../../gameengine/Ketsji CPPFLAGS += -I../../../gameengine/Ketsji/KXNetwork CPPFLAGS += -I../../../gameengine/Network diff --git a/source/gameengine/GamePlayer/ghost/Makefile b/source/gameengine/GamePlayer/ghost/Makefile index 8a3d194cbd7..d5aae181396 100644 --- a/source/gameengine/GamePlayer/ghost/Makefile +++ b/source/gameengine/GamePlayer/ghost/Makefile @@ -69,6 +69,8 @@ CPPFLAGS += -I../../../blender/imbuf CPPFLAGS += -I../../../blender/makesdna CPPFLAGS += -I../../../blender/readblenfile +CPPFLAGS += -I../../../gameengine/BlenderRoutines + # kernel? GEN? stuff CPPFLAGS += -I../../../kernel/gen_system CPPFLAGS += -I../../../kernel/gen_messaging diff --git a/source/gameengine/Ketsji/KX_CameraActuator.cpp b/source/gameengine/Ketsji/KX_CameraActuator.cpp index cb3180cb05e..27f4870de10 100644 --- a/source/gameengine/Ketsji/KX_CameraActuator.cpp +++ b/source/gameengine/Ketsji/KX_CameraActuator.cpp @@ -155,14 +155,25 @@ static void Kx_VecUpMat3(float *vec, float mat[][3], short axis) mat[coz][0]= vec[0]; mat[coz][1]= vec[1]; mat[coz][2]= vec[2]; - Kx_Normalize((float *)mat[coz]); + if (Kx_Normalize((float *)mat[coz]) == 0.f) { + /* this is a very abnormal situation: the camera has reach the object center exactly + We will choose a completely arbitrary direction */ + mat[coz][0] = 1.0f; + mat[coz][1] = 0.0f; + mat[coz][2] = 0.0f; + } inp= mat[coz][2]; mat[coy][0]= - inp*mat[coz][0]; mat[coy][1]= - inp*mat[coz][1]; mat[coy][2]= 1.0 - inp*mat[coz][2]; - Kx_Normalize((float *)mat[coy]); + if (Kx_Normalize((float *)mat[coy]) == 0.f) { + /* the camera is vertical, chose the y axis arbitrary */ + mat[coy][0] = 0.f; + mat[coy][1] = 1.f; + mat[coy][2] = 0.f; + } Kx_Crossf(mat[cox], mat[coy], mat[coz]); diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp index 4c6ba448ebf..fb636b23082 100644 --- a/source/gameengine/Ketsji/KX_GameObject.cpp +++ b/source/gameengine/Ketsji/KX_GameObject.cpp @@ -581,16 +581,27 @@ void KX_GameObject::SetObjectColor(const MT_Vector4& rgbavec) -MT_Vector3 KX_GameObject::GetLinearVelocity() +MT_Vector3 KX_GameObject::GetLinearVelocity(bool local) { MT_Vector3 velocity(0.0,0.0,0.0); - + MT_Matrix3x3 ori, locvel; + int i, j; if (m_pPhysicsController1) { velocity = m_pPhysicsController1->GetLinearVelocity(); + + if (local) + { + ori = GetSGNode()->GetWorldOrientation(); + + for(i=0; i < 3; i++) + for(j=0; j < 3; j++) + locvel[i][j]= velocity[i]*ori[i][j]; + for(i=0; i < 3; i++) + velocity[i] = locvel[0][i] + locvel[1][i] + locvel[2][i]; + } } - return velocity; - + return velocity; } @@ -948,7 +959,15 @@ PyObject* KX_GameObject::PyGetLinearVelocity(PyObject* self, PyObject* kwds) { // only can get the velocity if we have a physics object connected to us... - return PyObjectFrom(GetLinearVelocity()); + int local = 0; + if (PyArg_ParseTuple(args,"|i",&local)) + { + return PyObjectFrom(GetLinearVelocity((local!=0))); + } + else + { + return NULL; + } } diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h index da0cd69e129..b83d63e26bf 100644 --- a/source/gameengine/Ketsji/KX_GameObject.h +++ b/source/gameengine/Ketsji/KX_GameObject.h @@ -252,8 +252,9 @@ public: /** * Return the linear velocity of the game object. */ - MT_Vector3 + MT_Vector3 GetLinearVelocity( + bool local=false ); /** diff --git a/source/gameengine/PyDoc/KX_GameObject.py b/source/gameengine/PyDoc/KX_GameObject.py index 31c9993e194..8ef82b4943b 100644 --- a/source/gameengine/PyDoc/KX_GameObject.py +++ b/source/gameengine/PyDoc/KX_GameObject.py @@ -58,15 +58,16 @@ class KX_GameObject: @rtype: 3x3 rotation matrix @return: The game object's rotation matrix """ - def getLinearVelocity(): + def getLinearVelocity(local): """ Gets the game object's linear velocity. This method returns the game object's velocity through it's centre of mass, ie no angular velocity component. - cf getVelocity() - + @type local: boolean + @param local: - False: you get the "global" velocity ie: relative to world orientation. + - True: you get the "local" velocity ie: relative to object orientation. @rtype: list [vx, vy, vz] @return: the object's linear velocity. """ @@ -138,6 +139,9 @@ class KX_GameObject: def setParent(parent): """ Sets this object's parent. + + @type parent: L{KX_GameObject} + @param parent: new parent object. """ def removeParent(): """ diff --git a/source/gameengine/Rasterizer/Makefile b/source/gameengine/Rasterizer/Makefile index 9cde6069167..d544056e8ae 100644 --- a/source/gameengine/Rasterizer/Makefile +++ b/source/gameengine/Rasterizer/Makefile @@ -39,6 +39,8 @@ CPPFLAGS += -I$(OPENGL_HEADERS) CPPFLAGS += -I$(NAN_STRING)/include CPPFLAGS += -I$(NAN_MOTO)/include CPPFLAGS += -I../../kernel/gen_system +CPPFLAGS += -I../BlenderRoutines + ifeq ($(OS),darwin) CPPFLAGS += -fpascal-strings endif diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile index b0d79dcc897..1a88c51dc25 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile @@ -40,6 +40,7 @@ CPPFLAGS += -I$(OPENGL_HEADERS) CPPFLAGS += -I$(NAN_STRING)/include CPPFLAGS += -I$(NAN_MOTO)/include CPPFLAGS += -I../../../kernel/gen_system +CPPFLAGS += -I../../BlenderRoutines CPPFLAGS += -I.. ifeq ($(OS),darwin) CPPFLAGS += -fpascal-strings diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index 43345817f2e..e19d10dba64 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -64,7 +64,11 @@ all debug:: export WITH_BF_STATICOPENGL ?= false export WITH_BF_BLENDERGAMEENGINE ?= true export WITH_BF_BLENDERPLAYER ?= true - export WITH_BF_WEBPLUGIN ?= false + ifeq ($(NAN_NO_PLUGIN), true) + export WITH_BF_WEBPLUGIN = false + else + export WITH_BF_WEBPLUGIN ?= false + endif export NAN_MOTO ?= $(LCGDIR)/moto ifeq ($(FREE_WINDOWS), true) |