Commit Graph

4448 Commits

Author SHA1 Message Date
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
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
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
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
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
Campbell Barton
72889d8935 Code Cleanup: remove unused preset variable. 2012-02-07 06:53:19 +00:00
Campbell Barton
3937ec7d11 svn merge ^/trunk/blender -r43887:43918 2012-02-05 22:13:10 +00:00
Thomas Dinges
fa163003c9 Release schedule:
* BCon4, important bug fixes only.
* Update readme.html and links to release logs, which now point to http://www.blender.org/development/release-logs/blender-262
2012-02-05 16:05:36 +00:00
Sergey Sharybin
81048fed74 Merging r43871 through r43908 from trunk into soc-2011-tomato 2012-02-05 14:39:43 +00:00
Sergey Sharybin
04a079668c Movie Clip Editor: cleanup of display panels
- Split display options into two panels:
  * Display, which contains all general display options related on editor itself
  * Marker Display, which contains options which makes sense for markers themselves
   and not used so often.
- Remove Show GPencil option which doesn't actually make sense because strokes might
  be disabled from GPencil panel
- Removed Show Pyramid option and show pyramid for KLT tracker as default.
- Added hotkey to toggle Show Disabled (Alt-D)
- Added hotkey to toggle Show Pattern (Alt-S)

Changes in interface and hotkeys are done by Sebastian Koenig.
 Thanks for the patch!

Own changes in interface were related on Aspect Ratio. It doesn't make
much sense for tracking (camera pixel aspect is what you'll want to use,
but for masking it would make much more sense because when you just
want to create a mask for footage you don't actually have camera).
Just removing from interface seems not so nice for now.

Merged from soc-2011-tomato rev43872
2012-02-05 13:43:58 +00:00
Campbell Barton
d0412a1981 svn merge ^/trunk/blender -r43864:43887 2012-02-05 02:30:30 +00:00
Campbell Barton
6927dcbf6f fix [#30068] Link Empty to Track python error
incorrect attribute used (likely code added since last release).
2012-02-04 11:12:18 +00:00
Campbell Barton
637bc0ddea Code Cleanup: pep8 edits 2012-02-04 11:10:41 +00:00
Sergey Sharybin
c8f5dac11b Movie Clip Editor: implemented option to display frame using OpenGL textures
Initial idea was to perform bilinear filtering for displaying proxied frame
to make it looking a bit smoother. It was done but it was also discovered
that using such kind of texture buffers helps on some crappy videocards
when playing $k footage.

Currently check for NPOT support is disabled, so use this option with care.
2012-02-03 19:13:31 +00:00
Sergey Sharybin
c354a6a02c Movie Clip Editor: cleanup of display panels
- Split display options into two panels:
  * Display, which contains all general display options related on editor itself
  * Marker Display, which contains options which makes sense for markers themselves
    and not used so often.
- Remove Show GPencil option which doesn't actually make sense because strokes might
  be disabled from GPencil panel
- Removed Show Pyramid option and show pyramid for KLT tracker as default.
- Added hotkey to toggle Show Disabled (Alt-D)
- Added hotkey to toggle Show Pattern (Alt-S)

Changes in interface and hotkeys are done by Sebastian Koenig.
Thanks for the patch!

Own changes in interface were related on Aspect Ratio. It doesn't make
much sense for tracking (camera pixel aspect is what you'll want to use,
but for masking it would make much more sense because when you just
want to create a mask for footage you don't actually have camera).
Just removing from interface seems not so nice for now.
2012-02-03 19:13:08 +00:00
Sergey Sharybin
d273420690 Merging r43848 through r43870 from trunk into soc-2011-tomato 2012-02-03 18:47:15 +00:00
Campbell Barton
075fee4d58 svn merge ^/trunk/blender -r43830:43864 2012-02-03 01:30:21 +00:00
Campbell Barton
e3958015db Code Cleanup: check is / is not when comparing singletons. 2012-02-02 21:07:56 +00:00
Sergey Sharybin
3b3d811bf0 Disallow fill caps for curves without bevel object.
It's getting complicated to detect which part of curve is actually a
cap in cases like extruded 2d curve with non-zero depth.
2012-02-02 19:20:51 +00:00
Sergey Sharybin
aef11b52d0 Added option to fill caps of bevelled curves.
It can be found in Shape panel below Fill label. If this option is enabled,
caps of curve will be filled.
2012-02-02 15:15:52 +00:00
Sergey Sharybin
3719942abb Merging r43721 through r43847 from trunk into soc-2011-tomato 2012-02-02 13:04:52 +00:00
Campbell Barton
d8c4e59f67 * fix for error in shape transfer (wrong var name).
* fix for error alligning object to the view when no space was set.

also added blenderplayer start to CTest operator blacklist.
2012-02-02 05:11:42 +00:00
Campbell Barton
8926cbd0a7 svn merge ^/trunk/blender -r43819:43830 2012-02-02 00:04:47 +00:00
Sergey Sharybin
f193291b32 Movie Clip Editor: proxy sizes for original and undistortted footages are now controlling separately 2012-02-01 18:08:37 +00:00
Lukas Toenne
e6efe93c09 Optional offset for fluid cache frame reading.
This was a request by Daniel Salazar. It adds a new frame offset variable to fluid sim settings, which can be used to display baked fluid sims at different times. Eventually this could be replaced by real NLA strips for cached data, but until then this is a simple way to have more flexible cache result usage.

Not strictly a BCon3 patch, but after IRC discussion with Genscher, ZanQdo and kaito decided to commit it anyway, since it's a small feature and makes fluid sim a bit more usable. Similar patch for point cache (particles, smoke, cloth) is being worked on as well.
2012-02-01 15:58:26 +00:00
Campbell Barton
4aa82806ef svn merge ^/trunk/blender -r43751:43819, need to look into changes made to editmesh_loop.c from this range still 2012-02-01 09:31:13 +00:00
Bastien Montagne
ccd1d86638 Fixing a typo in Clip ui... 2012-01-30 20:41:36 +00:00
Brecht Van Lommel
ed8f690be7 Fix wrong uv editor Border Select Pinned name in menu. 2012-01-30 14:28:45 +00:00
Campbell Barton
68a8efa8d3 display keyblock mute in the shape key list.
Realize this is bcon3 but this is was very bad IMHO.
- button adjusting key block was in between 2 object settings - which is misleading/confusing.
- you needed to click through all shapes to check which was muted, currently you's assume 1.0 means the shape is enabled.
2012-01-30 09:49:30 +00:00
Campbell Barton
870aa90112 svn merge ^/trunk/blender -r43733:43751 2012-01-29 21:49:49 +00:00
Campbell Barton
56fe01c3fb fix [#30017] Make Dupli-Face needs active mesh object 2012-01-29 21:28:04 +00:00
Joshua Leung
0c7a455c07 Action Constraint GUI - Refinements and Clarification
While looking at a bug report, I found that the current GUI for the Action
Constraint actually didn't make sense, mixing up settings so that it wasn't
clear which settings corresponded to which others. This commit cleans up the
layout into a clearer two-column design to have a "from" -> "to" layout, making
all the
relationships between things clear.

For more details see http://aligorith.blogspot.com/2012/01/action-constraint-
gui-revised.html
2012-01-27 01:30:58 +00:00
Campbell Barton
de4eeb9694 svn merge ^/trunk/blender -r43693:43733 2012-01-26 19:20:33 +00:00
Sergey Sharybin
bcbe9ca5fc Color channels used for tracking is now a part of default tracking settings and also a part of presets. 2012-01-26 15:33:16 +00:00
Sergey Sharybin
6eb3d5cb50 Movie clip editor: default tracking settings can be copied from active track now 2012-01-26 15:04:25 +00:00
Sergey Sharybin
7892739869 Merging r43501 through r43720 form trunk into soc-2011-tomato 2012-01-26 12:12:20 +00:00
Sergey Sharybin
db57cbac20 More curves view improvements for clip editor:
- Renamed graph_jump_to_current_frame to graph_center_current_frame
  which makes more sense.
- Curve view now can be locked to time cursor (Lock to Time Cursor in
  Display panel or L button in curve view). Not sure if offset from
  locked position will make much sense here.
- Added hotkey for solving -- Shift-S.
2012-01-26 11:49:38 +00:00
Sergey Sharybin
18147117fe Fix #29991: Broken Hotkeys for rotation in custom Maya-Navigation. >rev43375
Issue was caused by incorrect operator property set in revision 43376.
2012-01-26 07:18:26 +00:00
Campbell Barton
201890d4bb disable toggle option for BGE boolean property, not sure why this was set. 2012-01-26 01:46:16 +00:00
Campbell Barton
4fae6cd38d svn merge ^/trunk/blender -r43685:43693 2012-01-25 18:13:58 +00:00
Sergey Sharybin
bce89860f5 Various fixes for camera tracking stuff
- Fixed tooltip displaying for track sequence forwards in clip editor
- Corrected detection of 8 tracks so it wouldn't count tracks disabled
  on keyframes.
- Scale track preview to actual track widget size instead of scaling the
  whole preview image with given zoom ratio, so no extra memory needed to
  store zoomed margin would be used.
- Track's statistics text will fit pattern position instead of search if
  marker is disabled on current frame.
- Fixed toggle selection operator if selected track is hidden due to
  "Hide Disabled" policy.
2012-01-25 13:37:11 +00:00
Campbell Barton
75a4832af3 svn merge ^/trunk/blender -r43676:43685 2012-01-24 22:44:48 +00:00
Thomas Dinges
fb1fba1454 Node UI:
* Make sure to check on snode_id, raised errors if no world datablock was active.
2012-01-24 20:56:19 +00:00
Thomas Dinges
c905415f6b Cycles Node Editor:
* Add Use Nodes button for World shader type
* UI was not redrawing the Node area, when enabling "Use nodes", added check for it to the listener.
2012-01-24 20:10:37 +00:00
Campbell Barton
4af4863baf svn merge ^/trunk/blender -r43639:43664 2012-01-24 16:18:20 +00:00
Bastien Montagne
ebe01d06bc Misc picky edits to UI messages. 2012-01-23 22:57:46 +00:00
Campbell Barton
5cc898ada2 svn merge ^/trunk/blender -r43616:43639 2012-01-23 16:46:35 +00:00
Daniel Genrich
37e1285042 Cloth: Add "velocity damping" to damping options. This will help with the "cloth wobbling" problem which accurs quite often when having animated characters with cloth. 2012-01-23 01:35:14 +00:00
Thomas Dinges
a004257e47 Cycles UI:
* Add World ID Block to World Shader Nodes.
2012-01-22 23:13:24 +00:00
Campbell Barton
4966982a5a svn merge ^/trunk/blender -r43564:43609 2012-01-22 18:04:35 +00:00
Thomas Dinges
39aaf4f2f0 Fix for the Sculpt UI (revert part of 43535 by nicholasbishop)
* Such labels like for "use_space_atten" should not be in the UI, thats too overkill. Toolbar is meant to be small in size.
2012-01-22 16:29:10 +00:00
Joshua Leung
cfab40b652 Fluidsim - Restoring simulation speed control (ZanQdo request)
This commit restores support for freezing or speeding up physics sims. Animate
the "Speed" parameter under Domain->Time, which controls a multiplier factor for
the rate at which the sim proceeds (i.e. the old "Fac-Tim" setting).

Notes:
* Subversion bumped to 4 to patch up defaults for new value so that old sim
files will still run correctly
* Names/descriptions could do with some tweaking
* Porting this across was not that obvious since quite a bit of stuff had
changed (as in, been cleaned up). However, from tests so far, it seems to work
well.
2012-01-22 03:42:49 +00:00
Campbell Barton
c8037fb56a svn merge ^/trunk/blender -r43530:43554 2012-01-20 12:34:00 +00:00
Nicholas Bishop
23bb7fc721 Add missing labels to sculpt/paint sliders.
Thanks Sergey for pointing out
2012-01-19 18:22:55 +00:00
Thomas Dinges
186c0531e2 Remesh Modifier UI:
* Some tweaks to the modifier UI
* Hide sharpness property, instead of greying out. 
The policy is to use greying out when a property depends on a boolean, if it depends on an enum item, hide it.
2012-01-19 17:30:29 +00:00
Campbell Barton
330da356da svn merge ^/trunk/blender -r43524:43530 2012-01-19 16:30:56 +00:00
Miika Hamalainen
25a5915650 Dynamic Paint:
* Added "Project" option also for "Volume + Proximity" brush type.
2012-01-19 11:13:41 +00:00
Sergey Sharybin
de8612ec62 Merging r43130 through r43500 from trunk into soc-2011-tomato 2012-01-18 17:25:05 +00:00
Campbell Barton
b281b5278f svn merge ^/trunk/blender -r43472:43482 2012-01-18 07:04:17 +00:00
Campbell Barton
7f08c71f43 cleanup for redefined vars 2012-01-18 06:55:51 +00:00
Campbell Barton
a7c1e339cf picky cleanup to use of bpy.types 2012-01-18 06:11:56 +00:00
Campbell Barton
259b68f5c7 de-duplicate paint parent class, added new py module for common paint UI classes/funcs --- since we'll likely have more of these. 2012-01-18 05:54:19 +00:00
Antony Riakiotakis
6a218612be fix size slider not working for image space brushes (uv sculpt and image paint). This is due to not checking if unified settings are active as per recent commit. Reused the space_view3D PaintPanel utility class slightly modified for the image space to do the checks. I am not very happy with the duplication but I decided to keep it as is since I change bl_space_type and bl_region_type from the original class. Reviewed by Nicholas Bishop. 2012-01-18 00:41:39 +00:00
Campbell Barton
0f28c1c27a svn merge ^/trunk/blender -r43461:43472 2012-01-17 21:08:25 +00:00