Commit Graph

49420 Commits

Author SHA1 Message Date
Campbell Barton
77ed2d8ca9 code cleanup: remove paranoid NULL checks (these cases would crash earlier of the vars were in fact NULL) 2012-09-15 06:29:32 +00:00
Sergey Sharybin
beba8014e4 Merging r50602 through r50617 form trunk into soc-2011-tomato 2012-09-15 06:24:48 +00:00
Campbell Barton
aa364bb366 fix incorrect macro for mask handle selection checking. 2012-09-15 06:10:48 +00:00
Campbell Barton
d98dd2585f code cleanup: replace memcpy for copy_v3_v3(), and fix for unlikely crash - if (ob->mat == NULL && ob->totcol) 2012-09-15 06:03:49 +00:00
Sergey Sharybin
c73cd2fb6a Silent compiler's warnings about tracking module 2012-09-15 05:01:52 +00:00
Campbell Barton
abce099804 code cleanup: quiet some windows warnings. 2012-09-15 04:57:51 +00:00
Campbell Barton
f9d9459e3f code cleanup: modify DO_INLINE define to not use __inline with mingw
make RegisterBlendExtension_Fail a static func
       u
2012-09-15 02:29:47 +00:00
Campbell Barton
e75f5c8208 quiet -Wmissing-prototypes warnings, and enable this warning by default for C with gcc.
helps for finding unused functions and making functions static, also did some minor code cleanup.
2012-09-15 01:52:28 +00:00
Tamito Kajiyama
4172997675 Merged changes in the trunk up to revision 50607.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
2012-09-15 00:15:24 +00:00
Campbell Barton
37748b1e08 fix [#32381] Sculpt: crash when using radius sensitivity 2012-09-14 23:34:00 +00:00
Gaia Clary
a77d048f66 Collada: #32549 partial fix: packed images now export correctly 2012-09-14 22:31:26 +00:00
Sergey Sharybin
a803f5d6d0 Merging r50600 through r50601 from trunk into soc-2011-tomato 2012-09-14 16:43:07 +00:00
Sergey Sharybin
b48398c96a Correction to rev50582: LABEL could have a1 = 1.0f and in this case a2 would be used as alpha multiplier for icon 2012-09-14 16:41:00 +00:00
Sergey Sharybin
8791eaa5b0 Movie cache: made it thread safe to operate with memory limitor
Movie cache is using global memory limitor, which isn't thread safe
in some of operations, so it required to add mutex around limitor
operations in movie cache.

It's probably could be solved in a way with less locks involved by
using different limitor for different areas (like use own limitor
for clips, own limitor for sequencer and so), but that wouldn't be
so easy to control overall memory usage.

--
svn merge -r50125:50126 ^/branches/soc-2011-tomato
2012-09-14 14:55:59 +00:00
Sergey Sharybin
be5a35d916 Color Management: get rid of image buffer's profile flag
Currently float buffers are always linear, space of byte buffer is defined by
rect_colorspace property.

Replaced logic of IMB_rect_from_float and IMB_float_from_rect to use this
assumptions (before it was special function used in some areas only, now it's
default behavior).

Almost all functions from ImBuf module which are actually used are got rid from
profile flag. Only remained issue is IMB_float_profile_ensure which only used by
CIneon/DPX exporter which is broken for a while already. Need to be fixed
separately.

This also fixed clone brush when cloning byte image on top of float, before
this result would be gamma-corrected twice.
2012-09-14 14:37:19 +00:00
Sergey Sharybin
8e1138d7f6 Color Management: re-implement OCIO-less build configuration
Use OCIO stub file with hardcoded displays, views and color spaces.

Intended to behave in the same way as old implementation, just it's
now more clear code with much fewer ifdef checks.

Also should make it possible to get rid of ibuf's profile flag.

Thanks Brecht van Lommel for this patch!
2012-09-14 14:37:00 +00:00
Sergey Sharybin
a97ddb0328 Color Management: remove unused functions 2012-09-14 14:36:53 +00:00
Sergey Sharybin
d7f55cff20 Color Management: image buffer loading reworked
Before this color space settings in image/movie clip data blocks
defined space in which loaded image buffer is, based on whether
this buffer contains float or byte buffer. This didn't work well
for formats like 16bit PNG, which are in fact non-linear formats
but were represented in Blender as float buffers.

Now image buffer loader is responsible to set up input default
color space for image/movie clip data blocks, which could be
based on format itself only or on particular file properties.

This means image/movie clip data blocks' input colorspace will
be initialized at time first image buffer is loaded.

This also resolves old confusing thing with image buffer's profile
flag, which in could have been non-linear for image buffer which
contained float buffer only -- this happened in mentioned case of
16 bit PNG format, i.e. Now float buffer would always be linear
which should make it easier to get rid of image buffer's profile.
2012-09-14 14:36:47 +00:00
Sergey Sharybin
cd4ffe496a Sequencer: clear cache and animation buffers for strips outside of cursor when rendering
This avoids having bunch of cached images when doing animation rendering,
keeping all the memory available for rendered itself.

This keeps memory usage low when rendering huge edits with mixed
scenes and movie strips.

This should not affect on sped of video encoding, which was confirmed by
some own tests.

--
svn merge -r50051:50052 ^/branches/soc-2011-tomato
2012-09-14 14:28:24 +00:00
Sergey Sharybin
58da4a1760 Merging r50576 through r50587 from trunk into soc-2011-tomato 2012-09-14 14:05:05 +00:00
Brecht Van Lommel
c849928d1c Code cleanup: removed unused Cocoa image load/save code. 2012-09-14 11:42:05 +00:00
Campbell Barton
e762797af5 fix for sharp edge selection being inverted, change default angle from 1 to 30deg. 2012-09-14 11:10:03 +00:00
Campbell Barton
7a71f58af3 fixes for NULL checks, remove some redundant checks and add some in that have been removed by accident as code has been updated. 2012-09-14 06:17:14 +00:00
Campbell Barton
3957efdd38 fix for out-of-bounds checks for fcurve modifier and poselib, also check for NULL members of avi structure (since they are checked for NULL later.) 2012-09-14 06:15:46 +00:00
Campbell Barton
f6c7a69565 code cleanup: correct misleading use of LABEL button type. 2012-09-14 05:44:47 +00:00
Campbell Barton
e74701fbfc node transform was using PET mode (drawing a circle - but it did nothing), disable PET for nodes. 2012-09-14 01:28:26 +00:00
Campbell Barton
883117077b fix for 2 crashes freeing masks
- freeing a mask from RNA BKE_libblock_free() twice on the mask.
- loading a new blend file would only free the mask and not unlink it from nodes - it would access freed memory.
2012-09-14 01:15:08 +00:00
Dalai Felinto
622ac250f9 bge cleanup caught by accident while going over the code, it seems someone forgot to use rect_height everywhere (no functional change) 2012-09-13 23:39:09 +00:00
Sergey Sharybin
5badefa8cf Color Management: fix crash when strip failed to render
In this case sequencer would allocate empty image buffer which used to not to
have assigned color spaces but it was marked as non-linear float.

Assuming black would always be black in sequencer's color space no additional
transformation for display is needed.

Solved by removing NOLINEAR_FLOAT flag from image buffers and using check
image buffer's float_colorspace for NULL when needed to check whether float
buffer is linear or not.
2012-09-13 14:52:25 +00:00
Sergey Sharybin
ad15c19ab9 Merging r50573 through r50575 from trunk soc-2011-tomato 2012-09-13 13:53:58 +00:00
Brecht Van Lommel
888c4fd253 Fix #32547: unwrap on default cube got broken in recent commit. 2012-09-13 13:29:10 +00:00
Sergey Sharybin
f631ae9f46 Color Management: fix segfault when configuration file is missing
Also don't try to load configuration file from environment variable if
it contains empty string.
2012-09-13 13:08:31 +00:00
Sergey Sharybin
de7a57a242 Merging r50522 through r50572 from trunk into soc-2011-tomato 2012-09-13 11:13:13 +00:00
Sergey Sharybin
c3b808721b Sequencer: add missed cache invalidation
Invalidation was missed for:

- Strip (Un)Muting
- Changing speed effect
- Strip translating
2012-09-13 10:51:18 +00:00
Sergey Sharybin
81d22a0e6b Sequencer: fix invalid update when translating strip which is behind semi-transparent strip 2012-09-13 10:51:13 +00:00
Jens Verwiebe
4f9ee399c0 Fix typo in blenfont sconscript, broke compile 2012-09-13 08:09:12 +00:00
Campbell Barton
05755d307a fix [#31946] Masking doesn't respect pixel ratio 2012-09-13 05:29:38 +00:00
Campbell Barton
c5310521f8 fix for drawing non 1:1 aspect masks, transform and selection still need support. 2012-09-13 02:28:48 +00:00
Campbell Barton
ab48f2108b - cmake macro list_insert_after/list_insert_before now error when the item passed is not found in the list.
- BKE_pose_copy_data() check for target pointer is no longer valid and infact comparing against un-initialized memory in some cases.
2012-09-13 01:52:58 +00:00
Campbell Barton
4cb6d5d214 code cleanup: reduce calls to CTX_ functions inline, add some docs to mask rasterizer. 2012-09-13 01:50:21 +00:00
Mitchell Stokes
3e4b353cfa BGE: LibLoaded sensors that made use of physics controllers (touch, collision) could cause various physics problems (like infinite loops in Bullet, etc). This happened because their KX_TouchEventManagers were merged prior to having their physics controllers merged, which has now been fixed. Thanks to Kupoman for hunting down the fix! 2012-09-13 00:46:50 +00:00
Campbell Barton
12da3d999b modifications needed to get a URL from an RNA id from the testing script 2012-09-13 00:26:01 +00:00
Campbell Barton
2596a0bd24 test script to check rna/wiki lookup completeness 2012-09-13 00:17:38 +00:00
Campbell Barton
f66d11cf77 fix for missing NULL check in own recent commit, thanks Gaia for pointing this out. 2012-09-12 23:19:08 +00:00
Gaia Clary
0a0074f9c6 Collada: do not call polylist export for objects with no polygons (avoid a missleading warning message) 2012-09-12 18:26:01 +00:00
Brecht Van Lommel
272700728f Fix #32338: particle instance modifier did not work well when the mesh had only
vertices. Previously it would hide particles by creating invalid faces, but this
didn't make the vertices actually disappear.

Also found that it could generated corrupt geometry for cases with faces, which
gave wrong subsurf and could crash in edit mode.
2012-09-12 16:42:24 +00:00
Gaia Clary
ab77d11bdb #31682: corrected some minor typos in the comment 2012-09-12 15:48:22 +00:00
Gaia Clary
26260ffc74 #31682: partial fix (the export): Avoid to copy exported image into itself 2012-09-12 15:41:58 +00:00
Brecht Van Lommel
7ed5d19c24 Fix #32543: screw modifier with smooth shading disabled still had one segment
smooth shaded.
2012-09-12 13:06:31 +00:00
Brecht Van Lommel
585cfff87a Fix #32031: particle distribution on degenerate faces could give NaN values,
which in this case caused NaN values in render lighting.
2012-09-12 13:06:28 +00:00