Commit Graph

407 Commits

Author SHA1 Message Date
Brecht Van Lommel
992a4e8e7a Fix a crash when failing to read .tga files in some cases. 2010-06-23 10:24:35 +00:00
Brecht Van Lommel
86de9694ff ffmpeg was computing the frame length of avis via doubles, but was
not properly ceiling them, sometimes resulting in truncation errors.

(merge from render25 branch, commit with revision 28901 by Joe)
2010-06-22 18:18:42 +00:00
Campbell Barton
c120689203 revert changes in own commit to fix warnings, was giving warnings with a newer swscale 2010-06-05 16:52:19 +00:00
Campbell Barton
556b57febf get rid of some warnings,
removed NG_LoopBackNetworkDeviceInterface::GetNetworkVersion(), wasnt used anywhere.
2010-06-05 15:31:55 +00:00
Guillermo S. Romero
7639c5146f SVN maintenance. 2010-06-04 18:26:15 +00:00
Campbell Barton
16ca0163d8 passepartout overlay wasnt written into thumbnails 2010-06-01 13:06:13 +00:00
Matt Ebb
80a89d2de5 * Only print libtiff debug messages to the console when in debug mode
* Allow loading non 3/4 channel TIFFs (eg. greyscale). This was already 
working, but disabled out of caution. Seems to work fine in my recent tests though.
2010-06-01 01:01:25 +00:00
Campbell Barton
177cffc171 blend file thumbnails
- fix for blend file thumbnails not being immediately visible in an external file manager (was writing the thumb before the blend)
- move overlay function from wm_files.c into thumbs_blend.c
2010-05-30 19:21:28 +00:00
Campbell Barton
c9ac1cc986 fix for 2 warnings & better error checking for the thumbnail loading. 2010-05-25 05:56:31 +00:00
Campbell Barton
c61e25e6ac blend file thumbnailing
- uses same thumbnail system as image browser
- blend files show thumbnails in ubuntu/gnome (freedesktop spec)
- 128x128 images are embedded into the blend file header, a simple loader avoids reading the entire blend file to extract it when generating thumbnails in the file selector.
  When the image browser reads a directory it loads images and creates thumbnails, blend files embedded images are treated just like loading an image.
- the thumbnail is created from the camera view in solid mode. (no camera == no thumbnal).
- readfile/writefile.c: had to use the 'TEST' code name to save thumbnails, anything else would segfault older blender versions on load. (its not used elsewhere).
2010-05-24 21:52:18 +00:00
Campbell Barton
4178b44b35 - correct --help message
- fix implicit decloration of DAG_scene_sort()
- same fix for tiff as made in renderbranch
- rename 'combined peak' --> 'peak' for shorter messages while rendering.
2010-05-24 11:40:45 +00:00
Stefan Gartner
bb85284228 Makefiles: statically link tiff libs when WITH_TIFF is set to true, which is the default for all platforms 2010-05-21 21:06:00 +00:00
Campbell Barton
418f1fcba8 libtiff working on linux & cmake again. 2010-05-21 04:23:33 +00:00
Matt Ebb
2be851c966 Blender TIFF support
* Removed dynamic linking libTIFF code and change it to static linking 
(built into the blender executable). Dynamic linking made things a 
fair bit more complicated and wasn't working at all before on OS X - 
the dylib didn't exist and wasn't being copied. Since TIFF is more heavily
depended upon now in Blender, it makes sense to make it less 'optional'
and more in line with other libraries.

I've updated both CMake and scons, and CMake on OS X/64bit works fine.
It's now up to other platform/build system maintainers to enable this for 
their respective platforms (Campbell will check it for linux). For windows,
and non-64bit osx, we need static libtiff libraries in /lib.

I've added options WITH_TIFF for CMake and WITH_BF_TIFF for scons,
so if blender won't build because of this, you should be able to disable 
these options until your build system has been updated.

* Bonus feature: while doing this, I added support for loading 16bit and 32bit 
per channel TIFFs - they get converted to Blender's float buffers. Handy for 
zbrush displacement maps!
2010-05-21 03:25:38 +00:00
Campbell Barton
7f575ddf89 revert 28807, fix for [#21385] Multilayer OpenEXR files import into other compositors upside down
looks like a threading problem:
 Easy to redo, 1024x436, FSA, 4 threads.

With 1 thread it runs ok, need to look into this further but no time now so reverting.
2010-05-19 16:23:09 +00:00
Matt Ebb
e3587f9e9f Fix [#22304] Tiff 16bit gives darker images
Also fixed similar issue for jpeg2000
2010-05-18 07:28:44 +00:00
Campbell Barton
9c3c7f970f no functional changes, simplify some exr api code. 2010-05-17 16:42:53 +00:00
Campbell Barton
d5f74baa17 [#21385] Multilayer OpenEXR files import into other compositors upside down
famous upside down EXR bugfix from Xavier Thomas

- Files from blender 2.4x will be flipped on load.
- New files will be saved correctly

tracker has detailed info for further reference.
2010-05-17 15:54:57 +00:00
Guillermo S. Romero
b2b780f2fe SVN maintenance. 2010-05-07 22:04:48 +00:00
Dalai Felinto
672044cd49 CMake + MSVC building fix (PTHREADS_INC needed in imbuf)
again, I know that the header shouldnt' be included there. But since it's still there at least let's make it build.
2010-05-07 21:35:10 +00:00
Campbell Barton
5774e61f4a shouldnt have committed this, was local hack to workaround float buffer bug. 2010-05-07 15:52:16 +00:00
Campbell Barton
d972b8488e fix for segfault when reading bad multilayer EXR's 2010-05-07 15:49:21 +00:00
Brecht Van Lommel
008863daec Merge image related changes from the render branch. This includes the image
tile cache code in imbuf, but it is not hooked up to the render engine.


Imbuf module: some small refactoring and removing a lot of unused or old code
(about 6.5k lines).

* Added a ImFileType struct with callbacks to make adding an file format type,
  or making changes to the API easier.
* Move imbuf init/exit code into IMB_init()/IMB_exit() functions.
* Increased mipmap levels from 10 to 20, you run into this limit already with
  a 2k image.
* Removed hamx, amiga, anim5 format support.
* Removed colormap saving, only simple colormap code now for reading tga.
* Removed gen_dynlibtiff.py, editing this is almost as much work as just
  editing the code directly.
* Functions removed that were only used for sequencer plugin API:
  IMB_anim_nextpic, IMB_clever_double, IMB_antialias, IMB_gamwarp,
  IMB_scalefieldImBuf, IMB_scalefastfieldImBuf, IMB_onethird, IMB_halflace,
  IMB_dit0, IMB_dit2, IMB_cspace
* Write metadata info into OpenEXR images. Can be viewed with the command
  line utility 'exrheader'

For the image tile cache code, see this page:
http://wiki.blender.org/index.php/Dev:2.5/Source/Imaging/ImageTileCache
2010-05-07 15:18:04 +00:00
Campbell Barton
394537715d string number decoding didnt check for win32 slash & minor adjustments to some other path funcs (no functional change). 2010-04-23 23:01:50 +00:00
Campbell Barton
0ebcc8557f [#22100] Jpeg2000 null pointer dereference
found by Dan Eicher (dna)
2010-04-21 07:49:06 +00:00
Campbell Barton
8f1500da00 remove config.h references, was added for automake build system rev around 124-126 but isnt used by any build systems now. 2010-04-18 10:28:37 +00:00
Brecht Van Lommel
9a85013692 Merge various small changes from render branch:
* Division by zero fix for TNT SVD code.
* Sound fix, in case ffmpeg decode fails, don't use the samples.
* Fix for incorrect bounds of transformed objects in new raytracing code.
* Gave memory arena's a name used for allocations for easier memory
  usage debugging.
* Dupligroup no_draw option was using layers but not restrict view/render
  setting. (not a bugfix exactly but would do display list context switching
  while drawing for no reason).
* Fix objects instanced on hair particles not giving consistent results
  when the object is transformed.
* New math functions: madd_v4_v4fl, len_squared_v3v3, interp_v4_v4v4v4,
  mul_v4_m4v4, SH and form factor functions, box_minmax_bounds_m4.
* mul_m4_m4m4 and mul_m3_m3m3 now accept the same pointers for multiple
  arguments.
* endjob callback for WM jobs system.
* Geometry node uv/color layer now has search list/autocomplete.
* Various small buildsystem tweaks, not strictly needed yet in trunk.
2010-04-15 10:28:32 +00:00
Matt Ebb
7d98982295 Patch from Xavier Thomas, tweaks/fixes to FFMPEG YUV conversion code 2010-04-11 23:52:47 +00:00
Matt Ebb
be3abe7b68 Fix for previous FFMPEG commit, needs extra version ifdefs 2010-04-08 06:10:41 +00:00
Matt Ebb
7693bbf484 Fix [#21890] YUV->RGB: Color clamping 16-235 in all motion pictures (ffmpeg)
Patch by Troy James Sobotka - this uses options in newer FFMPEG versions to 
convert the full 0-255 YUV range of imported imagery to RGB, rather than 
clipping at 16-235.

This functionality is not available yet in an official FFMPEG release 
(current precompiled version in /lib for osx at least is v0.5.1 from 2009) so this 
won't take effect in that situation, but if you've got a newer ffmpeg on your system
it will work.
2010-04-08 03:26:49 +00:00
Campbell Barton
1e9bf0cfdb spaces -> tabs, (4 spaces == 1 tab, only for white space preceding text) 2010-03-22 09:30:00 +00:00
Guillermo S. Romero
42ac4a3e7d Fix syntax for ID keyword. 2010-03-21 01:14:04 +00:00
Brecht Van Lommel
7ecba90f65 Remove SAT texture filter. It's not working, thought it was but that's
because the mipmap was not being refreshed. Also this will be problematic
to support when I add tile/mipmap cache, so would not rather not try to.
Can be added back afterwards if someone wants to make it work.
2010-03-14 18:22:04 +00:00
Andrea Weikert
c0b3ab6ceb filebrowser:
* move own thread handling for thumbnails to WM_jobs 
* cleanup of thumbnail creation code
* added function to kill the job, which actually allows thread to terminate gracefully

vc9 projectfiles:
* fixed some missing includes for release target!
2010-03-10 19:30:20 +00:00
Joshua Leung
e51bcbae62 Fix for crash in imbuf code under certain circumstances on linux. 2010-02-28 02:17:07 +00:00
Campbell Barton
f5c9574e68 remove duplicate function. 2010-02-17 14:09:16 +00:00
Brecht Van Lommel
5e58daa098 Fix #21078: image paint undo didn't work correct with wrap option, moved
wrapping code to paint_image.c so it can be used for the undo push.
2010-02-15 12:57:16 +00:00
Campbell Barton
081c1205a3 correct fsf address 2010-02-12 13:34:04 +00:00
Brecht Van Lommel
ec7df03c86 Warning fixes, one actual bug found in sequencer sound wave drawing. Also
changed some malloc to MEM_mallocN while trying to track down a memory leak.
2010-02-08 13:55:31 +00:00
Brecht Van Lommel
7d0885915b Fix #20146:
* .tif not loading on newer linux distributions, wasn't looking for
  libtiff version 4.
* fix dds being too verbose when testing if it can open an image file.
2010-01-30 09:14:12 +00:00
Brecht Van Lommel
50a7cdd116 Fix attempt to free already freed memory when loading an animation
in the sequencer, was in the code that tests if it's a file that it
understands. Didn't cause a crash here though, just warning.
2010-01-26 13:17:28 +00:00
Matt Ebb
e6a23762da Fix [#20821] COLOR MANAGEMENT: Corrupts motion picture files
Wasn't tagging movie formats with profiles properly.
2010-01-26 02:49:30 +00:00
Campbell Barton
b0f87935a8 spelling errors, no real changes to code. 2010-01-14 10:59:42 +00:00
Campbell Barton
a3e461ce1b - player building again
- fix for compiler warnigns
- bpath reporting was incorrect
2010-01-11 10:48:41 +00:00
Matt Ebb
04dec46c6a Color management fixes
Now it's a bit more robust, tagging images with profiles when they're loaded, 
which then get interpreted later on by conversion functions. Just Linear RGB 
and sRGB profiles at the moment, same as before.

This commit fixes Martin's problem with EXRs and Multilayer images loading/
saving too dark, and it also makes the sequence editor work correctly with it too.

Also fixes:
[#19647] gamma correction with color management is reset when resetting Curve
[#19454] 2.5: Dither does not work when Color management is enabled
2010-01-09 00:16:35 +00:00
Campbell Barton
d5592fe254 fixes for errors/warnings found with cppcheck 2009-12-26 20:23:13 +00:00
Benoit Bolsee
915f352400 ImBuf: Fix bug in clipping 2009-12-08 08:44:18 +00:00
Matt Ebb
a4d8c4a745 Fix for [#20240] Image inputs to the compositor are white when using color management
was missing include
2009-12-03 21:49:29 +00:00
Andrea Weikert
ce13cded15 fix for [#19990] file browser crash
needed to fix jpg error handling to not return control to the library from jpg_error used as error exit. Needed to add structured exception handling (setjmp/longjmp) - not very nice but needed in this case. (Also recommended in example.c from libjpg and used in gimp ;) )
2009-12-01 20:37:26 +00:00
Campbell Barton
ae5a814f26 ID properties that are displayed via RNA can now define their own UI settings,
only implimented min/max precision & step.

at the moment there is no way to edit these other then via python

example of setting UI limits...

>>> C.object['foo'] = 0.5
>>> C.object['_RNA_UI'] = {'foo': {'step': 0.5, 'soft_max': 10.0, 'soft_min': 0.0, 'precision': 2, 'description': 'Some setting'}}

Also fixed typo's: precission -> precision
2009-11-18 20:01:35 +00:00