Commit Graph

1179 Commits

Author SHA1 Message Date
d7cd6e349d Merged changes in the trunk up to revision 32390. 2010-10-09 22:30:01 +00:00
459cf92bf4 build-fix [#24142] path changes break osx 2010-10-05 10:23:25 +00:00
314121ee65 - use own string conversion function over PyUnicode_FromString when converting the argv
- report errors when files dont load when given from the command line but not running in background mode.
2010-10-04 01:18:47 +00:00
0540512866 fix for building over samba /w cmake+mingw 2010-10-04 00:40:48 +00:00
Nick Samarin
90ab716cd5 synched with trunk at revision 32129 2010-10-03 16:28:28 +00:00
854ef17700 Merged changes in the trunk up to revision 32271. 2010-10-03 11:33:32 +00:00
05884e09be - rna bugfix where ints were not clamped and would overflow, now raise an error and print valid range.
- fixed WM_OT_context_cycle_int was causing problems with int overflow, now it cycles properly.
- rename QUOTE macro to STRINGIFY_ARG, and added STRINGIFY, which is used more often since it gives the value as a string.
2010-10-03 01:44:00 +00:00
Nathan Letwory
6e41dc8571 CMake on Windows for project files will now copy correct python dll and correct python modules in place. 2010-09-29 11:09:11 +00:00
28d618e41b Merged changes in the trunk up to revision 31987. 2010-09-18 00:50:13 +00:00
4e9c329faf patch [#23855] fix CMakeList.txt for WITH_QUICKTIME
from Filiciss Muhgue (filiciss)
2010-09-17 16:54:59 +00:00
d5ee95644d win32 mingw works again with cmake 2010-09-15 14:36:32 +00:00
Nathan Letwory
8a25c33fca Apply patch [#23809] Blender.exe -W support
by Dalai Felinto/Nathan Letwory

This basically implements -W support for Blender.
2010-09-15 11:48:59 +00:00
74059891e9 option to disable ITASC IK solver, (will be enabled by default ofcourse)
- option only available to cmake, scons and make have this enabled always.
- without this clang/llvm can compile blender
- this was the second biggest internal lib, 192mb -> 172mb for all blenders libs (with debug flags), so gives some speedup to linking.
2010-09-12 12:27:12 +00:00
fdb4b0c3ed Merged changes in the trunk up to revision 31880. 2010-09-11 11:16:55 +00:00
ecbb170bb0 patch [#23717] Another install target fix for cmake/linux
from Ralf Hölzemer (cheleb)

 fix for *nix install target
2010-09-08 03:13:19 +00:00
82432d0d99 merge from trunk at r31523 2010-09-07 05:47:34 +00:00
2406ebe1a4 - added back zlib include (needed for win32).
- use list append in more places.
- remove non existing include dir.
2010-09-07 01:13:10 +00:00
9c6feb1987 * Merged changes in the trunk up to revision 31789.
* Made a local fix for a compilation error with VC++ 2008 and
CMake, reported to the bf-committers mailing list:
http://lists.blender.org/pipermail/bf-committers/2010-September/028643.html
2010-09-06 23:26:36 +00:00
04b0dcd9e5 - use list append in more places (preferred method since its faster)
- remove some unused include paths
- remove unused linux path define
2010-09-06 10:15:41 +00:00
bb7339a7ae merge with trunk at r31523 2010-09-04 05:31:25 +00:00
52cefa4bc1 sphinx doc gen
- use 3 column lists for inherited props, funcs and for references to save on vertical space.
- use the blender version string for the upload path and PDF name.
2010-09-03 09:21:40 +00:00
Nathan Letwory
e03437a34a Fix [#23638] Missing directory creation
Reported and patched by Mariusz Maximus

I overlooked this one while fixing up for win64 compiling, because I had already manually created this directory.
2010-09-02 22:04:33 +00:00
Nathan Letwory
94d4ff6423 remove debug prints 2010-09-01 06:51:20 +00:00
Nathan Letwory
5241c27594 Python library copying hack.
When creating project files the multi-configuration generator is used. CMAKE_BUILD_TYPE is then not set, so always release libs were copied.
For now copy both release and debug.
2010-09-01 06:19:38 +00:00
Nathan Letwory
3de9aa38cd * Don't use /ZI when 64bit building on Windows. Use /Zi instead.
* Copy files to ${BLENDER_VERSION} instead of .blender/
* Don't try to copy iconv.dll when 64bit building on Windows - it is static for 64bit.
2010-09-01 05:39:26 +00:00
0bca249298 Add CMake build system on Recast&Navigation branch 2010-08-31 22:08:01 +00:00
Nathan Letwory
6c113b54b3 Finally change SConscript tabs to spaces. 2010-08-29 20:52:05 +00:00
12f9a5de5b Merged changes in the trunk up to revision 31630. 2010-08-28 14:30:52 +00:00
77c7e10e9c apply scons change from r31616 to cmake. 2010-08-27 22:53:48 +00:00
6464718083 rename some cmake build targets 2010-08-24 04:29:23 +00:00
f5247d9425 Fix for a linkage issue with CMake on Linux. 2010-08-18 04:15:14 +00:00
92478de0eb Merged changes in the trunk up to revision 31403. 2010-08-17 07:10:03 +00:00
0be08725ad Py API (GSoC): Second merging commit
Rough summary of fixes/changes:
- Blender Py API: GameLogic -> bge.logic
- Blender Py API: Implemented missing KX_PYATTRIBUTE_TODOs and -DUMMYs.
- Fix for [#22924] KX_PolygonMaterial.diffuse does not return expected list[r,g,b]
- Py API: Renaming _owner attribute of mathutils classes to owner.
- Fix some minor errors in mathutils and blf.
- Enabling game engine autoplay again based on a patch by Dalai:
  * The biggest 3D view in the open scene is used, if there is none, blender opens the file normally and raises an error.
  * The 3D view are is made fullscreen.
  * Quad view, header, properties and toolbox panel are all hidden to get the maximum view.
  * If the game engine full screen setting is set, the game starts in fullscreen.
- Fix for ipo conversion on file transition in the game engine.
2010-08-16 12:14:09 +00:00
1a875f915d Merged changes in the trunk up to revision 31284. 2010-08-12 13:41:59 +00:00
95aa8cfa4a Update address in license block. 2010-08-10 21:22:26 +00:00
dd75ec4907 Merged changes in the trunk up to revision 31190. 2010-08-09 11:32:55 +00:00
27a0b9bef3 Fix #23099: cmake/mac did not copy the scripts/ directory correct for install. 2010-08-04 16:05:19 +00:00
2f8f86e4f6 fix path to release/python.zip for scons and cmake
I hope this doesn't break anything
2010-08-04 11:07:14 +00:00
957976882d build options to disable image formats WITH_CINEON, WITH_HDR.
- updated cmake, make & scons.
- renamed CMake build options WITH_TIFF -> WITH_IMAGE_TIFF, same for DDS, OPENJPEG etc.
2010-08-03 11:25:34 +00:00
ec2c52c9c8 SCons
- remove scons option WITH_BF_FHS, its not needed anymore.
- comment WITH_BF_DOCS, was using epydocs which we dont use now.
- blenderlite target was broken, always using openmp.
- building without python wasnt working.

- fixed some warnings.
2010-08-02 16:27:41 +00:00
7bd687ea58 cmake
- more strict warnings for gcc/unix, still <50 for a clean build.
- install files to /usr/local/share/blender/2.53 rather then /usr/local/share/blender/.blender
2010-08-02 16:23:58 +00:00
a5692fd67b Merged changes in the trunk up to revision 30952. 2010-08-01 23:37:52 +00:00
f3cca3e192 2.5: more G.main changes. 2010-08-01 12:57:01 +00:00
5fa7d1c1b4 2.5: code changes to reduce the usage of G.main and pass it along
or get it from the context instead.
2010-08-01 12:47:49 +00:00
be2e221608 Merged changes in the trunk up to revision 30781. 2010-07-27 00:08:15 +00:00
00149cfb9d patch [#23041] CMake WITH_PYTHON_INSTALL option
from Dan Eicher (dna)

--- snip ---
Adds the option to not copy python into the .blender/python directory.

Also fixes the problem of deleting the blender installed python where the blender runtime only looks for the copied python and not the system one but not entirely sure why, something to do with CMake hardcoding the PYTHONPATH and PYTHONHOME vars I suppose.

This patch only applies to the 'UNIX AND NOT APPLE' platforms but, then again, those are the only ones anyone really
cares about...or at least the only ones where using the system python is really viable.
2010-07-26 23:16:21 +00:00
f30c12bcab patch [#23039] cmake install taget fix for brush icons on linux
from Ralf Hölzemer (cheleb)
2010-07-26 19:59:33 +00:00
bed40ed8e3 move directories:
dlltool --> build_files/make/dlltool
 bin --> release/bin
 
Since dlltool is only used make + mingw and ./bin is misleading because it would seem the blender binary would be copied there, but its just used for home directory files.

updated scons/cmake/make
2010-07-26 11:47:33 +00:00
8bcb71aebd [finally! the commit went through]
=bmesh=

First pass at post-merge stabilization.  Seems to work well enough now, but
I need to do more testing.  Also need to go through bmesh_class.h and make
sure the design/headers there make sense.
2010-07-22 00:18:35 +00:00
e423e085f8 Merged changes in the trunk up to revision 30551. 2010-07-20 19:39:07 +00:00