griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
40,893 Commits 1 Branch 0 Tags
002b66e06abbd8b4aaaa864f2eaf5ff38b3ba5db
Commit Graph

33863 Commits

Author SHA1 Message Date
Campbell Barton
002b66e06a svn merge ^/trunk/blender -r50076:50080 2012-08-21 11:11:43 +00:00
Campbell Barton
f8db7ccb62 fix for bug with render slots - where the menus wouldnt only show layers from the last render which could be meaningless in different render slots. 2012-08-21 11:10:16 +00:00
Jeroen Bakker
ae9f5239a6 Fix for 
* [#32356] Problem with "Ghost" in the "Glare" Node in Compositor
 2012-08-21 10:45:01 +00:00
Campbell Barton
6a2018fe13 code cleanup: minor changes to last commit. 2012-08-21 10:44:10 +00:00
Sergey Sharybin
bd2cb7ae50 Merging r50049 through r50076 from trunk into soc-2011-tomato 2012-08-21 10:44:04 +00:00
Sergey Sharybin
08417318cd Sequencer: invalidate current frame cache on sequence transform 2012-08-21 10:42:21 +00:00
Campbell Barton
9a776daca8 code cleanup: vfont's used confusing and over complicated method of storing memory for loaded fonts, not store as a temp var in the fonts. 2012-08-21 10:39:02 +00:00
Brecht Van Lommel
671e3df070 Fix #32370: compiler error in wm_playanim.c due to conflicting Carbon ID type 
from Quicktime headers. However the Quicktime init/exit is no longer needed
here, it happens in IMB_init/IMB_exit now, so removed that code.
 2012-08-21 10:24:30 +00:00
Campbell Barton
34ad9ec004 code cleanup: includes and correction for macro 2012-08-21 09:45:30 +00:00
Campbell Barton
869382403a mask: skip self intersection on drawing when fill is disabled, since it was only drawing on one side of an unfilled spline. 2012-08-21 09:20:35 +00:00
Campbell Barton
29dd72ea84 code cleanup: some legacy compo nodes were not ifdef'd 2012-08-21 08:58:47 +00:00
Brecht Van Lommel
abda89bf4d Fix cycles continuously updating when creating a driver for a scene property, 
like driving integrator seed with #frame.

The scene drivers are evaluated continuously, which would be nice to fix but
complicated, now it compares the RNA value to see if it actually changed, and
avoids the update in that case, which is a useful optimization by itself.
 2012-08-21 08:57:24 +00:00
Campbell Barton
3204731209 code cleanup: don't use magic numbers for curve flag & use bool args for curvemapping_changed() 2012-08-21 08:47:36 +00:00
Campbell Barton
988df24551 compositor color curve was MEM_dupallocN'ing the curve for every pixel calculation (when there were black or white inputs on the curve node). 
avoid allocation by using local vars for black/white storage & curve calculation.
 2012-08-21 08:30:45 +00:00
Campbell Barton
49d3766ceb code cleanup: use math functions for curve compo code. 2012-08-21 08:20:32 +00:00
Campbell Barton
77f47799dd code cleanup: use BLI_RCT_SIZE macro 2012-08-20 23:06:17 +00:00
Thomas Dinges
94ce9505a9 Legacy Compositor / Scons: 
* Added WITH_BF_COMPOSITOR_LEGACY, enabled per default.
 2012-08-20 20:13:37 +00:00
Campbell Barton
ff876a473a HDR color picker now works in the clip space. 2012-08-20 16:56:11 +00:00
Campbell Barton
5e78327b92 fix for mask feather intersection checks not working right for non-filled, feathered masks. 
now do intersection checks for both sides of the feather.
 2012-08-20 16:34:14 +00:00
Sergey Sharybin
6f518e0ee9 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.

Currently commiting to tomato due to not sure if there's something
i can not foresee here.
 2012-08-20 16:15:09 +00:00
Campbell Barton
26f073b327 macros for rectangle center and size 2012-08-20 15:29:02 +00:00
Sergey Sharybin
bbd138081e Merging r50045 through r50048 from trunk into soc-2011-tomato 2012-08-20 15:17:17 +00:00
Sergey Sharybin
831eaf2d7f Sequencer: fix regression introduced in own previous commit 
Invalidate preprocessed cache when when global sequencer cache is
begin invalidated.

This is needed so scene would be rendered with a proper settings,
not taken from preprocess cache.
 2012-08-20 15:14:23 +00:00
Campbell Barton
63b1e79577 svn merge ^/trunk/blender -r50039:50044 2012-08-20 14:01:16 +00:00
Campbell Barton
6c74d1147e minor cleanup to node pasting. 2012-08-20 13:59:19 +00:00
Campbell Barton
0f6a6c7499 fix for crash pasting nodes into a node tree when the ID pointer is lost. 
also fix for ID user count on paste which wasn't increasing.
 2012-08-20 13:51:25 +00:00
Sergey Sharybin
21daa0d119 Merging r50037 through r50039 from trunk into soc-2011-tomato 2012-08-20 10:57:51 +00:00
Sergey Sharybin
ad647b2767 Sequencer: skip adding ImBuf to cache when it failed to render 2012-08-20 10:56:19 +00:00
Campbell Barton
1920c4ef39 svn merge ^/trunk/blender -r50023:50036 2012-08-20 10:16:22 +00:00
Sergey Sharybin
0ae7286891 Sequencer: Python API for sequence modifiers 2012-08-20 10:15:32 +00:00
Campbell Barton
4a6395cc21 fix for own error in bpy.utils.blend_paths() arg parsing. 2012-08-20 10:14:11 +00:00
Campbell Barton
65d5a818b5 quiet unused function warnings in RNA for functions created by macros. 2012-08-20 07:29:11 +00:00
Campbell Barton
817965613b added 'Unselected' option to remove doubles, merges selected vertices into unselected ones, but not each other. 2012-08-20 00:11:13 +00:00
Campbell Barton
f9258696aa disabling the compositor legacy build option now ifdef's exec() functions. 2012-08-19 23:36:29 +00:00
Campbell Barton
455c37c16b option to build without the legacy compositor 2012-08-19 22:19:19 +00:00
Campbell Barton
257c6de9ac copy as script operator for the console, so you can copy input from a console for use in a textblock. 2012-08-19 21:32:18 +00:00
Dalai Felinto
59c8c645c3 patch/bugfix [#32006] Fix for Collision Sensor - R6025 pure virtual function call crash when deleting objects in overlay scene by Jay Parker(battery) Fix for bug [#30477] Collision Sensor - R6025 pure virtual function call crash 2012-08-19 20:45:34 +00:00
Nicholas Bishop
526d0be9bf Fix crash when adding skin modifier to empty mesh 
Fixes bug [#32362] SIGSEGV when adding skin modifier to empty mesh
projects.blender.org/tracker/?func=detail&atid=498&aid=32362&group_id=9
 2012-08-19 17:13:45 +00:00
Sergey Sharybin
f81f4427f9 Merging r50022 through r50023 from trunk into soc-2011-tomato 2012-08-19 16:18:33 +00:00
Campbell Barton
cf3d58512b - fix for error in ndof patch. 
- ColorBalanceModifierData wasn't aligned on 32bit systems.
- BM_vert_find_first_loop() was missing NULL check.
 2012-08-19 15:56:49 +00:00
Sergey Sharybin
fb5c39f5c2 Merging r50016 through r50021 from trunk into soc-2011-tomato 2012-08-19 15:44:59 +00:00
Sergey Sharybin
995a19a983 Sequencer: per-sequence modifier stack for color grading 
This implements basic color grading modifiers in sequencer, supporting
color balance, RGB curves and HUE corrections.

Implementation is close to object modifiers, some details are there:

http://wiki.blender.org/index.php/User:Nazg-gul/SequencerModifiers

Modifiers supports multi-threaded calculation, masks and instant
parameter changes.

Also added cache for pre-processed image buffers for current frame,
so changing sequence properties does not require rendering of original
sequence (like rendering scene, loading file from disk and so)
 2012-08-19 15:41:56 +00:00
Sergey Sharybin
21e403e546 Merging r49953 through r50015 into from trunk into soc-2011-tomato 2012-08-19 13:57:55 +00:00
Sergey Sharybin
adec7cdea2 Patch #32326: NDOF support of rotation and panning the view at the same time 
Additional changes:
- Option to the ndof menu letting you pick turntable/trackball independently
  of the mouse viewport navigation style
- Option to change the rotation sensitivity separate from the panning

Holding shift + moving the ndof does just as before locking it to panning
Holding ctrl + moving will lock it to only rotation

Patch by Fredrik Hansson, thanks!

Reviewed by self and Mike Erwin.
 2012-08-19 13:52:36 +00:00
Campbell Barton
d36da8a8a1 style cleanup 2012-08-19 10:41:27 +00:00
Campbell Barton
58ab8d5c0a use BLI math length functions for distance compositor operations. 2012-08-19 10:41:16 +00:00
Dalai Felinto
48eb27791b The Distance Node in 2.49/2.5/2.6 pre-tiles has a different calculation for RGB and YCC. While RGB 
calculate the distance in 3d between R,G and B, the YCC only takes Cb and Cr
into consideration.

This commit makes COM_DistanceMatteOperation inheritable and expose the calculate distance function
to be re-implemented for the YCC node operation.

Thanks Troy Sobotka for the report over email.
Patch incorporates review suggestions by Jeroen Bakker.
 2012-08-19 03:05:38 +00:00
Mitchell Stokes
e4a6602a9a Fix for [#32361] "Blenderplayer quad-buffer maximum 100Hz Fps" reported by HG1. 
Allowing the Blenderplayer to break 100fps by making it less dependent on Ghost's messages.
 2012-08-18 23:46:37 +00:00
Campbell Barton
4120c18c47 re-enable metaball orientation for manipulator and view axis setting (was disabled since 2.4x) 2012-08-18 21:12:08 +00:00
Campbell Barton
ab662a1e02 fix for own commit r49991, this exposed bad logic in rect copy function. 2012-08-18 20:54:43 +00:00