82c84f4b58
Remove some more $Id$ that still were left after r41227 and r41228.
2011-10-23 19:01:59 +00:00
6105199668
Remove the svn:keywords property.
2011-10-23 18:38:16 +00:00
ed3d253c56
Fix for [ #28339 ] Rev:39618 The revision part doesn't suffice.
...
NAN_BUILDINFO > WITH_BUILDINFO change from rev 39618 was missing in those files.
2011-08-23 08:02:48 +00:00
ac2d935a32
Update cmake & scons scripts to use new Collada includes for building with latest blender collada updates
2011-03-26 09:09:00 +00:00
Nathan Letwory
3c45a2d298
COLLADA: supporting barebone class for <extra> support (incomplete).
2011-03-23 14:25:35 +00:00
Nathan Letwory
322ff7dfe4
I swear, it was just an innocence change in guardedalloc!
...
The butterfly wing flap, causing a nice storm in the rest of blender.
Now all dependencies should point ok again. CMakers, do double-test.
2011-02-21 12:35:04 +00:00
Nathan Letwory
6c113b54b3
Finally change SConscript tabs to spaces.
2010-08-29 20:52:05 +00:00
Nathan Letwory
92422ba452
Patch [ #23389 ] Add authorship information to exported COLLADA files
...
Contributed by Imran Syed (freakabcd).
This adds basic authoring tool and author info ("Blender User" for now).
NOTE: Linux and OSX users need now to update their OpenCOLLADA libs - Blender should now compile fine with their latest revision.
Made some changes to the original patch to ensure linking is done correctly.
Some small cleanups for scons too.
2010-08-26 06:58:32 +00:00
95aa8cfa4a
Update address in license block.
2010-08-10 21:22:26 +00:00
a545998c84
Merge -c 29009,29081,29189 from COLLADA branch into trunk.
2010-06-03 17:41:33 +00:00
ff0ba86a9b
Mac :
...
- scons update to build with openCollada
- scons & cmake update for render optimization cflags
2009-11-09 17:52:13 +00:00
31258507d0
Merge of the COLLADA GSoC branch into trunk.
...
COLLADA code is disabled by default (it has dependencies requiring manual install).
SCons and CMake builds are supported on Windows and Linux, no Mac building yet. More on building COLLADA code: http://wiki.blender.org/index.php/User:Kazanbas/Building_Collada_Branch .
The detailed command log of the merge (can be useful for educational purposes):
branch=https://svn.blender.org/svnroot/bf-blender/branches/soc-2009-chingachgook
# collada code
svn copy $branch/source/blender/collada source/blender/collada
# operator
svn merge -c 20401,20955,21077,24077,24079 $branch/source/blender/windowmanager/intern/wm_operators.c source/blender/windowmanager/intern/wm_operators.c
# menu
svn merge -c 24079 $branch/release/scripts/ui/space_info.py release/scripts/ui/space_info.py
# scons
svn merge -c 20398 $branch/source/blender/SConscript source/blender/SConscript
svn merge -c 20398,20691,20955,22726 $branch/tools/btools.py tools/btools.py
svn merge -c 20691,20955,22726 $branch/tools/Blender.py tools/Blender.py
svn merge -c 20398,20692,20955 $branch/config/linux2-config.py config/linux2-config.py
svn merge -c 22726 $branch/config/win64-vc-config.py config/win64-vc-config.py
svn merge -c 22726 $branch/config/win32-vc-config.py config/win32-vc-config.py
svn merge -c 24077 $branch/source/blender/windowmanager/SConscript source/blender/windowmanager/SConscript
# cmake
svn merge -c 23319,23905,24077,24158 $branch/CMakeLists.txt CMakeLists.txt
svn merge -c 23319 $branch/source/blender/CMakeLists.txt source/blender/CMakeLists.txt
svn merge -c 23319 $branch/source/creator/CMakeLists.txt source/creator/CMakeLists.txt
svn merge -c 23319 $branch/CMake/macros.cmake CMake/macros.cmake
svn merge -c 24077 $branch/source/blender/windowmanager/CMakeLists.txt source/blender/windowmanager/CMakeLists.txt
2009-10-30 15:35:50 +00:00
