Commit Graph

47594 Commits

Author SHA1 Message Date
Bastien Montagne
ef3be824a0 Fix [#31495] Modifiers in Text objects don't respect edit mode flag.
Need to also check for cu->editfont for text edit mode...

Also use modifier_isEnabled() to make general tests whether a modifier should be applied or skipped.
2012-05-17 13:22:19 +00:00
Antony Riakiotakis
9b42b99649 MinGW64 and possibly gcc 4.7 doesn't like interface as identifier. 2012-05-17 13:15:58 +00:00
Campbell Barton
463898014f code cleanup: quiet warnings from compositor merge (builds with -Werror now in cmake) 2012-05-17 13:10:34 +00:00
Joshua Leung
a00cc81efb readfile.c Style Cleanup: Whitespace, while -> for, etc.
(3rd time lucky!)
2012-05-17 12:59:34 +00:00
Jeroen Bakker
044e818cf8 ____
`````|````` | |        |                        ..'''' 
     |      | |        |______               .''       
     |      | |        |                  ..'          
     |      | |_______ |___________ ....''             
               merge to TRUNK!

 * The old compositor is still available (Debug Menu: 200)

This commit was brought to you by:

Developers:
 * Monique Dewanchand
 * Jeroen Bakker
 * Dalai Felinto
 * Lukas Tönne

Review:
 * Brecht van Lommel

Testers:
 * Nate Wiebe
 * Wolfgang Faehnle
 * Carlo Andreacchio
 * Daniel Salazar
 * Artur Mag
 * Christian Krupa
 * Francesco Siddi
 * Dan McGrath
 * Bassam Kurdali

But mostly by the community:
Gold:

    Joshua Faulkner
    Michael Tiemann
    Francesco Paglia
    Blender Guru
    Blender Developers Fund

Silver:

    Pablo Vazquez
    Joel Heethaar
    Amrein Olivier
    Ilias Karasavvidis
    Thomas Kumlehn
    Sebastian Koenig
    Hannu Hoffrén
    Benjamin Dansie
    Fred M'ule
    Michel Vilain
    Bradley Cathey
    Gianmichele Mariani
    Gottfried Hofmann
    Bjørnar Frøyse
    Valentijn Bruning
    Paul Holmes
    Clemens Rudolph
    Juris Graphix
    David Strebel
    Ronan Zeegers
    François Tarlier
    Felipe Andres Esquivel Reed
    Olaf Beckman
    Jesus Alberto Olmos Linares
    Kajimba
    Maria Figueiredo
    Alexandr Galperin
    Francesco Siddi
    Julio Iglesias Lopez
    Kjartan Tysdal
    Thomas Torfs
    Film Works
    Teruyuki Nakamura
    Roger Luethi
    Benoit Bolsee
    Stefan Abrahamsen
    Andreas Mattijat
    Xavier Bouchoux
    Blender 3D Graphics and Animation
    Henk Vostermans
    Daniel Blanco Delgado
    BlenderDay/2011
    Bradley Cathey
    Matthieu Dupont de Dinechin
    Gianmichele Mariani
    Jérôme Scaillet

Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó, 
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli, 
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein, 
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio, 
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel, 
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey, 
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter, 
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini, 
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch, 
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson, 
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song, 
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
Ove Murberg Henriksen
8521ca69fa removed:
OBJECT_OT_vertex_group_copy_to_selected_single()
plan for future to implement option as an argument in:
OBJECT_OT_vertex_group_copy_to_selected()
2012-05-17 12:36:07 +00:00
Ove Murberg Henriksen
044fd86a15 Some changes to structure as a response to review.
(I still havent adressed all issues.)
2012-05-17 12:15:39 +00:00
Campbell Barton
fddb05024e use vertex arrays for drawing mask splines 2012-05-17 12:08:37 +00:00
Bastien Montagne
eb57856a19 Fix select_similar_type_itemf() enum-item-generator func to return the whole prop_similar_types when context is NULL (needed at least by i18n tools!). 2012-05-17 10:42:24 +00:00
Campbell Barton
dde529e977 remove doubleups of newlines in readfile error prints 2012-05-17 10:31:06 +00:00
Joshua Leung
f9043865a2 Disable setting non-object actions as the action used by the Action Constraint
(... I could've sworn there used to be some dynamic enums for filtering actions
by root type)
2012-05-17 10:28:30 +00:00
Joshua Leung
c7c937547b KeyingSets UI stuff - Replaced names used in RNA enum instead of redefining
manually in UI files
2012-05-17 10:10:11 +00:00
Campbell Barton
c406ce2974 minor improvement - entering "//somepath" in the file selector didnt expand from the current blend files path.
also quiet warning.
2012-05-17 10:07:29 +00:00
Ove Murberg Henriksen
f4f5254100 cleanup: Style = adding spaces around operators. 2012-05-17 09:47:11 +00:00
Campbell Barton
37f6ed397d svn merge ^/trunk/blender -r46699:46714 2012-05-17 09:34:22 +00:00
Campbell Barton
dfa075b662 added readonly rna ID attribute ID.is_library_indirect, so python can tell if a link is direct or not. 2012-05-17 09:17:39 +00:00
Ove Murberg Henriksen
daa4b41fb2 Fucntions adjusted to support options.
(still lacking feature for selected and option for all)
2012-05-17 08:10:19 +00:00
Campbell Barton
599d213115 style cleanup: line length and ensure some macros error when not ending with ';' 2012-05-17 07:59:25 +00:00
Ove Murberg Henriksen
e7970575ef bugfix (using _all not _single as postfix for functions); 2012-05-17 03:18:47 +00:00
Ove Murberg Henriksen
506057c83b Fixed readabillity of options framework by adding enums. 2012-05-17 03:15:39 +00:00
Joshua Leung
27f224f12a Nitpicky stuff
* Ensure "Base" is fully nullified before anyone uses it
* Force channel flush when changing Action Editor modes
2012-05-17 02:50:07 +00:00
Keir Mierle
0a917fa1c3 Add new planar tracker features and use the new planar API
This commit removes the use of the legacy RegionTracker API from
Blender, and replaces it with the new TrackRegion API. This also
adds several features to the planar tracker in libmv:

- Do a brute-force initialization of tracking similar to "Hybrid"
  mode in the stable release, but using all floats. This is slower
  but more accurate. It is still necessary to evaluate if the
  performance loss is worth it. In particular, this change is
  necessary to support high bit depth imagery.

- Add support for masks over the search window. This is a step
  towards supporting user-defined tracker masks. The tracker masks
  will make it easy for users to make a mask for e.g. a ball.

- Add Pearson product moment correlation coefficient checking (aka
  "Correlation" in the UI. This causes tracking failure if the
  tracked patch is not linearly related to the template.

- Add support for warping a few points in addition to the supplied
  points. This is useful because the tracking code deliberately
  does not expose the underlying warp representation. Instead,
  warps are specified in an aparametric way via the correspondences.

- Remove the "num_samples_xy" concept and replace it with
  automatic determination of the number of samples. This makes the
  API easier for users.

- Fix various bugs in the parameterizations.

There remains a bug with subpixel precision tracking when in
"keyframe" mode; this will get fixed shortly.
2012-05-17 02:31:52 +00:00
Ove Murberg Henriksen
0978d1eb9d Added framework for transfer weight options.
vertex_group_transfer_weight_exec() governs all.
Functions renamed/added with _transfer_weight_
as opposed to _copy_by_ 
This is to reflect changes in parameters and usage as the internal code will change.
2012-05-17 01:42:06 +00:00
Campbell Barton
9dd981a440 style cleanup: block comments 2012-05-16 23:37:23 +00:00
Nicholas Bishop
18a7efac14 Fix for clay strips brush not showing Add/Subtract buttons. 2012-05-16 22:27:45 +00:00
Bastien Montagne
1b6600c3e8 Fix [#31432] Angles values stuck at 60 degrees. 2012-05-16 20:35:09 +00:00
Campbell Barton
7e5348f4c5 improvements to mask editor path editing
- adding new points de-selects previous so Ctrl+Click+Drag works usefully.
- cyclic curves now extrude properly
- adding new points inbetween existing now use the surrounding points handle length.
2012-05-16 18:05:35 +00:00
Campbell Barton
09bb37fe93 svn merge ^/trunk/blender -r46684:46699 2012-05-16 16:41:51 +00:00
Campbell Barton
bd45c0008c evil mango feature, alt transform sequence strips bumps other strips out of the way 2012-05-16 16:28:33 +00:00
Bastien Montagne
04bc61a0d5 Nodes i18n: don't call gettext stuff twice for categories' names, when building Add menu.
Now ui-names in foreach_nodeclass functions are only marked as translatable, it’s up to the callback to actually translate them or not!
2012-05-16 15:01:46 +00:00
Brecht Van Lommel
fc576add9f Fix issue with linked dupli objects not being displayed in the viewport, if they
have no object bounding box. Better fix will be to figure out why they are the
bounding boxes are not made.

Thanks to Campbell to tracking down the commit that caused this.
2012-05-16 14:36:15 +00:00
Antony Riakiotakis
5ff7ede1b5 modal operation for bevel and inset:
This commit adds some first building blocks for the two operators to work modally based on mouse input. To make their function easier, two hotkeys are introduced, Ctrl+B for bevel and I for inset.

TODO:
After discussion with Campbell, we would like to add scale-style line indicators for the operators. This is already done for transform operators but a new interface for mesh operations may have to be written using pieces from that code since, strictly speaking bevel and inset are not exactly "transform" operators.

Also, a better input method for inset is needed and more options exposed. The method implemented right now uses mouse move for thickness and ctrl-mouse move for depth. These are calculated using the distance of the selection center in screen space and the mouse position. While that may work and prevents abrupt changes in values when switching from thickness tweak mode to depth tweak mode, it limits the magnitude of values that can be put into the tool especially in small or large scale. 

Alternatives until a better method is written include:

* use relative offset (works but may give strange results)
* tweak manually after the operation.
2012-05-16 14:30:41 +00:00
Bastien Montagne
2e89e0096a Spell check fix (lenght -> length)
Note: two remains, in comments in extern/bullet2/src/LinearMath/btVector3.h and extern/libmv/libmv/image/tuple.h.
2012-05-16 14:25:25 +00:00
Campbell Barton
2be8263db4 style cleanup: indentation 2012-05-16 12:14:31 +00:00
Gaia Clary
2c05190374 fix [#31320] Collada now supports import/export of loose edges (edges not attached to faces) 2012-05-16 11:21:03 +00:00
Lukas Toenne
b68673f37c Fix #31369 (discussed in bug report comments). Setting the path/layer name strings of the file/layer slots of the file output node would crash, due to missing id.data pointer in the PointerRNA. Solved by using the iter->parent.id.data pointer for the RNA collection iterator. 2012-05-16 10:10:42 +00:00
Campbell Barton
e34a1fc1a5 style cleanup: imbuf 2012-05-16 09:26:37 +00:00
Lukas Toenne
a7e6d38727 Fix #31472: displace node wrong y derivative (simple typo). Credit to Ervin Weber (lusque) for the fix. 2012-05-16 09:22:59 +00:00
Campbell Barton
d82ca6d636 svn merge ^/trunk/blender -r46632:46684 2012-05-16 09:12:18 +00:00
Campbell Barton
9bcf305431 fix [#31474] Crash when object has parent and dupli_type == 'FRAMES' and show_x_ray, show_transparent are set to True
dupli objects should never be added to after-draw, added an assert to ensure this (and make fixing such bugs easier).
2012-05-16 08:42:50 +00:00
Campbell Barton
d64fd168c9 style cleanup: imbuf 2012-05-16 07:38:23 +00:00
Ove Murberg Henriksen
f386587e27 Bugfix 2012-05-16 05:16:34 +00:00
Joshua Leung
ffd56fdae4 Bugfix [#31469] 'cyclic offset' option is broken
Removing this option from the UI. Cyclic offset and/or other the myriad of other
half-working walk/stride cycle stuff has been removed pending further review at
a later date about what's really needed, and the best way to do so with regards
to different rig types (i.e. setup antagonistic).
2012-05-16 02:40:14 +00:00
Nicholas Bishop
ed33320e3f Code cleanup: simplify standard GHash creation.
Added four new functions as shortcuts to creating GHashes that use the
standard ptr/str/int/pair hash and compare functions.

GHash *BLI_ghash_ptr_new(const char *info);
GHash *BLI_ghash_str_new(const char *info);
GHash *BLI_ghash_int_new(const char *info);
GHash *BLI_ghash_pair_new(const char *info);

Replaced almost all occurrences of BLI_ghash_new() with one of the
above functions.
2012-05-16 00:51:36 +00:00
Campbell Barton
e79c29a1d6 style cleanup: raytree code 2012-05-15 18:45:20 +00:00
Brecht Van Lommel
7aa21d677a Python/CurveMapping: add Curve Mapping functions to add/remove curve points,
evaluate the curve and update after changes.
2012-05-15 18:34:00 +00:00
Nicholas Bishop
37552ac167 Update create_vert_edge_map() to match create_vert_poly_map(). 2012-05-15 16:32:08 +00:00
Sergey Sharybin
7b31c3c198 Fix cosmetic typos
Patch provided by Matteo F. Vescovi, thanks!
2012-05-15 16:11:04 +00:00
Sergey Sharybin
e5927b8cc5 Tomato: fixes for marker sliding operator
- Fixed crash on slide undo. Was caused by some typos in slide
  data initialization and not checking for slide action in
  cancel callback
- Always create keyframe for frame when marker is stared sliding.
2012-05-15 15:05:45 +00:00
Brecht Van Lommel
5478b21b28 Fix: mirror modifier only mirrors first UV map (IRC report). 2012-05-15 15:02:02 +00:00