blender.git
7 years agoOSL cmake cleanup:
Lukas Toenne [Mon, 10 Sep 2012 08:38:51 +0000 (08:38 +0000)]
OSL cmake cleanup:
* Removed unused lib and include directories (also one bad 'src' include that wouldn't work anyway)
* Copied cmake library finding to APPLE and WIN32 sections. These may need some adjustment for their respective OS.

7 years agocode cleanup: use typedef'd enum for block bounds types.
Campbell Barton [Mon, 10 Sep 2012 07:03:30 +0000 (07:03 +0000)]
code cleanup: use typedef'd enum for block bounds types.

7 years agomake alphanumeric key shortcuts work for submenu's so you can chain keys together...
Campbell Barton [Mon, 10 Sep 2012 06:44:25 +0000 (06:44 +0000)]
make alphanumeric key shortcuts work for submenu's so you can chain keys together to select items in a menu.

eg: 'Ctrl+V, E, S'
for - Vertex, Separate, Selection

7 years agoCleanup for OSL linking in cmake: Move cmake OSL library search and path definition...
Lukas Toenne [Mon, 10 Sep 2012 06:18:20 +0000 (06:18 +0000)]
Cleanup for OSL linking in cmake: Move cmake OSL library search and path definition from the cycles macro file to the top-level CMakeLists.txt. This makes the OSL_LIBRARIES and other variables accessible throughout Blender cmake scripts and especially in the creator module for linking libraries.

7 years agofix [#32384] Submenu hotkeys not working at all since 2.6x
Campbell Barton [Mon, 10 Sep 2012 06:10:43 +0000 (06:10 +0000)]
fix [#32384] Submenu hotkeys not working at all since 2.6x

7 years agocode cleanup:
Campbell Barton [Mon, 10 Sep 2012 06:05:19 +0000 (06:05 +0000)]
code cleanup:
use an enum typedef for button types. it was quite annoying debugging UI code since the defines are bit-shifted. GDB would show but->type as 13824 and blender define was (27 << 9).

Now but->type shows as a humanly readable names.

7 years agomissing include in own recent commit
Campbell Barton [Mon, 10 Sep 2012 05:47:07 +0000 (05:47 +0000)]
missing include in own recent commit

7 years agofix [#32518] Vertex slide crash sometimes.
Campbell Barton [Mon, 10 Sep 2012 03:42:29 +0000 (03:42 +0000)]
fix [#32518] Vertex slide crash sometimes.

Undo would leave BMEditMesh->me pointer NULL, this would likely crash EDBM_verts_mirror_cache_begin() too.

Rather then restore 'me', remove the pointer altogether and use BMEditMesh->ob->data to save us having to keep track of 2 pointers.

7 years agocode cleanup: use BMEdit_FromObject() rather then me->edit_btmesh in more places.
Campbell Barton [Mon, 10 Sep 2012 03:34:43 +0000 (03:34 +0000)]
code cleanup: use BMEdit_FromObject() rather then me->edit_btmesh in more places.

7 years agocode cleanup: use more specific args
Campbell Barton [Mon, 10 Sep 2012 02:45:29 +0000 (02:45 +0000)]
code cleanup: use more specific args

7 years agowhen pressing `play` report when the first frame can't be found.
Campbell Barton [Mon, 10 Sep 2012 02:04:02 +0000 (02:04 +0000)]
when pressing `play` report when the first frame can't be found.

7 years agocode cleanup: use single define for undo string size, was 64 mostly, but 512 in the UI.
Campbell Barton [Mon, 10 Sep 2012 01:55:58 +0000 (01:55 +0000)]
code cleanup: use single define for undo string size, was 64 mostly, but 512 in the UI.

7 years agostyle cleanup
Campbell Barton [Mon, 10 Sep 2012 01:34:42 +0000 (01:34 +0000)]
style cleanup

7 years agofix for own error in r50482.
Campbell Barton [Mon, 10 Sep 2012 01:22:04 +0000 (01:22 +0000)]
fix for own error in r50482.

7 years agostyle cleanup
Campbell Barton [Mon, 10 Sep 2012 01:07:20 +0000 (01:07 +0000)]
style cleanup

7 years agoFix #32513: incorrect color management in Material draw mode for Cycles.
Brecht Van Lommel [Sun, 9 Sep 2012 11:04:49 +0000 (11:04 +0000)]
Fix #32513: incorrect color management in Material draw mode for Cycles.

7 years agofix [#29072] Color pickers don't close properly when moving the mouse away
Campbell Barton [Sun, 9 Sep 2012 01:44:55 +0000 (01:44 +0000)]
fix [#29072] Color pickers don't close properly when moving the mouse away

instead of checking if the mouse is over another button to exit the popup.
Just check if the mouse is outside the rect-union between the button and the popup.

7 years agostyle cleanup:
Campbell Barton [Sun, 9 Sep 2012 00:00:21 +0000 (00:00 +0000)]
style cleanup:
also remove some redundant conversions int -> short -> int

7 years agofix for security flaw CVE-2008-1103, ref BZ #855092 on https://bugzilla.redhat.com
Campbell Barton [Sat, 8 Sep 2012 23:26:15 +0000 (23:26 +0000)]
fix for security flaw CVE-2008-1103, ref BZ #855092 on https://bugzilla.redhat.com

patch provided by Jochen Schmitt, made some minor edits.

7 years agominor improvements to saving quit.blend, print the OS error if the file fails to...
Campbell Barton [Sat, 8 Sep 2012 23:07:53 +0000 (23:07 +0000)]
minor improvements to saving quit.blend, print the OS error if the file fails to be created or written.

7 years agofix for error in own recent commit: do not hide alpha in HSV and Hex modes
Sv. Lockal [Sat, 8 Sep 2012 19:40:34 +0000 (19:40 +0000)]
fix for error in own recent commit: do not hide alpha in HSV and Hex modes

7 years agostyle cleanup
Campbell Barton [Sat, 8 Sep 2012 08:59:47 +0000 (08:59 +0000)]
style cleanup

7 years agostyle cleanup
Campbell Barton [Sat, 8 Sep 2012 06:40:03 +0000 (06:40 +0000)]
style cleanup

7 years ago== FFMPEG ==
Peter Schlaile [Fri, 7 Sep 2012 21:41:38 +0000 (21:41 +0000)]
== FFMPEG ==

This fixes [#32399] VSE doesn't show last 3 frames of Quicktime movie.

Some decoders store frames internally until EOF.
So one has to feed the decoding engine with empty packets after EOF
until all frames could be extracted properly.

7 years agoNew i18n font file for Blender, now including Hebrew charset!
Bastien Montagne [Fri, 7 Sep 2012 17:59:45 +0000 (17:59 +0000)]
New i18n font file for Blender, now including Hebrew charset!

7 years agoAdding Hebrew language.
Bastien Montagne [Fri, 7 Sep 2012 16:06:58 +0000 (16:06 +0000)]
Adding Hebrew language.

Note: looks like we do not have hebrew chars in current font... More FontForge fun ahead. :/

7 years agoinitial retina support for osx \ to take effect you must perhaps logout/in \i prefer...
Jens Verwiebe [Fri, 7 Sep 2012 15:44:20 +0000 (15:44 +0000)]
initial retina support for osx \ to take effect you must perhaps logout/in \i prefer in terminal: /System/Library/Frameworks/CoreServices.framework/Frameworks/LaunchServices.framework/Support/lsregister -v -f

7 years agoFix for Cycles (CUDA) compilation (again ...). Moved the AttributeStandard enum typed...
Lukas Toenne [Fri, 7 Sep 2012 11:06:45 +0000 (11:06 +0000)]
Fix for Cycles (CUDA) compilation (again ...). Moved the AttributeStandard enum typedef and the attribute_standard_name mapping function to util_attribute/util_types headers, so they can properly be used by kernel and render files alike. This should avoid any std C includes which are not available in CUDA. Thanks to Sergey for help!

7 years agoFix for order of creating mesh and filling in SculptSession
Sergey Sharybin [Fri, 7 Sep 2012 10:59:01 +0000 (10:59 +0000)]
Fix for order of creating mesh and filling in SculptSession

This would use proper draw_pbvh for initially calculated PBVH.

Wasn't harmful since this flag used to be updated form update_mesh_elements,
but it's still better to have things consistent all over.

7 years agominor fix for previous commit. ripping a vert-edge connected to a face would always...
Campbell Barton [Fri, 7 Sep 2012 06:46:26 +0000 (06:46 +0000)]
minor fix for previous commit. ripping a vert-edge connected to a face would always choose the face even if the mouse is closer to the edge, now check both edges and faces when ripping from a non wire vertex

7 years agominor improvements to rip
Campbell Barton [Fri, 7 Sep 2012 06:31:54 +0000 (06:31 +0000)]
minor improvements to rip
- rip tool didnt select the best edge to rip for wire verts (no connected faces)
- ripping one vert with 2 edges connected didnt work.

7 years agofixes for weight paint mode:
Campbell Barton [Fri, 7 Sep 2012 05:54:54 +0000 (05:54 +0000)]
fixes for weight paint mode:
- sample weight didnt work when the object was transformed.
- sample weight didnt work when vertex selection was enabled.
- 'All faces' option is used by weight paint mode, but there was no UI access.

add ED_mesh_pick_face_vert(). which uses the face selection buffer but returns the closest vertex.

7 years agofix Shift+LMB select when in weight-vertex-select mode. (it was mixing up vert/face...
Campbell Barton [Fri, 7 Sep 2012 02:18:04 +0000 (02:18 +0000)]
fix Shift+LMB select when in weight-vertex-select mode. (it was mixing up vert/face index values and didnt work at all)

7 years agoremove makeDerivedMesh from ED_mesh_pick_face(), this was added 44256 (bmesh merge...
Campbell Barton [Fri, 7 Sep 2012 00:58:00 +0000 (00:58 +0000)]
remove makeDerivedMesh from ED_mesh_pick_face(), this was added 44256 (bmesh merge), but is pretty bad (rebuilding entire derived mesh to pick a face), tested with subsurf modifier, sintel mesh - it works ok without it.
Also - other select modes like border-select dont do this, so looks safe to disable.

7 years agocode cleanup: header had many incorrect sections for function/file, also rename mouse...
Campbell Barton [Fri, 7 Sep 2012 00:22:10 +0000 (00:22 +0000)]
code cleanup: header had many incorrect sections for function/file, also rename mouse_mesh() --> EDBM_select_pick()

7 years agocode cleanup: move vertex and face picking functions into meshtools.c
Campbell Barton [Thu, 6 Sep 2012 23:50:28 +0000 (23:50 +0000)]
code cleanup: move vertex and face picking functions into meshtools.c

7 years agocode cleanup
Campbell Barton [Thu, 6 Sep 2012 23:41:03 +0000 (23:41 +0000)]
code cleanup

7 years agofix [#30063] Weight Paint + Pose Mode: [m] key does not toggle Face Selection Masking
Campbell Barton [Thu, 6 Sep 2012 23:10:01 +0000 (23:10 +0000)]
fix [#30063] Weight Paint + Pose Mode: [m] key does not toggle Face Selection Masking

disallow some pose operators when weight paint mode is enabled.

7 years agoResolve CUDA kernel compilation error
Sergey Sharybin [Thu, 6 Sep 2012 16:42:55 +0000 (16:42 +0000)]
Resolve CUDA kernel compilation error

Instead of including util_string.h which in fact also defines some
symbols from util_string.cpp include STL's string header and directly
use std::string.

7 years agoFix cycles continuously updating when creating a driver for a scene property,
Brecht Van Lommel [Thu, 6 Sep 2012 11:35:16 +0000 (11:35 +0000)]
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.

(merged from tomato branch)

7 years agoFix wrong cycles tile size in viewport, could affect performance a bit.
Brecht Van Lommel [Thu, 6 Sep 2012 11:34:55 +0000 (11:34 +0000)]
Fix wrong cycles tile size in viewport, could affect performance a bit.

7 years agofix for error in own recent commit
Campbell Barton [Thu, 6 Sep 2012 11:02:27 +0000 (11:02 +0000)]
fix for error in own recent commit

7 years agomake freeing sequencer strip without cache an option only exposed within sequencer.c
Campbell Barton [Thu, 6 Sep 2012 09:23:38 +0000 (09:23 +0000)]
make freeing sequencer strip without cache an option only exposed within sequencer.c

7 years agoCycles compiler fixes related to OSL changes:
Lukas Toenne [Thu, 6 Sep 2012 07:44:49 +0000 (07:44 +0000)]
Cycles compiler fixes related to OSL changes:

* reverted r50430
* removed 2 util_params.h includes from r50428, these were causing trouble with OIIO in CUDA compilation. The purpose of these was to define the ustring type, but can just use the standard string type from util_string as well.

7 years agofix [#32502] Shift + V Vertex slide doesn't work for x-mirror edit
Campbell Barton [Thu, 6 Sep 2012 06:18:10 +0000 (06:18 +0000)]
fix [#32502] Shift + V Vertex slide doesn't work for x-mirror edit

7 years agofix for crash in sequencer introduced with recent cache addition,
Campbell Barton [Thu, 6 Sep 2012 04:45:25 +0000 (04:45 +0000)]
fix for crash in sequencer introduced with recent cache addition,
- running undo with metastrips would crash immediately.
- freeing a strip without a scene would crash (clipboard does this).

7 years agofix [#32475] Enabled audio lets blender crash with autosplit option for movie output
Campbell Barton [Thu, 6 Sep 2012 03:08:47 +0000 (03:08 +0000)]
fix [#32475] Enabled audio lets blender crash with autosplit option for movie output

7 years agostyle cleanup: indentation
Campbell Barton [Thu, 6 Sep 2012 02:20:03 +0000 (02:20 +0000)]
style cleanup: indentation

7 years agocode clenup: comments and some style edits on ghost/osx (odd indentation)
Campbell Barton [Thu, 6 Sep 2012 02:10:09 +0000 (02:10 +0000)]
code clenup: comments and some style edits on ghost/osx (odd indentation)

7 years agocode cleanup: capitalize defines.
Campbell Barton [Thu, 6 Sep 2012 01:31:15 +0000 (01:31 +0000)]
code cleanup: capitalize defines.

7 years agofix [#32500] Odd behaviour with subdividing an ngon
Campbell Barton [Thu, 6 Sep 2012 01:06:36 +0000 (01:06 +0000)]
fix [#32500] Odd behaviour with subdividing an ngon

7 years agosupport ANIMFILTER_FOREDIT for mask layers, also move deprecated metaball types to...
Campbell Barton [Thu, 6 Sep 2012 00:38:28 +0000 (00:38 +0000)]
support ANIMFILTER_FOREDIT for mask layers, also move deprecated metaball types to the end of the switch statement when evaluating metaballs.

7 years agocode cleanup: remove deprecated defines and some struct members
Campbell Barton [Thu, 6 Sep 2012 00:33:59 +0000 (00:33 +0000)]
code cleanup: remove deprecated defines and some struct members

7 years agocommitted by accident
Campbell Barton [Wed, 5 Sep 2012 23:30:30 +0000 (23:30 +0000)]
committed by accident

7 years agocode cleanup: BM_face_legal_splits() was doing some redundant assignments.
Campbell Barton [Wed, 5 Sep 2012 23:22:47 +0000 (23:22 +0000)]
code cleanup: BM_face_legal_splits() was doing some redundant assignments.

7 years agoOSL Backend:
Thomas Dinges [Wed, 5 Sep 2012 23:22:36 +0000 (23:22 +0000)]
OSL Backend:
* Added the Phong BRDF from the inbuilt OSL shader library.

This can be used in OSL shaders only for now:
* phong(normal N, float exponent)
* phong_ramp(normal N, float exponent, color colors[8]

7 years agocode cleanup: use *(*var)[2] for pairs in bmesh code rather then a 1d array stepping...
Campbell Barton [Wed, 5 Sep 2012 23:17:19 +0000 (23:17 +0000)]
code cleanup: use *(*var)[2] for pairs in bmesh code rather then a 1d array stepping by 2.

7 years agosilencing some of the warnings in OSL for OSX
Dalai Felinto [Wed, 5 Sep 2012 20:50:10 +0000 (20:50 +0000)]
silencing some of the warnings in OSL for OSX

7 years agocode cleanup: bmesh subdivide code was growing arrays one by one, when the final...
Campbell Barton [Wed, 5 Sep 2012 19:21:55 +0000 (19:21 +0000)]
code cleanup: bmesh subdivide code was growing arrays one by one, when the final size is known - do this in one go.
also replace for loops with iterator macros.

7 years agoAdding brazilian portuguese language, as requested by portuguese team.
Bastien Montagne [Wed, 5 Sep 2012 18:35:22 +0000 (18:35 +0000)]
Adding brazilian portuguese language, as requested by portuguese team.

7 years agoQuick fix for compiler error. Somehow the isfinite symbol got lost for SVM too now...
Lukas Toenne [Wed, 5 Sep 2012 18:12:17 +0000 (18:12 +0000)]
Quick fix for compiler error. Somehow the isfinite symbol got lost for SVM too now, no idea how this happened or where it actually came from. This will likely also cause trouble with CUDA/OpenCL compilers, will have to be fixed properly later.

7 years agoFix for attribute lookup in OSL. This uses a map in the OSL globals instead of the...
Lukas Toenne [Wed, 5 Sep 2012 17:08:56 +0000 (17:08 +0000)]
Fix for attribute lookup in OSL. This uses a map in the OSL globals instead of the device texture.

7 years agoSequencer: show color sample line in image display mode only
Sergey Sharybin [Wed, 5 Sep 2012 14:11:22 +0000 (14:11 +0000)]
Sequencer: show color sample line in image display mode only

7 years agoFix compositor crash. g_highlightedNodes can be NULL.
Antony Riakiotakis [Wed, 5 Sep 2012 13:50:24 +0000 (13:50 +0000)]
Fix compositor crash. g_highlightedNodes can be NULL.

7 years agoCycles fix: particle standard attribute had no name conversion yet.
Lukas Toenne [Wed, 5 Sep 2012 12:06:44 +0000 (12:06 +0000)]
Cycles fix: particle standard attribute had no name conversion yet.

7 years agofix/workaround [#31555] Username with special chars in Windows 7
Campbell Barton [Wed, 5 Sep 2012 09:33:15 +0000 (09:33 +0000)]
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.

7 years ago * gcc 4.7 is more strict. This patch will remove 'non virtual
Jeroen Bakker [Wed, 5 Sep 2012 08:50:25 +0000 (08:50 +0000)]
 * gcc 4.7 is more strict. This patch will remove 'non virtual
destructor warnings' in the core of the compositor.

7 years agoFix for OSL memory leak. The context creation for OSL is now done in the shader_setup...
Lukas Toenne [Wed, 5 Sep 2012 08:12:22 +0000 (08:12 +0000)]
Fix for OSL memory leak. The context creation for OSL is now done in the shader_setup_* functions, since it should specific to the sample being worked on. The the context release then happens in the kernel_shader functions after shader evaluation is done. Care has to be taken to ensure the shader_release function is also called in cases where the path integration is cancelled early, this was the main cause for unreleased contexts and subsequent new allocations.

7 years agofix [#29431] "Normalize All" from Weight Tools don't work correctly
Campbell Barton [Wed, 5 Sep 2012 04:16:09 +0000 (04:16 +0000)]
fix [#29431] "Normalize All" from Weight Tools don't work correctly

7 years agocode cleanup: move get_selected_defgroups into object_deform.c and make it behave...
Campbell Barton [Wed, 5 Sep 2012 03:45:32 +0000 (03:45 +0000)]
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.

7 years agocode cleanup: move functions for getting defgroup arrays from objects out of editors...
Campbell Barton [Wed, 5 Sep 2012 02:51:55 +0000 (02:51 +0000)]
code cleanup: move functions for getting defgroup arrays from objects out of editors into blenkernel, since they are generally useful.

7 years agofix for various redundant checks and possibly fix some crashes in rare situations.
Campbell Barton [Wed, 5 Sep 2012 01:42:52 +0000 (01:42 +0000)]
fix for various redundant checks and possibly fix some crashes in rare situations.

7 years ago* Forgot to commit CMake change for the Brick texture.
Thomas Dinges [Wed, 5 Sep 2012 00:59:04 +0000 (00:59 +0000)]
* Forgot to commit CMake change for the Brick texture.

7 years agoadd missing files from cmakes lists
Campbell Barton [Wed, 5 Sep 2012 00:52:35 +0000 (00:52 +0000)]
add missing files from cmakes lists

7 years agochange templates to call modal_handler_add() is called last since any errors between...
Campbell Barton [Wed, 5 Sep 2012 00:11:39 +0000 (00:11 +0000)]
change templates to call modal_handler_add() is called last since any errors between calling this function and returning will crash blender. see [#30687]

7 years agoOSL:
Thomas Dinges [Tue, 4 Sep 2012 23:34:08 +0000 (23:34 +0000)]
OSL:
* Noise Texture is rendering now.

7 years agoCycles / OSL:
Thomas Dinges [Tue, 4 Sep 2012 22:33:11 +0000 (22:33 +0000)]
Cycles / OSL:
* Ported the Brick Texture to OSL. Renders fine :)

7 years agocode cleanup: python - pass multiple args to string startswith() / endswith() functio...
Campbell Barton [Tue, 4 Sep 2012 20:26:42 +0000 (20:26 +0000)]
code cleanup: python - pass multiple args to string startswith() / endswith() functions rather than calling multiple times.

7 years agofix [#32490] Compsitor crashes on missing OpenEXR multilayer files
Campbell Barton [Tue, 4 Sep 2012 19:42:09 +0000 (19:42 +0000)]
fix [#32490] Compsitor crashes on missing OpenEXR multilayer files

7 years agostule cleanup
Campbell Barton [Tue, 4 Sep 2012 18:47:08 +0000 (18:47 +0000)]
stule cleanup

7 years agofix for some errors reported by http://clang.blenderheads.org/trunk/ in r50384.
Campbell Barton [Tue, 4 Sep 2012 18:27:47 +0000 (18:27 +0000)]
fix for some errors reported by 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.

7 years agoRevert "Use one context per OSL thread. Not sure if this actually works, but the...
Lukas Toenne [Tue, 4 Sep 2012 17:28:36 +0000 (17:28 +0000)]
Revert "Use one context per OSL thread. Not sure if this actually works, but the simple renderer example in OSL does it this way."

This does not actually work: The context must not be shared between threads, but using the same context between different samples actually seems to prevent OSL from switching between shaders. The proper solution would be to ensure memory pooling works correctly.

This reverts commit 69f87e69258d6266dcb20f09f7e3d4021e663432.

7 years agoDo not show %t to user on right click menu buttons which use "Name%t|...%x0|..."...
Sv. Lockal [Tue, 4 Sep 2012 17:09:40 +0000 (17:09 +0000)]
Do not show %t to user on right click menu buttons which use "Name%t|...%x0|..." syntax

7 years agoSequencer: avoid allocating image buffer on every modifier
Sergey Sharybin [Tue, 4 Sep 2012 16:55:12 +0000 (16:55 +0000)]
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.

7 years agoOSL:
Thomas Dinges [Tue, 4 Sep 2012 16:54:32 +0000 (16:54 +0000)]
OSL:
* Holdout shader is now working in OSL.

7 years agoFix for OSL input parameter name mapping. When assigning input constants to shader...
Lukas Toenne [Tue, 4 Sep 2012 16:47:00 +0000 (16:47 +0000)]
Fix for OSL input parameter name mapping. When assigning input constants to shader parameters, use the compatible_name function to strip whitespace.

7 years agoMinor syntax error in musgrave osl texture.
Lukas Toenne [Tue, 4 Sep 2012 16:46:56 +0000 (16:46 +0000)]
Minor syntax error in musgrave osl texture.

7 years agoOSL:
Thomas Dinges [Tue, 4 Sep 2012 16:00:12 +0000 (16:00 +0000)]
OSL:
* WIP commit of fixes for musgrave and wave.

7 years agoSequencer: remove effect mask input
Sergey Sharybin [Tue, 4 Sep 2012 13:48:24 +0000 (13:48 +0000)]
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.

7 years agoCompilation fix for recent merge commit
Sergey Sharybin [Tue, 4 Sep 2012 13:37:58 +0000 (13:37 +0000)]
Compilation fix for recent merge commit

7 years agoSequencer: remove strip's color balance in favor of modifiers
Sergey Sharybin [Tue, 4 Sep 2012 13:37:53 +0000 (13:37 +0000)]
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 :)

7 years agoCycles: merge of changes from tomato branch.
Brecht Van Lommel [Tue, 4 Sep 2012 13:29:07 +0000 (13:29 +0000)]
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.

7 years agoMango request: display sliders for current point in curve mapping
Sergey Sharybin [Tue, 4 Sep 2012 12:40:47 +0000 (12:40 +0000)]
Mango request: display sliders for current point in curve mapping

--
svn merge -r49893:49894 ^/branches/soc-2011-tomato

7 years agoOSL:
Thomas Dinges [Tue, 4 Sep 2012 11:41:48 +0000 (11:41 +0000)]
OSL:
* Gradient texture renders now.

7 years ago * there is a tiny memory leak. I think it happens when you quit blenden
Jeroen Bakker [Tue, 4 Sep 2012 11:08:47 +0000 (11:08 +0000)]
 * 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.

7 years agoUse one context per OSL thread. Not sure if this actually works, but the simple rende...
Lukas Toenne [Tue, 4 Sep 2012 08:53:47 +0000 (08:53 +0000)]
Use one context per OSL thread. Not sure if this actually works, but the simple renderer example in OSL does it this way.

7 years agoFix for bad memory leak in OSL: the context created for each OSL sample did not get...
Lukas Toenne [Tue, 4 Sep 2012 08:53:44 +0000 (08:53 +0000)]
Fix for bad memory leak in OSL: the context created for each OSL sample did not get released properly.

7 years agofix [#31856] movieclips.load(filepath=None) or value crash Blender
Campbell Barton [Tue, 4 Sep 2012 05:36:07 +0000 (05:36 +0000)]
fix [#31856] movieclips.load(filepath=None) or value crash Blender

workaround for python bug/inconsistency

7 years agofix for building without python, also rework python-main-loop control in the BGE...
Campbell Barton [Tue, 4 Sep 2012 03:26:12 +0000 (03:26 +0000)]
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)

7 years agoFix for [#32469] "standalone blenderplayer no longer starts in lastest build" reporte...
Mitchell Stokes [Tue, 4 Sep 2012 02:33:37 +0000 (02:33 +0000)]
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().