blender.git
9 years agosvn merge ^/trunk/blender -r48409:48411
Campbell Barton [Fri, 29 Jun 2012 14:39:38 +0000 (14:39 +0000)]
svn merge ^/trunk/blender -r48409:48411

9 years agoExtended modes for snapping in the node editor.
Lukas Toenne [Fri, 29 Jun 2012 14:34:46 +0000 (14:34 +0000)]
Extended modes for snapping in the node editor.
The transform operators in nodes will now use the unselected nodes to generate snapping points. Unlike object snapping, node snapping works for the x/y axes separately and snaps node borders to same borders of unselected nodes. The sensitive area for node borders extends over the whole view2D range, to enable simple alignment of nodes in both x and y direction.

For snap points in the node editor an additional enum value is stored to indicate the type of node border (left/right/top/bottom). This works as a constraint on possible node alignments: only same border types align with each other.

9 years agoMerging r48407 through r48409 from trunk into soc-2011-tomato
Sergey Sharybin [Fri, 29 Jun 2012 14:34:29 +0000 (14:34 +0000)]
Merging r48407 through r48409 from trunk into soc-2011-tomato

9 years agoAdded command line option "--debug-jobs"
Sergey Sharybin [Fri, 29 Jun 2012 14:32:25 +0000 (14:32 +0000)]
Added command line option "--debug-jobs"

This option enables time profiling of background jobs, namely it's
measuring run time of the job and prints it to the console.

9 years agoFix [#31939] Loop cutting a self intersecting face loop
Bastien Montagne [Fri, 29 Jun 2012 13:55:25 +0000 (13:55 +0000)]
Fix [#31939] Loop cutting a self intersecting face loop

Enabled use_gridfill for edgesubdivide called by loopcut. This will break edgeslide in this specific case (intersecting faceloop), but imho makes more sense this way than the other. Very easy to revert anyway, and this should only affect this specific cornercase.

9 years agosvn merge ^/trunk/blender -r48378:48406
Campbell Barton [Fri, 29 Jun 2012 13:11:44 +0000 (13:11 +0000)]
svn merge ^/trunk/blender -r48378:48406

9 years agoFixing a bug found while checking "[#31937] UV/Image Editor: Copy Mirrored UV Coords...
Bastien Montagne [Fri, 29 Jun 2012 12:41:39 +0000 (12:41 +0000)]
Fixing a bug found while checking "[#31937] UV/Image Editor: Copy Mirrored UV Coords" (which isn't a bug at all).

The tool works OK, except it was messing vertices' order of polys, often giving ugly results! Now only using sorted list of vertices indices to find matching polys.

9 years agoRelated to [#31936] Mesh saved in 2.63 with legacy format have holes instead ngons
Bastien Montagne [Fri, 29 Jun 2012 11:59:47 +0000 (11:59 +0000)]
Related to [#31936] Mesh saved in 2.63 with legacy format have holes instead ngons

Make clear in this option's tooltip that it only saves tris and quads, no implicit triangulation of other ngons, which are lost!

9 years agoFix #31953: Forcefield Texture using image file, gradient mode not working
Miika Hamalainen [Fri, 29 Jun 2012 11:44:46 +0000 (11:44 +0000)]
Fix #31953: Forcefield Texture using image file, gradient mode not working

9 years agoTomato Branch:
Thomas Dinges [Fri, 29 Jun 2012 11:42:57 +0000 (11:42 +0000)]
Tomato Branch:
* Compile fix for windows platforms, pow10 -> pow.

9 years agoTomato Branch:
Thomas Dinges [Fri, 29 Jun 2012 11:28:01 +0000 (11:28 +0000)]
Tomato Branch:
* Disable OCIO on windows per default, we don't have OCIO win libs yet.

9 years agoFix #31948: dynamic paint substeps do not work for objects parented to armatures
Miika Hamalainen [Fri, 29 Jun 2012 11:19:29 +0000 (11:19 +0000)]
Fix #31948: dynamic paint substeps do not work for objects parented to armatures

9 years agoFix compile error
Antony Riakiotakis [Fri, 29 Jun 2012 11:15:02 +0000 (11:15 +0000)]
Fix compile error

9 years agofix for crash scaling an image
Campbell Barton [Fri, 29 Jun 2012 10:52:37 +0000 (10:52 +0000)]
fix for crash scaling an image

9 years agoFix #31951 Subdivide with multires splits uvs.
Antony Riakiotakis [Fri, 29 Jun 2012 10:12:42 +0000 (10:12 +0000)]
Fix #31951 Subdivide with multires splits uvs.

The bug is related to 31581 and the main cause is the small offset that
BM_loop_interp_from_face introduces before calculating barycentric
weights. Solved by only calculating displacement layer.

9 years agocode cleanup: bge builds with clang without warnings / errors.
Campbell Barton [Fri, 29 Jun 2012 09:16:59 +0000 (09:16 +0000)]
code cleanup: bge builds with clang without warnings / errors.

9 years agofix for bug where user scripts path set by an environment variable would write preset...
Campbell Barton [Fri, 29 Jun 2012 08:33:13 +0000 (08:33 +0000)]
fix for bug where user scripts path set by an environment variable would write presets there but not show up in the menu.

9 years agoprint warning if a script in the addons dir has no bl_info.
Campbell Barton [Thu, 28 Jun 2012 19:22:13 +0000 (19:22 +0000)]
print warning if a script in the addons dir has no bl_info.

9 years agoAdd missing brush types to sculpt_tool_name()
Nicholas Bishop [Thu, 28 Jun 2012 19:12:00 +0000 (19:12 +0000)]
Add missing brush types to sculpt_tool_name()

This function is used to name undo pushes in sculpt mode, was missing
some of the newer brush types. Also tweaked the switch statement so
that it will warn for future missing cases and removed extraneous
breaks.

9 years agoadd NULL check for ibuf, was crashing while rendering randomly
Campbell Barton [Thu, 28 Jun 2012 17:26:21 +0000 (17:26 +0000)]
add NULL check for ibuf, was crashing while rendering randomly

9 years agosvn merge ^/trunk/blender -r48375:48378
Campbell Barton [Thu, 28 Jun 2012 15:41:44 +0000 (15:41 +0000)]
svn merge ^/trunk/blender -r48375:48378

9 years agofix for crash in python getting the image size for a sequence.
Campbell Barton [Thu, 28 Jun 2012 15:34:21 +0000 (15:34 +0000)]
fix for crash in python getting the image size for a sequence.

9 years agorevert part of 48340, it causes uvs across islands to stitch in a different way ...
Antony Riakiotakis [Thu, 28 Jun 2012 15:09:24 +0000 (15:09 +0000)]
revert part of 48340, it causes uvs across islands to stitch in a different way (?) than before

9 years agosvn merge ^/trunk/blender -r48370:48375
Campbell Barton [Thu, 28 Jun 2012 14:19:53 +0000 (14:19 +0000)]
svn merge ^/trunk/blender -r48370:48375

9 years agorecent fix for #31581 could crash when doing edge slide on a mesh with no UV's.
Campbell Barton [Thu, 28 Jun 2012 14:18:04 +0000 (14:18 +0000)]
recent fix for #31581 could crash when doing edge slide on a mesh with no UV's.

9 years agocode cleanup: compile with clang and quiet some warnings.
Campbell Barton [Thu, 28 Jun 2012 12:32:06 +0000 (12:32 +0000)]
code cleanup: compile with clang and quiet some warnings.

9 years agosvn merge ^/trunk/blender -r48333:48370
Campbell Barton [Thu, 28 Jun 2012 11:20:19 +0000 (11:20 +0000)]
svn merge ^/trunk/blender -r48333:48370

9 years agoForgot these files in previous commit.
Brecht Van Lommel [Thu, 28 Jun 2012 11:16:47 +0000 (11:16 +0000)]
Forgot these files in previous commit.

9 years agoFix for image node: The button draw function was using the image user pointer for...
Lukas Toenne [Thu, 28 Jun 2012 10:59:40 +0000 (10:59 +0000)]
Fix for image node: The button draw function was using the image user pointer for displaying properties, which does not work correctly. The image node has to redefine image user RNA properties in order to make correct update calls and to have meaningful image layer names. For these properties the node pointer itself has to be used then.

9 years agoCycles: regular rendering now works tiled, and supports save buffers to
Brecht Van Lommel [Thu, 28 Jun 2012 10:34:38 +0000 (10:34 +0000)]
Cycles: regular rendering now works tiled, and supports save buffers to
save memory during render and cache render results.

Implementation notes:

In the render engine API it's now possible to get the render result for
one render layer only, and retrieve the expected tile size in case save
buffers is used. This is needed because EXR expects tiles with particular
size and coordinates.

The EXR temporary files are now also separated per layer, since Cycles
can't give the full render result for all render layers, and EXR doesn't
support writing parts of tiles.

In Cycles internally the handling of render buffers and multi GPU
rendering in particular changed quite a bit, and could use a bit more
refactoring to make things more consistent and simple.

9 years agoMove color management check stuff from blo_read_file_internal to setup_app_data
Sergey Sharybin [Thu, 28 Jun 2012 10:05:22 +0000 (10:05 +0000)]
Move color management check stuff from blo_read_file_internal to setup_app_data

9 years agoFix for [#23375] "texture2D in custom 2D filters can get texture outside of game...
Mitchell Stokes [Thu, 28 Jun 2012 09:37:30 +0000 (09:37 +0000)]
Fix for [#23375] "texture2D in custom 2D filters can get texture outside of game, resulting in ugliness" reported by Jacob F.

The 2D Filter system now only copies the game viewport instead of the whole window. This prevents 2D Filters from grabbing data outside of the game viewport. The textures for 2D filters are now also not forced to be powers of two (if NPOT textures are supported), which can save a little bit of VRAM.

9 years agofix for segfault on undo because of loading color profile info.
Campbell Barton [Thu, 28 Jun 2012 09:18:07 +0000 (09:18 +0000)]
fix for segfault on undo because of loading color profile info.

9 years agoFix #31835: OBJ Importer corrupts a model (crash in edit mode)
Sergey Sharybin [Thu, 28 Jun 2012 09:08:11 +0000 (09:08 +0000)]
Fix #31835: OBJ Importer corrupts a model (crash in edit mode)

Added back face validation to BKE_mesh_validate_arrays.

This is needed because some addons (like OBJ importer) are reading
tessfaces and then converting them to ngons and validation of tessfaces
is needed before such a conversion.

Validation of faces would happen only if there's no polys in mesh.

9 years agocode cleanup: cmake buildsystem edits, unused var warnings and better description...
Campbell Barton [Thu, 28 Jun 2012 08:51:02 +0000 (08:51 +0000)]
code cleanup: cmake buildsystem edits, unused var warnings and better description for WITH_PYTHON_MODULE.
also disable workaround for some linux installs.

9 years agoBasic snapping in node transform operator.
Lukas Toenne [Thu, 28 Jun 2012 08:47:22 +0000 (08:47 +0000)]
Basic snapping in node transform operator.

Snapping actually was working already, but grid spacing was set to 1.0, which is basically pixel size in the node editor. Increased this to 1x grid step for fine snapping and 5x grid step for rough snapping.

Grid drawing in node editor now draws 2 levels in slightly different shades to indicate the different snapping modes better.

Node editor also supports the general use_snap tool setting to enable automatic snapping during transform. For now only the incremental snapping is supported, in future could be extended to enable alignment between nodes in a number of ways.

9 years agodocument calling operators with undo enabled.
Campbell Barton [Thu, 28 Jun 2012 08:17:28 +0000 (08:17 +0000)]
document calling operators with undo enabled.

9 years agoFix #31929: VSE crash with relative paths and rebuilding proxies
Sergey Sharybin [Thu, 28 Jun 2012 07:58:34 +0000 (07:58 +0000)]
Fix #31929: VSE crash with relative paths and rebuilding proxies

9 years agocode cleanup: when heat weighting dont loop through all polys when its not needed.
Campbell Barton [Thu, 28 Jun 2012 07:18:19 +0000 (07:18 +0000)]
code cleanup: when heat weighting dont loop through all polys when its not needed.

9 years agofix [#31940] crash with automatic weights
Campbell Barton [Thu, 28 Jun 2012 07:13:03 +0000 (07:13 +0000)]
fix [#31940] crash with automatic weights

9 years agoRemoving channel manipulation from the Action Actuator Python API since this has...
Mitchell Stokes [Thu, 28 Jun 2012 06:22:47 +0000 (06:22 +0000)]
Removing channel manipulation from the Action Actuator Python API since this has been broken since the animation changes from Pepper. BL_ArmatureObject.channels should be used instead. For more information see bug #28843 for more info:
http://projects.blender.org/tracker/index.php?func=detail&aid=28843&group_id=9&atid=306

9 years agocommitted debug memcount by accident
Campbell Barton [Wed, 27 Jun 2012 22:27:04 +0000 (22:27 +0000)]
committed debug memcount by accident

9 years agobge.logic.keyboard.getClipboard() and .setClipboard methods
Dalai Felinto [Wed, 27 Jun 2012 21:57:33 +0000 (21:57 +0000)]
bge.logic.keyboard.getClipboard() and .setClipboard methods
the idea of using methods instead of attributes is to avoid users abusing of the system calls.

Thanks Campbell Barton for reviewing and small corrections

9 years agooption so operators can be executed with undo enabled (and redo).
Campbell Barton [Wed, 27 Jun 2012 21:41:17 +0000 (21:41 +0000)]
option so operators can be executed with undo enabled (and redo).

9 years agomissed tiff using 150 dpi as default in previous commit, use a define now.
Campbell Barton [Wed, 27 Jun 2012 19:28:44 +0000 (19:28 +0000)]
missed tiff using 150 dpi as default in previous commit, use a define now.

9 years agoAvoid adding overlapping triangles in convex hull
Nicholas Bishop [Wed, 27 Jun 2012 18:39:17 +0000 (18:39 +0000)]
Avoid adding overlapping triangles in convex hull

Add an epsilon value to the point-outside-hull test, helps when some
of the input vertices are nearly coplanar.

Fixes bug [#31941] convex hull fails (and depends on vertex order when it shouldn't)
http://projects.blender.org/tracker/index.php?func=detail&aid=31941&group_id=9&atid=498

9 years agostyle cleanup
Campbell Barton [Wed, 27 Jun 2012 18:29:47 +0000 (18:29 +0000)]
style cleanup

9 years agochange default DPI for images to 72, aparently 150 gives issues with adobe apps...
Campbell Barton [Wed, 27 Jun 2012 18:11:24 +0000 (18:11 +0000)]
change default DPI for images to 72, aparently  150 gives issues with adobe apps (which is stupid but default value isnt so important).

9 years agoClean-up and refactor of current OCIO integration
Sergey Sharybin [Wed, 27 Jun 2012 18:10:53 +0000 (18:10 +0000)]
Clean-up and refactor of current OCIO integration

- Cleaned up some files -- seems there were some wrongly resolved
  conflicts which resulted into duplicated code in space_image.py
  and some build configuration files.
- Store all color space related data (such as display device, view
  transform and so) as strings, so it could easily be ported to new
  OCIO configuration files and it'll be much more portable between
  different configurations.

  This required adding some look-ups to RNA associated with such
  settings, but it's indeed the only way to do this. If it'll be
  figured out such look-ups causes performance issues it's possible
  to optimize this further using hash. So far it's only few elements
  in list to be looked up.
- Added support of display device transformation from OCIO
  configuration files. Display device is setting per-window and
  different windows could have different display devices, so it's
  possible to have one blender window opened on sRGB monitor and
  another one on xyz projector.

  Display device is ignored when using ACES ODT Tonecurve view
  transform due to it's not an OCIO transformation. Probably it'll
  be possible to get rid of this tone curve soon (if it'll be
  proved useless or it'll be implemented as a part of OCIO LUT).
- Movie Cache now supports deleter functions for user keys, so
  such keys could have some allocated data which would be removed
  as soon as element in cache is being removed.
- Movie Cache now support callbacks to check whether current
  cache element could be removed from a cache due to it wouldn't
  be accessed anymore.
- Re-written cache stuff for display buffers of ImBuf. Now it's
  using Movie Cache which is global for all ImBufs.

  Probably it's not implemented in fastest way, would be investigated
  further and probably changed it performance wouldn't be good enough.

9 years agostyle cleanup: header comments, use more doxy compat formatting
Campbell Barton [Wed, 27 Jun 2012 17:48:39 +0000 (17:48 +0000)]
style cleanup: header comments, use more doxy compat formatting

9 years agoFix for #31581, UVs shrink on edge slide.
Antony Riakiotakis [Wed, 27 Jun 2012 17:08:12 +0000 (17:08 +0000)]
Fix for #31581, UVs shrink on edge slide.

Issue is that all loops of a face adjacent to the sliding verts were
getting project-corrected. Introduced a test to only project the
affected loops.

The projection code introduces a small offset to the boundaries so that
any boundary tests can work as expected, but this leads to shrinking of
the barycentric coordinates of the projection, causing a shrink of the
uvs in turn. This even affects the uvs that -should- be affected though
the unfixed behavior works strangely in a correctish way (my guess is
because the projection uses the same face as the opposite sliding loop).

I fixed the behaviour by taking the mean value of the uvs. This won't
support seams but current code doesn't either. Also, all CustomData to
exhibit this unfixed behaviour. I only fixed the uv case, other data
(Vcolors, etc) will have discontinuities when edge sliding. I expect
that the CorrectUV code I am working on may address some of these
issues.

Also, added NULL checks for utility function (was intended for this bug
but wasn't needed after all)

9 years agoUtility function to get the first loop of a vert. Behaves identical to
Antony Riakiotakis [Wed, 27 Jun 2012 15:39:14 +0000 (15:39 +0000)]
Utility function to get the first loop of a vert. Behaves identical to
the iterator initialization function.

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.

Vector.dot() 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