Tamito Kajiyama
35708fe150
Merged changes in the trunk up to revision 44561.
...
Conflicts resolved:
source/blender/bmesh/bmesh.h
source/blender/bmesh/bmesh_operators.h
source/blenderplayer/bad_level_call_stubs/stubs.c
2012-02-29 21:35:49 +00:00
Campbell Barton
e17bf02c2d
Code Cleanup:
...
* made bmesh_structure.h function names more consistant.
* remove unused code in bmesh_structure.c
* removed 'Edge Flip' operator (missing from bmesh but looked into trunk feature and dont think its worth keeping).
* tagged some BMESH_TODO's
2012-02-27 13:47:53 +00:00
Campbell Barton
72e1316dc4
minor style edits
...
- use GL_TRUE/FALSE for glLightModeli
- use set for python checks against multiple string values.
2012-02-25 21:27:45 +00:00
Tamito Kajiyama
001b8af4ff
Merged changes in the trunk up to revision 44436.
2012-02-25 21:11:29 +00:00
Thomas Dinges
4f4bba39fb
Patch [ #30341 ] by Davis Sorenson (dsavi). Thanks!
...
* Now the 3D view header displays value changes, when changing a value in the Object Special value (w-key).
2012-02-25 19:49:23 +00:00
Martin Poirier
3cfb637d7c
[ #30197 ] Snapping: Align rotation button
...
Reported by Pep Ribal
Volume snapping was showing invalid options.
2012-02-25 15:14:41 +00:00
Tamito Kajiyama
69289c978e
Merged changes in the trunk up to revision 44266 (including BMesh).
...
Freestyle edge/face marks were ported to BMesh.
Conflicts resolved:
source/blender/editors/mesh/editface.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_meshdata_types.h
source/blender/blenkernel/intern/editderivedmesh.c
2012-02-21 01:40:04 +00:00
Campbell Barton
0fd176e03d
moved select interior faces into a C function (was python)
2012-02-19 20:27:30 +00:00
Tamito Kajiyama
910f04ca63
Merged changes in the trunk up to revision 44221.
...
Conflicts resolved:
release/datafiles/blender_icons.png
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenloader/intern/readfile.c
2012-02-18 11:26:11 +00:00
Campbell Barton
48006292d8
svn merge ^/trunk/blender -r44189:44204
2012-02-17 20:56:25 +00:00
Sergey Sharybin
ea6d0b7a3b
In fact, snapping in particle edit mode also might make sense.
...
Pardon for extra noise..
2012-02-17 17:25:51 +00:00
Campbell Barton
4c66e696fb
svn merge ^/trunk/blender -r44136:44189
2012-02-17 15:51:48 +00:00
Sergey Sharybin
5ca057f755
Fix for recent changes in 3D viewport header: object might be missed and in this
...
case check for current mode isn't needed
2012-02-17 11:46:28 +00:00
Sergey Sharybin
283ab431a5
Cleanup of 3D viewport header in painting modes:
...
- Hide Manipulate center points in sculpt and particle edit modes
- Hide 3D manipulators and orientation from sculpt mode
- Hide snap buttons in sculpt, weight, texture, vertex and particle painting modes
All this options weren't make sense in this modes and might only confuse user.
This will resolve issue #30180 : 3D View header buttons and modes
2012-02-17 06:59:32 +00:00
Nicholas Bishop
7cbd4d3576
Sculpt/Paint UI: Add a new menu for brush options.
...
For vertex/weight/texture paint, this has only the flags for using
unified size/strength. (Addresses TODO in code, before only sculpt
menu had these settings.)
For sculpt, moved the brush-related settings from the sculpt menu to
the brush menu.
Note that these menus are still very out of date (missing lots of
options), will address that in a different commit.
2012-02-16 18:06:38 +00:00
Nicholas Bishop
cbe14f3400
Sculpt UI: add missing sculpt options to menu
2012-02-16 16:38:05 +00:00
Nicholas Bishop
c8fe53871c
Bugfix: update the sculpt menu to use the correct path to the unified paint settings.
2012-02-16 16:33:50 +00:00
Campbell Barton
cde2f11244
new bmesh tool - limited dissolve.
...
This is a kind of simplification/cleanup tool which joins adjacent faces and edges based on the angle.
I've written this as an exercise (since I havnt written a bmesh operator before), and because quite a few users were asking for the dissolve operator to be extended, but I think this kind of functionality needs its own operator.
access from specials menu and mesh menu.
notes
* this exposed a bug in angle_v3v3v3(). will merge fix into trunk after release.
* added utility function BM_vert_edge_angle(), to get the angle between 2 connecting edges of a vert.
2012-02-13 14:37:07 +00:00
Tamito Kajiyama
5c5685f6c5
Merged changes in the trunk up to revision 44039.
2012-02-12 00:09:48 +00:00
Campbell Barton
ac4484b239
svn merge ^/trunk/blender -r43976:43995
2012-02-09 01:53:14 +00:00
Campbell Barton
0d29b5c3df
add bake action into animation menu - this nifty operator wasn't available anywhere in the UI.
2012-02-08 14:01:47 +00:00
Campbell Barton
19d0f93099
svn merge ^/trunk/blender -r43934:43976
2012-02-08 05:45:16 +00:00
Campbell Barton
1f74789d12
Correct mathutils documentation, also correct some python spelling errors and add makefile target check_spelling
2012-02-08 04:37:37 +00:00
Tamito Kajiyama
68ae82bb47
Merged changes in the trunk up to revision 43585.
...
Conflicts resolved:
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_scene.c
2012-01-21 23:01:25 +00:00
Campbell Barton
0f28c1c27a
svn merge ^/trunk/blender -r43461:43472
2012-01-17 21:08:25 +00:00
Campbell Barton
391a214303
pep8 edits, also remove unused vars
2012-01-17 17:57:20 +00:00
Tamito Kajiyama
e0df491d1e
Merged changes in the trunk up to revision 43404.
...
Conflicts resolved:
source/blender/python/SConscript
2012-01-15 23:13:12 +00:00
Campbell Barton
caca9cc8f6
svn merge ^/trunk/blender -r43381:43392
2012-01-15 10:33:41 +00:00
Campbell Barton
917714acf7
svn merge ^/trunk/blender -r43345:43381
2012-01-15 09:16:39 +00:00
Bastien Montagne
82871f27d3
Ooops ! Small error in previous own commit :/
2012-01-14 21:41:13 +00:00
Campbell Barton
166a37532f
remove *.select_inverse operators where the *.select_all operator has an invert option.
2012-01-14 06:58:03 +00:00
Campbell Barton
93cf1531d0
fix own bug [ #29875 ] Due to operators now reusing there last-used settings, some UI options are more or less broken (esp. in shortcuts and menu entries)
...
also prefer *.select_all rather then *.select_inverse operators, since this is an option for select_all.
2012-01-14 06:30:27 +00:00
Campbell Barton
98bdf0274b
svn merge ^/trunk/blender -r43183:43220
2012-01-08 13:09:09 +00:00
Tamito Kajiyama
76a211d809
Merged changes in the trunk up to revision 43219.
...
Conflicts resolved:
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/pipeline.c
2012-01-08 11:57:53 +00:00
Thomas Dinges
f983fe709d
3DView / Properties Region:
...
* Simplify UI inside the Transform Orientation Panel.
2012-01-06 01:14:57 +00:00
Campbell Barton
c0eec8f379
svn merge ^/trunk/blender -r43062:43085
2012-01-03 02:16:52 +00:00
Campbell Barton
aa43cab820
weight paint buttons now work in weight paint vertex select mode
2012-01-02 16:59:46 +00:00
Campbell Barton
b64f352270
svn merge ^/trunk/blender -r43033:43062
2012-01-02 02:57:36 +00:00
Campbell Barton
a49e80c48a
use props
all over for operator properties vars
2012-01-01 13:09:58 +00:00
Campbell Barton
c99975e24f
pep8 edits
2012-01-01 08:52:54 +00:00
Tamito Kajiyama
0896a22723
Merged changes in the trunk up to revision 42902.
...
Conflicts resolved:
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_mesh_types.h
source/blender/python/intern/bpy.c
2011-12-27 22:12:46 +00:00
Campbell Barton
4ced91da47
svn merge ^/trunk/blender -r42778:42839
2011-12-23 08:41:53 +00:00
Campbell Barton
4537061e55
patch [ #29673 ] Visualize Indices (developer aid)
...
by Howard Trickey (howardt)
2011-12-22 05:39:23 +00:00
Dalai Felinto
056c49e9ec
Patch [ #29654 ] New menu option under Object > Game with "Copy All Physics Attributes" by Daniel Macedo
...
"This is a patch that adds an option under the menu Object > Game to copy all the physics attributes from Game Engine."
2011-12-21 02:41:27 +00:00
Antony Riakiotakis
ab6adf86cc
Add vertex connect tool to Ctrl-V submenu and Mesh->Vertices submenu.
2011-12-11 16:56:09 +00:00
Tamito Kajiyama
efc4341ee4
Merged changes in the trunk up to revision 42556.
...
Conflicts resolved:
source/blender/editors/space_view3d/drawobject.c
2011-12-10 20:54:43 +00:00
Campbell Barton
b245dfbc06
svn merge ^/trunk/blender -r42466:42495
2011-12-07 18:29:21 +00:00
Brecht Van Lommel
f96ac8c335
Fix #29518 : uv cylinder/sphere unwrap from menu didn't work same as using U key menu.
2011-12-07 11:22:29 +00:00
Tamito Kajiyama
3197796cf7
Merged changes in the trunk up to revision 42425.
...
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/editmesh.c
source/blender/editors/space_view3d/drawobject.c
2011-12-05 02:12:49 +00:00
Andrew Wiggin
e883fa168b
Adjust face menu links to "mirror uvs" and "mirror colors" to use the bmesh n-gon-compatible replacements "reverse uvs" and "reverse colors"
2011-12-02 17:17:40 +00:00