9 years agosvn merge ^/trunk/blender -r49644:49653
Campbell Barton [Tue, 7 Aug 2012 13:38:35 +0000 (13:38 +0000)]
svn merge ^/trunk/blender -r49644:49653

9 years agomask - draw both sides of the curve when `filled` option is disabled.
Campbell Barton [Tue, 7 Aug 2012 13:37:16 +0000 (13:37 +0000)]
mask - draw both sides of the curve when `filled` option is disabled.

9 years agoTomato Cycles: report currently rendering sample when using GPU
Sergey Sharybin [Tue, 7 Aug 2012 13:27:19 +0000 (13:27 +0000)]
Tomato Cycles: report currently rendering sample when using GPU

Currently it makes more sense to use single tile for GPU rendering
and in this case tile-based progress report doesn't work well.

Since threading happens within single tile, it's possible to
detect currently computing sample and report it to the interface,

This also allows to display smoother progress when using CPU
with small amount of tiles.

9 years agoCode Cleanup:
Thomas Dinges [Tue, 7 Aug 2012 13:22:40 +0000 (13:22 +0000)]
Code Cleanup:
* Remove old comment, Internal Player is working again.

9 years agoFix knife stack overflow (bug #31907).
Howard Trickey [Tue, 7 Aug 2012 12:54:32 +0000 (12:54 +0000)]
Fix knife stack overflow (bug #31907).
The mutual recursion was removed: it was not needed.

9 years agoFix for fix, now nested
Jens Verwiebe [Tue, 7 Aug 2012 12:09:48 +0000 (12:09 +0000)]
Fix for fix, now nested

9 years agoFix for endiantest, xcode condition interferred with other os
Jens Verwiebe [Tue, 7 Aug 2012 12:03:43 +0000 (12:03 +0000)]
Fix for endiantest, xcode condition interferred with other os

9 years agoFix for particle influence textures. These now work with "Particle/Strand" input...
Lukas Toenne [Tue, 7 Aug 2012 10:54:50 +0000 (10:54 +0000)]
Fix for particle influence textures. These now work with "Particle/Strand" input coordinates, mapping the relative particle index into the [-1, 1] Y-coordinate range.

9 years agoOSX: disable kernels in cycles gpu again, would only work in 10.8 afaik
Jens Verwiebe [Tue, 7 Aug 2012 10:10:03 +0000 (10:10 +0000)]
OSX: disable kernels in cycles gpu again, would only work in 10.8 afaik

9 years agosvn merge ^/trunk/blender -r49638:49644
Campbell Barton [Tue, 7 Aug 2012 10:06:31 +0000 (10:06 +0000)]
svn merge ^/trunk/blender -r49638:49644

9 years agofix a crash when python is registering enum properties and the `items` argument is...
Campbell Barton [Tue, 7 Aug 2012 10:03:14 +0000 (10:03 +0000)]
fix a crash when python is registering enum properties and the `items` argument is a generator (some sequence type besides a list/typle), in this case it could free the strings before blender duplicates them.

this fixes [#32192] Import Images as Planes script is broken

9 years agoOSX/cmake: Mountain-Lion (10.8 )adaptions, skip unsupported endianess etc., todo...
Jens Verwiebe [Tue, 7 Aug 2012 10:02:34 +0000 (10:02 +0000)]
OSX/cmake: Mountain-Lion (10.8 )adaptions, skip unsupported endianess etc., todo: deployment target management

9 years agoCode cleanup: remove unused sample counter from render session
Sergey Sharybin [Tue, 7 Aug 2012 09:54:55 +0000 (09:54 +0000)]
Code cleanup: remove unused sample counter from render session

It's not used since new tile-based rendering and it was confusing
to have it in both session and tile manager.

Should be no functional changes.

9 years agoTomato Cycles: do not discard unfinished tiles on cancel
Sergey Sharybin [Tue, 7 Aug 2012 09:22:26 +0000 (09:22 +0000)]
Tomato Cycles: do not discard unfinished tiles on cancel

Do not discard (fill with black) tiles which are not fully rendered
(not all the samples are calculated for tile) when canceling render.

This could be helpful to tweak some settings when render glitch is
discovered. Also it could be used in such scenarios as setting
samples number to something really high and render still image
until result is reasonable, controlling this manually.

This could make cancel not so responsible on CPU, but it wouldn't
be less responsible than GPU, also could potentially give some
%% of speedup by avoiding checking cancel state after every pixel

9 years agospeedup to inpaint node in my tests was about ~30% for an optimized build.
Campbell Barton [Tue, 7 Aug 2012 09:20:30 +0000 (09:20 +0000)]
speedup to inpaint node in my tests was about ~30% for an optimized build.

also replace MIN/MAX2 with inline functions in transform.

9 years agoMerging r49635 through r49638 from trunk into soc-2011-tomato
Sergey Sharybin [Tue, 7 Aug 2012 07:59:48 +0000 (07:59 +0000)]
Merging r49635 through r49638 from trunk into soc-2011-tomato

9 years agoFix for drawing arrows on node lines between two reroute nodes. This was a typo in...
Lukas Toenne [Mon, 6 Aug 2012 20:48:08 +0000 (20:48 +0000)]
Fix for drawing arrows on node lines between two reroute nodes. This was a typo in r48762 which inverted the arrow scale.

9 years agosvn merge ^/trunk/blender -r49628:49634
Campbell Barton [Mon, 6 Aug 2012 19:37:35 +0000 (19:37 +0000)]
svn merge ^/trunk/blender -r49628:49634

9 years agoremove unused mask pointer
Campbell Barton [Mon, 6 Aug 2012 19:31:34 +0000 (19:31 +0000)]
remove unused mask pointer

9 years agoSwitching images in the image space would modify UV coordinates.
Campbell Barton [Mon, 6 Aug 2012 19:28:22 +0000 (19:28 +0000)]
Switching images in the image space would modify UV coordinates.

This is an intended feature but works too unreliably.

- This setting was stored in each face and only editable by re-running the unwrap, this is too hidden (only discovered this by reading code).
- This worked with blender internal but not with cycles, such basic options as changing an image shouldn't behave different depending on the render engine selected.

I've ifdef'd out the aspect correction for now, it could be added back as a per scene option and be made to run on both cycles or blender internal but for now I prefer to keep this disabled.

9 years agoAdding "inpaint" as allowed words...
Bastien Montagne [Mon, 6 Aug 2012 19:19:51 +0000 (19:19 +0000)]
Adding "inpaint" as allowed words...

9 years agoTile fix: Use the validity flag in node links directly instead of the indirect node...
Lukas Toenne [Mon, 6 Aug 2012 19:11:59 +0000 (19:11 +0000)]
Tile fix: Use the validity flag in node links directly instead of the indirect node level check for cyclic links to avoid crash in cases of invalid links, which can be created in some situations (reroute nodes). The link flag may have been set by additional constraints. It is much simpler to use and avoids the redundant check.

9 years agoFix for incomplete Reroute node updates. Adding reroute nodes by spliting links would...
Lukas Toenne [Mon, 6 Aug 2012 18:49:28 +0000 (18:49 +0000)]
Fix for incomplete Reroute node updates. Adding reroute nodes by spliting links would often result in unrelated color sockets or otherwise miss updates.

The reason is that the per-node updates used for Reroute node type inheritance are not supposed to be looking at connected nodes, they are purely for "local" updates. For this sort of "global" update which requires depth-first search, the update function on the node tree level must be used instead.

9 years agoMerging r49624 through r49628 from trunk into soc-2011-tomato
Sergey Sharybin [Mon, 6 Aug 2012 17:07:20 +0000 (17:07 +0000)]
Merging r49624 through r49628 from trunk into soc-2011-tomato

9 years agoFix for Reroute nodes: Reloading could change socket types without updating the socke...
Lukas Toenne [Mon, 6 Aug 2012 16:25:38 +0000 (16:25 +0000)]
Fix for Reroute nodes: Reloading could change socket types without updating the socket data structs, leading to crash. This is caused by the node verification procedure, which resets any socket type to the initial type defined in the socket templates. Adding sockets dynamically without templates solves this (the sockets are then ignored by verification).

9 years agobring back the play option from 2.4x
Campbell Barton [Mon, 6 Aug 2012 16:07:11 +0000 (16:07 +0000)]
bring back the play option from 2.4x

9 years agomissed this when merging inpaint
Campbell Barton [Mon, 6 Aug 2012 15:59:09 +0000 (15:59 +0000)]
missed this when merging inpaint

9 years agofix for memory leak playing animations.
Campbell Barton [Mon, 6 Aug 2012 15:54:52 +0000 (15:54 +0000)]
fix for memory leak playing animations.

9 years agoMerging r49622 through r49623 from trunk into soc-2011-tomato
Sergey Sharybin [Mon, 6 Aug 2012 15:22:19 +0000 (15:22 +0000)]
Merging r49622 through r49623 from trunk into soc-2011-tomato

9 years agoMade feather self-intersection check an option.
Sergey Sharybin [Mon, 6 Aug 2012 15:20:14 +0000 (15:20 +0000)]
Made feather self-intersection check an option.
Useful in cases when masking stuff like self-intersecting
ropes. This could probably be smarter option, but can't
currently think about robust approach here.

9 years agofix for bge module imports so you can do for eg:
Campbell Barton [Mon, 6 Aug 2012 14:29:25 +0000 (14:29 +0000)]
fix for bge module imports so you can do for eg:

  import bge.render as render

9 years agosvn merge ^/trunk/blender -r49601:49620
Campbell Barton [Mon, 6 Aug 2012 14:02:03 +0000 (14:02 +0000)]
svn merge ^/trunk/blender -r49601:49620

9 years agomisc small edits syncing with trunk
Campbell Barton [Mon, 6 Aug 2012 13:59:11 +0000 (13:59 +0000)]
misc small edits syncing with trunk

9 years agoMask feather self-intersection check
Sergey Sharybin [Mon, 6 Aug 2012 13:53:38 +0000 (13:53 +0000)]
Mask feather self-intersection check

Enable self-intersection check for preview. In own tests average
time for this operation on mango files was ~0.0015sec, and it was
like 20 splines max which still gives pretty smooth performance
on my core quad machine.

Would think let's check how it works for now, if it'll give some
issues here, would just avoid tessellation on every redraw by
storing tessellation in some cache (probably in mask user).

Another change is related on a way which loop to collapse.
Changed length check with AABB size check. A bit slower but
should be a bit more predictable.

9 years agoinpaint node from tomato branch by Peter Schlaile
Campbell Barton [Mon, 6 Aug 2012 13:45:11 +0000 (13:45 +0000)]
inpaint node from tomato branch by Peter Schlaile

9 years agoPatch [#32246] (Bugfix): UV editor -> "Proportional edit" together with "constrain...
Daniel Genrich [Mon, 6 Aug 2012 13:40:29 +0000 (13:40 +0000)]
Patch [#32246] (Bugfix): UV editor -> "Proportional edit" together with  "constrain to bounds" does not work.

Patch reviewed by Campbell Barton. Thanks!

9 years agoFix to knife: would sometimes miss cuts on non-planar faces.
Howard Trickey [Mon, 6 Aug 2012 13:37:25 +0000 (13:37 +0000)]
Fix to knife: would sometimes miss cuts on non-planar faces.
Also, there was a needless loop through all three loops of
a tesselation triangle, which all share the same original face.
Also, made an early out for case where an edge cut had already
been discovered on a Knife edge.

9 years agoRemove redundant typedef of BLI_Stack
Howard Trickey [Mon, 6 Aug 2012 13:31:28 +0000 (13:31 +0000)]
Remove redundant typedef of BLI_Stack
(caused compilation errors with some compilers)

9 years agofix for freeing NULL pointer.
Campbell Barton [Mon, 6 Aug 2012 13:04:40 +0000 (13:04 +0000)]
fix for freeing NULL pointer.

9 years agofix for own bug - missing NULL check when the image space starts a render job
Campbell Barton [Mon, 6 Aug 2012 12:14:02 +0000 (12:14 +0000)]
fix for own bug - missing NULL check when the image space starts a render job

9 years agomove pivot point and cursor out of UV rna into image space since both mask and uvedit...
Campbell Barton [Mon, 6 Aug 2012 12:12:45 +0000 (12:12 +0000)]
move pivot point and cursor out of UV rna into image space since both mask and uvedit use them.

9 years agoBugfix: Crash when changing collider type after loading blend file.
Daniel Genrich [Mon, 6 Aug 2012 11:55:52 +0000 (11:55 +0000)]
Bugfix: Crash when changing collider type after loading blend file.

Thanks to MiikaH for pointing out.

9 years agoFix #32271, Node group/parent crash. The grouping operators need to also look at...
Lukas Toenne [Mon, 6 Aug 2012 11:23:09 +0000 (11:23 +0000)]
Fix #32271, Node group/parent crash. The grouping operators need to also look at the non-selected nodes in the edit tree to find nodes whose parent is to be moved but the child is not, and then detach those.

9 years agofix [#32272] crash while rendering and modifying the node setup.
Campbell Barton [Mon, 6 Aug 2012 10:13:49 +0000 (10:13 +0000)]
fix [#32272] crash while rendering and modifying the node setup.

9 years agoTomato Cycles: report current scene and render layer being rendering
Sergey Sharybin [Mon, 6 Aug 2012 10:10:35 +0000 (10:10 +0000)]
Tomato Cycles: report current scene and render layer being rendering

Helps figuring out what exactly takes time when rendering in render farm.

9 years agostyle cleanup
Campbell Barton [Mon, 6 Aug 2012 10:03:17 +0000 (10:03 +0000)]
style cleanup

9 years agosvn merge ^/trunk/blender -r49573:49601
Campbell Barton [Mon, 6 Aug 2012 09:33:43 +0000 (09:33 +0000)]
svn merge ^/trunk/blender -r49573:49601

9 years agonode transform for frames was broken since the frames locx, locy are used as offsets...
Campbell Barton [Mon, 6 Aug 2012 09:08:24 +0000 (09:08 +0000)]
node transform for frames was broken since the frames locx, locy are used as offsets, now node transform uses node ccenters (works nicer for regular nodes too).

9 years agoprevent copy/paste from incompatible types (compo -> material for eg) - would crash...
Campbell Barton [Mon, 6 Aug 2012 08:41:45 +0000 (08:41 +0000)]
prevent copy/paste from incompatible types (compo -> material for eg) - would crash instantly.

9 years agofix for node clipboard leak on exit, also use blenders convention for function naming...
Campbell Barton [Mon, 6 Aug 2012 08:25:24 +0000 (08:25 +0000)]
fix for node clipboard leak on exit, also use blenders convention for function naming with BKE clipboard funcs.

9 years agofix for building in debug mode.
Campbell Barton [Mon, 6 Aug 2012 08:01:20 +0000 (08:01 +0000)]
fix for building in debug mode.

9 years agoFix for [#32054] "Animation break after resuming scene" reported by Andreas Esau...
Mitchell Stokes [Mon, 6 Aug 2012 00:53:26 +0000 (00:53 +0000)]
Fix for [#32054] "Animation break after resuming scene" reported by Andreas Esau (ndee). The action's timing was getting messed up which resulted in negative local frames, which were being counted as "done."

9 years agoAvoid recursion in skin modifier's edge matrix calculations
Nicholas Bishop [Sun, 5 Aug 2012 23:29:50 +0000 (23:29 +0000)]
Avoid recursion in skin modifier's edge matrix calculations

This is a potential fix for bug [#32263] Instant Crash with Skin

9 years agoAdd an array-based generic stack structure to blenlib
Nicholas Bishop [Sun, 5 Aug 2012 23:29:43 +0000 (23:29 +0000)]
Add an array-based generic stack structure to blenlib

Very simple stack with homogeneous contents. Provides push, pop, and
is-empty operations.

9 years agoFix for [#32270] "Removing a Character object from the scene causes a crash." reporte...
Mitchell Stokes [Sun, 5 Aug 2012 22:31:55 +0000 (22:31 +0000)]
Fix for [#32270] "Removing a Character object from the scene causes a crash." reported by me. The character's action wasn't being removed from the dynamics world when the character controller was.

9 years agoCOLLADA: report #32237 fixed Camera exporter and Importer to use correct camera...
Gaia Clary [Sun, 5 Aug 2012 21:35:09 +0000 (21:35 +0000)]
COLLADA: report #32237  fixed Camera exporter and Importer to use correct camera animation data

9 years agofix for transforming parented nodes, the node would check its parent was not transfor...
Campbell Barton [Sun, 5 Aug 2012 21:06:56 +0000 (21:06 +0000)]
fix for transforming parented nodes, the node would check its parent was not transformed, but in fact its parents parent could still be getting transformed still, also, the order of initializing transform data made this check unreliable.

fix for mingw broke from one of my own commits, changing header order fixes.

9 years agofix for crash when moving frames about in the node space, was possible to move a...
Campbell Barton [Sun, 5 Aug 2012 20:40:26 +0000 (20:40 +0000)]
fix for crash when moving frames about in the node space, was possible to move a node into its own child frame (causing recursive parent loop).

also some minor code cleanup.

9 years agofix for transforming parented nodes (parent relative offset wasn't taken into account)
Campbell Barton [Sun, 5 Aug 2012 20:16:14 +0000 (20:16 +0000)]
fix for transforming parented nodes (parent relative offset wasn't taken into account)

9 years agofix for crash when mask editing if there is an active point but no active spline.
Campbell Barton [Sun, 5 Aug 2012 18:12:34 +0000 (18:12 +0000)]
fix for crash when mask editing if there is an active point but no active spline.

9 years agoTomato Cycles: fix regression since rev49535
Sergey Sharybin [Sun, 5 Aug 2012 17:38:44 +0000 (17:38 +0000)]
Tomato Cycles: fix regression since rev49535

Wrong sample number was reporting in viewport rendering.

9 years agouse define for 0.375 = GLA_PIXEL_OFS, used all over the interface.
Campbell Barton [Sun, 5 Aug 2012 17:27:52 +0000 (17:27 +0000)]
use define for 0.375 = GLA_PIXEL_OFS, used all over the interface.
also use M_SQRT1_2 in math_rotation.c

9 years agoTomato Cycles: fix for vector pass gives wrong result in some circumstances
Sergey Sharybin [Sun, 5 Aug 2012 17:24:10 +0000 (17:24 +0000)]
Tomato Cycles: fix for vector pass gives wrong result in some circumstances

Issue was caused by wrong camera motion stored in device in cases
when first render layer does not have vector pass enabled.

Solved by forcing device camera update in cases when scene's motion
changed since previous device camera update.

9 years agocode cleanup: minor edit - replace memset() with zero initialization, remove unneeded...
Campbell Barton [Sun, 5 Aug 2012 15:04:10 +0000 (15:04 +0000)]
code cleanup: minor edit - replace memset() with zero initialization, remove unneeded NULL check in ibuf_sample()

9 years agocode cleanup: remove redundant calls to CTX_data_main()
Campbell Barton [Sun, 5 Aug 2012 14:11:51 +0000 (14:11 +0000)]
code cleanup: remove redundant calls to CTX_data_main()

9 years agofix uninitialized memory use for mask feather points, also remove some double promotions.
Campbell Barton [Sun, 5 Aug 2012 13:26:39 +0000 (13:26 +0000)]
fix uninitialized memory use for mask feather points, also remove some double promotions.

9 years agoMerging r49534 through r49573 from trunk into soc-2011-tomato
Sergey Sharybin [Sun, 5 Aug 2012 12:54:39 +0000 (12:54 +0000)]
Merging r49534 through r49573 from trunk into soc-2011-tomato

9 years agoCOLLADA: #29058 Fixed crash when illegal reference to non existing camera object...
Gaia Clary [Sun, 5 Aug 2012 10:23:34 +0000 (10:23 +0000)]
COLLADA: #29058 Fixed crash when illegal reference to non existing camera object is found. And report a warning to the console)

9 years agoFix for keying screen incorrect memory write when some of tracks are disabled.
Sergey Sharybin [Sun, 5 Aug 2012 09:31:48 +0000 (09:31 +0000)]
Fix for keying screen incorrect memory write when some of tracks are disabled.

9 years agoFix [#32260] 'Select Sharp Edges' works vice versa
Bastien Montagne [Sun, 5 Aug 2012 07:50:51 +0000 (07:50 +0000)]
Fix [#32260] 'Select Sharp Edges' works vice versa

We want to select edges sharpest than the given threshold, i.e. which faces’s angle is below the limit! Looks like BMesh switched this somehow...

9 years agoBGE: Fixing a NULL pointer exception caused by calling KX_Scene.active_camera when...
Mitchell Stokes [Sun, 5 Aug 2012 07:01:08 +0000 (07:01 +0000)]
BGE: Fixing a NULL pointer exception caused by calling KX_Scene.active_camera when there is no camera in the scene.

9 years agoCOLLADA: fix for #32251. This seems to be compliant to the Collada 1.4.1 specification.
Gaia Clary [Sat, 4 Aug 2012 22:18:56 +0000 (22:18 +0000)]
COLLADA: fix for #32251. This seems to be compliant to the Collada 1.4.1 specification.

9 years agoCOLLADA: added initial support for ymag and yfov in importer. fixes issue #32237
Gaia Clary [Sat, 4 Aug 2012 21:25:19 +0000 (21:25 +0000)]
COLLADA: added initial support for ymag and yfov in importer. fixes issue #32237

9 years agofix a glitch where overlapping feathering could give random bad pixels, this was...
Campbell Barton [Sat, 4 Aug 2012 21:04:26 +0000 (21:04 +0000)]
fix a glitch where overlapping feathering could give random bad pixels, this was caused by feather edge going in a different direction to the mask edge - creating bowtie quads.

9 years agoWindows MSVC libraries:
Thomas Dinges [Sat, 4 Aug 2012 20:25:04 +0000 (20:25 +0000)]
Windows MSVC libraries:
* Some refactor, use set_lib_path macro again, which simplifies the code a bit.

9 years agoresolve some issues with curve resolution calculaction
Campbell Barton [Sat, 4 Aug 2012 20:17:22 +0000 (20:17 +0000)]
resolve some issues with curve resolution calculaction
- resolution could become so high that it would wrap around  to a negative number, now check for small numbers before doing float division.
- resolution was being calculated in some cases when it already met the clamp value - now this is skipped.

9 years agostyle cleanup
Campbell Barton [Sat, 4 Aug 2012 19:34:38 +0000 (19:34 +0000)]
style cleanup

9 years agostyle cleanup
Campbell Barton [Sat, 4 Aug 2012 12:54:27 +0000 (12:54 +0000)]
style cleanup

9 years agoCmake / Windows Libraries:
Thomas Dinges [Sat, 4 Aug 2012 12:43:45 +0000 (12:43 +0000)]
Cmake / Windows Libraries:
* Some more fixes for OpenEXR, works now (tested with cv2008 x64 and x32)
* Some more changes to have libs in lib/win*/libname/vc2010 folder. Commit to libs itself to change that will follow.

9 years agostyle cleanup
Campbell Barton [Sat, 4 Aug 2012 12:30:16 +0000 (12:30 +0000)]
style cleanup

9 years agoCode cleanup:
Thomas Dinges [Sat, 4 Aug 2012 11:42:38 +0000 (11:42 +0000)]
Code cleanup:
* Remove BSP_GhostTest, not used and working for ages, approved by Sergey.

9 years agoRevert part of r49504 by Genscher:
Thomas Dinges [Sat, 4 Aug 2012 11:39:16 +0000 (11:39 +0000)]
Revert part of r49504 by Genscher:
* MSVC Paths were put into the MinGW block, so Mingw did not work anymore.
* Also fix paths for vc2010 libs now, so they should work now with cmake.

9 years agoCamera tracking presets
Sergey Sharybin [Sat, 4 Aug 2012 10:47:31 +0000 (10:47 +0000)]
Camera tracking presets

- Fix for copy default settings from active track operator
- Add meaningful tracking presets

API changes:

- Added parameter exact to Marker.find_frame, so now it's
  possible to get estimated marker

- Added Marker.pattern_bound_box to get pattern's bound box

9 years agoTomato Cycles: minor code cleanup
Sergey Sharybin [Sat, 4 Aug 2012 09:13:52 +0000 (09:13 +0000)]
Tomato Cycles: minor code cleanup

Move center tile acquiring code into own function. Should be
easier for time being when we'll want to support other tile
render orders.

Also now there should be a single bucket growing from center
when multi-GPU is used. Can't test this here tho.

9 years agocode cleanup: use camelcase for struct name.
Campbell Barton [Fri, 3 Aug 2012 23:44:50 +0000 (23:44 +0000)]
code cleanup: use camelcase for struct name.

9 years agodont re-combute composite nodes when knife and add-socket operators don't add any...
Campbell Barton [Fri, 3 Aug 2012 23:44:19 +0000 (23:44 +0000)]
dont re-combute composite nodes when knife and add-socket operators don't add any links.

9 years agoallow editing masks in an image space when there is no image.
Campbell Barton [Fri, 3 Aug 2012 22:33:45 +0000 (22:33 +0000)]
allow editing masks in an image space when there is no image.
also simplify image listener.

9 years agocode cleanup:
Campbell Barton [Fri, 3 Aug 2012 22:12:57 +0000 (22:12 +0000)]
code cleanup:
- replace (strcmp(vfont->name, FO_BUILTIN_NAME) == 0)  with  (BKE_vfont_is_builtin(vfont)).
- reduce some double promotions.

9 years agofullscreen mask editing now works in the image space over a viewer node.
Campbell Barton [Fri, 3 Aug 2012 20:56:04 +0000 (20:56 +0000)]
fullscreen mask editing now works in the image space over a viewer node.

9 years agomask transforming when a mesh object was in editmode (but had no UV's), failed
Campbell Barton [Fri, 3 Aug 2012 20:12:49 +0000 (20:12 +0000)]
mask transforming when a mesh object was in editmode (but had no UV's), failed

9 years agochange blender minversion because of BMesh data.
Campbell Barton [Fri, 3 Aug 2012 15:23:17 +0000 (15:23 +0000)]
change blender minversion because of BMesh data.

9 years agoTomato Cycles: internal cleanup of tile-based integrator
Sergey Sharybin [Fri, 3 Aug 2012 15:18:42 +0000 (15:18 +0000)]
Tomato Cycles: internal cleanup of tile-based integrator

This commit solves couple of issues appeared with new integrator:

- Render job progress bar is now shows progress based on number of
  rendered tiles. This is the same as Blender Internal does.

  This still requires some further thoughts because for GPU it's
  better to use single tile and in this case progress bar should
  be based on number of rendered samples.

- Removes "global" sample counter from progress descriptor. There's
  no more global-being sample which makes sense.

  This counter was replaced with tile counter.

- Use proper sample number when copying render buffer to blender.
  It used to be final sample number used which lead to tiles
  appearing from complete dark to normal brightness as they're
  being rendered. Now tile would be displayed with proper
  brightness starting from the very first sample.

  Use sample counter stored in render tile descriptor and pass
  it to update / write callbacks.

This was tested on CPU and GPU CUDA rendering.

Additional change:

  OpenCL rendering now should be cancellable before it finished
  rendering all the samples (the same change as for CPU/CUDA from
  a while ago).

This part of commit wasn't actually tested, would do it later.

9 years agosvn merge ^/trunk/blender -r49531:49533
Campbell Barton [Fri, 3 Aug 2012 15:05:20 +0000 (15:05 +0000)]
svn merge ^/trunk/blender -r49531:49533

9 years agofix/edits to vector font handling
Campbell Barton [Fri, 3 Aug 2012 15:03:40 +0000 (15:03 +0000)]
fix/edits to vector font handling
- don't overwrite the font path with "<builtin>" when the font file cant be found, it caused bad problems when loading files on someone elses systems when paths couldn't be found blender would silently clobber paths (tsk tsk).

- when fonts are freed their temp data is now freed too.

- assigning a new filepath to a font now refreshes the object data.

9 years agosvn merge ^/trunk/blender -r49520:49531
Campbell Barton [Fri, 3 Aug 2012 13:29:33 +0000 (13:29 +0000)]
svn merge ^/trunk/blender -r49520:49531

9 years agoadd option to link fonts in make links menu.
Campbell Barton [Fri, 3 Aug 2012 13:27:58 +0000 (13:27 +0000)]
add option to link fonts in make links menu.

9 years agofont filepath wasn't editable from python.
Campbell Barton [Fri, 3 Aug 2012 13:03:53 +0000 (13:03 +0000)]
font filepath wasn't editable from python.

9 years agoDO not draw active outline for collapsed nodes when they're not selected
Sergey Sharybin [Fri, 3 Aug 2012 11:39:34 +0000 (11:39 +0000)]
DO not draw active outline for collapsed nodes when they're not selected

Also made corrections to currently unused code

9 years agoCorrection top previous commit: tiles were counted in opposite way
Sergey Sharybin [Fri, 3 Aug 2012 11:13:38 +0000 (11:13 +0000)]
Correction top previous commit: tiles were counted in opposite way

9 years agoTomato Cycles: fix own regression in currently rendering tile status
Sergey Sharybin [Fri, 3 Aug 2012 10:55:33 +0000 (10:55 +0000)]
Tomato Cycles: fix own regression in currently rendering tile status