Commit Graph

4387 Commits

Author SHA1 Message Date
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