Commit Graph

4625 Commits

Author SHA1 Message Date
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
9ca7f6659f Merged changes in the trunk up to revision 44419.
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_view3d/drawobject.c
source/creator/CMakeLists.txt
2012-02-25 01:26:45 +00:00
Campbell Barton
2673966678 elsyiun theme
* too light unselected vertex color.
* active color was darker then selected color (make active a lighter tint of selected).
2012-02-23 13:08:42 +00:00
Sergey Sharybin
eeec94701c Fix #30276: mesh subdivision shorcut with maya preset
Added subdivisions shortcut for mesh editing mode to maya preset.
Not actually sure such shortcut present in Maya, but seems to be logical
to have it both object and edit modes.
2012-02-22 08:25:14 +00:00
Sergey Sharybin
67d1706b3b Made Maya keymap working again.
Keypam for midpoint knife cutting was disabled for a while due to
midpoint toggle was moved to a model keymap and i'm not sure how to
start operator with midpoint enabled by default.
2012-02-22 08:16:12 +00:00
Tamito Kajiyama
9f243d531c Merged changes in the trunk up to revision 44288.
Conflicts resolved:
source/blender/blenkernel/intern/cdderivedmesh.c
2012-02-21 02:19:54 +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
89a5cf40e3 remove NGon Interp modifier (which was merged as apart of BMesh),
this didnt really give any advantage over subsurf's Simple-Subdiv mode.
2012-02-20 23:24:57 +00:00
Campbell Barton
71146bf93b copy over a change from bmesh branch that was needed for lightmap unpack to work, also tag some rna vars as unused. 2012-02-20 22:58:00 +00:00
Brecht Van Lommel
b4201e643a Fix #30263: tweak threshold option in user preferences was incorrectly placed
under NDOF settings, but it's a mouse/tablet setting. Patch by Tobias Johansson.
2012-02-20 15:29:02 +00:00
Campbell Barton
0fd176e03d moved select interior faces into a C function (was python) 2012-02-19 20:27:30 +00:00
Campbell Barton
b2956ecd00 BMesh Merge
===========

initial merge from BMesh branch,

this replaces the existing mesh format and editmode data structures, for more info see:
http://wiki.blender.org/index.php/Dev:2.6/Source/Modeling/BMesh

this is the work of quite a few developers over the years.


Key Contributors
================

* Geoffrey Bantle (aka) Briggs, original author.
* Joe Eager (aka) joeedh

More recently
* Howard Trickey
* Ender79 aka Ender79 :)


What to Expect
==============

In general blender shouldnt crash on files or totally fail to load scenes,
painting tools etc have been tested to work.

* its quite easy to make the tesselator fail (show holes, missing faces), with non planer ngons.
* most modifiers are working fine but a few had to be re-written - bevel, array - array is much slower, bevel will probably be changed to match trunk soon.
* NavMesh BGE feature isn't functional yet.
* Some UV sticth tools still need porting.
* hair doesnt work right on ngons yet.
* many python scripts will break.
* a python api to BMesh needs to be written still.

(for todo's in code do a searh for BMESH_TODO)
2012-02-19 19:12:36 +00:00
Campbell Barton
dc68210c7e misc changes from trunk (avoid confusion since these were not intentional differences) 2012-02-19 18:41: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
ed3b7e2c23 Camera tracking: configurable filter type for 2d stabilization
--
svn merge -r44151:44152 ^/branches/soc-2011-tomato
2012-02-17 08:27:19 +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
Tamito Kajiyama
f1e3e0fff0 Rearranged the locations of edge type options within the Selection by Edge Type in the Parameter Editor mode.
A better use of screen space concerning this component was suggested by Light BWK through personal communications.
2012-02-16 22:08:11 +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
Sergey Sharybin
62d09c9103 Tomato: configurable filter type for 2d stabilization 2012-02-16 15:03:37 +00:00
Sergey Sharybin
b5628b45ff Merging r44129 through r44139 from trunk into soc-2011-tomato 2012-02-16 07:11:50 +00:00
Campbell Barton
a0feea1fc0 fix [#30201] bpy_extras.image_utils.load_image always returns placeholder
in existing addons this only effects OBJ import.

interestingly even though this is a bug (in that its returning a placeholder when it should load the image), since the placeholder points to the correct path, the image will load correctly when refreshed, so the bug's not too bad.
2012-02-16 04:08:52 +00:00
Campbell Barton
428f031237 svn merge ^/trunk/blender -r44076:44118 2012-02-15 12:08:06 +00:00
Sergey Sharybin
4eb006f6f5 Merging r44070 through r44108 from trunk into soc-2011-tomato 2012-02-14 15:19:49 +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
Campbell Barton
b765dd16e4 fix for typo 2012-02-13 12:57:46 +00:00
Campbell Barton
e6dc5cc156 themes to be distributed with release 2012-02-13 11:29:34 +00:00
Campbell Barton
aee007c664 more tweaks, outline is lighter then the color given so compensate a bit. 2012-02-13 11:14:12 +00:00
Campbell Barton
2d1a05874b svn merge ^/trunk/blender -r44024:44076 2012-02-13 04:14:35 +00:00
Sergey Sharybin
bcf4491304 Merging r44003 through r44069 from trunk into soc-2011-tomato 2012-02-12 19:00:13 +00:00
Sergey Sharybin
bbff6787bc Fix #30132: "Add Game Property" works incorrect after "Add Text Game Property"
Issues was caused by operator props "presets" which was reusing name of property
on every run of OBJECT_OT_game_property_new. This run into conflict with how text
property is determining -- it's stupid name comparsion which worked unexpectable
after adding and removing text property.

Solved by using empty (default) name for game_property_new when crating game property.
2012-02-12 10:23:06 +00:00
Tamito Kajiyama
5c5685f6c5 Merged changes in the trunk up to revision 44039. 2012-02-12 00:09:48 +00:00
Campbell Barton
2956ea22f2 typo fix when a preset fails to run. (fail at failing) 2012-02-11 15:49:25 +00:00
Campbell Barton
5ea86e1e2b svn merge ^/trunk/blender -r43995:44024 2012-02-11 04:10:50 +00:00
Campbell Barton
a43e627371 fix for presets reusing previous options (which broke preset add/remove) 2012-02-09 13:02:22 +00:00
Sergey Sharybin
9e8c17206f Merging r43995 through r44002 from trunk into soc-2011-tomato 2012-02-09 12:35:50 +00:00
Sergey Sharybin
c966601e86 Reset Use Active Clip for Follow Track constraints when linking empty to a track 2012-02-09 10:24:44 +00:00
Campbell Barton
ac4484b239 svn merge ^/trunk/blender -r43976:43995 2012-02-09 01:53:14 +00:00
Sergey Sharybin
1957a29c5a Merging r43952 through r43994 from trunk into soc-2011-tomato 2012-02-08 20:40:44 +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
Sergey Sharybin
c5664a86a0 Merging r43909 through r43951 from trunk into soc-2011-tomato 2012-02-07 15:04:56 +00:00