Commit Graph

66005 Commits

Author SHA1 Message Date
Dalai Felinto
c052ebda8e Cycles bugfix: [32431] Cycles Math Node : Clamp does not work
the OSL solution is slightly different than the svm, but I think it's fine.

thanks Lukas Toenne for helping with a fix on the original patch
2012-08-29 17:30:14 +00:00
Sergey Sharybin
d6a617ff06 Merging r50248 through r50264 from trunk into soc-2011-tomato 2012-08-29 12:49:10 +00:00
Sergey Sharybin
7a13bc2196 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.
2012-08-29 12:47:42 +00:00
Campbell Barton
635db3b306 code cleanup: add utility function BLI_path_is_rel() 2012-08-29 10:32:38 +00:00
Campbell Barton
1d9eaad73a 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. 2012-08-29 09:51:38 +00:00
Campbell Barton
0bd759fddd new image operator now allows color grid (before was only grid on/off) 2012-08-29 08:17:38 +00:00
Campbell Barton
78ded61065 texture curves were not initialized (causing crash), own regression from moving curve initialization outside evaluation. 2012-08-29 07:58:36 +00:00
Campbell Barton
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
Tamito Kajiyama
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
Jens Verwiebe
8321acaf43 missing linebreak when multithreaded gl meesage is printed to log 2012-08-28 13:43:20 +00:00
Campbell Barton
7aeaeaf378 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.
2012-08-28 11:27:46 +00:00
Jeroen Bakker
8fd7471143 cleanup pixel sampler code (pixel interpolations in compositor) 2012-08-28 10:41:37 +00:00
Campbell Barton
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
Campbell Barton
a798371df1 code cleanup: use switch for metaball type checks and minor style cleanup 2012-08-28 01:50:13 +00:00
Bastien Montagne
40e3af441b Adding despeckle as “blender” word... 2012-08-27 21:01:21 +00:00
Bastien Montagne
316b72647a Picky spell-checking... 2012-08-27 20:58:43 +00:00
Sergey Sharybin
6a5d8e355d 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.
2012-08-27 15:23:14 +00:00
Campbell Barton
77f0be7fec support unary positive operators for vectors (same as numpy), so you can do 'vector_a = +vector_b', this makes a copy. 2012-08-27 13:40:19 +00:00
Sergey Sharybin
59042ad1ae Merging r50245 through r50247 from trunk into soc-2011-tomato 2012-08-27 12:00:39 +00:00
Sergey Sharybin
590251f55a 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.
2012-08-27 11:59:26 +00:00
Campbell Barton
5f902ed455 svn merge ^/trunk/blender -r50240:50244 2012-08-27 09:46:49 +00:00
Campbell Barton
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
Sergey Sharybin
4035bf16e7 Fix #31853: Marker deletion invokes strip deletion 2012-08-27 09:15:48 +00:00
Sergey Sharybin
6c500159d7 Merging r50237 through r50240 from trunk into soc-2011-tomato 2012-08-27 09:02:26 +00:00
Sergey Sharybin
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
Sergey Sharybin
1216dcffaa Style cleanup: spaces in sequencer scopes 2012-08-27 09:01:35 +00:00
Sergey Sharybin
b563039b8f Sequencer: fix crash of histogram view for float images
Overexposured pixels lead to wrong memory access in histogram making function
2012-08-27 09:01:34 +00:00
Sergey Sharybin
8716e9d98b Merging r50226 through r50236 from trunk into soc-2011-tomato 2012-08-27 08:28:29 +00:00
Campbell Barton
5d60dabef4 remove incorrect comment, add in useful one. 2012-08-27 08:23:51 +00:00
Campbell Barton
ae6907a065 fix [#32417] Grease Pencil color change + DopeSheet 'Summary' = crash
summery wasn't checking fcurve types.
2012-08-27 06:55:33 +00:00
Sergey Sharybin
f31d17220d Sequencer: fix for wrong color space sequencer effects were working in 2012-08-26 23:57:55 +00:00
Mitchell Stokes
b78b1924f3 BGE: Make sure lib loaded cameras are added to the active scene's camera list. 2012-08-26 23:17:50 +00:00
Campbell Barton
c68890cb87 ensure there are always the same number of feather points and non feather points when drawing. 2012-08-26 20:22:42 +00:00
Sergey Sharybin
fa5b0e1d0f Sequencer: typo fix 2012-08-26 19:36:56 +00:00
Campbell Barton
d33eb704f6 code cleanup: quiet warning for dead assignment. 2012-08-26 18:21:34 +00:00
Campbell Barton
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
Sergey Sharybin
89578a3074 Merging r50224 through r50225 from trunk into soc-2011-tomato 2012-08-26 16:43:24 +00:00
Sergey Sharybin
7b84a75a22 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
region.
2012-08-26 16:41:03 +00:00
Sergey Sharybin
c294ae035f Merging r50192 through r50223 from trunk into soc-2011-tomato 2012-08-26 14:12:09 +00:00
Campbell Barton
d35957ba94 code cleanup: split out mask spline evaluation into its own file. 2012-08-26 13:41:40 +00:00
Sergey Sharybin
09e340fdf7 Color Management: correction to previous commit 2012-08-26 13:18:43 +00:00
Campbell Barton
25a925ceab fix for build error without ffmpeg 2012-08-26 12:21:25 +00:00
Campbell Barton
ee96cde864 style cleanup: whitespace 2012-08-26 11:35:43 +00:00
Sergey Sharybin
31705361ec Color Management: CMake should detect yaml-cpp and tinyxml libraries automatically
This makes Blender compilable with CMake and OCIO libraries from SVN.
2012-08-26 11:34:33 +00:00
Sergey Sharybin
3bfe4520ae Style cleanup: whitespace 2012-08-26 11:01:18 +00:00
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