Commit Graph

11497 Commits

Author SHA1 Message Date
Tamito Kajiyama b6a9a953bc Merged changes in the trunk up to revision 47056.
Conflicts resolved:
source/blender/bmesh/bmesh_class.h
source/blender/bmesh/intern/bmesh_construct.c
source/blender/editors/interface/resources.c
source/blender/render/intern/source/convertblender.c
2012-05-26 22:22:45 +00:00
Campbell Barton 54b64cfd61 code cleanup: use const float and define array size 2012-05-26 22:21:56 +00:00
Sergey Sharybin ce9ee99c07 Fix #31538: Wrong colors after reloading file with exr image
Issue was caused by generated images had got no profile set (IB_PROFILE_NONE)
which confused OpenEXR saver (which makes sRGB conversion for profiles which
are not linear).

Actually this is much deeper issue which would require the whole color pipeline
workflow (which would happen at some point when currently urgent stuff is resolved),
but having correct profile set for generated images would still be helpful.
2012-05-26 17:04:51 +00:00
Campbell Barton 8c89d52614 svn merge ^/trunk/blender -r47003:47047 2012-05-26 14:19:41 +00:00
Campbell Barton 63788b47d6 add vector versions of hsv_to_rgb, rgb_to_hsv & rgb_to_hsv_compat 2012-05-26 11:01:01 +00:00
Campbell Barton 10c6a8ce1a fix for adding/removing spline items with multiple splines in a mask-object 2012-05-25 17:44:37 +00:00
Campbell Barton 6fa349f85e support for deleting splines and points while maintaining animation 2012-05-25 15:20:29 +00:00
Campbell Barton b230ebf726 mask slide now auto-keys 2012-05-25 12:48:24 +00:00
Campbell Barton bb97cf31de print frame bumbers when printing shapes that mismatch 2012-05-25 12:06:10 +00:00
Campbell Barton 94fc1f5f4a fix error in prev commit 2012-05-25 11:51:56 +00:00
Campbell Barton e70316f3b2 fix for crash in auto ketframe. 2012-05-25 11:41:42 +00:00
Campbell Barton 5ed2e0d5bc svn merge ^/trunk/blender -r46979:47003 2012-05-25 09:42:58 +00:00
Miika Hamalainen c4bbc5abfc Fixed smoke 3D-view issues: Preview became invisible from certain angles if domain size was < 1.0 and density+shading strength changed depended on domain size. 2012-05-25 09:40:56 +00:00
Campbell Barton 139c92e7eb new points now have their animated locations applied all non-active keys. 2012-05-25 09:06:15 +00:00
Daniel Genrich f883d12e0c Smoke: Start fixing scaling issues which happen with non cube-shaped domains.
Detail: Smoke solver and Blender side of smoke now share the same cell length.

First reported by the Sintel artists long ago, again reported by MiikaH.

Part of my Smoke Development Project Phase III.
2012-05-24 23:50:20 +00:00
Nicholas Bishop 9dc161e8ed Fix bug [#31512] Focus Zoom on text object with modifers fails
Change BKE_object_minmax() to use the same logic as meshes: use the
object bounding box if available, since it will include the modifier
DM output.
2012-05-24 20:20:12 +00:00
Campbell Barton afe2def93c adding new keyframes now updates existing shapekeys 2012-05-24 19:16:08 +00:00
Daniel Genrich 8042c52fb6 Smoke: Fix wrong maximum timestep, resulting in exploding/unstable fluids.
Part of my Smoke Development project.
In conjunction with MiikaH and his gSoC project.
2012-05-24 18:22:36 +00:00
Campbell Barton 25b677787f svn merge ^/trunk/blender -r46966:46979 2012-05-24 16:37:40 +00:00
Campbell Barton da710b3e14 style cleanup: brace placement/newlines 2012-05-24 16:35:45 +00:00
Campbell Barton ebd39522d8 fix bug in own recent edits - shape key insertion 2012-05-24 15:29:50 +00:00
Sergey Sharybin 3305674bb5 Port mask node to new compositor system
Works in the same way as double edge node -- not actually multithreaded
but currently it's fast enough to be used in such way. In the future it
might be changed in some way.

Move actual mask rasterization code to BKE so it's resued by old compositor
system and new compositor. Also in the future it might be used to display
mask preview in mask editor.
2012-05-24 14:01:00 +00:00
Joshua Leung 240babf074 Graph Editor - View All/Selected now includes handles for calculating extents of
F-Curves

It is possible to get the old behaviour (handles excluded) by bringing up the
Operator Properties (F6) while in the Graph Editor (this doesn't work elsewhere
due to the context requirements of this stuff).
2012-05-24 13:52:25 +00:00
Campbell Barton 3e1df2d12e shapekeys for masks - this doesnt use existing shapekey code however. 2012-05-24 13:31:36 +00:00
Sergey Sharybin 14a56caee6 Merging r46725 through r46963 from trunk into soc-2011-tomato 2012-05-24 09:47:29 +00:00
Campbell Barton 57b488574a style cleanup: comma placement 2012-05-23 22:45:39 +00:00
Campbell Barton 5b8cbbe3fd code cleanup: fix possible use of uninitialized value and remove dead initializations. 2012-05-23 21:39:39 +00:00
Sergey Sharybin 6bb45ac67b Camera tracking: imbuf (un)distoriton used to set RECT_INVALID flag for source image instead of destination
This lead to wrong proxies generated for openexr float image sequences
2012-05-23 16:53:33 +00:00
Sergey Sharybin 1cee8d1f1d Movie clip: remove workaround for #27997
it's not actually helps, but only confuses system when using openexr movie clips.
2012-05-23 16:19:04 +00:00
Brecht Van Lommel 487fa055de Set "a" version character to put the version at 2.63a, this is apparently needed
for package managers to stay ahead of the 2.63a bugfix release.
2012-05-23 11:38:00 +00:00
Campbell Barton dab1d8e487 style cleanup 2012-05-22 22:03:41 +00:00
Campbell Barton d2a37d464a code cleanup: double promotion warnings 2012-05-22 21:16:59 +00:00
Nicholas Bishop 45265b326a Add operator to extract armature and vertex groups from skin.
* The operator creates bones for each input edge (does not subdivide
  them like the skin operator does), adds a fake root bone for skin
  roots with multiple children.

* The operator adds vertex weight groups to the original mesh.

* Make copy_object_transform() public, used to match the armature
  object to the mesh object.

Skin modifier documentation:
http://wiki.blender.org/index.php/User:Nicholasbishop/SkinModifier
2012-05-22 15:29:57 +00:00
Nicholas Bishop 417ac69320 Draw skin vertex roots in edit mode.
Roots are drawn with a view-oriented dashed red circle around the
vertex location. The circle's radius is the average if the skin
vertex's X and Y radii.

Skin modifier documentation:
http://wiki.blender.org/index.php/User:Nicholasbishop/SkinModifier
2012-05-22 15:29:27 +00:00
Nicholas Bishop f7b116e0bd Add Mesh equivalent to BM_edge_other_vert().
/* Return the index of the edge vert that is not equal to 'v'. If
 * neither edge vertex is equal to 'v', returns -1. */
int BKE_mesh_edge_other_vert(const struct MEdge *e, int v);
2012-05-22 15:28:44 +00:00
Nicholas Bishop 396a3d31cc Add MVertSkin DNA/RNA and customdata (CD_MVERT_SKIN).
The MVertSkin currently just stores local skin radii and skin
flags (MVertSkinFlag).

Skin modifier documentation:
http://wiki.blender.org/index.php/User:Nicholasbishop/SkinModifier

Reviewed by Campbell Barton.
2012-05-22 15:18:43 +00:00
Lukas Toenne 53b01d9002 A number of new features for the node editor in general and the Frame node in particular.
For an detailed user-level description of new features see the following blogpost:

http://code.blender.org/index.php/2012/05/node-editing-tweaks/

TL;DR:
* Frame node gets more usable bounding-box behavior
* Node resizing has helpful mouse cursor indicators and works on all borders
* Node selection/active colors are themeable independently
* Customizable background colors for nodes (useful for frames visual
distinction).
2012-05-22 14:13:33 +00:00
Campbell Barton 85923aff28 code cleanup: key/interpolation 2012-05-22 13:59:58 +00:00
Campbell Barton 40b7b9655a fix for regression in curve modifier (own fault) 2012-05-22 09:00:34 +00:00
Sergey Sharybin d435be750a Fix #31522: wrong ID user count on custom bone shape object after duplicate 2012-05-22 07:46:14 +00:00
Campbell Barton 3289628610 fix [#31489] EdgeSplit modifier prevents All Edge to be work correctly since 2.63
bmesh regression where the edge-draw flag was cleared when bmesh modifiers were used.
2012-05-22 07:26:45 +00:00
Brecht Van Lommel c3e1fce775 Cycles: add Object Info node, with outputs object location, object/material
pass index, and a random number unique to the instance of the object.

This can be useful to give some variation to a single material assigned to
multiple instances, either manually controlled through the object index, based
on the object location, or randomized for each instance. 

http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/More#Object_Info
2012-05-21 12:52:28 +00:00
Campbell Barton ebd87e18df mask parenting operator, and clear parenting. (Ctrl+P, Alt+P)
- also use offset now with parenting.
- draw line from point to parent.
2012-05-21 11:09:53 +00:00
Campbell Barton 14e4ad9302 fix for fix - possible on second loop to use freed memory still. 2012-05-21 10:13:43 +00:00
Campbell Barton 23d628a54f fix for unlikely but possible use of uninitialized pointers. 2012-05-21 10:11:51 +00:00
Sergey Sharybin 130e7ab6f4 Move search area form track to marker structure
This allows different markers has different size of search area which
makes it possible to scale search area when doing planar tracking.

Made changes to all related areas such as transformation, tracking,
finally ported marker clamping function, added python bindings for
changed search area and added python API for pattern corners.

TODO: It's still possible to make marker's center go outside of pattern
      corners when translating pattern area or rotating it around median
      point.
2012-05-21 09:19:08 +00:00
Campbell Barton be53fde9cd code cleanup:
- remove duplicate includes
- blender builds with -Werror in C++ for fluids/smoke
2012-05-21 06:33:45 +00:00
Campbell Barton 2d2d36fe3b code cleanup:
- style - multi-line ifs move braces onto new lines.
- iterators - convert some to macros, other split up and move brace.
2012-05-20 19:49:27 +00:00
Campbell Barton 5d92564041 use utf8 functions for new modifier names 2012-05-20 18:19:45 +00:00
Nicholas Bishop f919973f32 Fix bug #31529 Remesh remove Apply as Shape button
Change modifier_sameTopology() to not not treat Nonconstructive
modifiers as having same topology. This function is only used to test
whether Apply as Shape is allowed.

The exact nature of "nonconstructive" modifiers is not documented, but
current list is remesh, fluidsim, decimate, mask, build, and
boolean. All of these modify topology, and should not be making making
shape keys.
2012-05-20 15:00:19 +00:00