Commit Graph

66005 Commits

Author SHA1 Message Date
Andrew Wiggin
d424e1454b Fix [#29191] Crash when switching to mask mode for texture paint 2011-11-07 15:03:53 +00:00
Thomas Dinges
5ebee683bd 2.6 UI:
* Minor tweaks after tomato merge, rest of Tomato UI code is excellent. :)
2011-11-07 14:34:56 +00:00
Joshua Leung
2b6e4f2422 Bugfix [#29064] armature with curve contraint - crash
Spline IK and Auto-IK working together on the same bone chain could
crash due to the somewhat hacky way that they were sharing the same
list for the "iktree" forest. Resolved by doing what I should have
done from the beginning, and made Spline-IK save its ik chains off
into a separate list.

While this fixes the crash, it might be worth investigating outright
disabling this from working in this case, since it can be a bit
confusing to have it appear to not work.
2011-11-07 13:25:17 +00:00
Sergey Sharybin
7b43abb90e Camera tracking integration
===========================

Rest of changes from camera tracking gsoc project.

This commit includes:

- New compositor nodes:
  * Movie Clip input node
  * Movie Undistortion node
  * Transformation node
  * 2D stabilization node

- Slight changes in existing node to prevent code duplication
2011-11-07 12:56:05 +00:00
Sergey Sharybin
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
Sergey Sharybin
af5526e58c Camera tracking integration: Final pre-merge code clean-up 2011-11-07 12:50:26 +00:00
Sergey Sharybin
ca24008a77 Merging r41597 through r41607 from trunk into soc-2011-tomato 2011-11-07 12:49:52 +00:00
Campbell Barton
9842d845f8 don't write into bmesh edge indices when calculating solidify normals 2011-11-07 11:08:33 +00:00
Bastien Montagne
e122dc0748 Removing a wrong node_type_storage (checked and confirmed by lukas_t). 2011-11-07 09:33:49 +00:00
Campbell Barton
b0a21add8a replace bmesh specific macros with math functions, also some pedantic formatting edits. 2011-11-07 09:02:10 +00:00
Sergey Sharybin
22723a313e Fix #29174: Vertex normals temporarily incorrect after deleting a face
Looks like it was just missed recalc_editnoormals call in Delete Mesh operator.
2011-11-07 07:16:30 +00:00
Campbell Barton
7508540c53 svn merge -r41575:41602 ^/trunk/blender 2011-11-07 07:01:24 +00:00
Campbell Barton
4b3cc63f73 fix [#29183] Make duplicates real: parent informations of the group is not copied
infact this is a feature request but we had reports about it before and its useful to have.

2 new options for OBJECT_OT_duplicates_make_real
- parent to original duplicator
- keep internal hierarchy
2011-11-07 05:28:26 +00:00
Campbell Barton
bb8fe0bf4a minor edits
- remove unneeded type check from convert grease pencil operator.
- correct some error prints & use __func__.
- make copy_libblock take an ID* argument rather than void*.
2011-11-07 04:36:37 +00:00
Campbell Barton
96d73bfdcf replace VECCOPY with copy_v3_v3, same for 2d copy, also added vec copy functions for int & char. 2011-11-07 01:38:32 +00:00
Brecht Van Lommel
fb56dbc2af Cycles: procedural texture nodes reorganization. This will break existing files
using them, but rather do it now that I have the chance still. Highlights:

* Wood and Marble merged into a single Wave texture
* Clouds + Distorted Noise merged into new Noise node
* Blend renamed to Gradient
* Stucci removed, was mostly useful for old bump
* Noise removed, will come back later, didn't actually work yet
* Depth setting is now Detail socket, which accepts float values
* Scale socket instead of Size socket

http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures
2011-11-06 21:05:58 +00:00
Sergey Sharybin
a35a31880e Camera tracking integration
===========================

- Fixed to incorrect users count for clip datablocks when performing some actions.
- Slight changes in used notifiers.
2011-11-06 18:40:13 +00:00
Sergey Sharybin
afe399d84f Merging r41564 through r41596 from trunk into soc-2011-tomato 2011-11-06 18:38:20 +00:00
Campbell Barton
85540d5aa7 more macro --> BLI math lib, mainly replace VECCOPY in render and blenkernel. 2011-11-06 16:38:21 +00:00
Campbell Barton
7c88bc5952 replace macros for bli math functions in editors 2011-11-06 16:34:44 +00:00
Campbell Barton
3d1e45c414 replace macros with bli math functions for nodes 2011-11-06 16:23:28 +00:00
Andrew Wiggin
261c1679b4 fix *Redo unsupported* messages in operator panel when using edgeloop/edgering select 2011-11-06 15:42:12 +00:00
Lukas Toenne
b05ee8b65f Fix for bug #29046, the factor buffer input was not used correctly in curve nodes.
Curve Map exec function (for RGB curves) used a broken test condition for constant factor=1.0f eval. This must take the factor buffer into account, checking the factor vec for default value is not sufficient. These kinds of test should use a function interface, there are probably a lot more bugs like this hidden in the code.
2011-11-06 15:40:00 +00:00
Campbell Barton
d8717d2628 more macro --> bli math lib replacements. 2011-11-06 15:39:20 +00:00
Campbell Barton
ec3b0c6a96 misc macro --> bli math lib functions 2011-11-06 15:17:43 +00:00
Campbell Barton
0634d8a745 replace macros with math functions for render code 2011-11-06 14:36:37 +00:00
Thomas Dinges
3bf96250cd Cycles:
Use new libs on win32/64. Make sure you update lib/windows or lib/win64.
2011-11-06 14:09:08 +00:00
Campbell Barton
b82dee0cb4 replace macros with bli math functions for particles code 2011-11-06 14:00:55 +00:00
Tamito Kajiyama
72cfdfec30 Fix for a crash when two scenes in the compositor have different render
resolution (i.e., image width and height, scaled by the size factor).
Problem report by flokkievids together with a .blend file for reproducing
the bug, thanks!
2011-11-06 12:23:44 +00:00
Joshua Leung
e03fdd8112 Second attempt at getting rid of bsystem_time()
Hopefully this fixes Collada. Can't really compile that to check
here...
2011-11-06 12:12:14 +00:00
Campbell Barton
d738c8df1f use BLI math functions for kdopbvh (no functional change) 2011-11-06 12:11:50 +00:00
Campbell Barton
e936c78251 svn merge ^/trunk/blender -r41503:41575 2011-11-06 10:38:44 +00:00
Joshua Leung
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
Joshua Leung
723484ec06 Removed old "bsystem_time()" function, which by now is just a
duplicate of BKE_curframe() which just takes two extra args.

For the few calls in the physics engine where CFRA+1 instead of CFRA
was being used, I've added a new BKE_nextframe() call, which will
calculate for CFRA+1 instead of CFRA in much the same way that
bsystem_time() would end up doing things (which means including
subframe steps).
2011-11-06 06:08:18 +00:00
Joshua Leung
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
Campbell Barton
4c17f8e5de PyUnicode_From_STR_String utility function which passes STR_String to PyUnicode_FromStringAndSize (saves a call to strlen).
Also made CValue::ConvertKeysToPython use faster list creation and improved some of the macro formatting.
2011-11-06 01:39:36 +00:00
Sergey Sharybin
8c461466f3 Camera tracking integration
===========================

Code cleanup and minor refactor. Moved some functions from movieclip.c
to tracking.c due to they're operating on tracking data only.
2011-11-05 16:32:06 +00:00
Sergey Sharybin
497ea3c34e Camera tracking integration
===========================

Hopefully last codereview issue fix: do not set movieclip ID block in init function of nodes.
2011-11-05 15:14:28 +00:00
Sergey Sharybin
dea3b348e5 Camera tracking integration
===========================

- Set as Background button will enable displaying background images in 3d space.
- Move options in Display panel to column. Saves some space.
- Camera solving now should deal fine with non-centered principal.
2011-11-05 14:37:43 +00:00
Sergey Sharybin
5a49d05eba Merging r41555 through r41563 from trunk into soc-2011-tomato 2011-11-05 14:34:14 +00:00
Campbell Barton
2a7ade9de2 remove po/ since the workflow for translations uses branches which isnt that useful to have within blenders source dir.
For now treat translations as binary files - just access from 'release/datafiles/locale'
2011-11-05 14:26:18 +00:00
Campbell Barton
885d1e6ed3 update path loactions for external po/ 2011-11-05 13:21:03 +00:00
Brecht Van Lommel
647447db58 Code refactoring: split lamp functions from object.c into new lamp.c. 2011-11-05 13:11:49 +00:00
Brecht Van Lommel
9884129117 Code refactoring: split camera functions from object.c into new camera.c. 2011-11-05 13:00:39 +00:00
Campbell Barton
fd6138a26d remove dirs to make them external's 2011-11-05 12:16:40 +00:00
Sergey Sharybin
cb67a63374 Camera tracking integration
===========================

- Fix in rna description for pyramid level
- Unlock clip editor when deselecting all markers, deleting all marker
  or hiding them.
- Keep disabled marker when clearing upto/after so there'll be no
  estimated markers in this case which doesn't have much sense here.
2011-11-05 11:53:10 +00:00
Sergey Sharybin
e0cae62fb4 Merging r41536 through r41554 from trunk into soc-2011-tomato 2011-11-05 11:50:40 +00:00
Brecht Van Lommel
fd83a3ede0 Cycles: make cycles work with new camera sensor size. 2011-11-05 11:11:06 +00:00
Campbell Barton
33accdb725 use (const char*) rather than (char*) where possible.
also removed some unused function definitons.
2011-11-05 11:04:28 +00:00
Brecht Van Lommel
45b8a61bf3 Fix #29162: grease pencil did not decrement user count on adding new datablock
to replace an existing one.
2011-11-05 10:48:43 +00:00