Commit Graph

555 Commits

Author SHA1 Message Date
Tamito Kajiyama
003ab20292 Merged changes in the trunk up to revision 35618.
Conflicts resolved:
source/blender/makesrna/RNA_types.h
source/blender/makesrna/intern/rna_main_api.c
2011-03-19 00:05:30 +00:00
Campbell Barton
58c8dca7a6 missed removing WITH_INSTALL reference. 2011-03-17 09:09:48 +00:00
Brecht Van Lommel
bcee2343ea Mac OS X cmake changes and bundle fixes
For cmake users, you should now use "make install" instead of "make". This was
already changed for Linux and Windows. Same for Xcode, use the install target.

Changes:
* CMake install mechanism, resulting bundle was verified to be indentical here.
* For cmake, include Info.plist in bundle using builtin mechanism for that.
  There was some code in packaging.cmake, but it wasn't correct as these
  properties need to be set on the executable.
* For scons, fix app bundle version, was still using removed release/VERSION.
* Remove unused blendercreator.app and blenderpublisher.app.
* Fix Info.plist being set as a binary file in svn, should be plain text.
2011-03-16 15:44:17 +00:00
Campbell Barton
b65a56ccb5 fix [#26494] Auto run Python scripts option in User Preferences problem
- opening a file with blender by passing it as an argument would and loading it once in blender left script auto execute flag in a different state.
- command line args --enable/disable-autoexec were being overridden by the user prefs.
2011-03-15 08:04:11 +00:00
Brecht Van Lommel
c13947fe33 Fixes for GNUmakefile on Mac:
* Don't use "make install", doesn't work yet.
* Use total number of cores rather than number of processors.
* Quicker number of cores query, by not asking for all system info.
2011-03-14 15:40:07 +00:00
Campbell Barton
ca95a6f415 - lightmap pack wasnt reporting no mesh errors properly.
- cleanup headers.
- cmake on *nix was always writing to /bin/./2.56
2011-03-13 06:02:20 +00:00
Tamito Kajiyama
c8deda3276 Merged changes in the trunk up to revision 35505.
Conflicts resolved:
source/blender/makesdna/DNA_material_types.h
2011-03-13 02:10:39 +00:00
Nathan Letwory
2336612075 Fix small error in chdir + cmd combination. 2011-03-10 00:21:36 +00:00
Nathan Letwory
4ef2d32b72 untarring of Python 3.2 tarballs would fail if CMake was installed into path with spaces. Slightly
change how the extraction commands are presented (old BUILD_TYPE was empty all the time here) and
ensure also that python/lib subdir under versioned dir gets actually created.
2011-03-10 00:12:06 +00:00
Nathan Letwory
239a6f9de7 Some small fixes to the install part for windows. 2011-03-09 22:45:43 +00:00
Campbell Barton
63e37a6133 - CMake, print message to run 'make install', this is new and should help avoid confusion: [#26425] SVN release can't find scripts/modules and doesn't start properly
- remove extension from icon to match spec: http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.htm
2011-03-09 21:19:15 +00:00
Nathan Letwory
58fbef0a19 Don't try to copy gnu_gettext.dll when building 64bit Blender - it's linked statically on win64. 2011-03-09 20:58:26 +00:00
Campbell Barton
b3ad45aef6 CMake
- temp disable installing plugins dir, since its not used for 2.5x
- OSX wasnt getting text copied.
2011-03-09 00:23:26 +00:00
Campbell Barton
95ed5355b7 CMake: removed blenderplayer from install target by accident with recent commit. 2011-03-08 09:01:22 +00:00
Damien Plisson
df3688a05d CMake/OSX: Bugfix [#26375]: Add default values for the OSX architecture: x86_64 (also used to select the python dynlibs that'll be bundled with the application).
Set deployment target to be 10.5 by default.

Fix broken build introduced by recent source/creator/CMakeList.txt cleanup
2011-03-07 21:28:36 +00:00
Campbell Barton
e7bf671e25 se BLI_snprintf() for msvc compat, cleanup CMake file, some bad comments left in.
also on only try build RPM's on linux.
2011-03-07 03:57:04 +00:00
Campbell Barton
e1649ecda9 use install target for CMake Windows (msvc and mingw), for MinGW you now need to run 'make install', for MSVC the 'INSTALL' target needs to be enabled in the project file 2011-03-07 03:33:33 +00:00
Tamito Kajiyama
33efa9eeb6 Merged changes in the trunk up to revision 35367.
To branch builders: From this revision Python 3.2 will be used.
Don't forget svn update in the "lib" directory as well.
2011-03-06 12:13:32 +00:00
Campbell Barton
6106d919c3 CMake: Linux/Unix Only,
use 'install' target rather then copying files with post-build commands.

Main change is that you need to run 'make install', which copies files to ./bin by default
unless WITH_INSTALL_PORTABLE is OFF, where CMAKE_INSTALL_PREFIX is used for a typical unix-system install.
2011-03-06 11:41:30 +00:00
Nathan Letwory
9834aea031 Forgot this one from previous commit.
For now people should extract the python32(_d).zip in the lib/win*/release dirs into similarly named directories.
2011-03-04 14:16:43 +00:00
Campbell Barton
244f456a3c fix for error in recent cmake edits 2011-03-01 07:21:52 +00:00
Campbell Barton
5ef65a0a3b build system now exclude config-*, turtledemo when copying system python.
also remove __pycache__ dirs when cleaning (new in python 3.2)
2011-02-28 05:59:44 +00:00
Andrea Weikert
7ddfd39b28 == CMake Win ==
* remove copying of libjack dll's, libjack is statically linked now.
2011-02-27 18:47:03 +00:00
Tamito Kajiyama
63b31ef91b Merged changes in the trunk up to revision 35203.
Conflicts resolved:
source/creator/creator.c
source/blender/python/intern/bpy.c
2011-02-26 20:21:09 +00:00
Nathan Letwory
05c0eec5ff Small fix from sambler. 2011-02-25 10:58:04 +00:00
Nathan Letwory
3cd4110f78 fix #if errors, add defined() in proper places
doxygen: add file tags
2011-02-25 10:01:33 +00:00
Campbell Barton
18c7354bd2 remove warning left in by mistake and comment unused function. 2011-02-25 02:27:54 +00:00
Campbell Barton
b8e3f4ee30 fix for cmake not having the correct svn revision in buildinfo, now generate a header every build with the time, date, svn revision. 2011-02-24 17:57:35 +00:00
Campbell Barton
d13470ba72 patch from sambler on irc, writes version info for OSX. 2011-02-22 06:05:08 +00:00
Campbell Barton
9ef0eed4b6 build python module without binreloc, add dummy argv[0] to initialize bprogname. 2011-02-21 13:13:08 +00:00
Nathan Letwory
ef60ae9521 And the last one. hopefully. 2011-02-21 13:00:38 +00:00
Campbell Barton
eee4a62e87 move addon utilities into their own module, these were getting mixed between bpy.utils and space_userpref. 2011-02-21 07:07:44 +00:00
Nathan Letwory
958b5c1d8d Make sure we can build without the optional new WITH_PYTHON_MODULE option. Looks like a #ifndef was meant around the blender_esc implementation. 2011-02-21 00:45:54 +00:00
Campbell Barton
c30149991c Experimental option to build blender as a python module, rather then blender embedding python.
CMake build option WITH_PYTHON_MODULE, will build ./bin/bpy.so

This allows 'bpy' to be imported from python or other applications/IDE's which embed python, eg:
   python -c "import bpy ; bpy.ops.render.render(write_still=True)"

This runs in background mode and has similar restrictions to running a script:
   blender --background --python test.py

TODO:
 - install to site-packages with blender scripts
 - add support for imp.reload()
2011-02-20 23:39:29 +00:00
Campbell Barton
06aee2ef0e misc warnings/fixes
- WITH_OPENJPEG wasn't defined for creator.c with CMake.
- remove shadowed/redefined vars.
- remove some unused RNA report args.
- re-arrange IMB_FILE_TYPES so IRIS is not the first format tested, since its not very common test JPEG and PNG first.
2011-02-20 15:48:01 +00:00
Tamito Kajiyama
70aa63306a Merged changes in the trunk up to revision 34996.
Conflicts resolved:
C:\bf-blender\soc-2008-mxcurioni\doc\python_api\sphinx_doc_gen.py
C:\bf-blender\soc-2008-mxcurioni\source\blender\makesrna\RNA_types.h
C:\bf-blender\soc-2008-mxcurioni\source\blender\render\SConscript
2011-02-19 23:51:18 +00:00
Campbell Barton
9ee1b3930f set main() argv functions to be const char *
also set minimum cmake version to 2.8
2011-02-19 12:05:20 +00:00
Campbell Barton
f94256ea5c fix for building with make on linux from recent new lib. 2011-02-15 12:37:15 +00:00
Campbell Barton
8b7482892b made most variables which are only used in a single file and not defined in header static for blenlib, blenkernel and editors. 2011-02-14 17:55:27 +00:00
Tamito Kajiyama
3789c398ff Merged changes in the trunk up to revision 34828.
Conflicts resolved:
source/blender/makesrna/RNA_enum_types.h
2011-02-13 23:47:30 +00:00
Campbell Barton
0955c664aa fix for warnings from Sparse static source code checker, mostly BKE/BLI and python functions.
- use NULL rather then 0 where possible (makes code & function calls more readable IMHO).
- set static variables and functions (exposed some unused vars/funcs).
- use func(void) rather then func() for definitions.
2011-02-13 10:52:18 +00:00
Campbell Barton
867fc4b463 enforce string limits (reported by pedantic checking tools & some developers).
mostly replace strcpy with BLI_strncpy and multiple strcat's with a BLI_snprintf().
also fix possible crash if CWD isnt available.
2011-02-13 03:21:27 +00:00
Campbell Barton
55f68c3657 fix for more warnings.
- modifier code was using sizeof() without knowing the sizeof the array when clearing the modifier type array.
- use BLI_snprintf rather then sprintf where the size of the string is known.
- particle drawing code kept a reference to stack float values (not a problem at the moment but would crash if accessed later).
2011-02-12 16:54:24 +00:00
Campbell Barton
711ba795f7 ignore __pycache__ dir for scons and cmake installation (py3.2 caches modules here). 2011-02-09 00:45:16 +00:00
Tamito Kajiyama
4e9a519e22 Merged changes in the trunk up to revision 34574. 2011-01-30 23:41:58 +00:00
Campbell Barton
89c617a116 remove nan-makefiles 2011-01-30 15:29:22 +00:00
Janne Karhu
f11424d644 Fix for [#25825] Boolean doesn't work in command-line rendering (2.56)
* DAG_on_load_update wasn't called at all for background rendering, so any non-animated object data wasn't updated properly.
2011-01-28 15:24:02 +00:00
Campbell Barton
8cf0d64623 option for blender --addons rigify,io_scene_fbx,add_mesh_gears
needed so ctest unit testing can be done on addons that are not enabled by default.
2011-01-26 16:30:12 +00:00
Campbell Barton
d75216ba1c - fix problem with cmake, windows 'RelWithDebInfo' target, was giving error: "ImportError: No module named _socket" because of copying wrong files over.
- move test -> tests, this name is used elsewhere in lib/tests.
- change interface code not to loop on a float value (clang warning), harmless, but with extreme cases an eternal loop would still be possible though unlikely.
2011-01-23 11:42:29 +00:00
Tamito Kajiyama
50ced6b017 Merged changes in the trunk up to revision 34459. 2011-01-22 23:38:28 +00:00