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)
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.
Campbell Barton [Thu, 6 Sep 2012 11:02:27 +0000 (11:02 +0000)]
fix for error in own recent commit
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
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.
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
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).
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
Campbell Barton [Thu, 6 Sep 2012 02:20:03 +0000 (02:20 +0000)]
style cleanup: 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)
Campbell Barton [Thu, 6 Sep 2012 01:31:15 +0000 (01:31 +0000)]
code cleanup: capitalize defines.
Campbell Barton [Thu, 6 Sep 2012 01:06:36 +0000 (01:06 +0000)]
fix [#32500] Odd behaviour with subdividing an ngon
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.
Campbell Barton [Thu, 6 Sep 2012 00:33:59 +0000 (00:33 +0000)]
code cleanup: remove deprecated defines and some struct members
Campbell Barton [Wed, 5 Sep 2012 23:30:30 +0000 (23:30 +0000)]
committed by accident
Campbell Barton [Wed, 5 Sep 2012 23:22:47 +0000 (23:22 +0000)]
code cleanup: BM_face_legal_splits() was doing some redundant assignments.
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]
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.
Dalai Felinto [Wed, 5 Sep 2012 20:50:10 +0000 (20:50 +0000)]
silencing some of the warnings in OSL for OSX
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.
Bastien Montagne [Wed, 5 Sep 2012 18:35:22 +0000 (18:35 +0000)]
Adding brazilian portuguese language, as requested by portuguese team.
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.
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.
Sergey Sharybin [Wed, 5 Sep 2012 14:11:22 +0000 (14:11 +0000)]
Sequencer: show color sample line in image display mode only
Antony Riakiotakis [Wed, 5 Sep 2012 13:50:24 +0000 (13:50 +0000)]
Fix compositor crash. g_highlightedNodes can be NULL.
Lukas Toenne [Wed, 5 Sep 2012 12:06:44 +0000 (12:06 +0000)]
Cycles fix: particle standard attribute had no name conversion yet.
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.
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.
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.
Campbell Barton [Wed, 5 Sep 2012 04:16:09 +0000 (04:16 +0000)]
fix [#29431] "Normalize All" from Weight Tools don't work correctly
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.
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.
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.
Thomas Dinges [Wed, 5 Sep 2012 00:59:04 +0000 (00:59 +0000)]
* Forgot to commit CMake change for the Brick texture.
Campbell Barton [Wed, 5 Sep 2012 00:52:35 +0000 (00:52 +0000)]
add missing files from cmakes lists
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]
Thomas Dinges [Tue, 4 Sep 2012 23:34:08 +0000 (23:34 +0000)]
OSL:
* Noise Texture is rendering now.
Thomas Dinges [Tue, 4 Sep 2012 22:33:11 +0000 (22:33 +0000)]
Cycles / OSL:
* Ported the Brick Texture to OSL. Renders fine :)
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.
Campbell Barton [Tue, 4 Sep 2012 19:42:09 +0000 (19:42 +0000)]
fix [#32490] Compsitor crashes on missing OpenEXR multilayer files
Campbell Barton [Tue, 4 Sep 2012 18:47:08 +0000 (18:47 +0000)]
stule cleanup
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.
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.
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
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.
Thomas Dinges [Tue, 4 Sep 2012 16:54:32 +0000 (16:54 +0000)]
OSL:
* Holdout shader is now working in OSL.
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.
Lukas Toenne [Tue, 4 Sep 2012 16:46:56 +0000 (16:46 +0000)]
Minor syntax error in musgrave osl texture.
Thomas Dinges [Tue, 4 Sep 2012 16:00:12 +0000 (16:00 +0000)]
OSL:
* WIP commit of fixes for musgrave and wave.
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.
Sergey Sharybin [Tue, 4 Sep 2012 13:37:58 +0000 (13:37 +0000)]
Compilation fix for recent merge commit
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 :)
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.
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
Thomas Dinges [Tue, 4 Sep 2012 11:41:48 +0000 (11:41 +0000)]
OSL:
* Gradient texture renders now.
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.
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.
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.
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
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)
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().
Campbell Barton [Tue, 4 Sep 2012 01:23:50 +0000 (01:23 +0000)]
fix for building on msvc2008 (also style cleanup)
Campbell Barton [Mon, 3 Sep 2012 22:53:34 +0000 (22:53 +0000)]
code cleanup: curve path calculation
Campbell Barton [Mon, 3 Sep 2012 22:04:14 +0000 (22:04 +0000)]
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.
Lukas Toenne [Mon, 3 Sep 2012 18:51:02 +0000 (18:51 +0000)]
Fix for Cycles OSL: The RenderServices pointer in ShadingSystem is no longer accessible from the interface class (presumably because it is just the base class pointer anyway and would have to be casted). The OSLRenderServices pointer to our own implementation is now stored alongside the ShadingSystem in the kernel globals, so it can be accessed in thread_init.
Lukas Toenne [Mon, 3 Sep 2012 18:50:59 +0000 (18:50 +0000)]
The shader id generated by the manager contains some special flags in high bits, leading to out-of-range index if used directly. This must use the SHADER_MASK to get actual array index.
Gaia Clary [Mon, 3 Sep 2012 17:54:04 +0000 (17:54 +0000)]
fix:32348 Collada yfov to xfov conversion fo camera settings
Brecht Van Lommel [Mon, 3 Sep 2012 17:41:49 +0000 (17:41 +0000)]
Fix #32089: non-progressive integrator issue with semi-transparent surfaces.
Brecht Van Lommel [Mon, 3 Sep 2012 17:41:47 +0000 (17:41 +0000)]
Fix #32046: GHOST_DropTargetWin32 memory leak, patch by Matt D.
Brecht Van Lommel [Mon, 3 Sep 2012 16:52:59 +0000 (16:52 +0000)]
Fix #32088: cycles crash removing a lamp with non-progressive sampling.
Sergey Sharybin [Mon, 3 Sep 2012 16:08:28 +0000 (16:08 +0000)]
Fix #32372: Blender Locks up when using Quick Fluid feature
Sergey Sharybin [Mon, 3 Sep 2012 16:05:37 +0000 (16:05 +0000)]
Fix regression introduced in recent jobs system refactoring
Fluid simulation job progress wasn't displayed anymore.
Howard Trickey [Mon, 3 Sep 2012 14:37:34 +0000 (14:37 +0000)]
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.
Sergey Sharybin [Mon, 3 Sep 2012 14:26:53 +0000 (14:26 +0000)]
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
Thomas Dinges [Mon, 3 Sep 2012 14:08:03 +0000 (14:08 +0000)]
OSL / Cmake:
* Holdout shader was missing in cmake.
Brecht Van Lommel [Mon, 3 Sep 2012 14:07:49 +0000 (14:07 +0000)]
Fix #32097: cycles window texture coordinate wrong, happened after 2.63.
Lukas Toenne [Mon, 3 Sep 2012 13:56:40 +0000 (13:56 +0000)]
Enable compilation of the SVM backend for Cycles even when OSL is enabled. The switch between SVM/OSL is decided at runtime, so the SVM code cannot simply be ignored when OSL is enabled.
Currently all shader functions check the OSL/SVM flag to dispatch to the appropriate backend. If this turns out to be a significant overhead (unlikely) this test should be moved out of the inner loop.
Brecht Van Lommel [Mon, 3 Sep 2012 13:18:23 +0000 (13:18 +0000)]
Fix #32144: cycles viewport missing update with dupliverts. Ideally this would be
fixed in the dependency graph so it gives a proper signal but that would need a
bigger refactor.
Sergey Sharybin [Mon, 3 Sep 2012 13:17:21 +0000 (13:17 +0000)]
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
Brecht Van Lommel [Mon, 3 Sep 2012 12:52:21 +0000 (12:52 +0000)]
Compositor: initialize OpenCL only when the option is enabled. This eliminates
error prints or even crashes for poor OpenCL implementations when not using it.
Thomas Dinges [Mon, 3 Sep 2012 12:35:32 +0000 (12:35 +0000)]
* Added back UI switch for the Cycles shading system. Only visible when the feature set is "Experimental".
Sergey Sharybin [Mon, 3 Sep 2012 12:01:00 +0000 (12:01 +0000)]
Fix for logging FFmpeg messages
Brecht Van Lommel [Mon, 3 Sep 2012 11:55:30 +0000 (11:55 +0000)]
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.
Lukas Toenne [Mon, 3 Sep 2012 11:38:22 +0000 (11:38 +0000)]
Fix for OSL shader install paths.
Lukas Toenne [Mon, 3 Sep 2012 11:38:20 +0000 (11:38 +0000)]
RTTI needs to be disabled in cycles for OSL.
Lukas Toenne [Mon, 3 Sep 2012 11:38:18 +0000 (11:38 +0000)]
Added library linking for cycles_kernel_osl to OSL libraries and added cycles_kernel_osl to the list of blender libs in creator.
Lukas Toenne [Mon, 3 Sep 2012 11:38:15 +0000 (11:38 +0000)]
Replaced dynamic_casts for node type checks by simple 'special type' identifiers. RTTI has to be disabled in cycles for OSL.
Brecht Van Lommel [Mon, 3 Sep 2012 11:26:04 +0000 (11:26 +0000)]
Fix #32468: 3d view texture paint mode did not show uv layout in image editor.
Campbell Barton [Mon, 3 Sep 2012 10:39:15 +0000 (10:39 +0000)]
fix [#31694] Circle Selection is ignored within face selection in texture paint mode
Campbell Barton [Mon, 3 Sep 2012 10:12:25 +0000 (10:12 +0000)]
code cleanup: split out defines in BKE_utildefines.h into BLO_blend_defs.h and ui defines in interface_intern.h
Campbell Barton [Mon, 3 Sep 2012 09:03:25 +0000 (09:03 +0000)]
array functions for endian switching.
Campbell Barton [Mon, 3 Sep 2012 07:37:38 +0000 (07:37 +0000)]
add endian switch functions to replace macros SWITCH_INT/LONG/SHORT, with BLI_endian_switch_int32/int64/float/double...
Campbell Barton [Mon, 3 Sep 2012 05:36:47 +0000 (05:36 +0000)]
style cleanup
Campbell Barton [Mon, 3 Sep 2012 02:41:12 +0000 (02:41 +0000)]
style cleanup: also add debugging print function for derived mesh DM_debug_print_cdlayers()
Campbell Barton [Mon, 3 Sep 2012 02:08:56 +0000 (02:08 +0000)]
uncomment data identifiers from sphinx docs (own error made r41509)
Campbell Barton [Mon, 3 Sep 2012 01:05:04 +0000 (01:05 +0000)]
fix [#32434] Copy-Paste Tracks causes Blender to freeze/crash on second use.
Campbell Barton [Mon, 3 Sep 2012 00:30:55 +0000 (00:30 +0000)]
fix [#32423] Extrude crash
mistake in r50086 caused the crash (killing the wrong vertex)
Campbell Barton [Mon, 3 Sep 2012 00:02:13 +0000 (00:02 +0000)]
remove vertex groups from a mesh or lattice when this there are no remaining vertex groups. This was dont in edit-mode but not object-mode.
Lukas Toenne [Sun, 2 Sep 2012 18:11:28 +0000 (18:11 +0000)]
Cycles compile fix: only use std::isfinite when OSL is enabled.
Thomas Dinges [Sun, 2 Sep 2012 17:39:07 +0000 (17:39 +0000)]
* Removed last occurrence of get_pointcloud_attr_query.