Commit Graph

3575 Commits

Author SHA1 Message Date
4075fd85b9 add clip.py and space_clip.py, needed for last merge with trunk 2011-11-08 20:40:27 +00:00
5f40c0e9a5 - operator presets now work in the 3D view as well as the file selector.
to enable from python:
  bl_options = {'REGISTER', 'UNDO', 'PRESET'}

from C:
  ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_PRESET;

- added context member 'active_operator'
- enable this for 'Add Torus' for testing.
2011-11-08 16:59:06 +00:00
80e398e7b2 Merged changes in the trunk up to revision 41638.
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c
2011-11-08 06:30:02 +00:00
e28d0c6a8f Tracker:
* Typo fixes for space_clip.py, patch by Mike S on the mailing list.
2011-11-08 06:10:04 +00:00
cb890a49fb svn merge ^/trunk/blender -r41602:41638 . 2011-11-08 02:57:28 +00:00
f086201518 cmake & pep8 tidy up, also some style edits.
remove unneeded collection length function.
2011-11-08 01:32:34 +00:00
edec46b0a6 Merge with trunk r41625 2011-11-07 16:36:49 +00:00
4d7a9e5c05 RNA:
* Expose 3D view camera zoom and offset, needed if you want to precisely
  reconstruct camera parameters.
* Rename SpaceFileBrowser.operator to active_operator, to avoid conflict
  with c++ keyword.
2011-11-07 16:26:53 +00:00
a3e5bd02bb Some small fixed for camera tracking:
- Lock to selection and center to selection will now work fine with undistorted rendering
- Do not display pyramid for disabled tracks
- Corrected fix for wrong correlation_min property name
2011-11-07 15:32:32 +00:00
50ef1b14e4 Tracker/Movie Clip Editor:
* Fix property not showing up: correlation_min, was actually called minimum_correlation in RNA.
2011-11-07 15:19:13 +00:00
5ebee683bd 2.6 UI:
* Minor tweaks after tomato merge, rest of Tomato UI code is excellent. :)
2011-11-07 14:34:56 +00:00
27d42c63d9 Camera tracking integration
===========================

Commiting camera tracking integration gsoc project into trunk.

This commit includes:

- Bundled version of libmv library (with some changes against official repo,
  re-sync with libmv repo a bit later)
- New datatype ID called MovieClip which is optimized to work with movie
  clips (both of movie files and image sequences) and doing camera/motion
  tracking operations.
- New editor called Clip Editor which is currently used for motion/tracking
  stuff only, but which can be easily extended to work with masks too.

  This editor supports:
  * Loading movie files/image sequences
  * Build proxies with different size for loaded movie clip, also supports
    building undistorted proxies to increase speed of playback in
    undistorted mode.
  * Manual lens distortion mode calibration using grid and grease pencil
  * Supervised 2D tracking using two different algorithms KLT and SAD.
  * Basic algorithm for feature detection
  * Camera motion solving. scene orientation

- New constraints to "link" scene objects with solved motions from clip:

  * Follow Track (make object follow 2D motion of track with given name
    or parent object to reconstructed 3D position of track)
  * Camera Solver to make camera moving in the same way as reconstructed camera

This commit NOT includes changes from tomato branch:

- New nodes (they'll be commited as separated patch)
- Automatic image offset guessing for image input node and image editor
  (need to do more tests and gather more feedback)
- Code cleanup in libmv-capi. It's not so critical cleanup, just increasing
  readability and understanadability of code. Better to make this chaneg when
  Keir will finish his current patch.

More details about this project can be found on this page:
    http://wiki.blender.org/index.php/User:Nazg-gul/GSoC-2011

Further development of small features would be done in trunk, bigger/experimental
features would first be implemented in tomato branch.
2011-11-07 12:55:18 +00:00
e936c78251 svn merge ^/trunk/blender -r41503:41575 2011-11-06 10:38:44 +00:00
b18e661ffc Split off 3D Cursor settings from "View" panel in 3D View
This means that you don't need to have the view panel open all the
time, reducing the amount of scrolling required just to be able to
precisely position the 3D cursor at specific coordinates while
changing some other settings. While most of the settings in the View
panel are less likely to be frequently changed, the 3D cursor can in
some workflows end up needing to be accessed quite frequently.
2011-11-06 06:19:00 +00:00
440c1c2c17 As discussed on the mailing list, removing the non-functional,
incompatible, and unmaintainable Time Offset cruft.

- Slow Parenting lives another day (just), although it now carries
appropriate cautionary disclaimers. It's only really for the Game
Engine nowadays, as that's the only place where it can possibly work
with any reliability.
- "Animation Hacks" panel is now "Relations Extras". I could've merged
the two panels, though I figured these options weren't that frequently
used to justify taking up screen-space by default along with the panel
2011-11-06 05:46:45 +00:00
010cd66747 VIEW3D_PT_tools_meshedit_options panel:
* Removed ob check and add a proper poll function.
2011-11-05 10:34:29 +00:00
133a7df75e Disable x-mirror option when proportional edit is enabled.
This option isn't supported because it behaves strangely in 50% of cases and
hopefully disabled x-mirror will stop users be confused by this.
2011-11-05 10:19:36 +00:00
2ed6f077b3 Merge with trunk r41545 2011-11-05 08:04:49 +00:00
7b47a4125f Camera UI: tweaking panels, move clipping back because it's not part of the
preset, and move depth of field settings to a separate panel.
2011-11-04 18:10:50 +00:00
209ceb6969 correct some warnings, also sensor_x was being paassed to object_camera_matrix(...) for x and y args, looks like an accident 2011-11-04 15:21:34 +00:00
4ea816837d Configurable sensor size:
- Added support of variable size sensor width and height.
- Added presets for most common cameras, also new presets can be defined by user.
- Added option to control which dimension (vertical or horizontal) of sensor
  size defines FOV. Old behavior of automatic FOV calculation is also kept.
- Renderer, viewport, game engine and collada importer/exporter should
  deal fine with this changes. Other exporters would be updated soon.
2011-11-04 14:36:06 +00:00
70b7402252 svn merge -r41480:41503 ^/trunk/blender 2011-11-03 22:58:05 +00:00
0e51c9014c patch [#27917] MARKER MENUS: Unification and adding "Duplicate Marker to Scene..."
from Troy Sobotka (sobotka), with edits

- remove Markers from Ctrl+L menu (was out of place here and was broken from recent changes to marker operators)
- further de-duplicte scripts by having all menus call the same function: marker_menu_generic().

this fixes bug [#29083] too.
2011-11-03 12:47:39 +00:00
5fbf3b813c svn merge -r41458:41480 ^/trunk/blender 2011-11-02 23:16:10 +00:00
ac52c79cb1 RenderEngine/Nodes: system to check for shading nodes compatibility
* Scene.use_shading_nodes property to check if RenderEngine is using new shading
  nodes system, and RenderEngine.bl_use_shading_nodes to set this.
* Add mechanism for tagging nodes as being compatible with the old/new system.
2011-11-02 19:24:30 +00:00
30f1f28a8a Nodes: add support for shader nodes on world and lamps, in addition to materials.
The internal render engine does not support them, and they are not accesible in
the UI yet, but cycles will use them.
2011-11-02 18:55:32 +00:00
a59f7e02f8 Projection Paint UI:
* Code cleanup, much better to understand what is going on there now. 
* Stencil menu was mis aligned, fixed it for UI beauty. :)
2011-11-02 16:19:57 +00:00
bdc029a193 Toolbar UI code:
* More cleanup.
2011-11-02 15:58:56 +00:00
3d35e004d3 Related to #29092: make the working of the Mist Intensity option more clear in
the user interface.
2011-11-02 12:18:51 +00:00
9be43762bc svn merge -r41431:41453 ^/trunk/blender 2011-11-01 23:24:51 +00:00
90a19ce578 fix [#29120] project painting error 2011-11-01 23:01:57 +00:00
4b48a5a497 Fix #29101: 2D Tilt on Bezier Curve Bug?
Changing tilt for 2D curves doesn't really hurt, just makes things not so
clear tosee what's going on because you're changing value which isn't used
at all for 2D curves. Disallwo to run TRANSFORM_OT_tilt operator for 2D curves.

Also made a correct fix for incorrect shortcut for tilt in 3D viewport toolbar,
it was really confusing to have almost the same operators (TRANSFORM_OT_tilt and
TRANSFORM_OT_transform with mode=tilt) in keymap. Better to use tilt operator
in toolbar.
2011-11-01 11:00:08 +00:00
ac6bdfb653 Added two stroke geometry modifiers: Parameterization and Guiding Lines. 2011-11-01 09:47:41 +00:00
9aa901cccc svn merge -r41422:41431 ^/trunk/blender 2011-11-01 09:05:38 +00:00
2ad80bf3bb vertex group mirror
- now works in vertex select + weight paint mode.
- added option not to mirror all vertex groups.
2011-11-01 08:11:55 +00:00
e08c4a00d2 svn merge -r41371:41420 ^/trunk/blender 2011-11-01 02:01:09 +00:00
cd338a4130 Merge with trunk r41411 2011-10-31 13:18:14 +00:00
0a37e6ab97 Dynamic Paint:
* Redesigned alpha blending and paint drying algorithms. Now it gives much better results when using low brush alpha or when surface has initial color set.
* Fix: "Slow" dissolve/dry was scaled incorrect when using substeps. Also adjusted time to better match non-"slow" setting.
* Fixed possible issues when using image textured brush.
* Fix: particle brush panel was no longer visible since last commit.
* Adjusted default surface values.
* Some more code cleanup.
2011-10-31 13:01:06 +00:00
9905094f5d fix own error r41191 getting id property string lengths. 2011-10-31 01:50:04 +00:00
65b92d820a Sculpt UI:
* Code cleanup.
2011-10-31 00:35:14 +00:00
d3f63bf54c Another Bconf Feature Request. :)
Some UI and code cleanup for the "Symmetry" panel in sculpt mode. 
* Made X, Y, Z Buttons toggle buttons, as the other X,Y,Z in the "Options" panel above in sculpt mode, for consistency.
2011-10-31 00:03:18 +00:00
1f25228857 Fix for warnings about period at the end of description strings for
RNA operators and properties.  No functional changes were made.
2011-10-30 09:05:47 +00:00
65668dc5eb Merged changes in the trunk up to revision 41368.
Conflicts resolved:
source/blender/blenkernel/intern/library.c
source/blender/blenlib/intern/bpath.c
source/blender/render/intern/source/convertblender.c
2011-10-30 02:03:40 +00:00
16702c1729 Merged changes in the trunk up to revision 41225.
Conflicts resolved:
source/blender/render/intern/source/pipeline.c
2011-10-29 15:46:14 +00:00
46ae692710 Merge with trunk r41342 2011-10-28 17:00:53 +00:00
fae903e263 Dynamic Paint:
* More code changes pointed by Brecht in codereview.
* Some user interface improvements.
* Updating brush settings now also updates canvas preview.
2011-10-28 14:46:09 +00:00
ff837cbe9b svn merge -r41310:41329 ^/trunk/blender 2011-10-28 05:17:09 +00:00
36b8846f6e fix [#29063] reprojetion painting : failed to create opengl offscreen buffer
error report was not passed into the UI and only printed into the terminal, now shows an error popup.
2011-10-28 02:10:02 +00:00
f0ca79bccb Extended the set of conditions for feature edge selection by edge types.
In the Parameter Editor mode, each edge type check button in the Selection
by Edge Types has now an associated toggle button to exclude the edge type
from the feature edge selection.  This allows you to select, for instance,
those edges that are silhouette lines but not external contours.
2011-10-27 20:57:14 +00:00
510c69368b New option for disabling the chaining of feature edges in the Parameter Editor mode. 2011-10-25 23:24:59 +00:00