94f8e3198d
svn merge -r41266:41287 ^/trunk/blender
2011-10-26 03:26:52 +00:00
15e6d6cd75
svn merge ^/trunk/blender -r41226:41227 .
2011-10-24 12:43:08 +00:00
70bf00a74c
svn merge ^/trunk/blender -r41200:41226 .
2011-10-24 08:45:55 +00:00
ad1d3dd30f
svn merge ^/trunk/blender -r41175:41200 --- will need to apply fix after
2011-10-24 07:56:42 +00:00
4a04f72069
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
29f279e43d
Render API: add update_progress() function to update progress bar progress from
...
external render engines.
Also refactoring to move some render engine registration stuff out of RNA and
into render module.
2011-10-22 17:01:54 +00:00
00735ed9e4
Code cleanup: don't use btempdir/bprogdir/bprogname globals anymore, but wrap
...
in BLI_ functions.
2011-10-21 17:37:38 +00:00
aa6d7ebd14
svn merge ^/trunk/blender -r40720:40872
2011-10-09 07:31:15 +00:00
71256629b0
Update blenderplayer stubs to deal with recent keymaps commit.
2011-10-04 15:21:01 +00:00
4a157de23d
svn merge ^/trunk/blender -r40587:40643
2011-09-28 07:34:48 +00:00
7ba71fff8c
OSX: fix player bundle_creation
2011-09-27 10:51:57 +00:00
effea8c29b
svn merge ^/trunk/blender -r40511:40587
2011-09-27 03:12:31 +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
5bd83eede0
svn merge ^/trunk/blender -r40405:40431
2011-09-23 11:30:55 +00:00
ae0124157f
Translation: reload font on enabling/disabling use international fonts.
2011-09-21 15:15:30 +00:00
1ff373ef5b
svn merge -r40166:40279 ^/trunk/blender
2011-09-17 04:59:14 +00:00
9b06435653
move ED_object_pose_armature --> object_pose_armature_get to so we dont get bad level calls in the weight paint branch.
2011-09-14 01:48:55 +00:00
1741269d30
resolve bad level calls from blenkenel/ into editors/ & remove editors from the include path from CMake & SCons.
...
* ED_curve_editnurbs --> curve_editnurbs
* ED_sculpt_modifiers_changed --> object_sculpt_modifiers_changed
2011-09-14 00:37:27 +00:00
0383fb5341
svn merge -r40104:40117 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-11 08:28:16 +00:00
Dalai Felinto
ff04beb3e4
partial fix for blenderplayer linking problems (decast retour)
...
This fix the problem of linking the extern components for the KX module.
The remaining linking issues are related to actual bad level access so the fix is a bit more complex.
Remaining linking issues (osx cmake gcc)
###########
Undefined symbols:
"_buildNavMeshDataByDerivedMesh", referenced from:
KX_NavMeshObject::BuildVertIndArrays(float*&, int&, unsigned short*&, int&, unsigned short*&, float*&, int&, unsigned short*&, int&, int&)in libge_logic_ketsji.a(KX_NavMeshObject.cpp.o)
_applyModifier in libbf_modifiers.a(MOD_navmesh.cpp.o)
"_polyIsConvex", referenced from:
_applyModifier in libbf_modifiers.a(MOD_navmesh.cpp.o)
"_polyNumVerts", referenced from:
KX_NavMeshObject::BuildVertIndArrays(float*&, int&, unsigned short*&, int&, unsigned short*&, float*&, int&, unsigned short*&, int&, int&)in libge_logic_ketsji.a(KX_NavMeshObject.cpp.o)
"_polyFindVertex", referenced from:
KX_NavMeshObject::BuildVertIndArrays(float*&, int&, unsigned short*&, int&, unsigned short*&, float*&, int&, unsigned short*&, int&, int&)in libge_logic_ketsji.a(KX_NavMeshObject.cpp.o)
KX_NavMeshObject::BuildVertIndArrays(float*&, int&, unsigned short*&, int&, unsigned short*&, float*&, int&, unsigned short*&, int&, int&)in libge_logic_ketsji.a(KX_NavMeshObject.cpp.o)
KX_NavMeshObject::BuildVertIndArrays(float*&, int&, unsigned short*&, int&, unsigned short*&, float*&, int&, unsigned short*&, int&, int&)in libge_logic_ketsji.a(KX_NavMeshObject.cpp.o)
############
2011-09-11 08:21:26 +00:00
e74e245030
svn merge -r39890:39951 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-06 03:16:12 +00:00
Lukas Toenne
82f19e8df2
Fix for blender player linker bug, missing a stub function used in RNA.
2011-09-05 22:04:23 +00:00
9bc92b2146
svn merge -r39781:39792 https://svn.blender.org/svnroot/bf-blender/trunk/blender , merge pepper, manually merged source/blender/editors/transform/transform_generics.c
2011-09-01 00:35:30 +00:00
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
c5a3f361a0
svn merge -r39765:39781 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-08-30 00:23:11 +00:00
6cf447a29c
Fix player build error after envmap commit.
2011-08-29 12:57:46 +00:00
fd4575b2e3
svn merge -r39493:39664 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-08-24 02:29:45 +00:00
f0d5abfcb2
Merging trunk up to r39637.
2011-08-22 20:31:46 +00:00
c33e0c053a
fix for buildinfo changes with blenderplayer
2011-08-22 19:13:26 +00:00
750e754604
Adding ANIM_validate_keyingset to stubs.c so the Blenderplayer builds again.
2011-08-16 22:14:55 +00:00
55a560c0c4
svn merge -r39286:39385 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-08-16 06:30:14 +00:00
2c2fa877be
svn merge -r39286:39298 https://svn.blender.org/svnroot/bf-blender/trunk/blender , ensure some edits in trunk dont get merged back into pepper
2011-08-11 09:28:07 +00:00
a7663cc377
use ghash for operator and menu types, was doing string lookup in the operator list (containing over 1000 items) for each button draw.
...
gives small speedup for UI drawing and overall startup time.
2011-08-11 06:06:17 +00:00
226e424cb2
svn merge -r39057:39286 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-08-11 04:53:57 +00:00
daab78bc61
Merging trunk up to r39145.
2011-08-07 15:25:06 +00:00
e6e4c7ef8b
KEYMAP REFACTORING
...
Diff Keymaps
User edited keymaps now no longer override the builtin keymaps entirely, but
rather save only the difference and reapply those changes. This means they can
stay better in sync when the builtin keymaps change. The diff/patch algorithm
is not perfect, but better for the common case where only a few items are changed
rather than entire keymaps The main weakness is that if a builtin keymap item
changes, user modification of that item may need to be redone in some cases.
Keymap Editor
The most noticeable change here is that there is no longer an "Edit" button for
keymaps, all are editable immediately, but a "Restore" buttons shows for keymaps
and items that have been edited. Shortcuts for addons can also be edited in the
keymap editor.
Addons
Addons now should only modify the new addon keyconfiguration, the keymap items
there will be added to the builtin ones for handling events, and not get lost
when starting new files. Example code of register/unregister:
km = wm.keyconfigs.addon.keymaps.new("3D View", space_type="VIEW_3D")
km.keymap_items.new('my.operator', 'ESC', 'PRESS')
km = wm.keyconfigs.addon.keymaps["3D View"]
km.keymap_items.remove(km.keymap_items["my.operator"])
Compatibility
The changes made are not forward compatible, i.e. if you save user preferences
with newer versions, older versions will not have key configuration changes that
were made.
2011-08-05 20:45:26 +00:00
29f214f7f3
Merging up to trunk r38834.
2011-07-29 21:28:18 +00:00
73dde4e26f
svn merge -r38718:38804 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-07-29 02:03:53 +00:00
71692e802f
py api:
...
- added menu templates
- move template menu into the header of the text editor (so users will find more easily)
- updated mathutils examples, switching the order of multiplication.
2011-07-26 07:39:00 +00:00
fc95382a97
svn merge -r38400:38500 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-07-26 03:55:23 +00:00
cadfac5a0f
svn merge -r38000:38200 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-07-25 17:51:30 +00:00
cc0abf9963
svn merge -r37900:38000 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-07-25 16:12:54 +00:00
a7815053ef
svn merge -r37600:37700 https://svn.blender.org/svnroot/bf-blender/trunk/blender
...
manually merged source/blender/editors/uvedit/uvedit_unwrap_ops.c
2011-07-25 12:59:54 +00:00
97d0846d2c
svn merge -r37335:37500 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-07-24 13:03:48 +00:00
4532bd731d
Merge with trunk up to r38584.
2011-07-21 21:11:58 +00:00
5792bd7cc7
cmake: cleanup include paths, some duplicates and going up some unneeded dirs.
2011-07-17 09:11:13 +00:00
3a6158a8bf
move mathutils into its own lib.
2011-07-15 04:01:47 +00:00
074ac7c09b
Add ED_object_pose_armature to stubs.c. This should fix compilation
...
issues with blenderplayer.
2011-07-07 21:02:31 +00:00
3d5ae95986
Fix #27863 : converting curve spline type from python crashes.
2011-07-05 08:57:11 +00:00
398807e235
Fix #27785 : blenderplayer + eltopo linking error.
2011-07-04 13:03:41 +00:00
