9 years agoColor Management: made OpenColorIO transformations aware of color unpremultiply
Sergey Sharybin [Wed, 5 Sep 2012 13:58:01 +0000 (13:58 +0000)]
Color Management: made OpenColorIO transformations aware of color unpremultiply

Mainly behaves in the same way as legacy color transformation, but it'll
give different result on over and under exposured areas.

Not sure if it's indeed issue -- seems this behaves crappy in both of
current stable release and OCIO branch.

9 years agoColor Management: fix for tiled image draw and remove unused code
Sergey Sharybin [Wed, 5 Sep 2012 12:14:09 +0000 (12:14 +0000)]
Color Management: fix for tiled image draw and remove unused code

9 years agoCode cleanup -- remove unneeded changes, synchronize some areas with trunk
Sergey Sharybin [Wed, 5 Sep 2012 12:00:08 +0000 (12:00 +0000)]
Code cleanup -- remove unneeded changes, synchronize some areas with trunk

9 years agoSequencer: multi-threaded histogram calculation
Sergey Sharybin [Wed, 5 Sep 2012 11:43:11 +0000 (11:43 +0000)]
Sequencer: multi-threaded histogram calculation

This gives some percentage of speedup, which compensates slowdown
caused by converting image buffer into display space.

Used OpenMP for this. Still feel skeptic about this, discussed with
Brecht and we decided this approach actually could be used since
seems all the platforms has got OpenMP issues solved.

Waveform and vector scopes are still single-threaded since they're
a bit tricker to be done multi-threaded and probably not so commonly

9 years agoSequencer: cache currently displaying scopes
Sergey Sharybin [Wed, 5 Sep 2012 11:43:05 +0000 (11:43 +0000)]
Sequencer: cache currently displaying scopes

This avoids calculation of scopes on every redraw, so such tools as panning
and zoom wouldn't imply re-calculating scopes.

Implemented as a structure inside of SpaceSeq, juts like it's done for clip
and image spaces.

Also fixed zebra display to work in display space.

9 years agoColor Management: sequencer's scopes now works in display space
Sergey Sharybin [Wed, 5 Sep 2012 11:42:57 +0000 (11:42 +0000)]
Color Management: sequencer's scopes now works in display space

Added utility function to apply display transformation on image buffer's
float array which is currently only used by sequencer's scopes.

This function is multithreaded, but scopes should be improved further
since currently they're being recalculated from scratch on every draw.

9 years agoMerging r50374 through r50412 from trunk into soc-2011-tomato
Sergey Sharybin [Wed, 5 Sep 2012 11:42:20 +0000 (11:42 +0000)]
Merging r50374 through r50412 from trunk into soc-2011-tomato

9 years agoColor Management: fix for color sample information line
Sergey Sharybin [Tue, 4 Sep 2012 12:32:32 +0000 (12:32 +0000)]
Color Management: fix for color sample information line

- Color managed RGB values wouldn't be displayed anymore for
  byte images (which are currently unsupported to be managed).

- Color rectangle would now be color managed

- Sequencer was passing non-linear float to information line,
  now it'll pass linear float.

9 years agoColor Management: OpenCOlorIO configuration file cleanup
Sergey Sharybin [Tue, 4 Sep 2012 12:32:25 +0000 (12:32 +0000)]
Color Management: OpenCOlorIO configuration file cleanup

- Remove unused color space and LUTs/matrices
  There were couple of spaces for specific cameras which are unlikely
  be used by general blender users. Think better to keep this things
  as clean as possible for official builds, it could easily be extended
  for some specific pipeline.

- Move rec709 view to it's own display. Such way makes more sense.
  Probably it'll actually make sense to remove p3dci and rec709
  displays from default configuration. Not sure how often such a
  displays are used by blender users.
  XYZ display could still be useful to help generating DCP.

- Reshuffled views a bit. Added Default view to most of displays which
  is default sRGB transformation for sRGB display, ACES -> CIE XYZ for
  XYZ display.
  Should make things a bit clearer for understanding.

9 years agoColor Management: fix for view/display settings validation
Sergey Sharybin [Tue, 4 Sep 2012 12:32:18 +0000 (12:32 +0000)]
Color Management: fix for view/display settings validation

It was a misusage of LinkData and actual data leading to wrong
string comparsion and possible wrong memory access.

9 years agoColor Management: remove hardcoded ACES ODT tonemap
Sergey Sharybin [Tue, 4 Sep 2012 12:32:12 +0000 (12:32 +0000)]
Color Management: remove hardcoded ACES ODT tonemap

This tonemap was added as a temporary option only and if it'll be
needed again, it'll be better to implement is as either a spline
in OCIO or as a film response curve (as some of such curves were
added as a presets for RGB curves in Mango production SVN).

Also revert changes made to IMB_buffer_byte_from_float since it's
not actually needed anymore and makes it's clearer changes against

9 years agoMerging r50265 through r50373 from trunk into soc-2011-tomato
Sergey Sharybin [Tue, 4 Sep 2012 09:06:37 +0000 (09:06 +0000)]
Merging r50265 through r50373 from trunk into soc-2011-tomato

9 years agoColor Management: fix compilation error when OCIO is disabled
Sergey Sharybin [Mon, 3 Sep 2012 10:08:55 +0000 (10:08 +0000)]
Color Management: fix compilation error when OCIO is disabled

9 years agoCycles / Brick Texture:
Thomas Dinges [Thu, 30 Aug 2012 20:45:01 +0000 (20:45 +0000)]
Cycles / Brick Texture:
* Added GLSL stub for the Brick texture, fixes an error in the console when switching to Material Shading in the 3D View.

9 years agoColor management: new View for xyz display is added
Sergey Sharybin [Thu, 30 Aug 2012 15:02:20 +0000 (15:02 +0000)]
Color management: new View for xyz display is added

This view is currently called DCI and it implements the same conversion
into xyz space as OpenDCP does.

This is aimed to be used for Jpeg2K in xyz space generation used for DCP
creation directly from Blender.

9 years agoColor management: make it behave closer to trunk
Sergey Sharybin [Thu, 30 Aug 2012 13:40:31 +0000 (13:40 +0000)]
Color management: make it behave closer to trunk

Avoid using tricks with ibuf->profile to check whether image buffer is
in sequencer or linear space. Assume the whole sequencer works in non
linear float space and do transformation to linear where it;s needed

This removes confusion from the code, fixes wrong behavior of some

9 years agoColor management: some parts of previous commit were incorrect merged from WIP patch
Sergey Sharybin [Wed, 29 Aug 2012 18:11:51 +0000 (18:11 +0000)]
Color management: some parts of previous commit were incorrect merged from WIP patch

9 years agoColor management: fix for wrong view being used as default in configuration file...
Sergey Sharybin [Wed, 29 Aug 2012 18:08:34 +0000 (18:08 +0000)]
Color management: fix for wrong view being used as default in configuration file check

Also marked Jpeg2K as non-float format.

9 years agoMerging r50248 through r50264 from trunk into soc-2011-tomato
Sergey Sharybin [Wed, 29 Aug 2012 12:49:10 +0000 (12:49 +0000)]
Merging r50248 through r50264 from trunk into soc-2011-tomato

9 years agoFix wrong user counter in world node trees
Sergey Sharybin [Wed, 29 Aug 2012 12:47:42 +0000 (12:47 +0000)]
Fix wrong user counter in world node trees

World is being localized without increasing ID users, so no need
to decrease ID users on localized world free.

9 years agocode cleanup: add utility function BLI_path_is_rel()
Campbell Barton [Wed, 29 Aug 2012 10:32:38 +0000 (10:32 +0000)]
code cleanup: add utility function BLI_path_is_rel()

9 years agocode cleanup: replace term 'alpha' with '64' in makesdna, this was historic that...
Campbell Barton [Wed, 29 Aug 2012 09:51:38 +0000 (09:51 +0000)]
code cleanup: replace term 'alpha' with '64' in makesdna, this was historic that dec-alpha was the first 64bit system blender was ported for, but now its not helpful to call it this way.

9 years agonew image operator now allows color grid (before was only grid on/off)
Campbell Barton [Wed, 29 Aug 2012 08:17:38 +0000 (08:17 +0000)]
new image operator now allows color grid (before was only grid on/off)

9 years agotexture curves were not initialized (causing crash), own regression from moving curve...
Campbell Barton [Wed, 29 Aug 2012 07:58:36 +0000 (07:58 +0000)]
texture curves were not initialized (causing crash), own regression from moving curve initialization outside evaluation.

9 years agocode cleanup: move static mball vars into their own struct, wasnt very clear from...
Campbell Barton [Wed, 29 Aug 2012 07:07:18 +0000 (07:07 +0000)]
code cleanup: move static mball vars into their own struct, wasnt very clear from reading code what was defined in the function.

9 years agomissing linebreak when multithreaded gl meesage is printed to log
Jens Verwiebe [Tue, 28 Aug 2012 13:43:20 +0000 (13:43 +0000)]
missing linebreak when multithreaded gl meesage is printed to log

9 years agofix bug in mathutils.geometry.intersect_point_line() where 4D vectors were treated...
Campbell Barton [Tue, 28 Aug 2012 11:27:46 +0000 (11:27 +0000)]
fix bug in mathutils.geometry.intersect_point_line() where 4D vectors were treated as 2D.

also change behavior to return a 2d vector when all args are 2D.

9 years agocleanup pixel sampler code (pixel interpolations in compositor)
Jeroen Bakker [Tue, 28 Aug 2012 10:41:37 +0000 (10:41 +0000)]
cleanup pixel sampler code (pixel interpolations in compositor)

9 years agofix for own crash caused by curve refactor, now curve tables are initialized once...
Campbell Barton [Tue, 28 Aug 2012 10:02:10 +0000 (10:02 +0000)]
fix for own crash caused by curve refactor, now curve tables are initialized once when the tree is initialized.

thanks to Antony Riakiotakis for providing a fix, though this works a little different.

9 years agocode cleanup: use switch for metaball type checks and minor style cleanup
Campbell Barton [Tue, 28 Aug 2012 01:50:13 +0000 (01:50 +0000)]
code cleanup: use switch for metaball type checks and minor style cleanup

9 years agoAdding despeckle as “blender” word...
Bastien Montagne [Mon, 27 Aug 2012 21:01:21 +0000 (21:01 +0000)]
Adding despeckle as “blender” word...

9 years agoPicky spell-checking...
Bastien Montagne [Mon, 27 Aug 2012 20:58:43 +0000 (20:58 +0000)]
Picky spell-checking...

9 years agoColor management: display color managed RGB values in color sample line
Sergey Sharybin [Mon, 27 Aug 2012 15:23:14 +0000 (15:23 +0000)]
Color management: display color managed RGB values in color sample line

Makes it possible to investigate color managed ranges.

Not ideal but it's the quickest thing which could be done to remove
current grading stoppers for Mango.

9 years agosupport unary positive operators for vectors (same as numpy), so you can do 'vector_a...
Campbell Barton [Mon, 27 Aug 2012 13:40:19 +0000 (13:40 +0000)]
support unary positive operators for vectors (same as numpy), so you can do 'vector_a = +vector_b', this makes a copy.

9 years agoMerging r50245 through r50247 from trunk into soc-2011-tomato
Sergey Sharybin [Mon, 27 Aug 2012 12:00:39 +0000 (12:00 +0000)]
Merging r50245 through r50247 from trunk into soc-2011-tomato

9 years agoFile format fixes
Sergey Sharybin [Mon, 27 Aug 2012 11:59:26 +0000 (11:59 +0000)]
File format fixes

- Add check for header field in BMP decoder. This is needed to distinguish
  whether file is indeed BMP image or not.
  Without this check Blender could easily crash when it'll try to load
  non-BMP image.
  Tested with files from own HDD, but all of them has got BM header field,
  more testing would be welcome.

- Made Jpeg2000 aware of J2K codec. Originally was needed to verify .j2c
  files here in the studio, but having support of this codec would be
  nice in general.
  Currently supports only reading in this codec, writing would still
  using jp2 codec.

9 years agosvn merge ^/trunk/blender -r50240:50244
Campbell Barton [Mon, 27 Aug 2012 09:46:49 +0000 (09:46 +0000)]
svn merge ^/trunk/blender -r50240:50244

9 years agoAlternate mask spline feather offset calculation method: now there are 2 [Even |...
Campbell Barton [Mon, 27 Aug 2012 09:44:56 +0000 (09:44 +0000)]
Alternate mask spline feather offset calculation method: now there are 2 [Even | Smooth]

- Even preserves thickness but can give unsightly loops
- Smooth gives nicer shape but can give unsightly feather/spline mismatch for 'S' shapes created by beziers.

This is an example where smooth works much nicer.

9 years agoFix #31853: Marker deletion invokes strip deletion
Sergey Sharybin [Mon, 27 Aug 2012 09:15:48 +0000 (09:15 +0000)]
Fix #31853: Marker deletion invokes strip deletion

9 years agoMerging r50237 through r50240 from trunk into soc-2011-tomato
Sergey Sharybin [Mon, 27 Aug 2012 09:02:26 +0000 (09:02 +0000)]
Merging r50237 through r50240 from trunk into soc-2011-tomato

9 years agoSequencer: proper cache invalidation when deleting sequences
Sergey Sharybin [Mon, 27 Aug 2012 09:01:36 +0000 (09:01 +0000)]
Sequencer: proper cache invalidation when deleting sequences

Solves issue with effects not being recalculated when deleting their input.

9 years agoStyle cleanup: spaces in sequencer scopes
Sergey Sharybin [Mon, 27 Aug 2012 09:01:35 +0000 (09:01 +0000)]
Style cleanup: spaces in sequencer scopes

9 years agoSequencer: fix crash of histogram view for float images
Sergey Sharybin [Mon, 27 Aug 2012 09:01:34 +0000 (09:01 +0000)]
Sequencer: fix crash of histogram view for float images

Overexposured pixels lead to wrong memory access in histogram making function

9 years agoMerging r50226 through r50236 from trunk into soc-2011-tomato
Sergey Sharybin [Mon, 27 Aug 2012 08:28:29 +0000 (08:28 +0000)]
Merging r50226 through r50236 from trunk into soc-2011-tomato

9 years agoremove incorrect comment, add in useful one.
Campbell Barton [Mon, 27 Aug 2012 08:23:51 +0000 (08:23 +0000)]
remove incorrect comment, add in useful one.

9 years agofix [#32417] Grease Pencil color change + DopeSheet 'Summary' = crash
Campbell Barton [Mon, 27 Aug 2012 06:55:33 +0000 (06:55 +0000)]
fix [#32417] Grease Pencil color change + DopeSheet 'Summary' = crash

summery wasn't checking fcurve types.

9 years agoSequencer: fix for wrong color space sequencer effects were working in
Sergey Sharybin [Sun, 26 Aug 2012 23:57:55 +0000 (23:57 +0000)]
Sequencer: fix for wrong color space sequencer effects were working in

9 years agoBGE: Make sure lib loaded cameras are added to the active scene's camera list.
Mitchell Stokes [Sun, 26 Aug 2012 23:17:50 +0000 (23:17 +0000)]
BGE: Make sure lib loaded cameras are added to the active scene's camera list.

9 years agoensure there are always the same number of feather points and non feather points...
Campbell Barton [Sun, 26 Aug 2012 20:22:42 +0000 (20:22 +0000)]
ensure there are always the same number of feather points and non feather points when drawing.

9 years agoSequencer: typo fix
Sergey Sharybin [Sun, 26 Aug 2012 19:36:56 +0000 (19:36 +0000)]
Sequencer: typo fix

9 years agocode cleanup: quiet warning for dead assignment.
Campbell Barton [Sun, 26 Aug 2012 18:21:34 +0000 (18:21 +0000)]
code cleanup: quiet warning for dead assignment.

9 years agocode cleanup: remove dead assignments, gave mask vars clearer names & moved some...
Campbell Barton [Sun, 26 Aug 2012 18:09:01 +0000 (18:09 +0000)]
code cleanup: remove dead assignments, gave mask vars clearer names & moved some mask evaluation funcs into mask_evaluate.c

9 years agoMerging r50224 through r50225 from trunk into soc-2011-tomato
Sergey Sharybin [Sun, 26 Aug 2012 16:43:24 +0000 (16:43 +0000)]
Merging r50224 through r50225 from trunk into soc-2011-tomato

9 years agoFix zooming in/out preview in sequencer
Sergey Sharybin [Sun, 26 Aug 2012 16:41:03 +0000 (16:41 +0000)]
Fix zooming in/out preview in sequencer

It was a regression since disabling Y-axis zooming in sequencer.
Now check region type and allow all kind of zooming for preview

9 years agoMerging r50192 through r50223 from trunk into soc-2011-tomato
Sergey Sharybin [Sun, 26 Aug 2012 14:12:09 +0000 (14:12 +0000)]
Merging r50192 through r50223 from trunk into soc-2011-tomato

9 years agocode cleanup: split out mask spline evaluation into its own file.
Campbell Barton [Sun, 26 Aug 2012 13:41:40 +0000 (13:41 +0000)]
code cleanup: split out mask spline evaluation into its own file.

9 years agoColor Management: correction to previous commit
Sergey Sharybin [Sun, 26 Aug 2012 13:18:43 +0000 (13:18 +0000)]
Color Management: correction to previous commit

9 years agofix for build error without ffmpeg
Campbell Barton [Sun, 26 Aug 2012 12:21:25 +0000 (12:21 +0000)]
fix for build error without ffmpeg

9 years agostyle cleanup: whitespace
Campbell Barton [Sun, 26 Aug 2012 11:35:43 +0000 (11:35 +0000)]
style cleanup: whitespace

9 years agoColor Management: CMake should detect yaml-cpp and tinyxml libraries automatically
Sergey Sharybin [Sun, 26 Aug 2012 11:34:33 +0000 (11:34 +0000)]
Color Management: CMake should detect yaml-cpp and tinyxml libraries automatically

This makes Blender compilable with CMake and OCIO libraries from SVN.

9 years agoStyle cleanup: whitespace
Sergey Sharybin [Sun, 26 Aug 2012 11:01:18 +0000 (11:01 +0000)]
Style cleanup: whitespace

9 years agoSome FFmpeg changes
Sergey Sharybin [Sun, 26 Aug 2012 11:01:14 +0000 (11:01 +0000)]
Some FFmpeg changes

- Make FFmpeg initialization called from creator, not from functions
  which requires FFmpeg. Makes it easier to follow when initialization
  should happen.

- Enable DNxHD codec. It was commented a while ago due to some strange
  behavior on some platforms. Re-tested it on Linux and Windows and
  it seemd to be working quite nice. Would let it be tested further,
  if it wouldn't be stable enough, easy to comment it again.

- Make non-error messages from writeffmpeg.c printed only if ffmpeg
  debug argument was passed to blender. Reduces console pollution
  with messages which are not useful for general troubleshooting.
  Error messages would still be printed to the console.

- Show FFmpeg error message when video stream failed to allocate.
  makes it easier to understand what exactly is wrong from Blender
  interface, no need to restart blender with FFmpeg debug flag and
  check for console messages.

  Used custom log callback for this which stores last error message
  in static variable. This is not thread safe, but with current
  design FFmpeg routines could not be called form several threads
  anyway, so think it's fine solution/

9 years agoBugfix [#32410] Create New Group (CTRL+G) tried to activate even when nothing is
Joshua Leung [Sun, 26 Aug 2012 08:03:31 +0000 (08:03 +0000)]
Bugfix [#32410] Create New Group (CTRL+G) tried to activate even when nothing is

Some group operators were missing poll() callbacks

9 years agoCompiling fix for Windows+Mingw: "Ambiguous" use of IStream
Joshua Leung [Sun, 26 Aug 2012 07:27:51 +0000 (07:27 +0000)]
Compiling fix for Windows+Mingw: "Ambiguous" use of IStream

9 years agocode cleanup: comments and some minor edits to interface code.
Campbell Barton [Sat, 25 Aug 2012 20:49:51 +0000 (20:49 +0000)]
code cleanup: comments and some minor edits to interface code.

9 years agomake SWAP macros typesafe using CHECK_TYPE macro.
Campbell Barton [Sat, 25 Aug 2012 20:16:08 +0000 (20:16 +0000)]
make SWAP macros typesafe using CHECK_TYPE macro.

Its unlikely you want to do short -> int, int -> float etc, conversion during swapping (if its needed we could have a non type checking macro).

Double that the optimized assembler outbut using SWAP() remains unchanged from before.

This exposed quite a few places where redundant type conversion was going on.

Also remove curve.c's swapdata() and replace its use with swap_v3_v3()

9 years agofix for type mismatch with SWAP() macro.
Campbell Barton [Sat, 25 Aug 2012 19:43:15 +0000 (19:43 +0000)]
fix for type mismatch with SWAP() macro.

9 years agocode cleanup: vec_to_quat
Campbell Barton [Sat, 25 Aug 2012 17:58:49 +0000 (17:58 +0000)]
code cleanup: vec_to_quat

9 years agoadd conjugate_qt_qt(), also some code cleanup and use const for 'rotOrders' var in...
Campbell Barton [Sat, 25 Aug 2012 17:42:15 +0000 (17:42 +0000)]
add conjugate_qt_qt(), also some code cleanup and use const for 'rotOrders' var in math_rotation.c

9 years agoTomato Cycles:
Thomas Dinges [Sat, 25 Aug 2012 16:52:55 +0000 (16:52 +0000)]
Tomato Cycles:
* Added a Brick Texture Node to Cycles.
* Based on the Blender Internal Brick Texture with some modifications.
* Tested on CPU and GPU (CUDA & OpenCL)


ToDo: Only works correct on flat surfaces, like a Plane. If you attach the shader to 3D objects like a cube, the mapping is not correct on the Y/Z vector.

Thanks to Lukas Toenne for fixing a issue I had with the Node code! :)

9 years agoadd manual lookup to addon tempalte
Campbell Barton [Sat, 25 Aug 2012 15:00:41 +0000 (15:00 +0000)]
add manual lookup to addon tempalte

9 years agobetter handle sizes by default for mask mode, now ignore image width/height
Campbell Barton [Sat, 25 Aug 2012 14:18:54 +0000 (14:18 +0000)]
better handle sizes by default for mask mode, now ignore image width/height

9 years agoability to register your own online manual callbacks - useful for 3rd party addon...
Campbell Barton [Sat, 25 Aug 2012 14:07:51 +0000 (14:07 +0000)]
ability to register your own online manual callbacks - useful for 3rd party addon developers, who may want to link to their own URL's.

9 years agominor code cleanup
Campbell Barton [Sat, 25 Aug 2012 12:55:14 +0000 (12:55 +0000)]
minor code cleanup

9 years agobaking actions with euler rotations now uses compatible eulers for pose and object...
Campbell Barton [Sat, 25 Aug 2012 12:37:15 +0000 (12:37 +0000)]
baking actions with euler rotations now uses compatible eulers for pose and object bakes.

9 years agodon't use a while loop when in compatible_eul(). this is a low level rotation functio...
Campbell Barton [Sat, 25 Aug 2012 12:32:22 +0000 (12:32 +0000)]
don't use a while loop when in compatible_eul(). this is a low level rotation function called in many places so better to avoid iterations.

checked this function against the previous method using random rotation inputs and compared results, while this isnt exactly the same the results are very close and acceptable in both cases, also checked baking actions that the resulting FCurves are good and give matching rotations.

9 years agouse set's when checking against multiple types.
Campbell Barton [Sat, 25 Aug 2012 11:54:58 +0000 (11:54 +0000)]
use set's when checking against multiple types.

9 years agostyle cleanup: also spelling
Campbell Barton [Fri, 24 Aug 2012 23:22:34 +0000 (23:22 +0000)]
style cleanup: also spelling

9 years agomesh bridge tool now leaves bridge faces selected.
Campbell Barton [Fri, 24 Aug 2012 17:58:49 +0000 (17:58 +0000)]
mesh bridge tool now leaves bridge faces selected.

9 years agoalternate fix for bug [#32395],
Campbell Barton [Fri, 24 Aug 2012 17:01:35 +0000 (17:01 +0000)]
alternate fix for bug [#32395],
now customdata is interpolated into a temp variable and applied at the end of each layer interpolation function.

So this now works for CDDM customdata interpolation and avoids duplicating the customdata when the source and destination overlap.

9 years agofix for merged bridge crashing on closed loops (own bug in recent commit)
Campbell Barton [Fri, 24 Aug 2012 16:55:25 +0000 (16:55 +0000)]
fix for merged bridge crashing on closed loops (own bug in recent commit)

9 years agoMerging r50190 through r50191 from into soc-2011-tomato
Sergey Sharybin [Fri, 24 Aug 2012 16:11:12 +0000 (16:11 +0000)]
Merging r50190 through r50191 from  into soc-2011-tomato

9 years agoSequencer: reshuffle overlapping strips on cancel trasnform
Sergey Sharybin [Fri, 24 Aug 2012 16:09:48 +0000 (16:09 +0000)]
Sequencer: reshuffle overlapping strips on cancel trasnform

It was possible to create overlapped strips by duplicating and
cancelling transform, now it sohuld be handled properly.

9 years agofix [#32357] Subdivide fails on newly created edge
Campbell Barton [Fri, 24 Aug 2012 14:54:14 +0000 (14:54 +0000)]
fix [#32357] Subdivide fails on newly created edge

problem since bmesh merge, new edges were not selected.

9 years agoMergin trunk into soc-2011-tomato up to rev 50188
Sergey Sharybin [Fri, 24 Aug 2012 14:11:04 +0000 (14:11 +0000)]
Mergin trunk into soc-2011-tomato up to rev 50188

All reverted commits should be merged again.

svn merge -r50173:50188 ^/trunk/blender

9 years agoFix for build error on some platforms, seems ImfStdIO.h is not included with
Brecht Van Lommel [Fri, 24 Aug 2012 14:04:21 +0000 (14:04 +0000)]
Fix for build error on some platforms, seems ImfStdIO.h is not included with
the other headers everywhere.

9 years agoColor management: initialize input color space on movie clip load
Sergey Sharybin [Fri, 24 Aug 2012 14:01:01 +0000 (14:01 +0000)]
Color management: initialize input color space on movie clip load

9 years agouse the zoom level to set the size for new mask point handle sizes (artist request...
Campbell Barton [Fri, 24 Aug 2012 14:00:39 +0000 (14:00 +0000)]
use the zoom level to set the size for new mask point handle sizes (artist request - handles were annoyingly bug when zoomed in)

9 years agoFix #32198: UV unwrap of half a UV sphere would not give a perfect sphere as a
Brecht Van Lommel [Fri, 24 Aug 2012 13:29:48 +0000 (13:29 +0000)]
Fix #32198: UV unwrap of half a UV sphere would not give a perfect sphere as a
result. This wasn't really guaranteed anyway, because of numerical precision and
possible asymmetry in the triangulation, but we can do a bit better.

Now we bias the choice of how to split a quad into two triangles slightly
towards one of two possibilities, so that in case they are equal, floating point
errors do not decide the direction and symmetry is preserved.

9 years agostop socket hiding from causing compositor recalculation.
Campbell Barton [Fri, 24 Aug 2012 13:22:05 +0000 (13:22 +0000)]
stop socket hiding from causing compositor recalculation.

9 years agoMerging r50179 from trunk into soc-2011-tomato
Sergey Sharybin [Fri, 24 Aug 2012 13:17:57 +0000 (13:17 +0000)]
Merging r50179 from trunk into soc-2011-tomato

9 years agoRevert previous merge commit, we need compilable blender in the studio
Sergey Sharybin [Fri, 24 Aug 2012 13:17:08 +0000 (13:17 +0000)]
Revert previous merge commit, we need compilable blender in the studio

9 years agoColor management: fix for clone brush
Sergey Sharybin [Fri, 24 Aug 2012 13:12:18 +0000 (13:12 +0000)]
Color management: fix for clone brush

It was using ibuf->rect for drawing alpha over, now it's using actual
display buffer.

9 years agosvn merge ^/trunk/blender -r50173:50179
Campbell Barton [Fri, 24 Aug 2012 12:50:54 +0000 (12:50 +0000)]
svn merge ^/trunk/blender -r50173:50179

9 years agofix for bug in variable size blur compositor node - using incorrect Y blur operations...
Campbell Barton [Fri, 24 Aug 2012 12:48:56 +0000 (12:48 +0000)]
fix for bug in variable size blur compositor node - using incorrect Y blur operations and uninitialized memory was causing random blur results.

9 years agoColor management: use partial buffer update when painting image
Sergey Sharybin [Fri, 24 Aug 2012 12:17:07 +0000 (12:17 +0000)]
Color management: use partial buffer update when painting image

Makes it much more responsible, especially when small brushes are used.

Could make sense look into using full multithreaded buffer update when
brush is large enough.

9 years agoCode cleanup: remove some unused code.
Brecht Van Lommel [Fri, 24 Aug 2012 12:10:38 +0000 (12:10 +0000)]
Code cleanup: remove some unused code.

9 years agoFix second part #32377: saving/loading exr files to file paths with non-ascii
Brecht Van Lommel [Fri, 24 Aug 2012 12:10:35 +0000 (12:10 +0000)]
Fix second part #32377: saving/loading exr files to file paths with non-ascii
characters should now work on Windows.

9 years agoColor management: fix regression with updating image while painting
Sergey Sharybin [Fri, 24 Aug 2012 11:02:01 +0000 (11:02 +0000)]
Color management: fix regression with updating image while painting

It'll update image properly but it seems it behaves slower then in trunk,
would investigate further.

9 years agoMerging r50172 through r50173 from trunk into soc-2011-tomato
Sergey Sharybin [Fri, 24 Aug 2012 09:45:42 +0000 (09:45 +0000)]
Merging r50172 through r50173 from trunk into soc-2011-tomato