Commit Graph

47594 Commits

Author SHA1 Message Date
Sergey Sharybin
1b487e9948 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/
2012-08-26 11:01:14 +00:00
Joshua Leung
aa17fc367b Bugfix [#32410] Create New Group (CTRL+G) tried to activate even when nothing is
selected

Some group operators were missing poll() callbacks
2012-08-26 08:03:31 +00:00
Joshua Leung
a5e77e3753 Compiling fix for Windows+Mingw: "Ambiguous" use of IStream 2012-08-26 07:27:51 +00:00
Campbell Barton
2ec75c3104 code cleanup: comments and some minor edits to interface code. 2012-08-25 20:49:51 +00:00
Campbell Barton
a3c4b0f47d 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()
2012-08-25 20:16:08 +00:00
Campbell Barton
699b23ecdb fix for type mismatch with SWAP() macro. 2012-08-25 19:43:15 +00:00
Campbell Barton
7caff79a1a code cleanup: vec_to_quat 2012-08-25 17:58:49 +00:00
Campbell Barton
32e4e0f873 add conjugate_qt_qt(), also some code cleanup and use const for 'rotOrders' var in math_rotation.c 2012-08-25 17:42:15 +00:00
Thomas Dinges
614a82cb8c 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)

Documentation: http://wiki.blender.org/index.php/User:DingTo/CyclesBrickTexture

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! :)
2012-08-25 16:52:55 +00:00
Campbell Barton
6b1582c012 better handle sizes by default for mask mode, now ignore image width/height 2012-08-25 14:18:54 +00:00
Campbell Barton
71d1b09708 minor code cleanup 2012-08-25 12:55:14 +00:00
Campbell Barton
049811dabd 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.
2012-08-25 12:32:22 +00:00
Campbell Barton
ed0489bb6e style cleanup: also spelling 2012-08-24 23:22:34 +00:00
Campbell Barton
3da7e0f3bf mesh bridge tool now leaves bridge faces selected. 2012-08-24 17:58:49 +00:00
Campbell Barton
c3bc1da93c 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.
2012-08-24 17:01:35 +00:00
Campbell Barton
d3a566457b fix for merged bridge crashing on closed loops (own bug in recent commit) 2012-08-24 16:55:25 +00:00
Sergey Sharybin
c8915f4f3c Merging r50190 through r50191 from into soc-2011-tomato 2012-08-24 16:11:12 +00:00
Sergey Sharybin
2536362f79 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.
2012-08-24 16:09:48 +00:00
Campbell Barton
b5e90d6b1c fix [#32357] Subdivide fails on newly created edge
problem since bmesh merge, new edges were not selected.
2012-08-24 14:54:14 +00:00
Sergey Sharybin
206d7958f3 Mergin trunk into soc-2011-tomato up to rev 50188
All reverted commits should be merged again.

--
svn merge -r50173:50188 ^/trunk/blender
2012-08-24 14:11:04 +00:00
Brecht Van Lommel
1a2d0d84da Fix for build error on some platforms, seems ImfStdIO.h is not included with
the other headers everywhere.
2012-08-24 14:04:21 +00:00
Sergey Sharybin
54c64cb443 Color management: initialize input color space on movie clip load 2012-08-24 14:01:01 +00:00
Campbell Barton
90a0cf41d0 use the zoom level to set the size for new mask point handle sizes (artist request - handles were annoyingly bug when zoomed in) 2012-08-24 14:00:39 +00:00
Brecht Van Lommel
b30da4d58f 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.
2012-08-24 13:29:48 +00:00
Campbell Barton
aba2754a19 stop socket hiding from causing compositor recalculation. 2012-08-24 13:22:05 +00:00
Sergey Sharybin
56d71219da Merging r50179 from trunk into soc-2011-tomato 2012-08-24 13:17:57 +00:00
Sergey Sharybin
c708156491 Revert previous merge commit, we need compilable blender in the studio 2012-08-24 13:17:08 +00:00
Sergey Sharybin
049df11a70 Color management: fix for clone brush
It was using ibuf->rect for drawing alpha over, now it's using actual
display buffer.
2012-08-24 13:12:18 +00:00
Campbell Barton
735210102c svn merge ^/trunk/blender -r50173:50179 2012-08-24 12:50:54 +00:00
Campbell Barton
a7831c74e6 fix for bug in variable size blur compositor node - using incorrect Y blur operations and uninitialized memory was causing random blur results. 2012-08-24 12:48:56 +00:00
Sergey Sharybin
e3abd8553f 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.
2012-08-24 12:17:07 +00:00
Brecht Van Lommel
cb21d3f670 Code cleanup: remove some unused code. 2012-08-24 12:10:38 +00:00
Brecht Van Lommel
61a39c7b17 Fix second part #32377: saving/loading exr files to file paths with non-ascii
characters should now work on Windows.
2012-08-24 12:10:35 +00:00
Sergey Sharybin
c54b1c5172 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.
2012-08-24 11:02:01 +00:00
Sergey Sharybin
5f31ea249a Merging r50172 through r50173 from trunk into soc-2011-tomato 2012-08-24 09:45:42 +00:00
Sergey Sharybin
7a66f139b4 Sequencer: allow negative bright/contrast 2012-08-24 09:44:46 +00:00
Sergey Sharybin
6bf49c47f8 Merging r50162 through r50171 from trunk into soc-2011-tomato 2012-08-24 09:09:33 +00:00
Sergey Sharybin
501efb0e7c 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.
2012-08-24 09:07:04 +00:00
Campbell Barton
93d89ec768 correct assert for customdata overlap, also quiet uninitialized warning in transform. 2012-08-24 08:17:53 +00:00
Nicholas Rishel
cfd21c7852 Gave the spacetype time region header malloc a more descriptive text, consistent with other header mallocs. 2012-08-24 05:14:16 +00:00
Nicholas Rishel
b47a7c7701 Code cleanup: comment referenced an outdated file path + spelling error 2012-08-24 05:12:05 +00:00
Campbell Barton
56b28635e7 code cleanup: rename BLI_in_rctf() --> BLI_rctf_isect_pt(), to conform with our naming convention. 2012-08-23 18:25:45 +00:00
Dalai Felinto
dfbc793d88 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
2012-08-23 17:37:04 +00:00
Campbell Barton
f6a6fa419e fix [#32395] BMesh data interpolation feedback loop 2012-08-23 17:16:11 +00:00
Campbell Barton
65dbeabdc6 style cleanup: indentation, also quiet double promotion warnings for despeckle node. 2012-08-23 16:17:47 +00:00
Sergey Sharybin
e68e1d69e1 Merging r50160 through r50161 from trunk into soc-2011-tomato 2012-08-23 16:15:37 +00:00
Sergey Sharybin
c9d5f32270 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.
2012-08-23 16:14:52 +00:00
Campbell Barton
95707955ff svn merge ^/trunk/blender -r50156:50159 2012-08-23 15:16:57 +00:00
Campbell Barton
f4ab3b9d8b sequencer zooms horizontal only from mouse wheel and plus buttons. 2012-08-23 14:49:20 +00:00
Brecht Van Lommel
0dd42fd513 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.
2012-08-23 13:54:30 +00:00