9 years agosvn merge ^/trunk/blender -r48321:48333
Campbell Barton [Wed, 27 Jun 2012 14:36:06 +0000 (14:36 +0000)]
svn merge ^/trunk/blender -r48321:48333

9 years agoadd access to dissolve_limit from python.
Campbell Barton [Wed, 27 Jun 2012 14:01:58 +0000 (14:01 +0000)]
add access to dissolve_limit from python.

9 years agoutility function to get the points inside a list of planes.
Campbell Barton [Wed, 27 Jun 2012 09:51:22 +0000 (09:51 +0000)]
utility function to get the points inside a list of planes.

9 years agostyle cleanup: also some spelling correction.
Campbell Barton [Wed, 27 Jun 2012 05:59:41 +0000 (05:59 +0000)]
style cleanup: also some spelling correction.

9 years agobmesh.ops module for bmesh operator access, only remove_doubles and convex_hull at...
Campbell Barton [Tue, 26 Jun 2012 21:40:01 +0000 (21:40 +0000)]
bmesh.ops module for bmesh operator access, only remove_doubles and convex_hull at the moment.

9 years agosvn merge ^/trunk/blender -r48313:48321
Campbell Barton [Tue, 26 Jun 2012 20:36:19 +0000 (20:36 +0000)]
svn merge ^/trunk/blender -r48313:48321

9 years agofix for a handful of memory leaks relating to parsing and allocating arbitrary sized...
Campbell Barton [Tue, 26 Jun 2012 16:58:58 +0000 (16:58 +0000)]
fix for a handful of memory leaks relating to parsing and allocating arbitrary sized vectors from python args. was always leaking memory, and would crash if args sizes didnt match.

These errors were introduced with n-dimensional vector support.

also fixed an error with bmesh py api allocation.

9 years agoMerging r48308 through r48313 from trunk into soc-2011-tomato
Sergey Sharybin [Tue, 26 Jun 2012 15:29:22 +0000 (15:29 +0000)]
Merging r48308 through r48313 from trunk into soc-2011-tomato

9 years agoFix for crash of keying screen node in cases when there's no
Sergey Sharybin [Tue, 26 Jun 2012 15:26:16 +0000 (15:26 +0000)]
Fix for crash of keying screen node in cases when there's no
triangulation generated for tracks setup

9 years agomathutils.Vector(kw=value) wasn't raising an error as it should.
Campbell Barton [Tue, 26 Jun 2012 14:49:49 +0000 (14:49 +0000)]
mathutils.Vector(kw=value) wasn't raising an error as it should.

9 years agoFix issue with resetting active nurb when sawing from edit mode
Sergey Sharybin [Tue, 26 Jun 2012 10:18:53 +0000 (10:18 +0000)]
Fix issue with resetting active nurb when sawing from edit mode

Issue was caused by loading editNurb into normal nurbs when saving,
this used to set active nurb to NULL.

This isn't actually needed, because active nurb would be set properly
on making editNurb and even if one accessed to active spline via PY API
when object is in object it'll be completely harmless.

9 years agosvn merge ^/trunk/blender -r48305:48307
Campbell Barton [Tue, 26 Jun 2012 10:17:11 +0000 (10:17 +0000)]
svn merge ^/trunk/blender -r48305:48307

9 years agomask and grease pencil now display in the dope sheet summery
Campbell Barton [Tue, 26 Jun 2012 10:14:50 +0000 (10:14 +0000)]
mask and grease pencil now display in the dope sheet summery

9 years agoMerging r48303 through r48305 from trunk into soc-2011-tomato
Sergey Sharybin [Tue, 26 Jun 2012 09:48:24 +0000 (09:48 +0000)]
Merging r48303 through r48305 from trunk into soc-2011-tomato

9 years agoOptimization of keying screen node
Sergey Sharybin [Tue, 26 Jun 2012 09:46:24 +0000 (09:46 +0000)]
Optimization of keying screen node

When creating tile data include only triangles which have got intersection
with tile's rectangle only. This saves quite a lot of per-pixel iterations
through triangles which simply can not affect on current tile.

In fact, it's AABB check is used here. It could be improved further, but
it'll slowdown tile data generation with questionable speedup.

Another major slowdown is in fact caused by voronoi triangulation code.
Currently it's used naive algorithm which is O(N^2) where N is number
of edges. Added few euristics there and removed unused part of code, which
gave quite noticeable speedup already.

This could be improved further, but this node is not ment to be used for
lots of markers. It's also generates wrong triangulation when there're
many sites used. Need to be investigated further.

9 years agofix for checking wrong flag with removing mask shape keys doubles on the dope sheet.
Campbell Barton [Tue, 26 Jun 2012 08:25:17 +0000 (08:25 +0000)]
fix for checking wrong flag with removing mask shape keys doubles on the dope sheet.

9 years agosvn merge ^/trunk/blender -r48288:48302
Campbell Barton [Tue, 26 Jun 2012 07:44:59 +0000 (07:44 +0000)]
svn merge ^/trunk/blender -r48288:48302

9 years agoquiet all -Wshadow warnings in the compositor.
Campbell Barton [Tue, 26 Jun 2012 07:32:24 +0000 (07:32 +0000)]
quiet all -Wshadow warnings in the compositor.

9 years agorename remaining class members with m_ prefix.
Campbell Barton [Tue, 26 Jun 2012 07:09:49 +0000 (07:09 +0000)]
rename remaining class members with m_ prefix.

9 years agouse m_ prefix for compositor class members (all compositor operations).
Campbell Barton [Tue, 26 Jun 2012 01:22:05 +0000 (01:22 +0000)]
use m_ prefix for compositor class members (all compositor operations).

9 years agoBugfix [#31930] DopeSheet - Grease Pencil mode collapses visible channels when
Joshua Leung [Tue, 26 Jun 2012 00:35:05 +0000 (00:35 +0000)]
Bugfix [#31930] DopeSheet - Grease Pencil mode collapses visible channels when
switch channel

This was caused by a typo, which would end up toggling the expanded status of
the Grease Pencil datablock (gpd->flag & 4) instead of the layer active status
(gpl->flag & 4).

9 years agoMerging r48284 through r48288 from trunk into soc-2011-tomato
Sergey Sharybin [Mon, 25 Jun 2012 19:52:07 +0000 (19:52 +0000)]
Merging r48284 through r48288 from trunk into soc-2011-tomato

9 years agoFixed crash when trying to perform transformation in Clip Editor without clip opened
Sergey Sharybin [Mon, 25 Jun 2012 19:48:05 +0000 (19:48 +0000)]
Fixed crash when trying to perform transformation in Clip Editor without clip opened

Reported by JumboCoDeC in IRC. Thanks for the report.

9 years agomake hue correct grid more faded out.
Campbell Barton [Mon, 25 Jun 2012 19:42:10 +0000 (19:42 +0000)]
make hue correct grid more faded out.

9 years agosvn merge ^/trunk/blender -r48276:48283
Campbell Barton [Mon, 25 Jun 2012 18:03:19 +0000 (18:03 +0000)]
svn merge ^/trunk/blender -r48276:48283

9 years agofix for crash with blur - happened most when there was a size input, need to mutex...
Campbell Barton [Mon, 25 Jun 2012 18:01:01 +0000 (18:01 +0000)]
fix for crash with blur - happened most when there was a size input, need to mutex lock before allocating the gauss array.

also add suspiciously missing call to BlurBaseOperation::initExecution, X had but Y was missing.

9 years agocode cleanup
Jeroen Bakker [Mon, 25 Jun 2012 17:27:54 +0000 (17:27 +0000)]
code cleanup

9 years agofix for [#31899] Compositor: scale to rendersize doesn't work on
Jeroen Bakker [Mon, 25 Jun 2012 17:26:18 +0000 (17:26 +0000)]
fix for [#31899] Compositor: scale to rendersize doesn't work on
separate channels

9 years agocorrect free command for an array in the compositor
Campbell Barton [Mon, 25 Jun 2012 17:09:11 +0000 (17:09 +0000)]
correct free command for an array in the compositor

9 years agoMerging r48264 through r48276 from trunk into soc-2011-tomato
Sergey Sharybin [Mon, 25 Jun 2012 16:37:58 +0000 (16:37 +0000)]
Merging r48264 through r48276 from trunk into soc-2011-tomato

9 years agoIgnore disabled markers when building keying screen.
Sergey Sharybin [Mon, 25 Jun 2012 16:36:22 +0000 (16:36 +0000)]
Ignore disabled markers when building keying screen.

9 years agoCamera solver: take track offset into account
Sergey Sharybin [Mon, 25 Jun 2012 16:36:12 +0000 (16:36 +0000)]
Camera solver: take track offset into account

This helps in cases when it's needed to track a feature which
goes out of screen for a while to prevent jump of camera.

9 years agoFix for [#31900] Loop Selection on wireframe selects vertex behind.
Bastien Montagne [Mon, 25 Jun 2012 13:32:04 +0000 (13:32 +0000)]
Fix for [#31900] Loop Selection on wireframe selects vertex behind.

Revert part of r48105 (calling mouse_mesh() in mouse_mesh_loop() is not a good idea, as it might select another element ouside the selected loop, and is anyway overkill!), added lighter code that simply checks for the nearest vertex/face of current edge.

9 years agofix for #31914
Jeroen Bakker [Mon, 25 Jun 2012 12:58:53 +0000 (12:58 +0000)]
fix for #31914

9 years agoFix #31920: switching from cycles to blender internal with 3d view in rendered
Brecht Van Lommel [Mon, 25 Jun 2012 12:13:21 +0000 (12:13 +0000)]
Fix #31920: switching from cycles to blender internal with 3d view in rendered
draw mode did not draw the 3d view properly.

9 years agoFix cycles not working in 3d local view, and missing update when toggling hiding
Brecht Van Lommel [Mon, 25 Jun 2012 11:43:22 +0000 (11:43 +0000)]
Fix cycles not working in 3d local view, and missing update when toggling hiding
in the outliner.

9 years agoGuardedalloc/C++: delete is valid on a NULL pointer, add a check so MEM_freeN
Brecht Van Lommel [Mon, 25 Jun 2012 11:43:12 +0000 (11:43 +0000)]
Guardedalloc/C++: delete is valid on a NULL pointer, add a check so MEM_freeN
doesn't print warning messages.

9 years agoFix for cycles building with assertions on scons/windows.
Brecht Van Lommel [Mon, 25 Jun 2012 11:42:58 +0000 (11:42 +0000)]
Fix for cycles building with assertions on scons/windows.

9 years agothe mutex struct seems to be different across systems, use memset rather then an...
Campbell Barton [Mon, 25 Jun 2012 11:19:38 +0000 (11:19 +0000)]
the mutex struct seems to be different across systems, use memset rather then an initializer value.
also quiet warning in cycles.

9 years agoFix compile after 48262 ( braces)
Jens Verwiebe [Mon, 25 Jun 2012 11:13:27 +0000 (11:13 +0000)]
Fix compile after 48262 ( braces)

9 years agoMerging r48257 through r48263 from trunk into soc-2011-tomato
Sergey Sharybin [Mon, 25 Jun 2012 10:56:48 +0000 (10:56 +0000)]
Merging r48257 through r48263 from trunk into soc-2011-tomato

9 years agoAdded feather control to keying node
Sergey Sharybin [Mon, 25 Jun 2012 10:50:24 +0000 (10:50 +0000)]
Added feather control to keying node

Behaves in the same way as feather dilate/erode node, applies
after dilate/erode in node.

Also use distance dilate/erode instead of size.

9 years agomore guardedalloc use in C++, also make compositorMutex a static var, was allocated...
Campbell Barton [Mon, 25 Jun 2012 10:35:24 +0000 (10:35 +0000)]
more guardedalloc use in C++, also make compositorMutex a static var, was allocated and never freed.

9 years agooptionally use guarded alloc for tiles compositor, also replace allocation functions...
Campbell Barton [Mon, 25 Jun 2012 09:14:37 +0000 (09:14 +0000)]
optionally use guarded alloc for tiles compositor, also replace allocation functions with a macro.

9 years agocomment for TODO - rgb_to_bw / rgb_to_grayscale usage.
Campbell Barton [Mon, 25 Jun 2012 08:58:50 +0000 (08:58 +0000)]
comment for TODO - rgb_to_bw / rgb_to_grayscale usage.

9 years agoMerging r48255 through r48256 from trunk into soc-2011-tomato
Sergey Sharybin [Mon, 25 Jun 2012 08:24:12 +0000 (08:24 +0000)]
Merging r48255 through r48256 from trunk into soc-2011-tomato

9 years agoOptimization of Keying Blur operation
Sergey Sharybin [Mon, 25 Jun 2012 08:21:55 +0000 (08:21 +0000)]
Optimization of Keying Blur operation

Separate X and Y passes of blurring like it's done for flat
gaussian blur. This reduces computing difficulty from size^2
to 2*size without any visual changes in matte.

9 years agosvn merge ^/trunk/blender -r48245:48254
Campbell Barton [Mon, 25 Jun 2012 07:41:01 +0000 (07:41 +0000)]
svn merge ^/trunk/blender -r48245:48254

9 years agostyle cleanup
Campbell Barton [Mon, 25 Jun 2012 07:24:48 +0000 (07:24 +0000)]
style cleanup

9 years agoutility mesh function to return UV islands
Campbell Barton [Mon, 25 Jun 2012 07:24:01 +0000 (07:24 +0000)]
utility mesh function to return UV islands

9 years agoUse own version of ff_update_cur_dts for FFmpeg >= 0.11, seems
Sergey Sharybin [Mon, 25 Jun 2012 07:14:21 +0000 (07:14 +0000)]
Use own version of ff_update_cur_dts for FFmpeg >= 0.11, seems
linking against function which isn't public in API gives error
when met some circumstances.

9 years agoFixes for modifier data in multi-user meshes.
Nicholas Bishop [Sun, 24 Jun 2012 20:18:32 +0000 (20:18 +0000)]
Fixes for modifier data in multi-user meshes.

When removing a skin or multires modifier, it skips deletion of the
associated CustomData layer if the object has any other modifiers of
that type. This check has been extended to all objects that use the
object's data.

Similarly, deleting higher multires levels and multires subdivision
will not update the maximum level of any other multires modifiers on
objects that link to the same mesh.

Note that modifier_apply_obdata() doesn't need any changes as it
does not allow applying to multi-user data.

Object joining has also been modified to synchronize multires levels
objects that share a mesh. This is needed because joining can
subdivide or delete levels in order to match the maximum level of the
join-from object to the join-to object.

Fixes bug [#31880] instance multiresolution modifier error.

Reviewed by Sergey:

9 years agoMerging r48241 through r48245 from trunk into soc-2011-tomato
Sergey Sharybin [Sun, 24 Jun 2012 18:01:46 +0000 (18:01 +0000)]
Merging r48241 through r48245 from trunk into soc-2011-tomato

9 years agoTracking dopesheet missed tagigng for update in some cases.
Sergey Sharybin [Sun, 24 Jun 2012 18:00:14 +0000 (18:00 +0000)]
Tracking dopesheet missed tagigng for update in some cases.

9 years agoSkip edge matte operation creation if output socket is not connected.
Sergey Sharybin [Sun, 24 Jun 2012 17:38:14 +0000 (17:38 +0000)]
Skip edge matte operation creation if output socket is not connected.

9 years agoFix [#31807] Ngon triangulation error
Bastien Montagne [Sun, 24 Jun 2012 16:19:19 +0000 (16:19 +0000)]
Fix [#31807] Ngon triangulation error

*This implements a quite simple algorithm, which simply checks angles (actually, absolute cosines) of created tri and remaining face (which may be a tri, quad, or more NGon), so that both are "best" (ie avoid as much as possible too much narrow/wide corners), and also checks the new edge is OK (i.e. does not goes "out" of original face).
*Incidently, it fixes a typo in that bm_face_goodline() func!
*It's quite performant (a bit quicker than previous code, as far as I have tested it) and prevent creation of completely flat triangles as much as possible, but it's far from being a "best" solution (as it is still a "progressive" one)!
*It also introduces a new math func (in BLI_math_vector.h), cos_v3v3v3, which computes cosine (ie dot product of normalized vectors) and is roughly a quicker replacement for angle_v3v3v3, when real angles are not needed.

9 years agoMark some utility functions as static to avoid namespace conflicts
Sergey Sharybin [Sun, 24 Jun 2012 15:54:36 +0000 (15:54 +0000)]
Mark some utility functions as static to avoid namespace conflicts
and make export symbol table smaller.

9 years agoMerging r48238 through r48240 from trunk into soc-2011-tomato
Sergey Sharybin [Sun, 24 Jun 2012 15:31:40 +0000 (15:31 +0000)]
Merging r48238 through r48240 from trunk into soc-2011-tomato

9 years agoOptimization of keying screen node
Sergey Sharybin [Sun, 24 Jun 2012 15:29:43 +0000 (15:29 +0000)]
Optimization of keying screen node

Use AABB check before calculating barycentric coordinates.

In simple tests with FullHD image and 4-9 tracks used for gradient
gave 1.5-2x speedup.

9 years agoStyle cleanup
Sergey Sharybin [Sun, 24 Jun 2012 14:50:03 +0000 (14:50 +0000)]
Style cleanup

9 years agoMerging r48224 through r48237 from trunk into soc-2011-tomato
Sergey Sharybin [Sun, 24 Jun 2012 14:27:23 +0000 (14:27 +0000)]
Merging r48224 through r48237 from trunk into soc-2011-tomato

9 years agoFix crash sliding disabled marker from preview widget.
Sergey Sharybin [Sun, 24 Jun 2012 14:16:40 +0000 (14:16 +0000)]
Fix crash sliding disabled marker from preview widget.

Reported by brothermechanic, thanks!

9 years agoRelease cycles:
Thomas Dinges [Sun, 24 Jun 2012 14:08:34 +0000 (14:08 +0000)]
Release cycles:
*BCon 3 - beta.

9 years agoTypo and spelling fixes pointed by Lockal. thanks!
Sergey Sharybin [Sun, 24 Jun 2012 13:52:20 +0000 (13:52 +0000)]
Typo and spelling fixes pointed by Lockal. thanks!

9 years agoFix #31909: "Make Segment" on path-curves gives wrong result
Sergey Sharybin [Sun, 24 Jun 2012 11:27:28 +0000 (11:27 +0000)]
Fix #31909: "Make Segment" on path-curves gives wrong result

In fact fixed in easiest way -- always re-calculate knots array
on topology changes.

After some discussion with Ton we agreed on that having manually
editable knots is not intuitive and user should only define
cyclic/endpoints flags and knots would be re-calculated based
on this flags.

This means that it's unnecessary to have special logic for knots
manipulating in some topology changing tools and they could just
re-calculate knots for the whole nurb, without worrying that knots
could have been manually edited.

9 years agoFix #31908, better drawing for node group interface links. Links from/to node group...
Lukas Toenne [Sun, 24 Jun 2012 10:49:22 +0000 (10:49 +0000)]
Fix #31908, better drawing for node group interface links. Links from/to node group internal sockets (input/output columns on the side) were drawn in a kind of subtle "background" mode, making them hard to see behind nodes. This was still from pre-2.56.2 versions, where group interfaces were created automatically and these links were just indicators of which external socket a node refers to.

Now these links are drawn in the same way as all others. Also they now display highlighting correctly when inserting a node into a link, making it easier to avoid unwanted insertions.

9 years agoFixes for area of interest in keying nodes: no need to wait for the whole
Sergey Sharybin [Sun, 24 Jun 2012 10:31:48 +0000 (10:31 +0000)]
Fixes for area of interest in keying nodes: no need to wait for the whole
input image to be calculated in some cases, use only actual area which is
needed to calculate current tile.

Seems to be giving some % of speedup. Verified result of keying before
this patch and after this patch and they were identical, so hopefully
now area of interest is indeed correct.

9 years agoRemove unused header include.
Sergey Sharybin [Sun, 24 Jun 2012 09:55:10 +0000 (09:55 +0000)]
Remove unused header include.

9 years agostyle cleanyp
Campbell Barton [Sat, 23 Jun 2012 23:22:19 +0000 (23:22 +0000)]
style cleanyp

9 years agoAdded option for exporting material based textures. Cleaned up header files due to...
Gaia Clary [Sat, 23 Jun 2012 22:03:31 +0000 (22:03 +0000)]
Added option for exporting material based textures. Cleaned up header files due to a bug in osx

9 years agoMerging r48196 through r48223 from trunk into soc-2011-tomato
Sergey Sharybin [Sat, 23 Jun 2012 18:08:56 +0000 (18:08 +0000)]
Merging r48196 through r48223 from trunk into soc-2011-tomato

9 years agoKeying node: assume overexposured pixels as foreground
Sergey Sharybin [Sat, 23 Jun 2012 18:04:41 +0000 (18:04 +0000)]
Keying node: assume overexposured pixels as foreground

Screens are usually doesn't have overexposured pixels and all
saturation / gradient math was written assuming that all channels
are withing 0 .. 1 range and in cases when some channel exceeds
this range matte could be completely wrong.

Added special check for overesposure and assume such pixels as
definitely foreground.

Also fixed minimal value for edge kernel size.

9 years agoadd cmake option WITH_SYSTEM_OPENJPEG so linux can build cycles without having libope...
Campbell Barton [Sat, 23 Jun 2012 14:23:44 +0000 (14:23 +0000)]
add cmake option WITH_SYSTEM_OPENJPEG so linux can build cycles without having libopenjpeg installed.

9 years agorename WITH_BUILTIN_GLEW, WITH_SYSTEM_GLEW & negate.
Campbell Barton [Sat, 23 Jun 2012 13:42:14 +0000 (13:42 +0000)]

9 years agoFix for [#29412] "Priority 0 cause problems with pulse mode" reported by Guillaume...
Mitchell Stokes [Sat, 23 Jun 2012 03:39:03 +0000 (03:39 +0000)]
Fix for [#29412] "Priority 0 cause problems with pulse mode" reported by Guillaume Côté.

Right now this is being fixed by not allowing the exact same action (action, start/end frames, speed, etc) to be played if it's already playing. Hopefully this will not cause more issues than it solves.

9 years agoSVN maintenance.
Guillermo S. Romero [Sat, 23 Jun 2012 02:10:54 +0000 (02:10 +0000)]
SVN maintenance.

9 years agoFix: Collada (Exporter) replaced the initial operator Presets with 2 up to date versions
Gaia Clary [Fri, 22 Jun 2012 17:14:50 +0000 (17:14 +0000)]
Fix: Collada (Exporter) replaced the initial operator Presets with 2 up to date versions

9 years agoCollada: (Export) Added export of surface textures, and control over exported uv...
Gaia Clary [Fri, 22 Jun 2012 16:16:58 +0000 (16:16 +0000)]
Collada: (Export) Added export of surface textures, and control over exported uv layers

9 years agoadded new function BKE_imbuf_to_image_format
Gaia Clary [Fri, 22 Jun 2012 15:40:49 +0000 (15:40 +0000)]
added new function BKE_imbuf_to_image_format

9 years agofixed function name: BLI_rebase_path, reworked description, added enum bli_rebase_sta...
Gaia Clary [Fri, 22 Jun 2012 15:38:49 +0000 (15:38 +0000)]
fixed function name: BLI_rebase_path, reworked description, added enum bli_rebase_state for defined return values

9 years agosvn merge ^/trunk/blender -r48188:48195
Campbell Barton [Fri, 22 Jun 2012 15:08:33 +0000 (15:08 +0000)]
svn merge ^/trunk/blender -r48188:48195

9 years agoremove scene from new compositor classes. only needs RenderData
Campbell Barton [Fri, 22 Jun 2012 15:06:52 +0000 (15:06 +0000)]
remove scene from new compositor classes. only needs RenderData

9 years agofix for [#31890] Lens Distortion inside Node group don't work
Jeroen Bakker [Fri, 22 Jun 2012 14:43:25 +0000 (14:43 +0000)]
fix for [#31890] Lens Distortion inside Node group don't work

9 years agoNullpointer exception happened when all input sockets of a (for example)
Jeroen Bakker [Fri, 22 Jun 2012 13:24:43 +0000 (13:24 +0000)]
Nullpointer exception happened when all input sockets of a (for example)
a translate node were connected with the same complex node (like lens

Added a check to see if the list of buffers are available to resolve
this issue.

9 years ago * fix for [#31553] Tile Compositor: Strange seams
Jeroen Bakker [Fri, 22 Jun 2012 13:11:38 +0000 (13:11 +0000)]
 * fix for [#31553] Tile Compositor: Strange seams

9 years agowhen draw-other-uv's is enabled. fallback to the spaces image if no active face is...
Campbell Barton [Fri, 22 Jun 2012 12:31:16 +0000 (12:31 +0000)]
when draw-other-uv's is enabled. fallback to the spaces image if no active face is found.

9 years agosvn merge ^/trunk/blender -r48168:48188
Campbell Barton [Fri, 22 Jun 2012 11:56:21 +0000 (11:56 +0000)]
svn merge ^/trunk/blender -r48168:48188

9 years agomask re-key feature - mango request. ability to reset selected points shape key data.
Campbell Barton [Fri, 22 Jun 2012 11:53:49 +0000 (11:53 +0000)]
mask re-key feature - mango request. ability to reset selected points shape key data.

useful if you add many keys to one part of a curve, then later want to key another part - but dont want to continuously make the same corrections.

9 years agouse an inline function for rgb -> bw conversion.
Campbell Barton [Fri, 22 Jun 2012 07:49:44 +0000 (07:49 +0000)]
use an inline function for rgb -> bw conversion.

9 years agoThis backtracks an error introduced in r48155 when trying to fix: http://projects...
Nicholas Rishel [Fri, 22 Jun 2012 04:40:38 +0000 (04:40 +0000)]
This backtracks an error introduced in r48155 when trying to fix:

First half of the problem is fixed, but the second issue regarding edge/vertex snapping disregarding angle constraints will need some refactoring eventually.

9 years ago[#31885] uiItemMenuEnumO / layout.operator_menu_enum() fails silently with bad proper...
Dan Eicher [Thu, 21 Jun 2012 20:14:27 +0000 (20:14 +0000)]
[#31885] uiItemMenuEnumO / layout.operator_menu_enum() fails silently with bad property argument.

uiItemsFullEnumO() not displaying an RNA_warning if the prop doesn't exist/isn't an enum

9 years agohue color display still was shifted, turned out the resolution was a bit too low.
Campbell Barton [Thu, 21 Jun 2012 19:45:36 +0000 (19:45 +0000)]
hue color display still was shifted, turned out the resolution was a bit too low.

9 years ago[#31895] Connect 'Hue Correct' to 'Viewer' crashes.
Jeroen Bakker [Thu, 21 Jun 2012 18:32:23 +0000 (18:32 +0000)]
[#31895] Connect 'Hue Correct' to 'Viewer' crashes.

9 years ago * only calculate node preview that are visible (node_preview flag set &
Jeroen Bakker [Thu, 21 Jun 2012 18:22:43 +0000 (18:22 +0000)]
 * only calculate node preview that are visible (node_preview flag set &
node_hidden unset)

9 years ago * make it possible to composite without an compositor node [#31878]
Jeroen Bakker [Thu, 21 Jun 2012 17:58:12 +0000 (17:58 +0000)]
 * make it possible to composite without an compositor node [#31878]
Tiles Compositor: Fails without 'Compositor' output node. Regression.

9 years ago * fix to support for multiple OpenCL platform for the Compositor
Jeroen Bakker [Thu, 21 Jun 2012 16:05:56 +0000 (16:05 +0000)]
 * fix to support for multiple OpenCL platform for the Compositor

9 years agocolor backdrop on hue balance was misleading (shifted to the right)
Campbell Barton [Thu, 21 Jun 2012 15:42:08 +0000 (15:42 +0000)]
color backdrop on hue balance was misleading (shifted to the right)

9 years agohue correct node: draw hsv backdrop with full alpha.
Campbell Barton [Thu, 21 Jun 2012 15:03:30 +0000 (15:03 +0000)]
hue correct node: draw hsv backdrop with full alpha.

9 years agoCorrect openjpeg for scons too.
Antony Riakiotakis [Thu, 21 Jun 2012 14:49:10 +0000 (14:49 +0000)]
Correct openjpeg for scons too.

9 years agoSet openjpeg to static. Solves linking issues on recent openjpeg update
Antony Riakiotakis [Thu, 21 Jun 2012 14:44:15 +0000 (14:44 +0000)]
Set openjpeg to static. Solves linking issues on recent openjpeg update