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

9 years agoSequencer: allow negative bright/contrast
Sergey Sharybin [Fri, 24 Aug 2012 09:44:46 +0000 (09:44 +0000)]
Sequencer: allow negative bright/contrast

9 years agoMerging r50162 through r50171 from trunk into soc-2011-tomato
Sergey Sharybin [Fri, 24 Aug 2012 09:09:33 +0000 (09:09 +0000)]
Merging r50162 through r50171 from trunk into soc-2011-tomato

9 years agoSequencer: bright/contrast modifier
Sergey Sharybin [Fri, 24 Aug 2012 09:07:04 +0000 (09:07 +0000)]
Sequencer: bright/contrast modifier

Behaves in exactly the same way as bright/contrast compositor node.

Some code could be de-duplicated, like contrast formula and mask
influence, but wouldn't call it stopper for commit since it's
already needed for grading Mango.

9 years agocorrect assert for customdata overlap, also quiet `uninitialized` warning in transform.
Campbell Barton [Fri, 24 Aug 2012 08:17:53 +0000 (08:17 +0000)]
correct assert for customdata overlap, also quiet `uninitialized` warning in transform.

9 years agoGave the spacetype time region header malloc a more descriptive text, consistent...
Nicholas Rishel [Fri, 24 Aug 2012 05:14:16 +0000 (05:14 +0000)]
Gave the spacetype time region header malloc a more descriptive text, consistent with other header mallocs.

9 years agoCode cleanup: comment referenced an outdated file path + spelling error
Nicholas Rishel [Fri, 24 Aug 2012 05:12:05 +0000 (05:12 +0000)]
Code cleanup: comment referenced an outdated file path + spelling error

9 years agocode cleanup: rename BLI_in_rctf() --> BLI_rctf_isect_pt(), to conform with our namin...
Campbell Barton [Thu, 23 Aug 2012 18:25:45 +0000 (18:25 +0000)]
code cleanup: rename BLI_in_rctf() --> BLI_rctf_isect_pt(), to conform with our naming convention.

9 years agobugfix for [32368] Added controllers don't count over 10
Dalai Felinto [Thu, 23 Aug 2012 17:37:04 +0000 (17:37 +0000)]
bugfix for [32368] Added controllers don't count over 10
Blender original code (NaN likely) was relying on strcmp to sort the list of controllers.
As it happens, in strcmp 10 < 2, thus the list was never in the right order.

The curious thing is that in 2.49 it worked, but I think it did because the make_unique_prop_names function was called twice. Strange ;)
The solution is to use blender BLI_natstrcmp to do natural sorting

9 years agofix [#32395] BMesh data interpolation feedback loop
Campbell Barton [Thu, 23 Aug 2012 17:16:11 +0000 (17:16 +0000)]
fix [#32395] BMesh data interpolation feedback loop

9 years agostyle cleanup: indentation, also quiet double promotion warnings for despeckle node.
Campbell Barton [Thu, 23 Aug 2012 16:17:47 +0000 (16:17 +0000)]
style cleanup: indentation, also quiet double promotion warnings for despeckle node.

9 years agoMerging r50160 through r50161 from trunk into soc-2011-tomato
Sergey Sharybin [Thu, 23 Aug 2012 16:15:37 +0000 (16:15 +0000)]
Merging r50160 through r50161 from trunk into soc-2011-tomato

9 years agoSequencer: display color sample information when mouse is holded down
Sergey Sharybin [Thu, 23 Aug 2012 16:14:52 +0000 (16:14 +0000)]
Sequencer: display color sample information when mouse is holded down

Behaves in exactly the same way as image editor's color sampling.

Would be nice to display color managed color too, but that's for tomato branch.

9 years agosvn merge ^/trunk/blender -r50156:50159
Campbell Barton [Thu, 23 Aug 2012 15:16:57 +0000 (15:16 +0000)]
svn merge ^/trunk/blender -r50156:50159

9 years agosequencer zooms horizontal only from mouse wheel and plus buttons.
Campbell Barton [Thu, 23 Aug 2012 14:49:20 +0000 (14:49 +0000)]
sequencer zooms horizontal only from mouse wheel and plus buttons.

9 years agoFix #32387: some mesh modifications breaking other shape keys.
Brecht Van Lommel [Thu, 23 Aug 2012 13:54:30 +0000 (13:54 +0000)]
Fix #32387: some mesh modifications breaking other shape keys.

The vertex shapekey index is now no longer copied, and propagation of offsets
in the basis to other shapekeys is disabled if new vertices were added. The
reason being that the propagation will only be done for the old vertices leaving
the new ones behind, and so doing e.g. subdivide + translate on the basis would
create a mess on other shape keys.

9 years agoMerging r50149 through r50156 from trunk into soc-2011-tomato
Sergey Sharybin [Thu, 23 Aug 2012 13:51:41 +0000 (13:51 +0000)]
Merging r50149 through r50156 from trunk into soc-2011-tomato

9 years agoSequencer: fix for color balance keyframing and modifier renaming
Sergey Sharybin [Thu, 23 Aug 2012 13:32:54 +0000 (13:32 +0000)]
Sequencer: fix for color balance keyframing and modifier renaming

9 years agoFix #32388: bpy.ops.wm.path_open() not working with path with spaces on Windows.
Brecht Van Lommel [Thu, 23 Aug 2012 11:18:31 +0000 (11:18 +0000)]
Fix #32388: bpy.ops.wm.path_open() not working with path with spaces on Windows.

9 years agoFix #32391: new remove doubles "unselected" option was enabled by default, don't
Brecht Van Lommel [Thu, 23 Aug 2012 10:56:16 +0000 (10:56 +0000)]
Fix #32391: new remove doubles "unselected" option was enabled by default, don't
think this was intentional.

9 years agoFix #32389: scons was compiling without iksolver and only itasc since a few days,
Brecht Van Lommel [Thu, 23 Aug 2012 10:56:14 +0000 (10:56 +0000)]
Fix #32389: scons was compiling without iksolver and only itasc since a few days,
which gave performance issues.

9 years agocode cleanup: use const weights for customdata interpolation functions
Campbell Barton [Thu, 23 Aug 2012 09:54:15 +0000 (09:54 +0000)]
code cleanup: use const weights for customdata interpolation functions

9 years agoBGE: When creating a controller by linking a sensor and actuator, the created control...
Mitchell Stokes [Thu, 23 Aug 2012 09:24:59 +0000 (09:24 +0000)]
BGE: When creating a controller by linking a sensor and actuator, the created controller will always be an and controller instead of the last controller type added.

9 years agofix own error in BM_data_interp_from_edges() from recent commit.
Campbell Barton [Thu, 23 Aug 2012 09:20:15 +0000 (09:20 +0000)]
fix own error in BM_data_interp_from_edges() from recent commit.

9 years agoMerging r50147 through r50148 from trunk into soc-2011-tomato
Sergey Sharybin [Thu, 23 Aug 2012 09:05:45 +0000 (09:05 +0000)]
Merging r50147 through r50148 from trunk into soc-2011-tomato

9 years agoSequencer: move up/down operators for modifiers
Sergey Sharybin [Thu, 23 Aug 2012 09:04:30 +0000 (09:04 +0000)]
Sequencer: move up/down operators for modifiers

9 years agosvn merge ^/trunk/blender -r50143:50146
Campbell Barton [Thu, 23 Aug 2012 08:54:06 +0000 (08:54 +0000)]
svn merge ^/trunk/blender -r50143:50146

9 years agoalt page up/down now jump between strip center frames (since often the middle frame...
Campbell Barton [Thu, 23 Aug 2012 08:10:45 +0000 (08:10 +0000)]
alt page up/down now jump between strip center frames (since often the middle frame is a better sample to check).

9 years agode-duplicate sequencer jump operator, use next/prev option instead.
Campbell Barton [Thu, 23 Aug 2012 07:39:51 +0000 (07:39 +0000)]
de-duplicate sequencer jump operator, use next/prev option instead.

9 years agosvn merge ^/trunk/blender -r50138:50143
Campbell Barton [Thu, 23 Aug 2012 07:14:53 +0000 (07:14 +0000)]
svn merge ^/trunk/blender -r50138:50143

9 years agostyle cleanup
Campbell Barton [Thu, 23 Aug 2012 07:10:48 +0000 (07:10 +0000)]
style cleanup

9 years agoset defaults for de-speckle
Campbell Barton [Thu, 23 Aug 2012 07:02:11 +0000 (07:02 +0000)]
set defaults for de-speckle

9 years agodespeckle composite node
Campbell Barton [Thu, 23 Aug 2012 06:48:01 +0000 (06:48 +0000)]
despeckle composite node

9 years agonothread was committed to tomato by accident
Campbell Barton [Thu, 23 Aug 2012 06:40:19 +0000 (06:40 +0000)]
nothread was committed to tomato by accident

9 years agosvn merge ^/trunk/blender -r50132:50138
Campbell Barton [Thu, 23 Aug 2012 06:32:51 +0000 (06:32 +0000)]
svn merge ^/trunk/blender -r50132:50138

9 years agochange I made gave a little nicer bleeding direction for inpaint but introduced dithe...
Campbell Barton [Thu, 23 Aug 2012 06:27:12 +0000 (06:27 +0000)]
change I made gave a little nicer bleeding direction for inpaint but introduced dithering artifact.

9 years ago- add BM_data_interp_from_edges() function (matches BM_data_interp_from_verts).
Campbell Barton [Thu, 23 Aug 2012 05:19:40 +0000 (05:19 +0000)]
- add BM_data_interp_from_edges() function (matches BM_data_interp_from_verts).
- bridge-merged now merges edge customdata and flags for verts and edges.

9 years agobmesh tool: support for merged-bridge (like bridge, collapsing), with a
Campbell Barton [Thu, 23 Aug 2012 04:55:59 +0000 (04:55 +0000)]
bmesh tool: support for merged-bridge (like bridge, collapsing), with a
factor to blend between loops.

9 years agoFix compilation on MinGW after recent utf 16 fixes (possibly win32 too). gcc ostream...
Antony Riakiotakis [Wed, 22 Aug 2012 19:01:09 +0000 (19:01 +0000)]
Fix compilation on MinGW after recent utf 16 fixes (possibly win32 too). gcc ostream does not support wchar_t, I hope it works as expected with unicode filenames.

9 years agoMerging r50119 through r50132 from trunk into soc-2011-tomato
Sergey Sharybin [Wed, 22 Aug 2012 17:23:02 +0000 (17:23 +0000)]
Merging r50119 through r50132 from trunk into soc-2011-tomato