Commit Graph

66005 Commits

Author SHA1 Message Date
Sergey Sharybin
fffabae1ee Camera tracking integration
===========================

Fixed compilation error caused by some changes related on sensor height.
2011-10-30 22:44:31 +00:00
Sergey Sharybin
760123e218 Camera tracking integration
===========================

Update rest of places to reflect sensor height and fov mode.
2011-10-30 22:13:52 +00:00
Tamito Kajiyama
e287e9d0c4 Merged changes in the trunk up to revision 41387. 2011-10-30 21:38:01 +00:00
Jens Verwiebe
6d5cf68aaf WIN32, fix a crash when blender is executed in background mode, patch by kjym3 2011-10-30 20:47:03 +00:00
Tamito Kajiyama
f0acdcf135 Fix for stroke rendering instability with stroke geometry shaders.
* Stroke::Resample(int nPoints) was not properly working when a wrong
value was returned from Stroke::getLength2D(), resulting in repeated
warning messages "Warning: incorrect points number" during stroke
rendering.  The main cause was that stroke geometry shaders did not
update the two-dimensional (2D) length (also referred to as curvilinear
abscissa) after they modified the 2D points of stroke vertices.  Now
all stroke geometry shaders make explicit calls for Stroke::UpdateLength()
that has been introduced for recomputing the 2D length.  Many thanks to
Josef who reported the problem together with sample .blend files for
reproducing the issue.

* Missing Python wrapper of Stroke::getLength2D() was added.
2011-10-30 16:00:35 +00:00
Sergey Sharybin
61a2dfe89d Change default values for mix node.
Discussed with plenty of artists on De Balie and this values makes much more sense.
2011-10-30 14:53:26 +00:00
Sergey Sharybin
640b6c0eb8 Camera tracking integration
===========================

Camera sensor size changes:
- Now blender camera has got vertical sensor size property
  and setting to control how FOV is getting calculated
  (depending on aspect ratio, using horizontal sensor size or
  vertical only).
- Made changes in game engine and uv project modifier as well
- Presets should be updated (don't have settings by hand right now
  and the internet in debalie is really fails this year)
2011-10-30 14:11:16 +00:00
Keir Mierle
db86c6bcf8 Improve the KLT tracking behaviour and UI
- Remove the overly-conservative use of libmv's re-track tracker. The re-track
  tracker would take a normal tracker such as TRKLT or KLT or pyramid KLT, and
  track from frame 1 to 2, then back from the position found in 2 back to 1.
  Then, when the reverse-track doesn't match the original track with high
  precision, the track is considered "failed". This is a good approach for
  fully automatic reconstruction, but is too conservative for supervised
  tracking.

  The retrack-tracker will return when fully automatic tracking is added.

- Always solve for (dx, dy) in the TRKLT loop even if the linear system is
  ill-conditioned. The client (Blender in this case) can still use the solved
  position, even though it is less reliable.

- Expose the pyramid level setting to the tracking UI when in KLT tracking
  mode. While it was tempting to hide this detail from the user, in reality it
  does more harm than good, since the way tracking fails depends on the pyramid
  level. For now, exposing the pyramid details is a good compromise.

- Move the settings for the tracking algorithm, including search window,
  tracking algorithm, pyramid levels, etc, into the track object instead of a
  global movie clip object.
2011-10-30 12:42:56 +00:00
Brecht Van Lommel
bb379c06e9 Cycles: progress printing in background mode, print finished at the end and
avoid duplicate prints.
2011-10-30 10:12:34 +00:00
Campbell Barton
02c4b6b26b bmesh todo - subsurf UV. 2011-10-30 09:48:59 +00:00
Campbell Barton
a8df5cbc76 move make_uv_vert_map() to bmesh - use MLoopUV's rather than MTFace's.
also some formatting on BLI_array
2011-10-30 09:19:07 +00:00
Tamito Kajiyama
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
Campbell Barton
c4fa7bf286 make_uv_vert_map() was looping over the texture face for not reason. 2011-10-30 06:53:25 +00:00
Campbell Barton
f708318833 correct flags for older GCC's which dont suppport -Wno-deprecated-declarations,
detect if the flag is supported before use
2011-10-30 04:48:00 +00:00
Campbell Barton
965dc3d2d0 fix for drawing error, subsurf was adding black vertex colors to its derived mesh (trunk doesn't do this). 2011-10-30 03:57:46 +00:00
Andrew Wiggin
66b14f977f Remove an edge split workaround and replace with faster, better fix for 28669 2011-10-30 03:33:08 +00:00
Campbell Barton
8408cf3dc2 fix for memory leak when switching shape keys 2011-10-30 02:15:32 +00:00
Tamito Kajiyama
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
Campbell Barton
bd86ba2c88 svn merge -r41335:41371 2011-10-30 01:27:49 +00:00
Andrew Wiggin
e48d7f4c11 Fix for #29087: Meshs with non-planar polys added from py scripts show boundaries between tesselated triangles of a single poly 2011-10-30 01:14:50 +00:00
Thomas Dinges
f837b46a2b Modifier compilation tweaks (Blender conference commit)
* Fluid compilation: Inverse the compile flag from DISABLE_ELBEEM to WITH_MOD_FLUID for consistency. (scons/cmake)
* Use WITH_BF_FLUID in your user config (scons) 

* Add support for scons to disable build with Decimate and Boolean modifier. 
(WITH_BF_DECIMATE and WITH_BF_BOOLEAN)
2011-10-29 23:56:07 +00:00
Andrew Wiggin
15bd96efeb Fix RelWithDebInfo build.
RelWithDebInfo sets the library path to only include release libraries (e.g. python32.lib) but defining _DEBUG when #include'ing python headers inserts a linker directive to require for python32_d.lib. Additionally, RelWithDebInfo should be different from release build in that it builds debugger symbols (.PDBs), it should not have asserts and other debug code.
2011-10-29 16:14:38 +00:00
Tamito Kajiyama
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
Brecht Van Lommel
238f3a7d34 Cycles: seed value to get different noise values from renders, there was a patch
for this but I've implemented it differently.
2011-10-29 14:27:24 +00:00
Brecht Van Lommel
996f2cd8b2 Cycles: fix blenderplayer build error. 2011-10-29 14:24:06 +00:00
Andrew Wiggin
5e90c040d9 Fix for #29080: vertex paint mask doesn't work 2011-10-29 13:25:18 +00:00
Sergey Sharybin
e4cbb8dd94 Camera tracking integration
===========================

- Fixed jump when sliding movie clip with lock to selection enabled and nothing selected.
- Reset offset from locked position when adding new marker.
2011-10-29 11:34:26 +00:00
Campbell Barton
a7bf015f38 style edits
- rename var to match trunk shape key code
- reduce scope of some vars
- comment some unused vars
2011-10-29 11:23:37 +00:00
Campbell Barton
e28c2ce753 bug from revision 2!, error noticed kjym3 on IRC, buffer overrun on lbarray, was 30 but 39 items beting accessed, surprising this didnt crash earlier. 2011-10-29 11:15:12 +00:00
Sergey Sharybin
393a95b7e3 Camera tracking integration
===========================

Fixed crash when trying to track from frame where there's no
keyframed markers to use for keyframed tracking
(i.e. when you've tracked forwards, then backwards and the forwards again).
2011-10-29 10:36:43 +00:00
Campbell Barton
1fd6bc21cd add in functionality from trunk, editing base shapekey now offsets other keys when exiting editmode. 2011-10-29 10:19:57 +00:00
Sergey Sharybin
a19b0d358a Camera tracing integration
==========================

Fix for SAD tracking sliding marker.
2011-10-29 09:46:53 +00:00
Campbell Barton
1e4be0a4bf replace BLI_strtok_r from r41337 with lighter method that doesnt alloc for template_list 2011-10-29 08:18:42 +00:00
Sergey Sharybin
9d2caba92e Camera tracking integration
===========================

DeBalie commit (main changes only):

- Code cleanup
- Selectable tracking graph curves and curve knots
- Graph curve and curve knots can be deleted now
- Fixed wrong write when linking libraries
  (error is caused by hardcoded cound of linkable ID blocks)
- Fixed for KLT tracker when using keyframe adjustment
2011-10-29 07:14:31 +00:00
Campbell Barton
b8afde900c macro -> math replacements, uncomment mirror funcs. 2011-10-29 06:57:50 +00:00
Miika Hamalainen
46ae692710 Merge with trunk r41342 2011-10-28 17:00:53 +00:00
Brecht Van Lommel
ed77c356fc Fix: OpenGL renders on graphics cards which do not support non-power-of-two
textures were stretched and the wrong size.
2011-10-28 16:57:06 +00:00
Miika Hamalainen
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
Campbell Barton
e9429f45e5 re-enable mirroring - it was commented in a few functions. 2011-10-28 14:31:15 +00:00
Campbell Barton
a5bd610e70 uncomment shape key mirror. 2011-10-28 14:17:27 +00:00
Bastien Montagne
7627a742ab UI list template: committing patch [#26629].
This adds the ability (esp. for py scripts) to add some controls for each list element. See http://wiki.blender.org/index.php/User:Mont29/UI_Template_List_Enhancement for details.
2011-10-28 13:09:43 +00:00
Bastien Montagne
2ed7a66653 BLI_string: Adding the BLI_strtok_r function, which mimics stdlib strtok_r (unavailable on some systems).
It allows to iterate over a string, returning an new element each time, using a char as separator. See BLI_String.h's comments for more info and an example.

Needed by the UI template list patch following!
2011-10-28 13:07:11 +00:00
Campbell Barton
0701982933 svn merge -r41329:41335 ^/trunk/blender 2011-10-28 12:57:37 +00:00
Campbell Barton
0d63bb005f replace VECCOPY and QUATCOPY with inline funcs. 2011-10-28 12:40:15 +00:00
Campbell Barton
565fcd8907 fix for error in gpu.export_shader() was missing *4 (only writing 1/4 of the colorband) 2011-10-28 08:53:00 +00:00
Campbell Barton
f5cf238884 the BMesh select mode wasnt being set on entering editmode, this made snap to selection fail. 2011-10-28 08:09:34 +00:00
Campbell Barton
243ef037c9 BMEditMesh.mirror_cdlayer wasnt being set anywhere, adding any other type of layer would break editmesh mirror editing. 2011-10-28 06:23:12 +00:00
Campbell Barton
f5d5de0d8a fix for compiling collada by nico_ga 2011-10-28 06:12:00 +00:00
Campbell Barton
ff837cbe9b svn merge -r41310:41329 ^/trunk/blender 2011-10-28 05:17:09 +00:00
Campbell Barton
4b635d1631 use generic path remapping when making all library data local, previously only image paths were getting corrected, now all paths will (scene image seq strips, pointcache etc) 2011-10-28 04:44:59 +00:00