diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-09-19 02:25:49 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-09-19 02:25:49 +0400 |
commit | be50ce61be7fdc96943dbdac79aabd88ba29996f (patch) | |
tree | 4dfde72478458923a3b2ce8d22e1658d4508024c /source/darwin | |
parent | 0a4d70f4d0ddc5bc709b162d84ec334e66ed848d (diff) |
Merged
https://svn.blender.org/svnroot/bf-blender/branches/soc-2008-mxcurioni (r22789) and
https://svn.blender.org/svnroot/bf-blender/trunk/blender (r23338)
with the "Ignore ancestry" and "Ignore line endings" options enabled (using
TortoiseSVN on Windows).
After the merge operation, all changes (i.e., deletion) in source/blender/freestyle/
were reverted in order to keep the primary source tree of the Freestyle renderer.
Diffstat (limited to 'source/darwin')
-rw-r--r-- | source/darwin/Makefile | 10 | ||||
-rw-r--r-- | source/darwin/blender.app/Contents/Resources/blender file icon.icns | bin | 48363 -> 145836 bytes | |||
-rw-r--r-- | source/darwin/blender.app/Contents/Resources/blender icon.icns | bin | 43688 -> 189097 bytes | |||
-rw-r--r-- | source/darwin/blendercreator.app/Contents/Resources/blender creator icon.icns | bin | 43688 -> 189097 bytes | |||
-rw-r--r-- | source/darwin/blendercreator.app/Contents/Resources/blender file icon.icns | bin | 48363 -> 145836 bytes | |||
-rw-r--r-- | source/darwin/blenderplayer.app/Contents/Resources/blender file icon.icns | bin | 48363 -> 145836 bytes | |||
-rw-r--r-- | source/darwin/blenderplayer.app/Contents/Resources/blender player icon.icns | bin | 43688 -> 189097 bytes |
7 files changed, 8 insertions, 2 deletions
diff --git a/source/darwin/Makefile b/source/darwin/Makefile index 4959fa428e9..35842b43eae 100644 --- a/source/darwin/Makefile +++ b/source/darwin/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.7 2003/05/12 18:12:25 sgefant Exp $ +# $Id$ # # ***** BEGIN GPL LICENSE BLOCK ***** # @@ -49,7 +49,13 @@ ifeq ($(APPLICATION), blender) @echo "---> copying .blender/ scripts" @cp -R $(NANBLENDERHOME)/bin/.blender $(DIR)/bin/$(APPLICATION).app/Contents/MacOS @cp -R $(NANBLENDERHOME)/release/scripts $(DIR)/bin/$(APPLICATION).app/Contents/MacOS/.blender/ + @echo "---> copying ui scripts" + @cp -R $(NANBLENDERHOME)/release/ui $(DIR)/bin/$(APPLICATION).app/Contents/MacOS/.blender/ + @echo "---> copying python modules" + @mkdir $(DIR)/bin/$(APPLICATION).app/Contents/MacOS/.blender/python + @unzip -q $(LCGDIR)/release/python.zip -d $(DIR)/bin/$(APPLICATION).app/Contents/MacOS/.blender/python/ endif - @echo "---> removing CVS directories and Mac hidden files from distribution" + @echo "---> removing SVN directories and Mac hidden files from distribution" @find $(DIR)/bin/$(APPLICATION).app -name CVS -prune -exec rm -rf {} \; @find $(DIR)/bin/$(APPLICATION).app -name .DS_Store -exec rm -f {} \; + @find $(DIR)/bin/$(APPLICATION).app -name .svn -prune -exec rm -rf {} \; diff --git a/source/darwin/blender.app/Contents/Resources/blender file icon.icns b/source/darwin/blender.app/Contents/Resources/blender file icon.icns Binary files differindex 78d84cf70c3..9065f1b359c 100644 --- a/source/darwin/blender.app/Contents/Resources/blender file icon.icns +++ b/source/darwin/blender.app/Contents/Resources/blender file icon.icns diff --git a/source/darwin/blender.app/Contents/Resources/blender icon.icns b/source/darwin/blender.app/Contents/Resources/blender icon.icns Binary files differindex a9b352f9a1c..5eef94afde9 100644 --- a/source/darwin/blender.app/Contents/Resources/blender icon.icns +++ b/source/darwin/blender.app/Contents/Resources/blender icon.icns diff --git a/source/darwin/blendercreator.app/Contents/Resources/blender creator icon.icns b/source/darwin/blendercreator.app/Contents/Resources/blender creator icon.icns Binary files differindex a9b352f9a1c..5eef94afde9 100644 --- a/source/darwin/blendercreator.app/Contents/Resources/blender creator icon.icns +++ b/source/darwin/blendercreator.app/Contents/Resources/blender creator icon.icns diff --git a/source/darwin/blendercreator.app/Contents/Resources/blender file icon.icns b/source/darwin/blendercreator.app/Contents/Resources/blender file icon.icns Binary files differindex 78d84cf70c3..9065f1b359c 100644 --- a/source/darwin/blendercreator.app/Contents/Resources/blender file icon.icns +++ b/source/darwin/blendercreator.app/Contents/Resources/blender file icon.icns diff --git a/source/darwin/blenderplayer.app/Contents/Resources/blender file icon.icns b/source/darwin/blenderplayer.app/Contents/Resources/blender file icon.icns Binary files differindex 78d84cf70c3..9065f1b359c 100644 --- a/source/darwin/blenderplayer.app/Contents/Resources/blender file icon.icns +++ b/source/darwin/blenderplayer.app/Contents/Resources/blender file icon.icns diff --git a/source/darwin/blenderplayer.app/Contents/Resources/blender player icon.icns b/source/darwin/blenderplayer.app/Contents/Resources/blender player icon.icns Binary files differindex a9b352f9a1c..5eef94afde9 100644 --- a/source/darwin/blenderplayer.app/Contents/Resources/blender player icon.icns +++ b/source/darwin/blenderplayer.app/Contents/Resources/blender player icon.icns |