Commit Graph

369 Commits

Author SHA1 Message Date
Kent Mein
ae976e087a This is patch: [#7975] imbuf for DDS textures: improved read support and a few bugs fixed
Kent

Notes From the author:
The attached patch syncs the DDS code in Blender with the latest revision 
(324) of the nvidia texture tools. This fixes a few minor issues and adds 
support for a more types of DDS textures, in particular uncompressed textures 
that don't have the standard 16, 24, or 32 bits per pixel.

Note: I have started using the nvidia texture tools convention for naming 
integer types (uint, uint16, uint8, uint64 etc.) because doing so makes it 
much easier to merge patches from upstream. Since the code is compiled 
separately from the rest of Blender, this likely does not pose a problem. 
However, if there turns out to be a good reason for avoiding those nvidia type 
names from upstream, I'd be happy to fix it.

Regards,
Amorilia
2007-12-26 21:46:30 +00:00
Andrea Weikert
e06edeb801 == MSVC 7.1 projectfiles ==
- added missing files to projectfiles
- cleaned up thumbnail creation to avoid dependency on BKE_
2007-12-26 19:19:51 +00:00
Peter Schlaile
6e812d5901 == Sequencer ==
* Make Lock flag work for metastrips
* Fixes: flags are cleared on exit of metastrips
* Fixes (hopefully): red picture on big endian
2007-12-25 20:31:07 +00:00
Ton Roosendaal
463cf8e332 Part 4 of the event refactor branch: all changes in existing files,
Makefiles especially, and of course the windowmanager DNA!
2007-12-24 18:53:37 +00:00
Peter Schlaile
6cbc3daf34 == FFMPEG ==
Fixes [#7475] no video as background 
libswscale sets the alpha channel to 0 by default... grmbl.
Added a workaround. Big endian users please complain, if it doesn't work.
2007-12-23 18:44:32 +00:00
Peter Schlaile
2a43932a74 == Imbuf ==
The TIFF reader did error handling with assert which is a pretty bad
idea (tm).

This fixes the assert-crash, that the TIFF reader triggers, if one tries
to open a RAW-DV file within the compositor. (File extension is only
two characters long, which is enough for an assert... EVEN IF IT ISN'T
A TIFF FILE, WE ARE GOING TO OPEN. GRMBL)

Removed all other assertions and added proper error handling.
(using STDERR, where it belongs.)
2007-12-19 23:14:14 +00:00
Diego Borghetti
0b66838f40 Add support for stampinfo to the JPEG format.
This is the review of the patch:
	[#5485] Invisibly stamp render information into jpg and png files.
		by Rob Hausauer (paprmh)

NOTE: I split this patch in 3 part:
	1) jpeg support
	2) python api
	3) sequence plugin

This is the first part, hope finish with the other two tomorrow night.
2007-12-19 05:37:57 +00:00
Joshua Leung
e448f20db5 Routine purge of compiler warnings. Yet again, they were mostly uninitialised vars. 2007-10-29 05:59:26 +00:00
Campbell Barton
7718b3d642 render stamp drawing is now done everywhere - (not just when saving
images)
separated stamp metadata and stamp draw functions.
2007-10-28 22:27:07 +00:00
Campbell Barton
2a2453d3e2 nodes from eechlo
* glare
* tonemap
* lense distort
* fast gauss blur

http://projects.blender.org/tracker/?func=detail&atid=127&aid=7505&group_id=9

made fast gauss blur an option for the blur node rather then a separate node.
2007-10-26 15:32:36 +00:00
Campbell Barton
94dfb616a9 Patch by GSR #7628, I also added alpha for text background.
The list of changes (some are fixes):
- Properly horizontally centered tags in all fields (bug?).
- File area does not have trailing space and has leading "File " at
start instead (probably a bug).
- Small separation between to time related fields, space saving.
- Removed colons, for consistency and space saving again.
- Frame field is zero aligned for higher visual stability.
- Marker name shows a rarer name, "<none>" (using <> is typical for cases
in which there is nothing: <none>, <empty>, <blank>, etc).
- Top area for misc info that can be really long (file, note and render date).
- Bottom area for more constantly changing but short ones (marker, SMPTE,
frame, camera and scene).
- Only render date moves a line (when note field is not used), and frame one
moves if no SMPTE (still in same line, so no big jump), for extra visual
stability (marker is fixed, assuming most people would show frame and or
SMPTE).
- ISO 8601 date format for render date, localization independant.

Comparision images:
http://www.infernal-iceberg.com/blender/stamp-original.png
http://www.infernal-iceberg.com/blender/stamp-cleanup.png
2007-10-23 22:51:50 +00:00
Campbell Barton
46deddcc62 Image Stamping patch by Diego (and peach request)- stamps image info into metadata and optionally
draws into the
frame.

This patch includes some changes I made...   
* use blenders bitmap fonts (rather then own fonts)
* select font size
* user interface layout changes
* Marker as another image stamp option

Also added some new API calls   
BMF_GetFontHeight(font);
BMF_DrawStringBuf(...);  - so we can draw text into an imbuf's image buffer.
get_frame_marker(frame) - get the last marker from the frame.
IMB_rectfill_area(...) - fill in an image buffer with a rectangle area of color.

TODO - draw stamp info in 3d view, at the moment it just displays in the animation.
2007-10-20 16:17:27 +00:00
Kent Mein
6fe98f19a9 This is patch [#7483] imbuf support for uncompressed DDS images
provided by Amorilia

NVIDIA updated the dds stuff so we get a nice new patch.

Kent
2007-10-12 16:09:59 +00:00
Peter Schlaile
3697e08524 == IMBuf fix ==
Fixed Campbell's patch for IMB_flipx:
- header file declaration is corrected
- reordered loops to make things faster (less cache misses 
  and no tests for float-buffers on a _per pixel basis_!)

(Campbell: it'd be nice, if you could check with me before patching
the sequencer. Or at least pay attention to compiler warnings :) )
2007-10-12 06:37:20 +00:00
Campbell Barton
4a43099c5a Peach request
new option for the image sequencer's image strips, flip x/y, (useful when making animatics to test the direction characters walk across the screen)
added IMB_flipy was alredy there, needed to add IMB_flipx.
2007-10-10 23:34:40 +00:00
Kent Mein
d2ecbefa16 This is a fix for the following bug:
7096  	bitfields not c++ standard compliant, can't compile using sun CC

Kent
2007-10-08 19:07:50 +00:00
Peter Schlaile
ba6a09f31d == Sequencer / FFMPEG ==
Confused RGBA32 with RGBA.
2007-09-23 17:26:22 +00:00
Peter Schlaile
fd44aa2204 == Sequencer / FFMPEG ==
Updated FFMPEG to latest version.

Since we now use swscaler, things should be a lot faster!

Please check on Big-Endian, if this still works!
2007-09-23 14:04:23 +00:00
Andrea Weikert
70edf4e293 fixing some compile problems with MSVC7.1/scons
* stupid misplacement of declaration
* replacing fmodf with fmod (fmodf not available with MSVC7.1 when compiling C-code)
* appending CXXFLAGS to CCFLAGS in tools/Blender.py to avoid linking errors with runtime library (/MT not set) 
  - jesterKing, could you please check if that's ok?
2007-09-23 13:52:08 +00:00
Joshua Leung
d86a03113d Another purge of compiler warnings (some of which I've been getting for a while) as a warmup exercise. 2007-09-18 06:33:24 +00:00
Andrea Weikert
1460856642 fix compile on not-windows platforms, accidentally removed declaration
in warning fix.
2007-09-17 11:07:28 +00:00
Andrea Weikert
8bfbccb329 thumbs.c: warning fixes
filelist.c: warning fixes
2007-09-17 10:26:09 +00:00
Peter Schlaile
c8fe5a0ed9 == Sequencer ==
Bugfix for transform effect by Damiles.

Fixes crash with float buffers. (Don't try to render into output buffers,
that do not exist...)
2007-09-15 18:54:03 +00:00
Andrea Weikert
f0995e87b5 fix svn properties for line endings
fix a few no newlines at end of file warnings
2007-09-05 17:55:44 +00:00
Stephen Swaney
3326d493a0 more warning fixes.
sprinkle a few 'const char*'s around to remove warnings 
about discarding qualifiers in imbuf code.
2007-09-03 19:12:36 +00:00
Andrea Weikert
600c4c7c19 == imagebrowser ==
fix for missing null pointer check in IMB_thumb_create.
found by Diego Borghetti (bdiego) - thanks!
2007-09-02 17:41:25 +00:00
Andrea Weikert
356ab94373 == imagebrowser ==
Initial commit of imagebrowser in trunk.
BIG COMMIT!

Main changes:
* completely reworked imasel space
* creation and storage of the preview images for materials, textures, world and lamp
* thumbnails of images and movie files when browsing in the file system
* loading previews from external .blend when linking or appending
* thumbnail caching according to the Thumbnail Managing Standard: http://jens.triq.net/thumbnail-spec/
* for now just kept imasel access mostly as old imgbrowser (CTRL+F4, CTRL+F1) a bit hidden still.
* filtering of file types (images, movies, .blend, py,...)
* preliminary managing of bookmarks ('B' button to add, XKEY while bookmark active to delete)

More detailed info which will be updated here: http://wiki.blender.org/index.php/User:Elubie/PreviewImageBrowser

Places that need special review (and probably fixes):
* BLO_blendhandle_get_previews in readblenentry
* readfile.c: do_version and refactorings of do_library_append
* UI integration

TODO and known issues still:
* Accented characters do not display correctly with international fonts
* Crash was reported when browsing in directory with movie files
* Bookmark management still needs some UI work (second scrollbar?), feedback here is welcome!

Credits:
Samir Bharadwaj (samirbharadwaj@yahoo.com) for the icon images.

Many thanks to everyone who gave feedback and helped so far!
2007-09-02 17:25:03 +00:00
Ton Roosendaal
22c23fb04f Bugfix #7125
The conversion from float to char (byte) was not correct. It should include
the possibility for colors like 0.999999 to become 255 still. The correct
multiplication factor I don't know though... and this should become a system
wide definition!
2007-09-02 16:34:02 +00:00
Kent Mein
6cd6bf7d80 Updated the Makefiles removing some of the gcc specific stuff...
Basically I moved  -funsigned-char -fno-strict-aliasing
from individual Makefiles to nan_compile.mk defines for CFLAGS and CCFLAGS

Kent
2007-08-31 16:16:33 +00:00
Kent Mein
9f3670ce9f Removed comments with non ascii chars...
I left the link that points to documentation on the web so not really needed 
anyway.

Kent
2007-07-10 19:34:41 +00:00
Kent Mein
9298357670 This is patch [#6929] Interpolation Methods
http://projects.blender.org/tracker/index.php?func=detail&aid=6929&group_id=9&atid=127
Its a subset of patch [#6766] Transform Sequencer effect

It adds 3 image functions for different types of interpolation.
For people that like pictures:
http://wiki.blender.org/index.php/User:Damiles#Interpolations_Algorithms

Patch provided by David Millán Escrivá (damiles)

Kent
2007-07-10 19:13:03 +00:00
Ken Hughes
cc1a3941cc For scons: Add "-DWITH_DDS" to compile flags when dds is enabled. 2007-06-25 21:25:28 +00:00
Kent Mein
613646b33e This commit is a modified version of patch #6860
It adds read only dds support.  (Writing will come later)

Kent
2007-06-25 19:50:25 +00:00
Nathan Letwory
86ff85932b * Fix for #6707
This fix is windows specific. AVIs are now evaluated by the pre-FFMPEG code first, failing that only by FFMPEG. Adding the 200 frame testfile from the bugreport http://projects.blender.org/tracker/?func=detail&aid=6707&group_id=9&atid=125 now goes fine with Add>Movie. Add>Movie+Audio will complain about the fail first, but it will be added anyway.
2007-05-30 06:11:25 +00:00
Nathan Letwory
769615aed2 * playback of image sequence now also for OpenEXR images (but not multilayer). 2007-05-25 17:32:41 +00:00
Nathan Letwory
6849af7a3b * fix for #6714
- don't handle images with ffmpeg, blender knows itself perfectly fine how to do that. This fix is done as per Qt handling (skip non-Qt files).
2007-05-25 17:11:24 +00:00
Campbell Barton
afdd54fa37 moved source and text to american spelling
* colour -> color
* centre -> center
* normalise -> normalize
* modelling -> modeling
2007-04-04 13:18:41 +00:00
Nathan Letwory
e3ff98fc6b === OpenEXR ===
* fix [ #6105 ] Blender crashes when opening multilayer with node in compositor
  - Mem_IStream membuf was allocated on the stack, so it caused major troubles when
 out of the function scope. Now allocate it on the heap and let OpenEXR deal with
 freeing it.
  - moved + added delete file;'s for completeness
2007-03-27 10:13:57 +00:00
Ken Hughes
83e72cc813 Fix various gcc warning, unused variables and incorrect type passed to
*printf functions.
2007-03-17 14:46:04 +00:00
Ken Hughes
d60b05254d Remove gcc compiler warnings from various files. 2007-03-11 17:31:27 +00:00
Joseph Eagar
dcd74620e5 =Cineon Bug=
In my attempts to get cinepaint's cineon code to work with files in memory,
I accidently rewrote something that should have been left as it is.  This
causes images whose image buffers didn't start right after the cineon header to
become "shifted" to the left.

The DPX code looks correct, though.
2007-03-11 12:27:57 +00:00
Andrea Weikert
d1b17f8c30 ==== MSVC 7.1 project files ====
- fix for 3DPlugin compile
- cleanup of bullet path
- removed PHY_ODE project from 3D plugin too, not used anymore

Now all configurations should build again, let me know of any problems!

Not been able to test if the 3DPlugin is actually working,is job for another day ;)
Also the 3DPlugin is compiled without OpenExr, this needs to be looked into once too.
2007-03-03 11:28:15 +00:00
Ton Roosendaal
5b816ab8f8 Bugfix (via email)
Bake crashed when baking to float images. Caused by an Imbuf call not
handling float imbufs well.
2007-02-15 10:46:10 +00:00
Ton Roosendaal
06826d27d4 Bugfix #5818
OpenEXR MultiLayer: line order DECREASING_Y (openexr spec) crashes newer
openexr libs in windows... ???
Removed it, since tests reveiled the line order is still bottom-top
2007-01-24 15:03:20 +00:00
Kent Mein
c778c7f286 Paprmh's fix for the blur plugin.
Kent
2007-01-22 17:43:36 +00:00
Ken Hughes
1ff94bec38 Bugfix: imb_savepng() didn't deallocate memory under some error conditions. 2007-01-22 05:07:16 +00:00
Brecht Van Lommel
75161c24c1 Fix for bug #5694:
Another issue with division by zero in texture paint, this time in
torus wrapping.
2007-01-13 00:02:37 +00:00
Ton Roosendaal
3228b58a38 Added flag in MultiChannel exr file to denote line order. Blender has the
Y coordinate 0 in left-bottom of screen :)

Fun news: cinepaint now reads such files too:
http://www.blender.org/bf/cornelius.exr_sc1.jpg
2007-01-09 13:58:51 +00:00
Ton Roosendaal
ac37a15675 "Save Buffers" fix: when you ESC from rendering, it now saves empty
tiles in the file, that read back fast as black. This also solves
crashes on partial written files, when trying to read them.
2006-12-21 19:37:53 +00:00
Ton Roosendaal
b12927ecb8 MultiLayer images: added support for choosing compression type.
Without setting anything, it uses ZIP now as default, which gives the best
lossless compression and works nice fast.
2006-12-21 10:41:43 +00:00