griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
66,005 Commits 1 Branch 0 Tags
c50ccc847613bbe02bea64cee3f744b449da170c
Commit Graph

712 Commits

Author SHA1 Message Date
Tamito Kajiyama
1f25228857 Fix for warnings about period at the end of description strings for 
RNA operators and properties.  No functional changes were made.
 2011-10-30 09:05:47 +00:00
Tamito Kajiyama
65668dc5eb Merged changes in the trunk up to revision 41368. 
Conflicts resolved:
source/blender/blenkernel/intern/library.c
source/blender/blenlib/intern/bpath.c
source/blender/render/intern/source/convertblender.c
 2011-10-30 02:03:40 +00:00
Tamito Kajiyama
16702c1729 Merged changes in the trunk up to revision 41225. 
Conflicts resolved:
source/blender/render/intern/source/pipeline.c
 2011-10-29 15:46:14 +00:00
Campbell Barton
36b8846f6e fix [#29063] reprojetion painting : failed to create opengl offscreen buffer 
error report was not passed into the UI and only printed into the terminal, now shows an error popup.
 2011-10-28 02:10:02 +00:00
Campbell Barton
4a04f72069 remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n 2011-10-23 17:52:20 +00:00
Bastien Montagne
daf51fe6cd A big set of UI messages fixes and tweaks! No functional changes. 2011-10-20 07:56:04 +00:00
Tamito Kajiyama
b4e7451cb0 Merged changes in the trunk up to revision 41099. 2011-10-18 23:36:43 +00:00
Jens Verwiebe
dc907ef876 Allow symlinks in user_scripts, this fixes raised exeption in copy_prefs for version_updates 2011-10-17 16:36:03 +00:00
Campbell Barton
fda2045150 correct spelling errors in comments 2011-10-17 06:58:07 +00:00
Campbell Barton
fa5275cdfa - bpy.path.abspath(), added optional library argument since any paths from linked datablocks are relative to this, not the blend files path, this saves kludgy path code wherever libraries may be used. 
- Image "Edit Externally" operator can now edit relative library images.

also minor edits to navmesh.
 2011-10-11 04:09:11 +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
9a51266f35 fix for align objects with non mesh objects. 2011-10-07 20:53:54 +00:00
Campbell Barton
8cfc183f84 hide 3d view header use_pivot_point_align button in editmode since its not used there, also remove unneeded copy() funcs from quick effects. 2011-10-06 10:06:53 +00:00
Campbell Barton
ccb7a81d86 - fix for keymap test operator 
- cleanup pep8 warnings and unused py imports
py pep8 cleanup
 2011-10-02 18:09:36 +00:00
Dalai Felinto
4ea3f1cc29 using Blender 2.49 as playback for Ctrl+F11 doesn't take 'frame step' into consideration 
... now it does ;) -- self-reported bug, not in tracker. Sorry statics people.
 2011-09-28 17:57:12 +00:00
Campbell Barton
8a423f59ea pep8 cleanup and fix for keymap test operator from my own recent fix. 2011-09-26 15:39:15 +00:00
Campbell Barton
e1e5371335 fix for keymap export, move functions common for the UI and operators into bpy_extras.keymap_utils 2011-09-26 11:22:07 +00:00
Campbell Barton
0aa19de52f add missing imports to wm.py and remove "." from rna descriptions. 2011-09-26 09:31:24 +00:00
Dalai Felinto
2d91b6cda7 wm.py needs import os in some of its execute funcs + now we can have blender2.60x version :) 
I guess someone did a cleanup in the file and forgot to test "add an Add-On" ;)
+ a bug I found while studying the cmake files
 2011-09-26 06:29:58 +00:00
Tamito Kajiyama
c0c488d0b2 Merged changes in the trunk up to revision 40520. 2011-09-24 21:39:11 +00:00
Campbell Barton
c658442c65 - move animsys update operator into the anim.py 
- move the data into animsys_refactor.py module so its not loaded on blender start.
 2011-09-23 17:38:52 +00:00
Campbell Barton
c658b74db5 minor edits to recent fix for addons 2011-09-23 13:47:29 +00:00
Thomas Dinges
f7c8ea702f * Some more fixes for recent move operator commit. 2011-09-23 13:29:28 +00:00
Thomas Dinges
728cf26ee4 * Fix for the Operator move commit, missed includes. 
* import os at the beginning of file
 2011-09-23 05:20:15 +00:00
Campbell Barton
458b920abb remove bl_operators/nla.py, move bake_action function into bpy_extras.anim_utils and bake operator into bl_operators/anim.py 2011-09-22 22:51:54 +00:00
Guillermo S. Romero
ea32492dd5 SVN maintenance. 2011-09-22 20:37:22 +00:00
Thomas Dinges
e17ee1b415 2.6 Python UI files: 
* Moved Operators from bl_ui into bl_operators.
* Renamed HELP_OT_operator_cheat_sheet to WM_OT_operator_cheat_sheet.
 2011-09-22 19:50:41 +00:00
Brecht Van Lommel
402f583abd Fix warnings about operator descriptions ending with "." 2011-09-22 15:44:35 +00:00
Campbell Barton
f1a227cf43 check that descriptions dont end with a '.', for non release builds. 
this is annoying for translators so rather then correct along the way which gives merge conflicts for branches - print a complaint message.
 2011-09-21 17:52:51 +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
Campbell Barton
0af633a36c move message.txt generator out of wm.py (which was loaded with blender always), into it own py script which runs on its own, also added this to 'make translations' target. 2011-09-20 17:44:45 +00:00
Sergey Sharybin
bba54a051a i18n: fake_gettext is no longer needed for python 2011-09-20 08:38:16 +00:00
Sergey Sharybin
8dbc7a3ba3 Merging r40345 through r40365 from trunk into soc-2011-garlic 2011-09-19 15:47:05 +00:00
Bastien Montagne
712e434a5f /release/scripts: Removed final points in UI strings and messages. 2011-09-19 14:00:42 +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
30293dc2ca svn merge -r39834:40222 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-15 13:02:37 +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
7500f4cd48 fix for misc py errors + some pep8 edits. 2011-09-08 05:42:44 +00:00
Tamito Kajiyama
7db432d29d Merged changes in the trunk up to revision 39826. 
Made a major amount of conflict resolution for code adaptation to
the animation system updates introduced in the Pepper branch recently
merged to the trunk.

Resolved conflicts:
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/library.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/animation/keyframes_edit.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/space_nla/nla_buttons.c
source/blender/editors/space_nla/nla_channels.c
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_main_api.c
 2011-09-03 20:48:43 +00:00
Xiao Xiangquan
981f7fcd0d merge with trunk r39834 2011-09-01 15:08:32 +00:00
Campbell Barton
b20c9b0ba3 minor edits, pep8 - also correct float -> double promotion for blf. 2011-08-30 10:49:58 +00:00
Joerg Mueller
43ab8e8624 * Merge trunk up to r39790. 
* Subversion bump (also for init_userdef_do_versions).
* Minor fix for compilation without ffmpeg.
 2011-08-30 08:22:03 +00:00
Campbell Barton
d049a722fe fix [#28413] bpy.ops.nla.bake can't bake from frame 0 2011-08-30 04:13:48 +00:00
Tamito Kajiyama
7eb10d1538 Added a button to the UI of "Distance from Object" color/alpha/thickness 
modifiers to fill the Range Min/Max entries by the min/max distance between
selected mesh objects and the target object.
 2011-08-24 15:47:05 +00:00
Tamito Kajiyama
33bb1ed53e Merged changes in the trunk up to revision 39661. 2011-08-24 00:18:26 +00:00
Joerg Mueller
f0d5abfcb2 Merging trunk up to r39637. 2011-08-22 20:31:46 +00:00
Campbell Barton
5394cabe24 remove workaround for bug in python 3.2.0 loading web pages on *nix 2011-08-22 11:54:40 +00:00
Campbell Barton
1324173e99 pep8 edits and change '!= None' to 'is not None' 2011-08-22 09:01:49 +00:00
Campbell Barton
aa7545b0ea patch [#28320] Small change to trunk needed for Motion Capture Addon - GSoC 2011 - Pepper Branch 
from Benjy Cook (benjycook)
 2011-08-22 08:47:48 +00:00
Campbell Barton
90d19ad883 py style change only - make property definitions consistent 2011-08-19 19:25:20 +00:00