Commit Graph

4840 Commits

Author SHA1 Message Date
Sergey Sharybin
2e30bf28c1 Merging r49711 through r49737 from trunk into soc-2011-tomato 2012-08-09 17:03:33 +00:00
Sergey Sharybin
9f30c7147c Frame matching methods for follow track constraint
This is needed in cases when using blender camera with different
resolution than original footage. Behaves in the same way as
background picture framing.
2012-08-09 16:57:02 +00:00
Campbell Barton
3a92c8546c svn merge ^/trunk/blender -r49707:49710 2012-08-08 17:10:01 +00:00
Campbell Barton
de131177b0 code cleanup: lazy init enum for node search 2012-08-08 17:02:14 +00:00
Sergey Sharybin
5ad7ab03e3 Merging r49681 through r49707 from trunk into soc-2011-tomato 2012-08-08 16:48:05 +00:00
Lukas Toenne
bd3ec60651 Search option for adding nodes.
The 'Add' menu in the node editor now has an option 'Search' at the top, which opens a separate popup for searching node types by name.

The operator for this is implemented completely in Python (this could also be done for the regular menu-based Add options in the future). There are a few necessary extensions to the RNA as well:

* The View2D struct in regions is now exposed. Currently only contains converter functions for coordinates from the region to the view (i.e. scrolled and zoomed view space). Used for converting mouse location to node space.

* The SpaceNode exposes the existing 'cursor_location' for operators to store mouse position beyond invoke calls. Not used for anything else (transforms) so far.

* The edit_tree in SpaceNode is also exposed, this is needed for operators to work correctly inside node groups.
2012-08-08 16:44:16 +00:00
Mitchell Stokes
47c7266522 Accidentally did a commit when I wanted to revert... (ignore my last revision) 2012-08-08 01:29:20 +00:00
Mitchell Stokes
843b45cafa 2012-08-08 01:24:48 +00:00
Sergey Sharybin
93b823784d Merging r49659 through r49666 from trunk into soc-2011-tomato 2012-08-07 16:48:43 +00:00
Campbell Barton
258b4a8dad add view selected for node view 2012-08-07 16:30:34 +00:00
Campbell Barton
ec23feb85c svn merge ^/trunk/blender -r49653:49658 2012-08-07 15:04:46 +00:00
Sergey Sharybin
4085056218 Place color weels used for color balance in sequencer vertically
This was it makes more sense from accurate tuning point of view.
2012-08-07 14:59:49 +00:00
Campbell Barton
62c8772a91 svn merge ^/trunk/blender -r49628:49634 2012-08-06 19:37:35 +00:00
Bastien Montagne
43c3fa6c39 Adding "inpaint" as allowed words... 2012-08-06 19:19:51 +00:00
Campbell Barton
db6c4ba11e bring back the play option from 2.4x 2012-08-06 16:07:11 +00:00
Sergey Sharybin
24fc0287f3 Merging r49622 through r49623 from trunk into soc-2011-tomato 2012-08-06 15:22:19 +00:00
Sergey Sharybin
a334b5a4b6 Made feather self-intersection check an option.
Useful in cases when masking stuff like self-intersecting
ropes. This could probably be smarter option, but can't
currently think about robust approach here.
2012-08-06 15:20:14 +00:00
Campbell Barton
e2203d548e svn merge ^/trunk/blender -r49601:49620 2012-08-06 14:02:03 +00:00
Campbell Barton
75a188272e move pivot point and cursor out of UV rna into image space since both mask and uvedit use them. 2012-08-06 12:12:45 +00:00
Sergey Sharybin
cae3dbd141 Merging r49534 through r49573 from trunk into soc-2011-tomato 2012-08-05 12:54:39 +00:00
Sergey Sharybin
4f410971c3 Camera tracking presets
- Fix for copy default settings from active track operator
- Add meaningful tracking presets

API changes:

- Added parameter exact to Marker.find_frame, so now it's
  possible to get estimated marker

- Added Marker.pattern_bound_box to get pattern's bound box
2012-08-04 10:47:31 +00:00
Campbell Barton
84df85164d fullscreen mask editing now works in the image space over a viewer node. 2012-08-03 20:56:04 +00:00
Campbell Barton
a3cd8c5c61 svn merge ^/trunk/blender -r49478:49498 2012-08-02 11:29:32 +00:00
Lukas Toenne
9d2173518c Clipboard feature for nodes. With the Copy operator a copy of all selected nodes and links between them is stored in an offscreen list (not in the library). The Paste operator then in turn copies these into the active node tree in the editor.
Currently does not support copying of animation data. This would require copying of individual fcurves etc. between data block, which is not implemented yet.

Also it is currently possible to circumvent some constraints of the nodes, in particular for node groups (e.g. no groups inside groups, render layer not inside groups).
2012-08-02 09:52:37 +00:00
Sergey Sharybin
3f5e3ae0bf Merging r49413 through r49450 from trunk into soc-2011-tomato 2012-08-01 14:14:22 +00:00
Campbell Barton
179d00fb9c make node select_all consistent with other select operators, also add Ctrl+I, select inverse to node space. 2012-08-01 13:28:19 +00:00
Thomas Dinges
da4d468e98 Docs / Templates:
* Added a ui_panel template with more complex layouts.
2012-08-01 12:21:23 +00:00
Campbell Barton
26cc3dd708 misc mask fixes
- image space used wrong notifiers.
- image notifier now checks for mask mode before listening to mask edits.
- mask keyframes now draw in the image space.
2012-08-01 10:50:39 +00:00
Campbell Barton
c42d0189e5 resolve glitch in the image space where mask editing and UVs would conflict.
now UV editing overrides mask.
2012-07-31 14:16:27 +00:00
Sergey Sharybin
a080183e42 Merging r49400 through r49404 from trunk into soc-2011-tomato 2012-07-30 17:12:55 +00:00
Sergey Sharybin
9880f7fa50 Minor code cleanup 2012-07-30 17:12:01 +00:00
Sergey Sharybin
75046eadbf Mango request: option to create nodes with hidden preview by default 2012-07-30 17:11:59 +00:00
Campbell Barton
a14fc54702 svn merge ^/trunk/blender -r49333:49361 2012-07-29 18:48:34 +00:00
Campbell Barton
4ef8f3f537 code cleanup: assign mode to a variable in the 3d view header and remove some unused imports 2012-07-29 14:07:57 +00:00
Campbell Barton
2553cdf195 style cleanup 2012-07-29 12:07:06 +00:00
Thomas Dinges
ab38e1d379 User Interface Scripts:
* Code cleanup, removed unneeded code.
* Style cleanup, don't break lines to early 
(unless marked as pep8-80 or pep8-120 compliant) 
* Keep 1 line after layout declaration empty.
2012-07-29 10:03:46 +00:00
Campbell Barton
3270438678 fix for own regression with handling of script paths, however this didnt work quite right before either.
Handle these 2 kinds of script paths
* user script path: ~/.blender/scripts OR $BLENDER_USER_SCRIPTS
* pref script path: always bpy.context.user_preferences.filepaths.script_directory

now both are returned by bpy.utils.script_paths()
2012-07-29 01:02:25 +00:00
Sergey Sharybin
7d4ee53905 Merging r49239 through r49241 from trunk into soc-2011-tomato 2012-07-26 10:06:56 +00:00
Campbell Barton
77e7ca6aa8 mask/image editor now works for border select and lasso 2012-07-26 09:54:52 +00:00
Sergey Sharybin
0051d24b23 Merging r49191 through r49211 from trunk into soc-2011-tomato 2012-07-25 15:07:47 +00:00
Campbell Barton
eed0fda33c add mask buttons into the image space 2012-07-25 13:44:07 +00:00
Campbell Barton
c01a561ca7 split out mask UI into their own classes. 2012-07-25 13:09:12 +00:00
Campbell Barton
62187c386e mask UI for space image 2012-07-25 12:15:22 +00:00
Campbell Barton
e771e07fe8 image space now has a mode for view/paint/mask editing. 2012-07-25 11:25:10 +00:00
Campbell Barton
65f94b8c0b svn merge ^/trunk/blender -r49177:49186 2012-07-24 21:11:22 +00:00
Sergey Sharybin
72a106d56f Fix #32165: context_set_value didn't make an undo push when changing scene settings
This lead to such issues as changing mesh selection mode wasn't doing undo push
when it need to.
2012-07-24 15:51:26 +00:00
Sergey Sharybin
a0403fe2fb Merging r49149 through r49167 from trunk into soc-2011-tomato 2012-07-24 09:03:40 +00:00
Bastien Montagne
541e46f7ad Grrr... Minkowski... :p 2012-07-23 19:08:02 +00:00
Campbell Barton
ad4738e77f svn merge ^/trunk/blender -r49118:49143 2012-07-23 15:03:54 +00:00
Bastien Montagne
02ec32b60e Fix [#32163] vertex groups get wiped.
Usual "persistent" operator option... I guess there are still a few others that keep hiding in the dust! :)
2012-07-23 12:27:26 +00:00