1ff373ef5b
svn merge -r40166:40279 ^/trunk/blender
2011-09-17 04:59:14 +00:00
30293dc2ca
svn merge -r39834:40222 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-15 13:02:37 +00:00
c3a718702f
svn merge -r40195:40197 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-14 01:54:04 +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
ac51152ec5
svn merge -r40179:40195 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-14 01:32:59 +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
ac796827cb
Merged changes in the trunk up to revision 40189.
2011-09-13 22:24:59 +00:00
e67b2ee6eb
quiet compiler warnings
2011-09-13 14:38:05 +00:00
d48ee9d035
Submit of patch [ #28568 ] BMesh: make active element highlights work
2011-09-13 13:41:20 +00:00
7d02e66256
svn merge -r40000:40179 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-13 10:05:30 +00:00
92089e3c4d
svn merge -r39900:40000 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-13 09:07:20 +00:00
b310a76a1b
svn merge -r39558:39800 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-13 06:39:17 +00:00
ca662d0fd6
svn merge -r40124:40140 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-12 00:38:57 +00:00
b988a2abf8
Recast: fix bad level calls, Recast compiled out if BGE not enabled. SCons updated but not tested.
2011-09-11 14:13:04 +00:00
0383fb5341
svn merge -r40104:40117 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-11 08:28:16 +00:00
5fdbfbaf3a
replace magic numbers for flags for uiSetRoundBox();
2011-09-11 06:41:09 +00:00
6eaae376a8
simple changes to grid drawing logic.
...
- make ortho grid drawing use vertex arrays
- make perspective view floor drawing cache result of UI_ThemeColorShade so its not called on every line.
- make perspective view floor only loop once on each axis when the grid floor isnt being drawn (was looking over all grid lines for no reason).
- add UI_GetColorPtrShade3ubv() to replace UI_GetColorPtrBlendShade3ubv() when no blending is needed.
2011-09-11 04:31:09 +00:00
75b3936128
svn merge -r40075:40104 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-10 23:49:39 +00:00
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
357febc168
fix for building with collada and some other warnings
2011-09-10 09:38:38 +00:00
a7f3e347b7
SVN maintenance.
2011-09-09 22:02:12 +00:00
c1c4743696
svn merge -r 39975:40061 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-09 12:21:41 +00:00
61b6fcd804
svn merge -r39991:40034 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-08 08:29:49 +00:00
24c9369477
svn merge -r39990:39991 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-08 08:08:31 +00:00
dbd6658d73
svn merge -r 37306:39975 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-07 15:34:04 +00:00
520778163d
interface + naming improvements to vertex wright modifier
...
- WeightVG -> Vertex Weight
- mapping_mode -> falloff_type
- nicer layout for VertexWeightModifiers add/remove options
2011-09-07 07:46:26 +00:00
9f1966425f
Merging r39693 through r39989 from vgroup_modifiers branch into trunk.
2011-09-07 06:33:29 +00:00
bac64b39e9
Merging r39948 through r39988 from trunk into vgroup_modifiers.
2011-09-07 05:40:12 +00:00
a167ee1262
svn merge -r39951:39986 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-07 00:46:11 +00:00
c94fe5e299
Grease pencil: non-blocking sketch sessions
...
- Implement own undo stack for grease pencil, so now there'll be no keymaps conflicts.
- Supported redo's during sketch session.
- Get rid of flag stored in Globals -- use undo stack to check if grease pencil session is active.
2011-09-06 07:59:18 +00:00
e74e245030
svn merge -r39890:39951 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-06 03:16:12 +00:00
c643363905
svn merge -r39930:39947 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-06 00:31:00 +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
59a823c48a
Code cleanup: remove context from RNA update functions, only one left.
2011-09-05 19:34:27 +00:00
42faf7ae41
Merge with trunk r39928
2011-09-05 17:06:09 +00:00
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
e4fd20c20c
Merging r39652 through r39842 from trunk into vgroup_modifiers.
2011-09-01 17:49:57 +00:00
Xiao Xiangquan
981f7fcd0d
merge with trunk r39834
2011-09-01 15:08:32 +00:00
b62b9f16b8
ability to create polygons and loops from python (low level mesh creation access, not nice api but functional).
...
updated:
mesh.from_pydata(vert, edge, polys)
... so it can take polygons rather then faces, this is much better suited for scripter access.
2011-09-01 09:11:00 +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
5065d4c744
svn merge -r39664:39762 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-08-29 00:46:56 +00:00
1c153b011d
Merged changes in the trunk up to revision 39759.
2011-08-28 23:25:13 +00:00
39b66f9ad4
Merge with trunk r39750
2011-08-28 16:46:40 +00:00
01230b1374
fix [ #28373 ] "Lock camera to view" doew not work with 3D-mouse
2011-08-27 11:52:59 +00:00
c5106fd097
Merge with trunk r39589
2011-08-21 19:37:19 +00:00
c58fb76f1a
Merged 39338-39558
2011-08-19 17:15:30 +00:00
236a94268e
Merging r39199 through r39485 from trunk into vgroup_modifiers.
2011-08-17 11:11:43 +00:00
3e625d1efe
bmesh todo: material mesh select/deselect added.
2011-08-16 18:45:03 +00:00
23807d1fb4
Merging trunk up to r39447.
2011-08-16 14:11:58 +00:00
