Commit Graph

1543 Commits

Author SHA1 Message Date
Campbell Barton 5da894b1fe misc edits
- cmake/windows was installing locale & font when internationalization was disabled, twice when enabled.
- file selector was using the string size-1, where this isn't needed since string buttons expected this value to be the sizeof(), accounting for '\0'.
- use const char for extension checking funcs.
- minor pep8 edits
2011-10-15 05:01:47 +00:00
Brecht Van Lommel 4f33d65ba1 Cycles: svn merge -r40411:40934 ^/trunk/blender 2011-10-11 14:30:53 +00:00
Tamito Kajiyama d546002476 Merged changes in the trunk up to revision 40911.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
2011-10-10 21:15:11 +00:00
Campbell Barton aa6d7ebd14 svn merge ^/trunk/blender -r40720:40872 2011-10-09 07:31:15 +00:00
Thomas Dinges 8c229c060d Patch [#28660] x64 thumbnail handler not being installed in CMake builds by Tom Edwards. 2011-10-07 18:25:54 +00:00
Campbell Barton e42146c1ec remove .Blanguages, its not used anymore 2011-10-02 22:28:49 +00:00
Campbell Barton cf3956f450 formatting edits only 2011-09-30 15:51:58 +00:00
Campbell Barton 4a157de23d svn merge ^/trunk/blender -r40587:40643 2011-09-28 07:34:48 +00:00
Dalai Felinto c927e37410 OSX CMake bundle - blenderplayer doesn't need locale, data, ..
also blenderplayer is a subset of Blender, so no need to repeat the macros here.
2011-09-27 17:06:10 +00:00
jens verwiebe 7ba71fff8c OSX: fix player bundle_creation 2011-09-27 10:51:57 +00:00
Campbell Barton effea8c29b svn merge ^/trunk/blender -r40511:40587 2011-09-27 03:12:31 +00:00
Campbell Barton 58587a3881 replace strncpy with BLI_strncpy, in some cases strncpy was being misused since it doesnt ensure \0 termination.
also dont call CTX_data_scene() twice when checking for function arguments.
2011-09-26 18:51:10 +00:00
Dalai Felinto aeafb960b1 OSX - cmake: blenderplayer part 2: Jens Verwiever co-patch
Using OSX Bundle (in oppose to Blender dummy .app) as start point for binary.
That way we don't need to move the blenderplayer after the bundle is finished and we can rebuild it without doing `make install`
I will test more tomorrow, but it should be working now
2011-09-26 07:54:30 +00:00
Dalai Felinto 4b273f013e cmake files for bundling blenderplayer in OSX
this is working fine. The only problem is described in the XXX there.

While Blender is linked to the right place during `make` time (~/bin/blender.app/Content/MacOS/blender)
blenderplayer is in the top bin folder (~/bin/blenderplayer).

That means it will be correct only after you run `make install` (we are moving it to the right place inside the bundle).
I couldn't find the place to fix this properly. I will see with Jens Verwiebe how we can address that.
2011-09-26 05:26:04 +00:00
Campbell Barton 274b9c8fb8 whitespace cleanup 2011-09-25 12:31:21 +00:00
Tamito Kajiyama c0c488d0b2 Merged changes in the trunk up to revision 40520. 2011-09-24 21:39:11 +00:00
Campbell Barton 5bd83eede0 svn merge ^/trunk/blender -r40405:40431 2011-09-23 11:30:55 +00:00
Campbell Barton 460cde345b svn merge ^/trunk/blender -r40394:40395 2011-09-23 10:43:25 +00:00
Campbell Barton 4b449aefea remove support for irix 2011-09-21 08:40:30 +00:00
Tamito Kajiyama 9c42afb1c0 Merged changes in the trunk up to revision 40413.
Conflicts resolved:
source/blender/makesrna/intern/rna_scene.c
2011-09-20 21:22:15 +00:00
Brecht Van Lommel a2c6db0b44 Cycles: svn merge -r40358:40411 ^/trunk/blender 2011-09-20 18:48:28 +00:00
Sergey Sharybin 706a2c80f0 i18n: code cleanup and fixing unneeded translation (when partial translation is used only) 2011-09-19 15:10:38 +00:00
Sergey Sharybin 1c0bdad835 svn merge -r40222:40344 ^/trunk/blender 2011-09-19 10:48:15 +00:00
Tamito Kajiyama 70821c6b24 Merged changes in the trunk up to revision 40299. 2011-09-17 18:54:16 +00:00
Brecht Van Lommel f4a9215d7c Cycles: svn merge -r39870:r40266 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Merging the node changes required a lot of conflict resolution, fixed the
issues I could find but if you want stability you might want to wait a bit
before updating.
2011-09-17 13:28:40 +00:00
Campbell Barton 1ff373ef5b svn merge -r40166:40279 ^/trunk/blender 2011-09-17 04:59:14 +00:00
Sergey Sharybin 0eda51f2ea Fixing issues with i18n stuff:
- Make gettext stuff draw-time. so switching between languages
  can happens without restart now.
- Added option to translate visible interface (menus, buttons, labels)
  and tooltips. Now it's possible to have english UI and localized tooltips.
- Clean-up sources, do not use gettext stuff for things which can be
  collected with RNA.
- Fix issues with windows 64bit and ru_RU locale on my desktop
  (it was codepage issue).
- Added operator "Get Messages" which generates new text block with
  with all strings collected from RNA.
- Changed script for updating blender.pot so now it appends
  messages collected from rna to automatically gathered messages.
  To update .pot you have to re-generate messages.txt using "Get Messages"
  operator and then run update_pot script.
- Clean up old translation stuff which wasn't used and most probably
  wouldn't be used.
- Return back "International Fonts" option, so if it's disabled, no
  gettext lookups happens on draw.
- Merged read_homefile function back. No need in splitting it.

TODO:
- Custom fonts and font size.
  Current font isn't nice at least for russian locale, it's
  difficult to read it.
- Put references to messages.txt so gettext can merge translation when
  name/description of some property changes.
2011-09-15 13:20:18 +00:00
Sergey Sharybin e45b8ab76e - Whitespace fixes (was commiting from windows where text editor wasn't configured, pardon)
- Fixing typo in description of GP paint mode.
2011-09-15 13:14:46 +00:00
Sergey Sharybin 30293dc2ca svn merge -r39834:40222 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-15 13:02:37 +00:00
Campbell Barton 0d355a8a2c replace BLI_strncpy with BLI_strncpy_utf8 where input isnt ensured to be valid.
also replace strcpy's which copy using "" with str[0]='\0'
2011-09-15 12:26:48 +00:00
Sergey Sharybin 86d05b3144 Update build rules to deal with new gettext libraries. 2011-09-15 11:37:42 +00:00
Campbell Barton dd2a2ec699 removed nodes from CMake's BLENDER_LINK_LIBS, rewrote find-pcre using own template. 2011-09-14 01:23:17 +00:00
Campbell Barton 21253def7c - removed some duplicate library links from cmake (which were needed because of bad level calls)
- FindXML2 we had copied from another project was always running and not using cached value, rewrote based on template used for most of our other find modules which makes use of 'FindPackageHandleStandardArgs'
- mark statuc collada libs as advanced.
2011-09-14 01:02:57 +00:00
Tamito Kajiyama ac796827cb Merged changes in the trunk up to revision 40189. 2011-09-13 22:24:59 +00:00
Campbell Barton ca662d0fd6 svn merge -r40124:40140 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-12 00:38:57 +00:00
Campbell Barton 3d3f6b1ddc fix for 'blender -E' crashing. 2011-09-11 13:46:58 +00:00
Campbell Barton 75b3936128 svn merge -r40075:40104 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-10 23:49:39 +00:00
Tamito Kajiyama 353713afe8 Merged changes in the trunk up to revision 40096.
Conflicts resolved:
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/CMakeLists.txt

Note for branch builders: Enabling Blender Player may cause linker errors.
2011-09-10 13:36:27 +00:00
Campbell Barton fb4abf2e41 fixed linking with CMake 2011-09-10 03:42:45 +00:00
Benoit Bolsee dbd6658d73 svn merge -r 37306:39975 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-07 15:34:04 +00:00
Campbell Barton e74e245030 svn merge -r39890:39951 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-06 03:16:12 +00:00
Lukas Toenne 8e0fe8bff7 Merged the particles-2010 branch with node improvements into trunk.
This branch adds mostly organizational improvements to the node system by renaming the node folders and files. A couple of internal features have been added too.
Detailed information can be found on the wiki page:

http://wiki.blender.org/index.php/User:Phonybone/Particles2010
2011-09-05 21:01:50 +00:00
Brecht Van Lommel 27102bfec4 Cycles: OpenCL library is now dynamically loaded so that blender doesn't crash
if it's not installed on the system.

Code copied from clew.h/clew.c in CLCC:
http://clcc.sourceforge.net/
2011-09-01 19:00:23 +00:00
Xiao Xiangquan 981f7fcd0d merge with trunk r39834 2011-09-01 15:08:32 +00:00
Brecht Van Lommel d48e4fc92b Cycles: fix linux build issue, link order was wrong. 2011-08-25 12:50:52 +00:00
Brecht Van Lommel 564eae2dc4 Cycles: remove automatic copy of boost/openimageio shared libraries to binary
folder, this doesn't work well, proper solution is to statically link these in
official builds.
2011-08-24 13:43:34 +00:00
Brecht Van Lommel 29bdf37f9d Cycles: svn merge -r39457:39669 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-08-24 09:44:08 +00:00
Campbell Barton fd4575b2e3 svn merge -r39493:39664 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-08-24 02:29:45 +00:00
Tamito Kajiyama 33bb1ed53e Merged changes in the trunk up to revision 39661. 2011-08-24 00:18:26 +00:00
Sergey Sharybin a33a26ca07 FFmpeg library update:
- Update scons/cmake rules to use new versions of libs/dlls.
- Update rules for buildbot.
2011-08-22 18:49:42 +00:00