blender.git
7 years agoMerging r49775 through r49807 from trunk into soc-2011-tomato
Sergey Sharybin [Sat, 11 Aug 2012 14:39:09 +0000 (14:39 +0000)]
Merging r49775 through r49807 from trunk into soc-2011-tomato

7 years agoStyle cleanup: whitespace and line breaks
Sergey Sharybin [Sat, 11 Aug 2012 14:38:02 +0000 (14:38 +0000)]
Style cleanup: whitespace and line breaks

7 years agoSequencer: support for masked color balance
Sergey Sharybin [Sat, 11 Aug 2012 14:37:58 +0000 (14:37 +0000)]
Sequencer: support for masked color balance

This implements option which could be used to color balance only
specified area. Currently done by adding Mask input to Adjustment
effect. Affects on color balance and multiply settings.

Supporting masked saturation control is in the list, not supported
in this commit.

Also show value slider in the right of color wheel.

7 years agosimplified data_to_c macro in cmake
Campbell Barton [Sat, 11 Aug 2012 13:32:19 +0000 (13:32 +0000)]
simplified data_to_c macro in cmake

7 years agogenerate glsl shaders c files at build time.
Campbell Barton [Sat, 11 Aug 2012 13:01:44 +0000 (13:01 +0000)]
generate glsl shaders c files at build time.

7 years agostartup.blend and preview.blend are now converted to C at build time.
Campbell Barton [Sat, 11 Aug 2012 12:26:43 +0000 (12:26 +0000)]
startup.blend and preview.blend are now converted to C at build time.

made some changes to startup.c
- change default player to internal since its working now.
- added new screen for full screen 3d viewport (nice for demo's and navigating)
- disable cursor depth option (was enabled by default because of re-used flag)

7 years agoadd MEM_recallocN(), so bytes are ensured to be zero'd when growing.
Campbell Barton [Sat, 11 Aug 2012 12:16:09 +0000 (12:16 +0000)]
add MEM_recallocN(), so bytes are ensured to be zero'd when growing.

7 years agoCode cleanup and minor change to CMake's colalda detection to make
Sergey Sharybin [Sat, 11 Aug 2012 10:32:27 +0000 (10:32 +0000)]
Code cleanup and minor change to CMake's colalda detection to make
it detect directory structure used for libs in our svn (<root>/include/<component>/include)

7 years agodocs for window structs
Campbell Barton [Sat, 11 Aug 2012 01:05:09 +0000 (01:05 +0000)]
docs for window structs

7 years agofix for minor UI annoyance - when the window is fullscreen now dont draw area corners...
Campbell Barton [Sat, 11 Aug 2012 00:05:57 +0000 (00:05 +0000)]
fix for minor UI annoyance - when the window is fullscreen now dont draw area corners since areas cant be split when fullscreen.

7 years agoFix effect settings panel for adjustment effect
Sergey Sharybin [Fri, 10 Aug 2012 16:07:13 +0000 (16:07 +0000)]
Fix effect settings panel for adjustment effect

Since r46801 options used for this effect were moved to input panel.

7 years agosvn merge ^/trunk/blender -r49763:49774
Campbell Barton [Fri, 10 Aug 2012 15:45:09 +0000 (15:45 +0000)]
svn merge ^/trunk/blender -r49763:49774

7 years agocompositor: bokeh blur size input can now be an image, in this case it uses VariableS...
Campbell Barton [Fri, 10 Aug 2012 15:31:54 +0000 (15:31 +0000)]
compositor: bokeh blur size input can now be an image, in this case it uses VariableSizeBokehBlurOperation class internally.

updated opencl too.

7 years agoFix infinite recursion when using adjustment strip placed to channel 1
Sergey Sharybin [Fri, 10 Aug 2012 15:30:38 +0000 (15:30 +0000)]
Fix infinite recursion when using adjustment strip placed to channel 1

7 years agofix own error with scons, building failed when BF_BUILDDIR was absolute.
Campbell Barton [Fri, 10 Aug 2012 15:25:54 +0000 (15:25 +0000)]
fix own error with scons, building failed when BF_BUILDDIR was absolute.

7 years agocode cleanup: compositor - define size for executePixel function output float array
Campbell Barton [Fri, 10 Aug 2012 14:07:24 +0000 (14:07 +0000)]
code cleanup: compositor - define size for executePixel function output float array

7 years agouse define for bokeh blur size, also define size of determineResolution args.
Campbell Barton [Fri, 10 Aug 2012 13:23:31 +0000 (13:23 +0000)]
use define for bokeh blur size, also define size of determineResolution args.

7 years agoFix building with audaspace disabled
Sergey Sharybin [Fri, 10 Aug 2012 12:56:09 +0000 (12:56 +0000)]
Fix building with audaspace disabled

7 years agoadd asserts in MemoryBuffer.readNoCheck() so it raises an error when used incorrectly...
Campbell Barton [Fri, 10 Aug 2012 12:38:53 +0000 (12:38 +0000)]
add asserts in MemoryBuffer.readNoCheck() so it raises an error when used incorrectly in debug mode.

7 years agofix [#32289] Border Zoom, Zoom Border or Zoom to Border?
Campbell Barton [Fri, 10 Aug 2012 11:43:53 +0000 (11:43 +0000)]
fix [#32289] Border Zoom, Zoom Border or Zoom to Border?

pedantic report but may as well name them the same.

7 years agofix [#32300] Convex Hull Poll Shouldn't Require 3D View
Campbell Barton [Fri, 10 Aug 2012 11:38:52 +0000 (11:38 +0000)]
fix [#32300] Convex Hull Poll Shouldn't Require 3D View

7 years agosvn merge ^/trunk/blender -r49757:49763
Campbell Barton [Fri, 10 Aug 2012 10:37:31 +0000 (10:37 +0000)]
svn merge ^/trunk/blender -r49757:49763

7 years agosplit off auto depth option to have cursor placement use depth too since you dont...
Campbell Barton [Fri, 10 Aug 2012 10:34:24 +0000 (10:34 +0000)]
split off auto depth option to have cursor placement use depth too since you dont always want both.

7 years agominor compositor change: use the max dimension for bokeh blur size, rather then width.
Campbell Barton [Fri, 10 Aug 2012 10:20:28 +0000 (10:20 +0000)]
minor compositor change: use the max dimension for bokeh blur size, rather then width.

7 years agoFix for particle object rendering in Cycles. On object sync the object first has...
Lukas Toenne [Fri, 10 Aug 2012 10:15:45 +0000 (10:15 +0000)]
Fix for particle object rendering in Cycles. On object sync the object first has to determine if a particle update is needed (which depends on dupli objects and their meshes), before deciding to skip the actual syncing.

7 years agoSmoke: High res on even resolution did not write to all cells (downsampling = n-1...
Daniel Genrich [Fri, 10 Aug 2012 09:58:58 +0000 (09:58 +0000)]
Smoke: High res on even resolution did not write to all cells (downsampling = n-1, upsampling = n).

Thanks goes to MiikaH.

7 years agoMerging r49738 through r49757 from trunk into soc-2011-tomato
Sergey Sharybin [Fri, 10 Aug 2012 08:54:14 +0000 (08:54 +0000)]
Merging r49738 through r49757 from trunk into soc-2011-tomato

7 years agoFix wrong tracks list used for search in Follow Track constraint
Sergey Sharybin [Fri, 10 Aug 2012 08:51:34 +0000 (08:51 +0000)]
Fix wrong tracks list used for search in Follow Track constraint

7 years agozero rotation values for quat_apply_track() which were in fact just float in precision.
Campbell Barton [Fri, 10 Aug 2012 08:19:45 +0000 (08:19 +0000)]
zero rotation values for quat_apply_track() which were in fact just float in precision.

also minor code cleanup - tabs -> spaces in scons file.

7 years agoExtended the search operator for nodes to also support node groups. The basic node...
Lukas Toenne [Fri, 10 Aug 2012 07:22:36 +0000 (07:22 +0000)]
Extended the search operator for nodes to also support node groups. The basic node group type is not included in the node items list, instead all existing node groups are added to the items list in the callback. A prefix is used to distinguish base node types from node groups.

7 years agoAdded a poll function for the node_tree pointer node groups. This ensure that only...
Lukas Toenne [Fri, 10 Aug 2012 07:22:33 +0000 (07:22 +0000)]
Added a poll function for the node_tree pointer node groups. This ensure that only node trees of the same type as the group node's tree can be selected for the pointer, other trees would be invalid for the node group (e.g. a Shader node group using a Compositor node tree).

7 years agoBugfix: Cloth did not work with Dynamic Paint.
Daniel Genrich [Fri, 10 Aug 2012 00:04:15 +0000 (00:04 +0000)]
Bugfix: Cloth did not work with Dynamic Paint.

Fix 1: Pinned vertices were never released when "unpinned" by Dynamic Paint.

Fix 2: When pinning vertices during simulation, they would get "warped" to their original starting position of frame 1.

Thanks to MiikaH for pointing this out and also for providing the regression blend file: http://wiki.blender.org/uploads/a/ab/Cloth_dynamic_paint.blend

7 years agoCycles Test App:
Thomas Dinges [Thu, 9 Aug 2012 23:00:57 +0000 (23:00 +0000)]
Cycles Test App:
* Fix for changes in the OpenImageIO API.

7 years agoSeparate uv selection operator: Y key, behaves much the same way as the mesh separate...
Campbell Barton [Thu, 9 Aug 2012 22:43:10 +0000 (22:43 +0000)]
Separate uv selection operator: Y key, behaves much the same way as the mesh separate tool works.

7 years agogenerate COM_OpenCLKernels.cl.h automatically at build time, this allows editing...
Campbell Barton [Thu, 9 Aug 2012 19:59:36 +0000 (19:59 +0000)]
generate COM_OpenCLKernels.cl.h automatically at build time, this allows editing COM_OpenCLKernels.cl and rebuilding and means we dont have to have both files in svn.

updates made to cmake and scons.

7 years agoCompilation error fix: G.rendering was renamed to G.is_rendering
Sergey Sharybin [Thu, 9 Aug 2012 18:12:58 +0000 (18:12 +0000)]
Compilation error fix: G.rendering was renamed to G.is_rendering

7 years agoMerging r49711 through r49737 from trunk into soc-2011-tomato
Sergey Sharybin [Thu, 9 Aug 2012 17:03:33 +0000 (17:03 +0000)]
Merging r49711 through r49737 from trunk into soc-2011-tomato

7 years agoFrame matching methods for follow track constraint
Sergey Sharybin [Thu, 9 Aug 2012 16:57:02 +0000 (16:57 +0000)]
Frame matching methods for follow track constraint

This is needed in cases when using blender camera with different
resolution than original footage. Behaves in the same way as
background picture framing.

7 years agoFixed typo in clip's display aspect usage
Sergey Sharybin [Thu, 9 Aug 2012 16:56:42 +0000 (16:56 +0000)]
Fixed typo in clip's display aspect usage

7 years agouse sensor size when calculating dof rather then hard coded values.
Campbell Barton [Thu, 9 Aug 2012 15:59:32 +0000 (15:59 +0000)]
use sensor size when calculating dof rather then hard coded values.

7 years agoBugfix/Enhancement: Cloth didn't support animated vertex groups like the "Vertex...
Daniel Genrich [Thu, 9 Aug 2012 13:33:27 +0000 (13:33 +0000)]
Bugfix/Enhancement: Cloth didn't support animated vertex groups like the "Vertex Weight" modifier.

Regression blend file: http://wiki.blender.org/uploads/b/b8/Cloth_anim_vertex.blend

Thanks to Kologe for reporting this problem and also providing the regression blend file.

7 years agoCycles / Cmake:
Thomas Dinges [Thu, 9 Aug 2012 12:08:35 +0000 (12:08 +0000)]
Cycles / Cmake:
* When CUDA building is enabled, build sm_30 kernel as well.

7 years agoFix for the default internal connect function for nodes (used in muting, detaching...
Lukas Toenne [Thu, 9 Aug 2012 11:45:54 +0000 (11:45 +0000)]
Fix for the default internal connect function for nodes (used in muting, detaching, etc.). This is supposed to look for the first input/output of every socket type, but was actually taking the first matching link from the link list, regardless of the linked socket's position.

7 years agoRemove redundant referenced to bf_intern_bop
Sergey Sharybin [Thu, 9 Aug 2012 09:36:53 +0000 (09:36 +0000)]
Remove redundant referenced to bf_intern_bop

7 years agocode cleanup: ensure macros require ';' endings
Campbell Barton [Wed, 8 Aug 2012 21:20:10 +0000 (21:20 +0000)]
code cleanup: ensure macros require ';' endings

7 years agoutility functions for getting/setting rectangles for operators.
Campbell Barton [Wed, 8 Aug 2012 20:38:55 +0000 (20:38 +0000)]
utility functions for getting/setting rectangles for operators.

7 years agosupport for border zooming out by using the middle mouse button, works in 2D views...
Campbell Barton [Wed, 8 Aug 2012 19:54:31 +0000 (19:54 +0000)]
support for border zooming out by using the middle mouse button, works in 2D views already

7 years agocode cleanup: rename G.afbreek --> is_break, G.rendering --> is_rendering
Campbell Barton [Wed, 8 Aug 2012 18:37:06 +0000 (18:37 +0000)]
code cleanup: rename G.afbreek --> is_break, G.rendering --> is_rendering

7 years agocode cleanup: rename G.rt to G.debug_value
Campbell Barton [Wed, 8 Aug 2012 18:21:54 +0000 (18:21 +0000)]
code cleanup: rename G.rt to G.debug_value

7 years agoadd threshold blending to opencl too.
Campbell Barton [Wed, 8 Aug 2012 18:10:13 +0000 (18:10 +0000)]
add threshold blending to opencl too.

7 years agosync changes between opencl and C++ VariableSizeBokehBlurOperation, also remove absf...
Campbell Barton [Wed, 8 Aug 2012 18:04:40 +0000 (18:04 +0000)]
sync changes between opencl and C++ VariableSizeBokehBlurOperation, also remove absf() check on pixel radius, this is ensured to be unsigned.

7 years agoRenamed the mx/my coordinates in SpaceNode to more descriptive 'cursor'. This follows...
Lukas Toenne [Wed, 8 Aug 2012 17:37:02 +0000 (17:37 +0000)]
Renamed the mx/my coordinates in SpaceNode to more descriptive 'cursor'. This follows the naming in the View3D space, since this vector is used for essentially the same purpose (adding nodes at a specific location), although not used for any transform origin and not displayed in the editor.

Note: While renaming DNA properties is usually dangerous and can break files, in this case it is possible because the mx/my values are only used at runtime.

7 years agosvn merge ^/trunk/blender -r49707:49710
Campbell Barton [Wed, 8 Aug 2012 17:10:01 +0000 (17:10 +0000)]
svn merge ^/trunk/blender -r49707:49710

7 years agocode cleanup: lazy init enum for node search
Campbell Barton [Wed, 8 Aug 2012 17:02:14 +0000 (17:02 +0000)]
code cleanup: lazy init enum for node search

7 years agodof node; change how threshold is applied, rather then clip out pixels at the thresho...
Campbell Barton [Wed, 8 Aug 2012 16:49:12 +0000 (16:49 +0000)]
dof node; change how threshold is applied, rather then clip out pixels at the threshold, fade instead.

note: need to apply this change to opencl still.

7 years agoMerging r49681 through r49707 from trunk into soc-2011-tomato
Sergey Sharybin [Wed, 8 Aug 2012 16:48:05 +0000 (16:48 +0000)]
Merging r49681 through r49707 from trunk into soc-2011-tomato

7 years agoSequencer: corrections to sequence cache invalidation
Sergey Sharybin [Wed, 8 Aug 2012 16:46:47 +0000 (16:46 +0000)]
Sequencer: corrections to sequence cache invalidation

7 years agoSequencer: initial implementation of multithreaded effects
Sergey Sharybin [Wed, 8 Aug 2012 16:46:45 +0000 (16:46 +0000)]
Sequencer: initial implementation of multithreaded effects

Added a framework to run effects in several threads. Port most
of effects to this new framework.

Still some work to be done here (some effects are not so easy to port)

7 years agoCode cleanup: use defines instead of magic constants
Sergey Sharybin [Wed, 8 Aug 2012 16:46:44 +0000 (16:46 +0000)]
Code cleanup: use defines instead of magic constants

7 years agoSequencer: do not invalidate sequences which are not blending with bottom machines
Sergey Sharybin [Wed, 8 Aug 2012 16:46:43 +0000 (16:46 +0000)]
Sequencer: do not invalidate sequences which are not blending with bottom machines

7 years agoStyle cleanup: whitespace
Sergey Sharybin [Wed, 8 Aug 2012 16:46:42 +0000 (16:46 +0000)]
Style cleanup: whitespace

7 years agoSequencer: initial support of refreshing only changed sequences
Sergey Sharybin [Wed, 8 Aug 2012 16:46:40 +0000 (16:46 +0000)]
Sequencer: initial support of refreshing only changed sequences

Before this the the whole sequencer cache would be invalidated
when hanging sequence settings.

This was completely annoying because changing color balance
settings would re-load image file for which color balance
is happening on every change,

In fact it's still an issue if color balance is changing for
image strip itself, but if this strip has got effect and
color balance is changing for it file wouldn't be reloaded.

7 years agoimprovement to the DOF node, after blurring the radius buffer (derived from the depth...
Campbell Barton [Wed, 8 Aug 2012 16:46:12 +0000 (16:46 +0000)]
improvement to the DOF node, after blurring the radius buffer (derived from the depth), overlay with the original so pixels in focus are not mixed with out of focus pixels.

7 years agoSearch option for adding nodes.
Lukas Toenne [Wed, 8 Aug 2012 16:44:16 +0000 (16:44 +0000)]
Search option for adding nodes.

The 'Add' menu in the node editor now has an option 'Search' at the top, which opens a separate popup for searching node types by name.

The operator for this is implemented completely in Python (this could also be done for the regular menu-based Add options in the future). There are a few necessary extensions to the RNA as well:

* The View2D struct in regions is now exposed. Currently only contains converter functions for coordinates from the region to the view (i.e. scrolled and zoomed view space). Used for converting mouse location to node space.

* The SpaceNode exposes the existing 'cursor_location' for operators to store mouse position beyond invoke calls. Not used for anything else (transforms) so far.

* The edit_tree in SpaceNode is also exposed, this is needed for operators to work correctly inside node groups.

7 years agoDOF node: clamp blurring the zdepth radius buffer by the blur max. This could doo...
Campbell Barton [Wed, 8 Aug 2012 16:14:56 +0000 (16:14 +0000)]
DOF node: clamp blurring the zdepth radius buffer by the blur max. This could doo easily blur very high depths and cause artifacts.

7 years agodata_to_c in cmake, not used yet.
Campbell Barton [Wed, 8 Aug 2012 16:03:42 +0000 (16:03 +0000)]
data_to_c in cmake, not used yet.

7 years agoCode cleanup - whitespace
Joshua Leung [Wed, 8 Aug 2012 14:02:44 +0000 (14:02 +0000)]
Code cleanup - whitespace

7 years agoDisable saving property defaults for many of the properties for animation-editor
Joshua Leung [Wed, 8 Aug 2012 14:02:18 +0000 (14:02 +0000)]
Disable saving property defaults for many of the properties for animation-editor
click activated operators to prevent any further errors

7 years agoBugfix [#32250] Dubious selection mode in Dopesheet and Action Editor makes it
Joshua Leung [Wed, 8 Aug 2012 13:55:30 +0000 (13:55 +0000)]
Bugfix [#32250] Dubious selection mode in Dopesheet and Action Editor makes it
impossible to delete ungrouped channels

* Active flag wouldn't get cleared off selected Groups and FCurves when clicking
on them again to deselect them

* Disabled property defaults saving for click-handling operator for channels.
While testing the fix for this bug, I noticed that the property-defaults stuff
was leading to selections always defaulting to "extend" once this had been used
once.

7 years agoMovie cache: add function to iterate through cache and remove items
Sergey Sharybin [Wed, 8 Aug 2012 12:16:46 +0000 (12:16 +0000)]
Movie cache: add function to iterate through cache and remove items
using custom check function for this.

Currently unused, but would be helpful for sequencer cache.

7 years agoFix logic error in mipmap filter and refactor scaling routine to lower self cost...
Sv. Lockal [Wed, 8 Aug 2012 12:15:26 +0000 (12:15 +0000)]
Fix logic error in mipmap filter and refactor scaling routine to lower self cost by ~30%

7 years agoCode cleanup: make some more functions more meaningful name
Sergey Sharybin [Wed, 8 Aug 2012 11:56:58 +0000 (11:56 +0000)]
Code cleanup: make some more functions more meaningful name

7 years agoStyle cleanup
Sergey Sharybin [Wed, 8 Aug 2012 11:52:14 +0000 (11:52 +0000)]
Style cleanup

7 years agoCode cleanup: BKE_ prefix for public sequencer functions
Sergey Sharybin [Wed, 8 Aug 2012 11:15:40 +0000 (11:15 +0000)]
Code cleanup: BKE_ prefix for public sequencer functions

7 years agoCode cleanup: remove redundant struct and some space cleanup
Sergey Sharybin [Wed, 8 Aug 2012 11:15:38 +0000 (11:15 +0000)]
Code cleanup: remove redundant struct and some space cleanup

7 years agoCode cleanup: remove unused functions
Sergey Sharybin [Wed, 8 Aug 2012 11:15:36 +0000 (11:15 +0000)]
Code cleanup: remove unused functions

The code would be in SVN anyway and having bunch of unused code
doesn't seems to be logical.

7 years agoStyle cleanup: white space
Sergey Sharybin [Wed, 8 Aug 2012 11:15:36 +0000 (11:15 +0000)]
Style cleanup: white space

7 years agoCode cleanup: mark functions as static, ifdef 0 some unused functions
Sergey Sharybin [Wed, 8 Aug 2012 11:15:32 +0000 (11:15 +0000)]
Code cleanup: mark functions as static, ifdef 0 some unused functions

7 years agofix for minor regression in own recent edits: sample line was drawing in newly create...
Campbell Barton [Wed, 8 Aug 2012 08:41:10 +0000 (08:41 +0000)]
fix for minor regression in own recent edits: sample line was drawing in newly created curve nodes (Hue correct).

7 years agoskip loading file selector icons when running in background mode.
Campbell Barton [Wed, 8 Aug 2012 08:25:20 +0000 (08:25 +0000)]
skip loading file selector icons when running in background mode.

7 years agoMerging r49667 through r49680 from trunk into soc-2011-tomato
Sergey Sharybin [Wed, 8 Aug 2012 08:21:58 +0000 (08:21 +0000)]
Merging r49667 through r49680 from trunk into soc-2011-tomato

7 years agoFix crash in cases when render layers node is muted
Sergey Sharybin [Wed, 8 Aug 2012 08:15:56 +0000 (08:15 +0000)]
Fix crash in cases when render layers node is muted

7 years agopatch [#32282] Fix segfault on exit in IM shutdown.
Campbell Barton [Wed, 8 Aug 2012 07:31:19 +0000 (07:31 +0000)]
patch [#32282] Fix segfault on exit in IM shutdown.

from Bill Currie (taniwha)

7 years agoAccidentally did a commit when I wanted to revert... (ignore my last revision)
Mitchell Stokes [Wed, 8 Aug 2012 01:29:20 +0000 (01:29 +0000)]
Accidentally did a commit when I wanted to revert... (ignore my last revision)

7 years ago(no commit message)
Mitchell Stokes [Wed, 8 Aug 2012 01:24:48 +0000 (01:24 +0000)]

7 years agouse -FLT_MAX where FLT_MIN was misused
Campbell Barton [Tue, 7 Aug 2012 19:49:38 +0000 (19:49 +0000)]
use -FLT_MAX where FLT_MIN was misused

7 years agominor edits to node view
Campbell Barton [Tue, 7 Aug 2012 18:45:24 +0000 (18:45 +0000)]
minor edits to node view
- when single (non frame) node selected, dont zoom in, just pan.
- only reset the background when pressing home key

7 years agofix for own error confusing FLT_MIN with -FLT_MAX (didnt get into a release, dont...
Campbell Barton [Tue, 7 Aug 2012 18:41:47 +0000 (18:41 +0000)]
fix for own error confusing FLT_MIN with -FLT_MAX (didnt get into a release, dont include in log)

7 years agoselect linked
Campbell Barton [Tue, 7 Aug 2012 17:20:21 +0000 (17:20 +0000)]
select linked
- dupligroup now only selects objects with dupligroup enabled.
- selected onjects are skipped, this way and undo push wont happen if no new objects are selected.

also minor edits to node view all/selected

7 years agoCode cleanup: use generic threaded image buffer processor for color management
Sergey Sharybin [Tue, 7 Aug 2012 16:55:15 +0000 (16:55 +0000)]
Code cleanup: use generic threaded image buffer processor for color management

7 years agoMerging r49659 through r49666 from trunk into soc-2011-tomato
Sergey Sharybin [Tue, 7 Aug 2012 16:48:43 +0000 (16:48 +0000)]
Merging r49659 through r49666 from trunk into soc-2011-tomato

7 years agoMade image buffer threaded processor generic function,
Sergey Sharybin [Tue, 7 Aug 2012 16:47:46 +0000 (16:47 +0000)]
Made image buffer threaded processor generic function,
so color management could use the same routines.

Should be no functional changes.

7 years agoadd view selected for node view
Campbell Barton [Tue, 7 Aug 2012 16:30:34 +0000 (16:30 +0000)]
add view selected for node view

7 years agoMade color balance in sequencer multi-threaded
Sergey Sharybin [Tue, 7 Aug 2012 16:09:42 +0000 (16:09 +0000)]
Made color balance in sequencer multi-threaded

Should give some more realtime update, but it's currently not the
biggest issue - changing color balance settings would imply reloading
of file which is slow. Would be investigated further.

This change shouldn't affect on pre-fetching job which is already
multi-threaded and doing threaded color balance would make things
only worse.

7 years agosvn merge ^/trunk/blender -r49653:49658
Campbell Barton [Tue, 7 Aug 2012 15:04:46 +0000 (15:04 +0000)]
svn merge ^/trunk/blender -r49653:49658

7 years agouse bilinear rather then bicubic scaling because bicubic blurs too much.
Campbell Barton [Tue, 7 Aug 2012 15:01:48 +0000 (15:01 +0000)]
use bilinear rather then bicubic scaling because bicubic blurs too much.

7 years agoPlace color weels used for color balance in sequencer vertically
Sergey Sharybin [Tue, 7 Aug 2012 14:59:49 +0000 (14:59 +0000)]
Place color weels used for color balance in sequencer vertically

This was it makes more sense from accurate tuning point of view.

7 years agoTomato Cycles:
Thomas Dinges [Tue, 7 Aug 2012 14:02:53 +0000 (14:02 +0000)]
Tomato Cycles:
* Improvement for reporting current sample.
Also show the current amount of rendered samples, when using the CPU, and 1x1 tiles.

7 years agoOSX/cmake: refactoring of setting endianess defines, this fixes compile of builds...
Jens Verwiebe [Tue, 7 Aug 2012 13:51:19 +0000 (13:51 +0000)]
OSX/cmake: refactoring of setting endianess defines, this fixes compile of builds with endianess other than the buildmachine and avoids also failing configuration with xcode 4.4 due not supporting big_endian archs anymore

7 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