Xiao Xiangquan
b429af10d0
merge from trunk #37722
2011-06-24 03:30:50 +00:00
1309f17103
cmake was installing .bfont.ttf in ~/.blender/VER/config, use ~/.blender/VER instead (as with scons)
2011-06-22 08:43:01 +00:00
07dee0d8a6
Cycles: svn merge -r37333:37694 https://svn.blender.org/svnroot/bf-blender/trunk
2011-06-21 15:47:18 +00:00
968b2a8afb
rename cmake include/libraries to conform with suggested cmake names
2011-06-18 14:12:54 +00:00
17ee056fc6
Merged changes in the trunk up to revision 37539.
...
Conflicts resolved:
source/blender/render/intern/source/pipeline.c
Also fixed an inconsistent conflict resolution in the last commit with
regard to release/scripts/startup/bl_ui/properties_render.py. This
problem resulted in empty menus in the GUI.
2011-06-16 05:50:13 +00:00
Xiao Xiangquan
40981d872f
merge from trunk r37405
2011-06-15 08:28:56 +00:00
Xiao Xiangquan
12f0795d49
accident when merge. revert to r37405
2011-06-11 18:15:46 +00:00
Xiao Xiangquan
2d3795ab3c
merge from trunk r37405
2011-06-11 12:48:13 +00:00
c2e1f3a1e2
fix for using system includes, the include macro wasn't un-setting the previous include list so system includes could be mixed up with non system includes.
...
Also workaround for CMake 2.8.4 & GNU-Make which doesn't set CMAKE_INCLUDE_SYSTEM_FLAG_C
2011-06-11 06:00:28 +00:00
32c7e22d36
Merged changes in the trunk up to revision 37388.
...
Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py
source/creator/SConscript
source/blender/blenlib/intern/bpath.c
source/blender/editors/space_outliner/outliner.c
2011-06-11 00:22:10 +00:00
eeba877926
fix [ #27607 ] Scene's render.filepath gets cropped to 159 characters
...
use 240 char limit, remove backbuffer path which wasn't used.
2011-06-10 10:13:50 +00:00
f122a74b1e
svn merge -r37078:37335 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-06-09 15:20:29 +00:00
c5e63925db
Cycles: svn merge -r37040:37333 https://svn.blender.org/svnroot/bf-blender/trunk/blender/
2011-06-09 14:53:25 +00:00
Nathan Letwory
899f2776db
Shuffle some build code around to ensure debug builds on Windows actually run too.
...
* creator/SConscript is now empty, code is moved to an emitter function in Blender.py
* make sure COLLADA debug libs are used when BF_DEBUG=True
2011-06-08 11:53:07 +00:00
Nick Samarin
5ceb8b3d35
synched with trunk at revision 37212
2011-06-05 18:51:00 +00:00
4a59928484
CMake option 'WITH_HEADLESS' to build blender in headless mode (no x11/xlib) with NULL ghost classe.
2011-06-04 14:12:55 +00:00
Xiao Xiangquan
a40e1302ae
Almost complete the i18n system, including:
...
Copy unifont..ttf.gz from source tree to target datafile path( now ONLY works with cmake );
Set the locale the same with system's setting;
If need unicode font, unzip and load unifont when init ui styles;
Apply gettext() to labels in space_info.py, who are the main menu items.
Each of these should have been commit one by one. As they work well according to my tests, so I just lazily send a long list.
2011-06-02 11:22:22 +00:00
6a128eee7b
Cycles: svn merge -r36777:37040 https://svn.blender.org/svnroot/bf-blender/trunk/blender/
2011-05-31 09:51:46 +00:00
08d6932c86
svn merge -r36900:37028 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-05-31 05:11:04 +00:00
35cbb3ed49
svn merge -r36840:36890 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-05-31 02:55:29 +00:00
5a3aaf1fd1
cmake formatting adjustment, no functional change.
2011-05-30 10:51:37 +00:00
b92e6985cf
fix for cmakes windows install target, was extracting python 4 times, note install(CODE... doesnt support CONFIGURATIONS setting.
2011-05-30 10:39:18 +00:00
9b5800bcd7
fixed "rather then" -> "rather than" typos all over the place
2011-05-28 13:11:24 +00:00
d369a6aaaf
Windows installer and Path changes, fixing various issues:
...
* Windows installer not working for non-admin users and multiple users
* Addon scripts not installing next to user configuration
* Portable install not being taken into account in all places
The main problem was the windows installer was installing system scripts in
AppData next to the user configuration directory, which is not shared between
users. Now these are installed in ProgramFiles, and only addon scripts added
by the users go to AppData.
On all platforms, addon scripts were sometimes getting installed between
system scripts, because the scripts folder in the executable directory was
given precedence over the user configuration folder, that is no longer done
now. So addons now behave like user configuration, they are preserved even
if you download a newer build of the same blender version.
If you have an installation of 2.57 on windows, the addon install location
will not change until we do the version bump to 2.58, to avoid conflicts with
the existing the installed 2.57 version.
The old behavior of giving precedence to the local folder was done to support
portable install, where all configuration is written to the local folder. This
is now implemented differently: if and only if a "config" folder exists in the
local folder, portable install will be assumed, and files will only be written
to that local folder.
2011-05-27 09:57:53 +00:00
e6d396d17d
fix for installing blender as a python module with cmake.
2011-05-26 12:15:42 +00:00
514de547ac
update to build system excluding parts of the python bundle.
2011-05-26 11:45:25 +00:00
3cfa9a2163
cmake's install target now works for the python module on *nix.
2011-05-24 18:34:07 +00:00
dc33976fc2
fix for cmake/msvc when the path name contains spaces, patch by Kupoman on IRC
2011-05-24 05:21:51 +00:00
671cb93f1b
svn merge -r36801:36840 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-05-24 04:35:21 +00:00
6e39d908a9
quiet compiler warnings for -Wundef
2011-05-22 04:25:31 +00:00
dfcd015535
Merged changes in the trunk up to revision 36757.
2011-05-19 01:40:37 +00:00
88d9d89c97
Cycles: svn merge -r36495:36747 https://svn.blender.org/svnroot/bf-blender/trunk/blender/
2011-05-18 13:56:20 +00:00
0a1223c87e
Render API: add self.report() function for RenderEngine, for reporting warnings and errors.
2011-05-17 15:20:12 +00:00
4514be8f4f
svn merge -r36672:36725 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-05-17 07:03:12 +00:00
Nick Samarin
a918040902
synched with trunk at revision 36569
2011-05-16 20:30:59 +00:00
80c2582f0e
enable game panel even if the BGE is disabled since its settings effect the viewport.
...
also remove unused function in creator.c and minor edit to search menu poll function.
2011-05-16 04:55:31 +00:00
33bfcb26b8
manually copy more changes from trunk.
2011-05-12 09:02:39 +00:00
191ad54599
svn merge -r36603:36628 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-05-12 05:35:19 +00:00
b72f087e7e
remove remaining event recording code
2011-05-11 20:39:27 +00:00
3a34dcde68
Code cleanup: remove readblenfile module, only contained some utility functions
...
to read .blend files from runtimes, folded those into blenloader.
2011-05-11 19:29:23 +00:00
21a9dc8d8b
svn merge -r36564:36583 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-05-10 00:45:06 +00:00
1e0c3d315b
minor cleanup, no functional changes.
2011-05-09 14:41:44 +00:00
5ba0c2c049
tag unused arguments, quiet some warnings
2011-05-09 14:32:55 +00:00
9d8a08de55
warning fixes
2011-05-09 08:20:39 +00:00
5a2a3d7d82
more syncing with trunk, also cleared many warnings with gcc4.6
2011-05-09 04:06:48 +00:00
14a2330d7b
copied across changes which were missed by merging.
2011-05-09 02:45:52 +00:00
31471f644c
Merged changes in the trunk up to revision 36551.
...
Conflicts resolved:
source/creator/SConscript
2011-05-09 01:38:29 +00:00
6ef77cf95a
=bmesh= merge from trunk at r36529
2011-05-08 23:43:18 +00:00
cb12337363
Code cleanup: remove source/kernel module, this wasn't really the kernel of
...
anything, only contained a hash map and functions to pass command line args
to the game engine. Moved those to container and BlenderRoutines modules.
2011-05-06 20:18:42 +00:00
b25346a48c
Cycles: svn merge -r36352:36495 https://svn.blender.org/svnroot/bf-blender/trunk/blender/
2011-05-05 10:14:56 +00:00
