Commit Graph

11497 Commits

Author SHA1 Message Date
0bd759fddd new image operator now allows color grid (before was only grid on/off) 2012-08-29 08:17:38 +00:00
a3d4b98a30 code cleanup: move static mball vars into their own struct, wasnt very clear from reading code what was defined in the function. 2012-08-29 07:07:18 +00:00
141dd5233e Merged changes in the trunk up to revision 50257.
Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
2012-08-29 00:53:29 +00:00
c43583a23a 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.
2012-08-28 10:02:10 +00:00
a798371df1 code cleanup: use switch for metaball type checks and minor style cleanup 2012-08-28 01:50:13 +00:00
5f902ed455 svn merge ^/trunk/blender -r50240:50244 2012-08-27 09:46:49 +00:00
13254cde8c 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.

http://www.graphicall.org/ftp/ideasman42/mask_compare.png
2012-08-27 09:44:56 +00:00
6c500159d7 Merging r50237 through r50240 from trunk into soc-2011-tomato 2012-08-27 09:02:26 +00:00
d6a92c9c31 Sequencer: proper cache invalidation when deleting sequences
Solves issue with effects not being recalculated when deleting their input.
2012-08-27 09:01:36 +00:00
8716e9d98b Merging r50226 through r50236 from trunk into soc-2011-tomato 2012-08-27 08:28:29 +00:00
f31d17220d Sequencer: fix for wrong color space sequencer effects were working in 2012-08-26 23:57:55 +00:00
fa5b0e1d0f Sequencer: typo fix 2012-08-26 19:36:56 +00:00
52310bd4a7 code cleanup: remove dead assignments, gave mask vars clearer names & moved some mask evaluation funcs into mask_evaluate.c 2012-08-26 18:09:01 +00:00
c294ae035f Merging r50192 through r50223 from trunk into soc-2011-tomato 2012-08-26 14:12:09 +00:00
d35957ba94 code cleanup: split out mask spline evaluation into its own file. 2012-08-26 13:41:40 +00:00
ee96cde864 style cleanup: whitespace 2012-08-26 11:35:43 +00:00
3bfe4520ae Style cleanup: whitespace 2012-08-26 11:01:18 +00:00
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
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
699b23ecdb fix for type mismatch with SWAP() macro. 2012-08-25 19:43:15 +00:00
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
71d1b09708 minor code cleanup 2012-08-25 12:55:14 +00:00
ed0489bb6e style cleanup: also spelling 2012-08-24 23:22:34 +00:00
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
54c64cb443 Color management: initialize input color space on movie clip load 2012-08-24 14:01:01 +00:00
6bf49c47f8 Merging r50162 through r50171 from trunk into soc-2011-tomato 2012-08-24 09:09:33 +00:00
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
93d89ec768 correct assert for customdata overlap, also quiet uninitialized warning in transform. 2012-08-24 08:17:53 +00:00
b47a7c7701 Code cleanup: comment referenced an outdated file path + spelling error 2012-08-24 05:12:05 +00:00
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
f6a6fa419e fix [#32395] BMesh data interpolation feedback loop 2012-08-23 17:16:11 +00:00
65dbeabdc6 style cleanup: indentation, also quiet double promotion warnings for despeckle node. 2012-08-23 16:17:47 +00:00
6f1680e1b7 Merging r50149 through r50156 from trunk into soc-2011-tomato 2012-08-23 13:51:41 +00:00
bbd8863956 code cleanup: use const weights for customdata interpolation functions 2012-08-23 09:54:15 +00:00
a4188f6303 svn merge ^/trunk/blender -r50138:50143 2012-08-23 07:14:53 +00:00
9ecc6fdcc7 style cleanup 2012-08-23 07:10:48 +00:00
1ab5a4f0ed despeckle composite node 2012-08-23 06:48:01 +00:00
6900c792d1 Merging r50119 through r50132 from trunk into soc-2011-tomato 2012-08-22 17:23:02 +00:00
b0dd030ba6 Fixed regression introduced in 50107
Shader preview job localizes material without referencing it as a user,
so don't need to unreference itself as a user from this material.

Added BKE_material_free_ex function which could skip user dereferencing.
This also removed old hack with mtex users.
2012-08-22 17:22:04 +00:00
b2483c3dbe despeckle node for tomato only 2012-08-22 15:08:41 +00:00
dd65a6b67d Color Management: pipeline cleanup
- Move color management settings to scene, so it's now clear for
  all areas (such as compositor, sequencer) which settings to
  use for display buffers

- Currently removed per-editor color management settings. It could
  be nice to have them, but they don't fit nicely into overall
  pipeline and could be added as a override settings for display
  only later.

- Make sequencer working in space defined by sequencer_workspace
  role in OCIO configuration file.
  If this role is not set, sequencer will fallback to legacy sRGB
  Gamma 2.2 space.

  Currently use vd16 color space for sequencer. Not sure what exactly
  this color space is, but it's pretty close to SPI Film view and
  it's still invertable.

- Sequencer will now output linear float buffers, not color managed
  float buffers.
  Before this sequencer used to output float buffers in sRGB space,
  which was sequencer's working space. Now it can not output buffers
  in this space since other areas are not aware of this space.
  This also makes it's consistent that all float buffers in Blender
  are in linear space.

- When saving render result into byte file format scene's display
  transform would be applied on this buffer.
  When saving files from image editor, there'll be a display
  transform settings which are default set to scene's settings but
  could also be overwritten.

Additional details are there (would be extended soon):

  http://wiki.blender.org/index.php/User:Nazg-gul/ColorManagement
2012-08-22 14:23:08 +00:00
24498f084d Merging r50113 through r50118 from trunk into soc-2011-tomato 2012-08-22 13:46:23 +00:00
0fbd15df0f Sequencer: fix for incorrect proxies rendering after some recent refactor 2012-08-22 13:45:20 +00:00
97ee630dcd Fix #32201: particle size compatibility broken for object/group duplication.
After 2.63 there was a bugfix to take object scale into account for the duplicated
objects, but this breaks compatibility on earlier files. Now there is an option to
control if the scale should be used or not.

Scale is used by default on newer files, and not used on older ones.
2012-08-22 13:10:43 +00:00
c984a8fa56 svn merge ^/trunk/blender -r50107:50112 2012-08-22 12:04:27 +00:00
f67d0e63a4 add new mask blend mode: 'Merge Subtract'. gives better results when using feather on overlapping masks when one subtracts from another. 2012-08-22 11:58:59 +00:00
6e127b3009 svn merge ^/trunk/blender -r50091:50107 2012-08-22 09:36:49 +00:00
2b9fd376e1 all areas of blender now do node tree id user count management, except for some exceptions like making a node tree local and material clipboard. 2012-08-22 09:35:46 +00:00
a4fd9f827b fix for bug where scene copy and free didn't manage ID users.
you could for eg, make a full copy of a scene, then manually remove its compo nodes - which would give invalid zero user count.
2012-08-22 09:10:16 +00:00
ffcc63a7d0 node tree functions for copy/free now support optional ID user count management,
this is not used yet, so no functional changes.
2012-08-22 08:54:18 +00:00