9 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

9 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]

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

9 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 :)

9 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.

9 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

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

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

9 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.

9 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

9 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.

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

9 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.

9 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.

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

9 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

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.

9 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

9 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 :)

9 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.

Image texture Blended Box Mapping.

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.

9 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

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

9 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

9 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.

9 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.

9 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

9 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)

9 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().

9 years agofix for building on msvc2008 (also style cleanup)
Campbell Barton [Tue, 4 Sep 2012 01:23:50 +0000 (01:23 +0000)]
fix for building on msvc2008 (also style cleanup)

9 years agocode cleanup: curve path calculation
Campbell Barton [Mon, 3 Sep 2012 22:53:34 +0000 (22:53 +0000)]
code cleanup: curve path calculation

9 years agocode cleanup: move file string defines into BLI_path_utils.h, BKE_utildefines is...
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.

9 years agoFix for Cycles OSL: The RenderServices pointer in ShadingSystem is no longer accessib...
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.

9 years agoThe shader id generated by the manager contains some special flags in high bits,...
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.

9 years agofix:32348 Collada yfov to xfov conversion fo camera settings
Gaia Clary [Mon, 3 Sep 2012 17:54:04 +0000 (17:54 +0000)]
fix:32348 Collada yfov to xfov conversion fo camera settings

9 years agoFix #32089: non-progressive integrator issue with semi-transparent surfaces.
Brecht Van Lommel [Mon, 3 Sep 2012 17:41:49 +0000 (17:41 +0000)]
Fix #32089: non-progressive integrator issue with semi-transparent surfaces.

9 years agoFix #32046: GHOST_DropTargetWin32 memory leak, patch by Matt D.
Brecht Van Lommel [Mon, 3 Sep 2012 17:41:47 +0000 (17:41 +0000)]
Fix #32046: GHOST_DropTargetWin32 memory leak, patch by Matt D.

9 years agoFix #32088: cycles crash removing a lamp with non-progressive sampling.
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.

9 years agoFix #32372: Blender Locks up when using Quick Fluid feature
Sergey Sharybin [Mon, 3 Sep 2012 16:08:28 +0000 (16:08 +0000)]
Fix #32372: Blender Locks up when using Quick Fluid feature

9 years agoFix regression introduced in recent jobs system refactoring
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.

9 years agoFix knife bug #30764, failure to cut sometimes.
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.

9 years agoFix for compositor always cacheing frames when using Movie Clip input node
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

9 years agoOSL / Cmake:
Thomas Dinges [Mon, 3 Sep 2012 14:08:03 +0000 (14:08 +0000)]
OSL / Cmake:
* Holdout shader was missing in cmake.

9 years agoFix #32097: cycles window texture coordinate wrong, happened after 2.63.
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.

9 years agoEnable compilation of the SVM backend for Cycles even when OSL is enabled. The switch...
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.

9 years agoFix #32144: cycles viewport missing update with dupliverts. Ideally this would be
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.

9 years agoFix for usage of un-initialized memory.
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

9 years agoCompositor: initialize OpenCL only when the option is enabled. This eliminates
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.

9 years ago* Added back UI switch for the Cycles shading system. Only visible when the feature...
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".

9 years agoFix for logging FFmpeg messages
Sergey Sharybin [Mon, 3 Sep 2012 12:01:00 +0000 (12:01 +0000)]
Fix for logging FFmpeg messages

9 years agoFix #32461: adjusting brush strength with shift+F in image editor would show
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.

9 years agoFix for OSL shader install paths.
Lukas Toenne [Mon, 3 Sep 2012 11:38:22 +0000 (11:38 +0000)]
Fix for OSL shader install paths.

9 years agoRTTI needs to be disabled in cycles for OSL.
Lukas Toenne [Mon, 3 Sep 2012 11:38:20 +0000 (11:38 +0000)]
RTTI needs to be disabled in cycles for OSL.

9 years agoAdded library linking for cycles_kernel_osl to OSL libraries and added cycles_kernel_...
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.

9 years agoReplaced dynamic_casts for node type checks by simple 'special type' identifiers...
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.

9 years agoFix #32468: 3d view texture paint mode did not show uv layout in image editor.
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.

9 years agofix [#31694] Circle Selection is ignored within face selection in texture paint mode
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

9 years agocode cleanup: split out defines in BKE_utildefines.h into BLO_blend_defs.h and ui...
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

9 years agoarray functions for endian switching.
Campbell Barton [Mon, 3 Sep 2012 09:03:25 +0000 (09:03 +0000)]
array functions for endian switching.

9 years agoadd endian switch functions to replace macros SWITCH_INT/LONG/SHORT, with BLI_endian_...
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...

9 years agostyle cleanup
Campbell Barton [Mon, 3 Sep 2012 05:36:47 +0000 (05:36 +0000)]
style cleanup

9 years agostyle cleanup: also add debugging print function for derived mesh DM_debug_print_cdla...
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()

9 years agouncomment data identifiers from sphinx docs (own error made r41509)
Campbell Barton [Mon, 3 Sep 2012 02:08:56 +0000 (02:08 +0000)]
uncomment data identifiers from sphinx docs (own error made r41509)

9 years agofix [#32434] Copy-Paste Tracks causes Blender to freeze/crash on second use.
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.

9 years agofix [#32423] Extrude crash
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)

9 years agoremove vertex groups from a mesh or lattice when this there are no remaining 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.

9 years agoCycles compile fix: only use std::isfinite when OSL is enabled.
Lukas Toenne [Sun, 2 Sep 2012 18:11:28 +0000 (18:11 +0000)]
Cycles compile fix: only use std::isfinite when OSL is enabled.

9 years ago* Removed last occurrence of get_pointcloud_attr_query.
Thomas Dinges [Sun, 2 Sep 2012 17:39:07 +0000 (17:39 +0000)]
* Removed last occurrence of get_pointcloud_attr_query.

9 years ago* OSL can't overwrite input parameters, use a local variable instead.
Thomas Dinges [Sun, 2 Sep 2012 16:37:58 +0000 (16:37 +0000)]
* OSL can't overwrite input parameters, use a local variable instead.

9 years agoCycles / OSL:
Thomas Dinges [Sun, 2 Sep 2012 16:06:18 +0000 (16:06 +0000)]
Cycles / OSL:
* Updates for noise_turbulence, to match svm function.

9 years agoFixed a number of OSL syntax errors from the updated 1.2 API. Microfacet functions...
Lukas Toenne [Sun, 2 Sep 2012 15:41:35 +0000 (15:41 +0000)]
Fixed a number of OSL syntax errors from the updated 1.2 API. Microfacet functions now all take an eta parameter, set to 1.0 if no IOR is given.

9 years agoFix for r50314:
Thomas Dinges [Sun, 2 Sep 2012 15:26:13 +0000 (15:26 +0000)]
Fix for r50314:
* oren_nayar is not part of the default stdosl, added it back.

9 years agoFixed remaining syntax errors in OSL files. node_sepcomb_rgb.osl is split into 2...
Lukas Toenne [Sun, 2 Sep 2012 15:07:51 +0000 (15:07 +0000)]
Fixed remaining syntax errors in OSL files. node_sepcomb_rgb.osl is split into 2 parts, since OSL only allows one shader per file.

9 years agoUse function pointers instead of hard-coded english button names in color picker...
Sv. Lockal [Sun, 2 Sep 2012 13:36:33 +0000 (13:36 +0000)]
Use function pointers instead of hard-coded english button names in color picker block.

This solves the problem with es/ru translations of color picker block reported by Gabriel Gazzán in Bf-translations-dev.

9 years agoCycles / OSL:
Thomas Dinges [Sun, 2 Sep 2012 13:34:12 +0000 (13:34 +0000)]
Cycles / OSL:
* Add oslutil.h, from osl 1.2.

9 years agoOSL / Cycles:
Thomas Dinges [Sun, 2 Sep 2012 13:23:44 +0000 (13:23 +0000)]
OSL / Cycles:
* Update the stdosl header file, from official osl 1.2.

9 years agoCycles / OSL:
Thomas Dinges [Sun, 2 Sep 2012 12:46:54 +0000 (12:46 +0000)]
Cycles / OSL:
* Remove declaration of node_blend_weight_texture from cmake, does not exist, and match node_blend_weight name in nodes.cpp with the actual file.

9 years agoCycles / OSL:
Thomas Dinges [Sun, 2 Sep 2012 12:24:04 +0000 (12:24 +0000)]
Cycles / OSL:
* First batch of compile fixes for several shaders, mainly syntax errors.

9 years agoCycles / OSL:
Thomas Dinges [Sun, 2 Sep 2012 01:10:31 +0000 (01:10 +0000)]
Cycles / OSL:
Fixes for API changes in OSL RendererServices:

* Added two new required get_matrix methods, from OSL RendererServices (otherwise the constructor fails). The two new matrix methods probably still need an implementation.
* Removed deprecated "get_pointcloud_attr_query" and "pointcloud". There are two new routines for pointclouds, function headers for those are there.

* Removed the (unused) PARTIO code parts from OSL. It was marked as not tested / not working, and due to the api changes here broken for sure. Code is still in svn history if needed.

9 years ago..\commmit_hive.txt
Benoit Bolsee [Sat, 1 Sep 2012 21:23:05 +0000 (21:23 +0000)]

9 years agoCycles / OSL:
Thomas Dinges [Sat, 1 Sep 2012 15:30:35 +0000 (15:30 +0000)]
Cycles / OSL:
* Compile fix for the "direction_to_panorama" issue.
Added kernel_projection.h to kernel_triangle.h.

9 years agoEnable shader model 3.0 shaders for mingw compilers
Antony Riakiotakis [Sat, 1 Sep 2012 14:53:01 +0000 (14:53 +0000)]
Enable shader model 3.0 shaders for mingw compilers

9 years agoFix #32463, Cycles crashing. The particle system sync_recalc part was checking object...
Lukas Toenne [Sat, 1 Sep 2012 11:30:22 +0000 (11:30 +0000)]
Fix #32463, Cycles crashing. The particle system sync_recalc part was checking object data, which can be NULL and doesn't actually say anything about particles, removed.

9 years agoCycles fix: don't skip particle device update when there are no particle systems...
Lukas Toenne [Sat, 1 Sep 2012 11:30:19 +0000 (11:30 +0000)]
Cycles fix: don't skip particle device update when there are no particle systems. The device texture always contains at least one dummy particle in case particle info node is used for non-instance objects, this must be initialized in any case.

9 years agoCycles / OSLGlobals:
Thomas Dinges [Fri, 31 Aug 2012 20:31:21 +0000 (20:31 +0000)]
Cycles / OSLGlobals:
* Fixes for changes in the Open Shading Langauge API from version 0.6.0:

* Removed the need for ShadingSystemImpl.

9 years agoCycles / OSL:
Thomas Dinges [Fri, 31 Aug 2012 20:08:55 +0000 (20:08 +0000)]
Cycles / OSL:
* OSL namespace fixes for osl_shader.cpp.

9 years agoCycles / OSL:
Thomas Dinges [Fri, 31 Aug 2012 19:59:50 +0000 (19:59 +0000)]
Cycles / OSL:
* Fixes for changes in r40163. Removed unused code and fixed emissive_eval function.

9 years agoPossible fix for [#32462] blender cannot load bmp files (Windows OS).
Thomas Dinges [Fri, 31 Aug 2012 19:57:03 +0000 (19:57 +0000)]
Possible fix for [#32462] blender cannot load bmp files (Windows OS).
* Typo in the CHECK_HEADER_FIELD macro.

Patch by kjym3 in IRC, thanks!

9 years agoCycles: Fix for particle info node crash: The particle 'alive' state can be set to...
Lukas Toenne [Fri, 31 Aug 2012 19:39:08 +0000 (19:39 +0000)]
Cycles: Fix for particle info node crash: The particle 'alive' state can be set to 'dying', which is just an indicator that the particle will be removed, but it is is used for instancing. This would lead to insufficient texture size and assert crash.

9 years agoCycles: Fully initialize the dummy particle at index 0.
Lukas Toenne [Fri, 31 Aug 2012 19:39:06 +0000 (19:39 +0000)]
Cycles: Fully initialize the dummy particle at index 0.

9 years agoCycles: Start the particle index for object instances at 1 instead 0. The first parti...
Lukas Toenne [Fri, 31 Aug 2012 19:39:04 +0000 (19:39 +0000)]
Cycles: Start the particle index for object instances at 1 instead 0. The first particle in the device texture is a dummy for non-instance objects using the particle info node.

9 years agoCycles: Tag particle systems after syncing to make sure the particle system manager...
Lukas Toenne [Fri, 31 Aug 2012 19:39:03 +0000 (19:39 +0000)]
Cycles: Tag particle systems after syncing to make sure the particle system manager updates the device data.

9 years agoAdded a bunch of additional particle state attributes to the Cycles particle info...
Lukas Toenne [Fri, 31 Aug 2012 19:38:59 +0000 (19:38 +0000)]
Added a bunch of additional particle state attributes to the Cycles particle info node:

* Location: Basically the same as the location from Object Info node for object instances on particles, but in principle there could be additional offsets for dupli objects, so included for completeness.
* Size: Single float scale of the particle. Also directly translates to object scale for current dupli objects, but handy to have as a single float to start with instead of a scale vector (currently not even exposed in Object Info).
* Rotation: This is a quaternion, which are not yet supported by Cycles nodes. The float4 is copied to internal Cycles data and stored in the particles texture data, but the node doesn't have a socket for it yet and the data is not yet written to the stack. Code is just commented out so could be enabled quickly if/when rotation support is added to cycles.
* Velocity: Linear velocity vector of particles.
* Angular Velocity: Angular velocity around principle axes.

The texture data is currently packed tightly into the particles texture, which saves a few bytes, but requires an additional texture lookup for some vector attributes which spread over two float4s. Could also add another float4 to particle size to avoid this.

9 years agoFix for #32184 and redesign of particle storage in Cycles.
Lukas Toenne [Fri, 31 Aug 2012 17:27:08 +0000 (17:27 +0000)]
Fix for #32184 and redesign of particle storage in Cycles.

The particle data used by the Particle Info node was stored in cycles as a list in each object. This is a problem when the particle emitter mesh is hidden: Objects in cycles are only intended as instances of renderable meshes, so when hiding the emitter mesh the particle data doesn't get stored either. Also the particle data can potentially be copied to multiple instances of the same object, which is a waste of texture space.

The solution in this patch is to make a completely separate list of particle systems in the Cycles scene data. This way the particle data can be generated even when the emitter object itself is not visible.

9 years agoFix #32329: inset produces incorrect result, epsilon was too small to handle
Brecht Van Lommel [Fri, 31 Aug 2012 16:10:13 +0000 (16:10 +0000)]
Fix #32329: inset produces incorrect result, epsilon was too small to handle
floating point error.

9 years agoFix #32458: changing UV image in image editor not working when the active face
Brecht Van Lommel [Fri, 31 Aug 2012 15:01:40 +0000 (15:01 +0000)]
Fix #32458: changing UV image in image editor not working when the active face
was not selected. Now changed it so that the active face must also have its
UVs shown in the image editor to be used as the source of the image shown.

9 years agoFix part of #32376: mirror vertex groups with flip group names did not keep
Brecht Van Lommel [Fri, 31 Aug 2012 13:43:56 +0000 (13:43 +0000)]
Fix part of #32376: mirror vertex groups with flip group names did not keep
the same vertex group active.

9 years agoFix #32408: image editor does not show paint brush circle on loading a .blend
Brecht Van Lommel [Fri, 31 Aug 2012 13:04:03 +0000 (13:04 +0000)]
Fix #32408: image editor does not show paint brush circle on loading a .blend
file that has paint mode enabled.

9 years agoFix #32447: mouse selection in uv editor is now no longer registerd as last
Brecht Van Lommel [Fri, 31 Aug 2012 12:08:08 +0000 (12:08 +0000)]
Fix #32447: mouse selection in uv editor is now no longer registerd as last
operator, same as 3d view.

9 years agoFix #32450: edge slide with multiple loops selected could move some loops
Brecht Van Lommel [Fri, 31 Aug 2012 12:08:04 +0000 (12:08 +0000)]
Fix #32450: edge slide with multiple loops selected could move some loops
in the wrong direction.

9 years agoCycles / OSL:
Thomas Dinges [Fri, 31 Aug 2012 00:21:56 +0000 (00:21 +0000)]
Cycles / OSL:
* Assume OSL libs in the libdir.

9 years agoFix #32418: color copy/paste between gamma and linear color buttons gave wrong
Brecht Van Lommel [Thu, 30 Aug 2012 17:55:21 +0000 (17:55 +0000)]
Fix #32418: color copy/paste between gamma and linear color buttons gave wrong
results, now it does the conversion.