Commit Graph

1299 Commits

Author SHA1 Message Date
Sergey Sharybin
1694e5978a Merging r38898 through r38940 from trunk into soc-2011-tomato 2011-08-02 17:32:19 +00:00
Nathan Letwory
f1c68bdbec Don't show NDOF guide by default. 2011-08-02 09:12:58 +00:00
Mike Erwin
dc2609da3d svn merge -r38814:38905 https://svn.blender.org/svnroot/bf-blender/trunk/blender . 2011-08-02 01:01:56 +00:00
Sergey Sharybin
e9b3225b8d Merging r38832 through r38897 from trunk into soc-2011-tomato 2011-08-01 15:24:15 +00:00
Guillermo S. Romero
e8c3c4097a SVN maintenance. 2011-07-31 06:03:14 +00:00
Campbell Barton
f66ec41b6a quiet some compiler warnings & fix possible (but unlikely) crash.
also added GPLv2+ header to resources.c.
2011-07-30 09:24:10 +00:00
Sergey Sharybin
feffc920bb Merging r38780 through r38818 from trunk into soc-2011-tomato 2011-07-29 15:18:14 +00:00
Nathan Letwory
24def76ac8 svn merge -r38753:38813 https://svn.blender.org/svnroot/bf-blender/trunk/blender . 2011-07-29 07:58:03 +00:00
Campbell Barton
b948459031 fix [#28096] Custom gradient for weightpainting in mask mode not working properly. 2011-07-28 12:17:24 +00:00
Sergey Sharybin
e2566984ed Merging r38733 through r38779 from trunk into soc-2011-tomato 2011-07-28 11:01:38 +00:00
Nathan Letwory
73a9ce7ec0 svn merge -r38558:38752 https://svn.blender.org/svnroot/bf-blender/trunk/blender . 2011-07-27 07:42:53 +00:00
Thomas Dinges
955ba3f7fb * Fixed a typo in the code (uiLayoutItemSplt -> uiLayoutItemSplit) 2011-07-26 20:22:54 +00:00
Campbell Barton
a460299b08 - bugfix for icon listview where the icons would only wrap once
- also quiet some clang warnings
2011-07-26 19:47:56 +00:00
Sergey Sharybin
f8e1783516 Camera tracking integration
===========================

- Clip Editor now could be an owner for jobs. It was useful
  when i've been attaching Peter's work in my local repo.
- Fixed mouse selection to handle offset correct.
2011-07-26 15:58:29 +00:00
Sergey Sharybin
e92162744b Merging r38704 through r38732 from trunk into soc-2011-tomato 2011-07-26 15:56:53 +00:00
Campbell Barton
06ae122f60 include menu ID's in tooltips when python tips are enabled, there was no way to find the ID of a menu which become annoying if you wanted to reference it from a script. 2011-07-26 09:19:51 +00:00
Sergey Sharybin
f41d9007c3 Merging r38637 through r38703 from trunk into soc-2011-tomato 2011-07-25 18:05:27 +00:00
Mike Erwin
e31fef1d94 set default values for all other ndof flags 2011-07-25 00:10:42 +00:00
Thomas Dinges
b401d09d8f * Minor code cleanup / comment changing. No functional changes. 2011-07-24 11:11:23 +00:00
Nathan Letwory
6149526aac Default for ndof_sensitivity to 1.0 in case 0.0 is found on start. 2011-07-24 08:50:09 +00:00
Sergey Sharybin
fa283be400 Camera tracking integration
===========================

- Fixed bug with copying colors to all selected markers.
- Hide mouse cursor when sliding from preview widget.
- Shit-key holded down during sliding in preview area makes
  sliding more accurate.
- Fixed bug with preview area refresh when disabling colors.
2011-07-23 18:37:20 +00:00
Sergey Sharybin
0fec30a35f Camera tracking integration
===========================

- Internal change: do not use maroses for checking the only
  one bit of track/marker flags.
- Do not display track name for disabled markers when
  "Show Disabled" is turned off.
- Option to lock tracks. Locked tracks can't be be moved,
  scaled, re-tracked and so.
2011-07-20 10:51:47 +00:00
Sergey Sharybin
146a184d2a Camera tracking integration
===========================

- Remove set but not used variable in clip buttons.
- Set keyframe when sliding marker with mouse.
- Also set keyframe when sliding from preview widget.
2011-07-19 10:40:22 +00:00
Sergey Sharybin
e42806a744 Camera tracking integration
===========================

- Sliding from preview could now be undone.
- Fixed memory leak caused by NULL-ing used scopes on
  layout restore.
- Fixed possible crash after splitting space clip.
2011-07-18 19:39:02 +00:00
Sergey Sharybin
426ca2ef89 Camera tracking integration
===========================

- Enable disabled markers when sliding from preview.
- Refresh space clip when marker is moving from preview.
2011-07-18 19:06:18 +00:00
Sergey Sharybin
3a6ea7b5e1 Camera tracking integration
===========================

- Track preview widget is now resizeable.
- Marker position could now be adjusted from track
  preview widget.
2011-07-18 14:54:32 +00:00
Sergey Sharybin
b18dd20aea Merging r38433 through r38453 from trunk into soc-2011-tomato 2011-07-17 17:25:11 +00:00
Campbell Barton
5792bd7cc7 cmake: cleanup include paths, some duplicates and going up some unneeded dirs. 2011-07-17 09:11:13 +00:00
Sergey Sharybin
d279e8891f Camera tracking integration
===========================

- ColaMD moved from OpenNL to extern/.
  It'll be needed for libmv. Also, it's a bit updated from
  year 1999 to 2007.
  Need to be tested for regressions.
- Updated bundling script for libmv. Now it uses fuller
  subset of this library.
- Bundled new libmv.
- Request from Keir: add command line argument to toggle logging
  stuff on. Currently, if Blender is launched with -d argument
  libmv would start printing logging messages. There's no
  argument to increase verbosity, but there's API in libmv-capi,
  so it'll be easy to add.
- Finally fixed crash when ibuf is acquiring with user=NULL.
- Added ActiveClip property to the scene. This clip is used
  as default value for new match-moving constraints.
- Added some flags to Display panel of View3D. Related on
  displaying match-moving stuff.
- Internal change: bundles data moved inside to MovieTrackingTrack.
- Initial implementation of 3d reconstruction.
- Added constraint "Camera Solver". This constraint is supposed
  to be used to make camera follow the reconstructed camera path.
- Added "reference" property to "Follow Track" constraint.
  Now object could be "parented" to 2D track position or to
  3D bundle position.

The very quick guide:

To use reconstruction you should have footage with tracked markers,
choose two keyframes in "Tracking settings" panel. There should be
quite noticeable parallax effect between this two frames. This
is used to initialize reconstruction stuff.
Camera data (focal length and optical center) should be filled in
"Camera Data" panel. Optical center is often the center of image,
so it'll be filled in automatically.
You should also set values for undistortion (K1, K2 and K3). Currently,
there's no any visualization for this parameters and approach of
"change value -> reconstruct -> see what've changed" is the only way
for now.
Libmv team is working on auto-calibration tool, so it should be
easier to gather this coefficients in nearest (i hope) future.
There's also no scene orientation stuff.

Basic workflow:
- Open footage.
- Set markers and track them.
- Fill in camera data and keyframes.
- Hit "Solve Camera" button.
- Add "Camera Solver" constraint to camera in scene.
- Choose movieclip in that constraint.
- To see bundles in 3D viewport active clip should be set
  in scene buttons.
2011-07-07 17:58:33 +00:00
Sergey Sharybin
ef5110a033 Merging r38036 through r38196 from trunk into soc-2011-tomato 2011-07-07 17:48:22 +00:00
Brecht Van Lommel
4d7449b336 Fix part of #26811: absolute shape keys should not show influence value in list. 2011-07-07 11:01:36 +00:00
Brecht Van Lommel
ca2c319649 Fix #27850: keyboards with a comma instead of a dot on the numpad now get
converted to a dot when typing into number buttons, for easier number entry.
2011-07-04 10:56:59 +00:00
Campbell Barton
613e9b9926 changed the max decimal points to show from 7 to 6, since with float precision problems the median point of a selection could be 0.0000003 2011-07-03 13:20:21 +00:00
Sergey Sharybin
f141b59497 Merging r37952 through r38022 from trunk into soc-2011-tomato 2011-07-01 16:39:13 +00:00
Ton Roosendaal
06fcf2e6ef Todo item:
Closed regions didn't always draw the (+) icon right place, confusing
for users.

Next to that, I think this icon is using a bad metaphor or visual language,
Illustrated best if you close a header in outliner or buttons. Icons are
UI widgets, for screen/editor layouts different controls can be stylized.

My preference is something that aligns visually to the seperators between
regions; for testing and hacking pleasure I've added two quick versions,
a small tabbish thing and a triangle. Enable these with debug menu,
ALT+CTRL+D, values 1 or 2.

This is simply drawn with opengl now. An image for it can be made as well.

Previews:
http://www.blender.org/bf/closed_regions1.png
http://www.blender.org/bf/closed_regions2.png
http://www.blender.org/bf/closed_regions3.png

There's other design ideas to explore as well, like making region deviders
8-10 pixels wide, with a 'drag me' dot on it or so. That takes some screen
estate though, and will require to add big editor-dividers too...
Fun stuff for the mockup-mafia to check on, we have time :)
2011-06-30 15:02:03 +00:00
Sergey Sharybin
bcf23357bc Camera tracking integration
===========================

- Fixed bug with drawing cache line for marker states.
  It worked correct for cases, when start frame was 1.
- Added color codes for path parts before current frame and
  after current frame.
- Added color code for disabled marker. Color is specifying for
  unselected disabled marker. Color for selected marker is
  calculating automatically. Color for active disabled marker
  is equal to the enabled active marker.
2011-06-28 15:46:38 +00:00
Sergey Sharybin
70eb9e85c5 Merging r37732 through r37862 from trunk into soc-2011-tomato 2011-06-27 14:20:48 +00:00
Ton Roosendaal
05fb0e2d61 First commit to make "Style" settings saved in startup.blend
Usage currently is limited to:
- Panel text, widget text and label text style:
  point size, shadow effects

Setting individual fonts to these is not possible yet, it uses the
default for it.

Access goes via outliner now; check "User Preferences". UI team could
add this in userpref scripts :)
2011-06-24 14:00:15 +00:00
Sergey Sharybin
c710c2ccba Camera tracking integration
===========================

Fixed bug with invalid colors for space clip when startup.blend
is created in 2.58 release build.
2011-06-22 16:28:41 +00:00
Sergey Sharybin
9f769c43a3 Merging r37594 through r37703 from trunk into soc-2011-tomato 2011-06-21 18:24:00 +00:00
Campbell Barton
1283b07409 use ascii drawing function where utf8 isnt needed. 2011-06-18 09:01:26 +00:00
Sergey Sharybin
f4ce5770ca Merging r37518 through r37593 from trunk into soc-2011-tomato 2011-06-17 14:41:44 +00:00
Campbell Barton
68a12c74b6 fix [#26621] Memory leaks when creating popup window.
also fixes memory leak when cancelling a popup dialog (new image for example).
2011-06-17 12:48:33 +00:00
Campbell Barton
dce577ad85 use directory selector for properties defined as PROP_DIRPATH, user preferences 'File' buttons for eg. 2011-06-16 15:28:39 +00:00
Campbell Barton
4a5a9dc71c fix for own error in r37542 2011-06-16 07:02:33 +00:00
Campbell Barton
0a998decb6 fix [#27673] Value sliders >1 do not represent numerical ratios right
the soft limits for array buttons not take into account the min/max of all array elements
2011-06-16 06:47:54 +00:00
Campbell Barton
051dedeeec minor speedup for UI draw code, noticed ui_get_but_val() could be called 3-5 times per button draw,
for RNA buttons this gets the entire array for each call so its not great to call many times.
2011-06-16 06:00:02 +00:00
Mitchell Stokes
a3e296fc40 Committing patch #25676 Anisotropic filtering in viewport and BGE by me.
This patch adds anisotropic filtering of textures in the viewport and the BGE. The quality of the filtering is adjustable in the user preferences under System. For more information on anisotropic filtering:
http://en.wikipedia.org/wiki/Anisotropic_filtering

One current limitation of this setup (having the option a user preference) is it makes runtimes more troublesome. Runtimes don't have user preferences set, so for now the blender player defaults to 2x AF. Options will be added later to change this value (probably a command line option).
2011-06-15 18:59:22 +00:00
Sergey Sharybin
1eaea0b484 Merging r37479 through r37513 from trunk into soc-2011-tomato 2011-06-15 17:21:34 +00:00
Ton Roosendaal
3fe26d7093 RGB curve widget follows user preference DPI now too. 2011-06-14 17:48:42 +00:00