Commit Graph

49420 Commits

Author SHA1 Message Date
Sergey Sharybin
16a126622e Merging r50413 through r50422 from trunk into soc-2011-tomato 2012-09-05 14:19:40 +00:00
Sergey Sharybin
c1dc375379 Sequencer: show color sample line in image display mode only 2012-09-05 14:11:22 +00:00
Sergey Sharybin
196028a99f Color Management: made OpenColorIO transformations aware of color unpremultiply
Mainly behaves in the same way as legacy color transformation, but it'll
give different result on over and under exposured areas.

Not sure if it's indeed issue -- seems this behaves crappy in both of
current stable release and OCIO branch.
2012-09-05 13:58:01 +00:00
Antony Riakiotakis
9ca25136a1 Fix compositor crash. g_highlightedNodes can be NULL. 2012-09-05 13:50:24 +00:00
Sergey Sharybin
ade9acca41 Color Management: fix for tiled image draw and remove unused code 2012-09-05 12:14:09 +00:00
Sergey Sharybin
201583592f Code cleanup -- remove unneeded changes, synchronize some areas with trunk 2012-09-05 12:00:08 +00:00
Sergey Sharybin
c6599979c7 Sequencer: multi-threaded histogram calculation
This gives some percentage of speedup, which compensates slowdown
caused by converting image buffer into display space.

Used OpenMP for this. Still feel skeptic about this, discussed with
Brecht and we decided this approach actually could be used since
seems all the platforms has got OpenMP issues solved.

Waveform and vector scopes are still single-threaded since they're
a bit tricker to be done multi-threaded and probably not so commonly
used.
2012-09-05 11:43:11 +00:00
Sergey Sharybin
54cf098492 Sequencer: cache currently displaying scopes
This avoids calculation of scopes on every redraw, so such tools as panning
and zoom wouldn't imply re-calculating scopes.

Implemented as a structure inside of SpaceSeq, juts like it's done for clip
and image spaces.

Also fixed zebra display to work in display space.
2012-09-05 11:43:05 +00:00
Sergey Sharybin
f4817e316e Color Management: sequencer's scopes now works in display space
Added utility function to apply display transformation on image buffer's
float array which is currently only used by sequencer's scopes.

This function is multithreaded, but scopes should be improved further
since currently they're being recalculated from scratch on every draw.
2012-09-05 11:42:57 +00:00
Sergey Sharybin
3963425006 Merging r50374 through r50412 from trunk into soc-2011-tomato 2012-09-05 11:42:20 +00:00
Campbell Barton
e2eea6c38d fix/workaround [#31555] Username with special chars in Windows 7
Theres a bug where python/windows ignores PYTHONIOENCODING, workaround this by manually overriding the stdout/stderr.
2012-09-05 09:33:15 +00:00
Jeroen Bakker
7efe2153b2 * gcc 4.7 is more strict. This patch will remove 'non virtual
destructor warnings' in the core of the compositor.
2012-09-05 08:50:25 +00:00
Campbell Barton
99fcec3334 fix [#29431] "Normalize All" from Weight Tools don't work correctly 2012-09-05 04:16:09 +00:00
Campbell Barton
a512cac545 code cleanup: move get_selected_defgroups into object_deform.c and make it behave like similar functions, also when drawing vertex weight colors, only call this function when multi-paint is enabled. 2012-09-05 03:45:32 +00:00
Campbell Barton
84dc5c2992 code cleanup: move functions for getting defgroup arrays from objects out of editors into blenkernel, since they are generally useful. 2012-09-05 02:51:55 +00:00
Campbell Barton
a4b71f4e01 fix for various redundant checks and possibly fix some crashes in rare situations. 2012-09-05 01:42:52 +00:00
Campbell Barton
2016791fee add missing files from cmakes lists 2012-09-05 00:52:35 +00:00
Campbell Barton
8cf9e5f8c3 change templates to call modal_handler_add() is called last since any errors between calling this function and returning will crash blender. see [#30687] 2012-09-05 00:11:39 +00:00
Campbell Barton
dba5ef3ba8 code cleanup: python - pass multiple args to string startswith() / endswith() functions rather than calling multiple times. 2012-09-04 20:26:42 +00:00
Campbell Barton
1d4316f35f fix [#32490] Compsitor crashes on missing OpenEXR multilayer files 2012-09-04 19:42:09 +00:00
Campbell Barton
306e2b4878 stule cleanup 2012-09-04 18:47:08 +00:00
Campbell Barton
068cceab6c fix for some errors reported by http://clang.blenderheads.org/trunk/ in r50384.
- when renderlayers could not be found in save_render_result_tile() blender would crash.
- RE_engine_end_result() / rna end_result() didn't set result argument as required.
... also some style cleanup.
2012-09-04 18:27:47 +00:00
Sv. Lockal
927b7ed303 Do not show %t to user on right click menu buttons which use "Name%t|...%x0|..." syntax 2012-09-04 17:09:40 +00:00
Sergey Sharybin
b3797d904d Sequencer: avoid allocating image buffer on every modifier
This means that modifier would operate on buffer which was passed to it,
without creating copy of image buffer and operating on it.

All current modifiers fit into this model and if it would need to have
original buffer on modifier calculation, that particular modifier can
create copy.

Gives some percentage of boost.
2012-09-04 16:55:12 +00:00
Sergey Sharybin
3d7fd3c158 Sequencer: remove effect mask input
Initial idea of this input was re-designed in a bit more flexible
way using modifiers.
Also since Color Balance (which was the only thing using effect
mask input) was moved to the modifiers, this input field became
rudiment.

It's pretty tricky to write versioning code to prevent possible
data in cases this field was used, but hope it wouldn't be difficult
to switch to modifiers masks.
2012-09-04 13:48:24 +00:00
Sergey Sharybin
159c1b4b22 Compilation fix for recent merge commit 2012-09-04 13:37:58 +00:00
Sergey Sharybin
122cb86d15 Sequencer: remove strip's color balance in favor of modifiers
Having two ways to control color balance now seems a bit overkill
and not clear.

Removed old Color Balance settings from the interface and logic,
added versioning code to convert this settings to modifier.

Unfortunately, since color balance was a pointer, it's not actually
possible to preserve compatibility of old files saved in new
blender and opened back in old blender.

Hopefully there's no regressions :)
2012-09-04 13:37:53 +00:00
Brecht Van Lommel
adea12cb01 Cycles: merge of changes from tomato branch.
Regular rendering now works tiled, and supports save buffers to save memory
during render and cache render results.

Brick texture node by Thomas.
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Brick_Texture

Image texture Blended Box Mapping.
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Image_Texture
http://mango.blender.org/production/blended_box/

Various bug fixes by Sergey and Campbell.
* Fix for reading freed memory in some node setups.
* Fix incorrect memory read when synchronizing mesh motion.
* Fix crash appearing when direct light usage is different on different layers.
* Fix for vector pass gives wrong result in some circumstances.
* Fix for wrong resolution used for rendering Render Layer node.
* Option to cancel rendering when doing initial synchronization.
* No more texture limit when using CPU render.
* Many fixes for new tiled rendering.
2012-09-04 13:29:07 +00:00
Sergey Sharybin
68563134d4 Mango request: display sliders for current point in curve mapping
--
svn merge -r49893:49894 ^/branches/soc-2011-tomato
2012-09-04 12:40:47 +00:00
Sergey Sharybin
8dff07ef9a Color Management: fix for color sample information line
- Color managed RGB values wouldn't be displayed anymore for
  byte images (which are currently unsupported to be managed).

- Color rectangle would now be color managed

- Sequencer was passing non-linear float to information line,
  now it'll pass linear float.
2012-09-04 12:32:32 +00:00
Sergey Sharybin
1508f62169 Color Management: fix for view/display settings validation
It was a misusage of LinkData and actual data leading to wrong
string comparsion and possible wrong memory access.
2012-09-04 12:32:18 +00:00
Sergey Sharybin
3b9c3604c6 Color Management: remove hardcoded ACES ODT tonemap
This tonemap was added as a temporary option only and if it'll be
needed again, it'll be better to implement is as either a spline
in OCIO or as a film response curve (as some of such curves were
added as a presets for RGB curves in Mango production SVN).

Also revert changes made to IMB_buffer_byte_from_float since it's
not actually needed anymore and makes it's clearer changes against
trunk.
2012-09-04 12:32:12 +00:00
Jeroen Bakker
d4be0ec9fb * there is a tiny memory leak. I think it happens when you quit blenden
during a WM_draw. tiny is max 8* size of pointer and it is maintained at
that size. So no worries there.
 * cleanup some code to be certain that deinitialization happens
correctly.
2012-09-04 11:08:47 +00:00
Sergey Sharybin
e15f352831 Merging r50265 through r50373 from trunk into soc-2011-tomato 2012-09-04 09:06:37 +00:00
Campbell Barton
3804b2d2ba fix [#31856] movieclips.load(filepath=None) or value crash Blender
workaround for python bug/inconsistency
2012-09-04 05:36:07 +00:00
Campbell Barton
914d389713 fix for building without python, also rework python-main-loop control in the BGE to not use RNA (use lower level BKE/BLI funcs instead) 2012-09-04 03:26:12 +00:00
Mitchell Stokes
e5a1b1b526 Fix for [#32469] "standalone blenderplayer no longer starts in lastest build" reported by narutocanada. It looks like the Hive commit (r50310) didn't take changes from r49998 into account, so it was still relying on Ghost events to push the engine along instead of calling app->EngineNextFrame(). 2012-09-04 02:33:37 +00:00
Campbell Barton
a71b160184 fix for building on msvc2008 (also style cleanup) 2012-09-04 01:23:50 +00:00
Campbell Barton
7283709a40 code cleanup: curve path calculation 2012-09-03 22:53:34 +00:00
Campbell Barton
aaafa0c2fe code cleanup: move file string defines into BLI_path_utils.h, BKE_utildefines is now unused but keep incase we want to add defines there later. 2012-09-03 22:04:14 +00:00
Gaia Clary
192935eb04 fix:32348 Collada yfov to xfov conversion fo camera settings 2012-09-03 17:54:04 +00:00
Sergey Sharybin
e58548706f Fix regression introduced in recent jobs system refactoring
Fluid simulation job progress wasn't displayed anymore.
2012-09-03 16:05:37 +00:00
Howard Trickey
5c2d9022d9 Fix knife bug #30764, failure to cut sometimes.
Two bugs: first, the point-in-face function had a bug that made it fail for the xz or yz planes.
Second, in ortho mode, simultaneous linehits need careful sorting.
Also, in orth mode it is somewhat random whether the edges exactly behind the front ones are reported 'hit' by bvh tree, so put in code to prevent cuts along the parallel-to-view faces when not in cut-through mode.
2012-09-03 14:37:34 +00:00
Sergey Sharybin
eff97a82f8 Fix for compositor always cacheing frames when using Movie Clip input node
Issue was caused by getting image from compositor node conversion code,
now it'll check whether rendering happens and if so, frame wouldn't be
stored in the cache.

This possible fixes #32465: Memory leak when rendering
2012-09-03 14:26:53 +00:00
Sergey Sharybin
1f64aecb30 Fix for usage of un-initialized memory.
Checked by Brecht when were in Blender Institute.

Discovered when was looking into #32296: Node Texture - Node Material - GLSL Viewport rendering issue
2012-09-03 13:17:21 +00:00
Brecht Van Lommel
d6ec4b874b Compositor: initialize OpenCL only when the option is enabled. This eliminates
error prints or even crashes for poor OpenCL implementations when not using it.
2012-09-03 12:52:21 +00:00
Sergey Sharybin
dde5ccb61f Fix for logging FFmpeg messages 2012-09-03 12:01:00 +00:00
Brecht Van Lommel
1cb9b1ddf3 Fix #32461: adjusting brush strength with shift+F in image editor would show
the cursor too big when zoomed in. Only the size adjusment needs to follow the
zoom level of the editor, others are fixed size.
2012-09-03 11:55:30 +00:00
Lukas Toenne
c0a3657e7a Added library linking for cycles_kernel_osl to OSL libraries and added cycles_kernel_osl to the list of blender libs in creator. 2012-09-03 11:38:18 +00:00
Brecht Van Lommel
acebddeb23 Fix #32468: 3d view texture paint mode did not show uv layout in image editor. 2012-09-03 11:26:04 +00:00