Commit Graph

585 Commits

Author SHA1 Message Date
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
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
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
Campbell Barton
3d3f6b1ddc fix for 'blender -E' crashing. 2011-09-11 13:46:58 +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
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
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
Campbell Barton
7d316b70b8 rename NAN_BUILDINFO --> WITH_BUILDINFO 2011-08-22 16:54:26 +00:00
Campbell Barton
817273931a buildinfo is now quoted from the build systems, avoids stripping quotes on startup.
tested with linux/cmake linux/scons windows/cmake/mingw windows/cmake/msvc
2011-08-22 12:24:14 +00:00
Brecht Van Lommel
360fcd73fe Cycles:
* add some (disabled) test code for using OpenImageIO in imbuf
* link cycles, openimageio and boost into blender instead of a shared library
* some cmakefile changes to simplify the code and follow conventions better
* this may solve running cycles problems on windows XP, or give a different
  and hopefully more useful error message
2011-08-16 16:15:34 +00:00
Xiao Xiangquan
5293b4f498 some small fix 2011-08-13 14:43:52 +00:00
Brecht Van Lommel
84d917dc6c Cycles: clean up some unnecessary changes compared to trunk. 2011-08-12 18:29:21 +00:00
Xiao Xiangquan
b99f7af357 remove gettext from mkaesrna, and update language packs 2011-08-11 22:14:07 +00:00
Xiao Xiangquan
465c3b82fa merge with trunk r39216 2011-08-10 14:32:03 +00:00
Brecht Van Lommel
ec26abd2db Cycles: svn merge -r37957:39132 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-08-07 13:21:04 +00:00
Xiao Xiangquan
16deef9e79 small fix of building rules 2011-08-07 11:50:48 +00:00
Xiao Xiangquan
66d1707293 fix of cmake rules for mac, from sirdude 2011-07-30 14:05:48 +00:00
Xiao Xiangquan
287b24926f merge with trunk r38787 2011-07-29 17:42:53 +00:00
Campbell Barton
2658949752 pep8 cleanup, also print message when attempting to run in animation player mode. 2011-07-29 01:24:03 +00:00
Xiao Xiangquan
8454f2b8b3 complete the language-select feature 2011-07-25 17:05:43 +00:00
Campbell Barton
3a6158a8bf move mathutils into its own lib. 2011-07-15 04:01:47 +00:00
Xiao Xiangquan
fa46278e34 merge from trunk 38379 2011-07-14 17:29:53 +00:00
Campbell Barton
80eb1eae42 run WM_exit(C) when blender as a python module exits 2011-07-10 18:54:02 +00:00
Campbell Barton
3ee2cb9cdb fix for error in cmake files 2011-07-02 07:55:06 +00:00
Campbell Barton
cf05777bc0 cmake was installing text as a directory rather then coping the files within it. 2011-07-01 13:10:49 +00:00
Brecht Van Lommel
8ddd2db648 RenderEngine API: add self.report() error reporting function for render engines,
works the same as for operators. Also includes some refactoring of render error
reporting code to use ReportList.
2011-06-28 16:25:07 +00:00
Brecht Van Lommel
d18d37d25f Cycles: svn merge -r37694:37904 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-06-28 15:00:42 +00:00
Campbell Barton
12e02fd474 own patch [#27752] Python Callback (Scriptlink functionality)
Python:
 * adds bpy.app.handlers which contains lists, each for an event type:
   render_pre, render_post, load_pre, load_post, save_pre, save_post
 * each list item needs to be a callable object which takes 1 argument (the ID).
 * callbacks are cleared on file load.

Example:
 def MyFunc(scene): print("Callback:", data)
 bpy.app.handlers.render_post.append(MyFunc)

C:
 * This patch adds a generic C callback api which is currently only used by python.
 * Unlike python callbacks these are not cleared on file load.
2011-06-24 16:54:30 +00:00
Xiao Xiangquan
b429af10d0 merge from trunk #37722 2011-06-24 03:30:50 +00:00
Campbell Barton
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
Brecht Van Lommel
07dee0d8a6 Cycles: svn merge -r37333:37694 https://svn.blender.org/svnroot/bf-blender/trunk 2011-06-21 15:47:18 +00:00
Campbell Barton
968b2a8afb rename cmake include/libraries to conform with suggested cmake names 2011-06-18 14:12:54 +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
Campbell Barton
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