blender.git
7 years agoRevert r50528: "Performance fix for Cycles: Don't wait in the main UI thread when...
Lukas Toenne [Mon, 17 Sep 2012 12:07:06 +0000 (12:07 +0000)]
Revert r50528: "Performance fix for Cycles: Don't wait in the main UI thread when resetting devices."

This commit leads to random freezes in Cycles rendering:
https://projects.blender.org/tracker/index.php?func=detail&aid=32545&group_id=9&atid=498

The goal of this commit was to remove UI lag for OSL, but since that is not officially supported yet, better revert it until a proper fix can be implemented in 2.65.

7 years agoUpdating mingw32 config to reflect new boost libraries in svn
Joshua Leung [Mon, 17 Sep 2012 12:05:18 +0000 (12:05 +0000)]
Updating mingw32 config to reflect new boost libraries in svn
(1.47 -> 1.49)

7 years agoFix cycles panorama camera not working with depth of field, patch by
Brecht Van Lommel [Mon, 17 Sep 2012 11:25:29 +0000 (11:25 +0000)]
Fix cycles panorama camera not working with depth of field, patch by
Daniel M. Basso, thanks!

7 years agoFix mac build issue after recent file browser fix.
Brecht Van Lommel [Mon, 17 Sep 2012 11:25:10 +0000 (11:25 +0000)]
Fix mac build issue after recent file browser fix.

7 years agoCycles: change preview "resolution divider" that gave the number of lower
Brecht Van Lommel [Mon, 17 Sep 2012 10:55:18 +0000 (10:55 +0000)]
Cycles: change preview "resolution divider" that gave the number of lower
resolutions to render, to a "start resolution" which gives the resolution
to start at.

This avoids unnecessary rendering of small resolutions in small viewports,
and avoids long waiting on big viewports.

7 years agoUI: cosmetic tweak to render/animation/play buttons, align, change icon.
Brecht Van Lommel [Mon, 17 Sep 2012 10:54:50 +0000 (10:54 +0000)]
UI: cosmetic tweak to render/animation/play buttons, align, change icon.

7 years agoRelease Cycles:
Thomas Dinges [Mon, 17 Sep 2012 10:50:13 +0000 (10:50 +0000)]
Release Cycles:
* Bump BLENDER_VERSION_CYCLE to rc. BCon4, bugfixes only.

7 years agoFix compilation for non GCC compilers
Sergej Reich [Mon, 17 Sep 2012 10:18:28 +0000 (10:18 +0000)]
Fix compilation for non GCC compilers

Was simple copy pase error.

7 years agoFix compilation issue, also get rid of annoying "_MSC_VER not defined"
Antony Riakiotakis [Mon, 17 Sep 2012 08:36:47 +0000 (08:36 +0000)]
Fix compilation issue, also get rid of annoying "_MSC_VER not defined"
preprocessor ambiguity for MinGW

7 years agoRemove obsolete code from BKE_tracking_marker_clamp
Sergey Sharybin [Mon, 17 Sep 2012 07:12:02 +0000 (07:12 +0000)]
Remove obsolete code from BKE_tracking_marker_clamp

7 years agoFixed crash in cases sequencer returns NULL image buffer
Sergey Sharybin [Mon, 17 Sep 2012 07:09:11 +0000 (07:09 +0000)]
Fixed crash in cases sequencer returns NULL image buffer

Happens when there's no strip under current frame. Simply added NULL-check.

7 years agofix [#32442] UNDO causes actual shape key to be lost, undoing a modification of anoth...
Campbell Barton [Mon, 17 Sep 2012 06:14:09 +0000 (06:14 +0000)]
fix [#32442] UNDO causes actual shape key to be lost, undoing a modification of another shape key.

7 years agoadd endian switching to mask shape key loading (loading mask animations between big...
Campbell Barton [Mon, 17 Sep 2012 05:31:41 +0000 (05:31 +0000)]
add endian switching to mask shape key loading (loading mask animations between big/little endian systems would break), also set attributes to BLI_endian_switch_* functions.

7 years agocode cleanup: fsmenu.c names were confusing - fsms / fsme / prev --> fsm_head / fsm_i...
Campbell Barton [Mon, 17 Sep 2012 04:29:43 +0000 (04:29 +0000)]
code cleanup: fsmenu.c names were confusing - fsms / fsme / prev --> fsm_head / fsm_iter / fsm_prev

7 years agocode cleanup: correct include paths and comment
Campbell Barton [Mon, 17 Sep 2012 04:08:36 +0000 (04:08 +0000)]
code cleanup: correct include paths and comment

7 years agofix [#32564] Entries in recent list (file select dialog) don't get pushed to top...
Campbell Barton [Mon, 17 Sep 2012 02:19:41 +0000 (02:19 +0000)]
fix [#32564] Entries in recent list (file select dialog) don't get pushed to top if used again

7 years agocode cleanup: replace fsmenu_insert_entry args with flags.
Campbell Barton [Mon, 17 Sep 2012 02:01:09 +0000 (02:01 +0000)]
code cleanup: replace fsmenu_insert_entry args with flags.

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

7 years agocode cleanup: text clipping function ui_text_leftclip() was also used for cursor...
Campbell Barton [Mon, 17 Sep 2012 00:57:33 +0000 (00:57 +0000)]
code cleanup: text clipping function ui_text_leftclip() was also used for cursor clipping which made it a bit confusing, split into 2 functions. ui_text_clip_left(), ui_text_clip_cursor().

7 years agocode cleanup: add some comments and made some small speedup to text clipping in the UI
Campbell Barton [Mon, 17 Sep 2012 00:33:07 +0000 (00:33 +0000)]
code cleanup: add some comments and made some small speedup to text clipping in the UI

7 years agostyle cleanup: multiple statements on a single line in interface code.
Campbell Barton [Sun, 16 Sep 2012 23:40:03 +0000 (23:40 +0000)]
style cleanup: multiple statements on a single line in interface code.

7 years agofix for node socket text buttons not scaling with DPI, also quiet -Wundef warning...
Campbell Barton [Sun, 16 Sep 2012 23:24:26 +0000 (23:24 +0000)]
fix for node socket text buttons not scaling with DPI, also quiet -Wundef warning WITH_DDS.

7 years ago* Enable opencolorio for scons/mingw32 (coming very soon)
Antony Riakiotakis [Sun, 16 Sep 2012 20:26:28 +0000 (20:26 +0000)]
* Enable opencolorio for scons/mingw32 (coming very soon)
* Change names of libraries for mingw32 boost to 1.49

7 years agoFix drawing of output slots with utf-8 names. Also always show last letters in alread...
Sv. Lockal [Sun, 16 Sep 2012 19:06:17 +0000 (19:06 +0000)]
Fix drawing of output slots with utf-8 names. Also always show last letters in already clipped output slots names

7 years agoEnable OpenColorIO for MinGW64 build targets
Antony Riakiotakis [Sun, 16 Sep 2012 18:05:32 +0000 (18:05 +0000)]
Enable OpenColorIO for MinGW64 build targets

7 years agoFew cleanup in matrix mathutils (make mul_m3_m3m4 and mul_m4_m3m4 consistant with...
Bastien Montagne [Sun, 16 Sep 2012 15:25:28 +0000 (15:25 +0000)]
Few cleanup in matrix mathutils (make mul_m3_m3m4 and mul_m4_m3m4 consistant with other similar funcs, mainly copy-safe [i.e. you can use the same matrix as operand and result, saves lines in some already over-complicated code!]).

7 years agoColor Management: fix crash when displaying render preview if OCIO was disabled buildtime
Sergey Sharybin [Sun, 16 Sep 2012 15:17:22 +0000 (15:17 +0000)]
Color Management: fix crash when displaying render preview if OCIO was disabled buildtime

7 years agoReal fix for OSX CMake -- was a typo in build file generation file
Sergey Sharybin [Sun, 16 Sep 2012 14:43:44 +0000 (14:43 +0000)]
Real fix for OSX CMake -- was a typo in build file generation file

Now Ceres re-bundling should go smooth :)

7 years agoFix OSX compile
Jens Verwiebe [Sun, 16 Sep 2012 14:31:25 +0000 (14:31 +0000)]
Fix OSX compile

7 years agoFix typo in one of previous commits
Sergey Sharybin [Sun, 16 Sep 2012 13:58:15 +0000 (13:58 +0000)]
Fix typo in one of previous commits

7 years agoOSL Fix for fireflies in velvet bsdf, ported over from SVM fix in r41738.
Lukas Toenne [Sun, 16 Sep 2012 13:17:39 +0000 (13:17 +0000)]
OSL Fix for fireflies in velvet bsdf, ported over from SVM fix in r41738.

7 years agoFix some warnings treated as errors here.
Sergey Sharybin [Sun, 16 Sep 2012 12:33:39 +0000 (12:33 +0000)]
Fix some warnings treated as errors here.

7 years agoCeres: tweak namespace for hash classes for MSVC2010
Sergey Sharybin [Sun, 16 Sep 2012 12:24:54 +0000 (12:24 +0000)]
Ceres: tweak namespace for hash classes for MSVC2010

Not sure if it'll solve all issues, but at least it should reduce
amount of errors.

Also added missed patch from previous commit.

7 years agoCeres: reshuffle include order to solve compilation error with MSVC
Sergey Sharybin [Sun, 16 Sep 2012 12:24:48 +0000 (12:24 +0000)]
Ceres: reshuffle include order to solve compilation error with MSVC

Not sure why exactly this happens, would need extra investigation
and should probably be also fixed in upstream.

7 years agoLibmv: remove unwind hack from CMake rules.
Sergey Sharybin [Sun, 16 Sep 2012 12:24:43 +0000 (12:24 +0000)]
Libmv: remove unwind hack from CMake rules.

Such stuff better be solved in glog itself.

Should be pretty safe change since it was defined for CMake only
and AFAIR Jens wanted to get rid of this too.

7 years agoCeres: upgrade to version 1.3.0
Sergey Sharybin [Sun, 16 Sep 2012 12:24:37 +0000 (12:24 +0000)]
Ceres: upgrade to version 1.3.0

This should contain real fixes for Windows, making it more robost and hopefully
faster (due to proper collection port) on that platform.

Also hack to fix Eigen alignment shouldn't be needed anymore.

Also on platforms which have got broken TR1 collections it's better to define
CERES_NO_TR1 instead of using Boost hacks. Made changes to Scons and CMake,
but can not check if this indeed works since i don't have OSX here.

7 years agoCeres: remove debug-only code from bundling script, also move osx workaround to template
Sergey Sharybin [Sun, 16 Sep 2012 12:23:00 +0000 (12:23 +0000)]
Ceres: remove debug-only code from bundling script, also move osx workaround to template

7 years agoCode cleanup - Remove/update outdated comments and whitespace tweaks
Joshua Leung [Sun, 16 Sep 2012 11:19:36 +0000 (11:19 +0000)]
Code cleanup - Remove/update outdated comments and whitespace tweaks

7 years agouse the format attribute in more places, disable X11 options when building with GHOST_SDL
Campbell Barton [Sun, 16 Sep 2012 10:39:19 +0000 (10:39 +0000)]
use the format attribute in more places, disable X11 options when building with GHOST_SDL

7 years agospeedup for vertex parent lookups, were looping over array elements when it wasn...
Campbell Barton [Sun, 16 Sep 2012 08:25:31 +0000 (08:25 +0000)]
speedup for vertex parent lookups, were looping over array elements when it wasn't needed for lattice and curves, and in some cases meshes.

do dirrect array lookups instead where possible.

7 years agoBugfix [#32501] Protected layer bones transform buttons are greyed out/inactive
Joshua Leung [Sun, 16 Sep 2012 07:27:43 +0000 (07:27 +0000)]
Bugfix [#32501] Protected layer bones transform buttons are greyed out/inactive

Since the transform values for bones in protected layers can be animated again
using many of the common tools, it makes sense that the transform properties for
these are allowed to be edited too.

I've left the rotation mode setting as a "proxy locked" value for now, since
this seems more like something that's defined as part of the rig creation (and
best left alone by animators).

7 years agoCode cleanup - remove some obsolete code
Joshua Leung [Sun, 16 Sep 2012 07:14:15 +0000 (07:14 +0000)]
Code cleanup - remove some obsolete code

7 years agostyle cleanup
Campbell Barton [Sun, 16 Sep 2012 04:58:18 +0000 (04:58 +0000)]
style cleanup

7 years agofix for error in recent commit (made function static that shouldn't have been), add...
Campbell Barton [Sun, 16 Sep 2012 01:35:00 +0000 (01:35 +0000)]
fix for error in recent commit (made function static that shouldn't have been), add extra gcc warnings to cmake.

7 years agocode cleanup: quiet warnings for gcc's -Wundef, -Wmissing-declarations
Campbell Barton [Sun, 16 Sep 2012 00:26:36 +0000 (00:26 +0000)]
code cleanup: quiet warnings for gcc's -Wundef, -Wmissing-declarations

7 years agocode cleanup: make local game engine functions static
Campbell Barton [Sun, 16 Sep 2012 00:22:55 +0000 (00:22 +0000)]
code cleanup: make local game engine functions static

7 years agocode cleanup: remove unused structs and also some style cleanup.
Campbell Barton [Sat, 15 Sep 2012 23:13:24 +0000 (23:13 +0000)]
code cleanup: remove unused structs and also some style cleanup.

7 years agoremove unused parts of raskter module.
Campbell Barton [Sat, 15 Sep 2012 23:05:34 +0000 (23:05 +0000)]
remove unused parts of raskter module.

7 years agoYet another OSL fix: Some functions are missing stubs that were not used in old OSL...
Lukas Toenne [Sat, 15 Sep 2012 18:08:51 +0000 (18:08 +0000)]
Yet another OSL fix: Some functions are missing stubs that were not used in old OSL implementation yet.

7 years agoFix for OSL 'Normal' node: the Direction parameter is of 'normal' type instead of...
Lukas Toenne [Sat, 15 Sep 2012 16:31:11 +0000 (16:31 +0000)]
Fix for OSL 'Normal' node: the Direction parameter is of 'normal' type instead of generic 'vector'.

7 years agoGenerate compatible OSL shader parameter names in cases where the node has and input...
Lukas Toenne [Sat, 15 Sep 2012 16:31:07 +0000 (16:31 +0000)]
Generate compatible OSL shader parameter names in cases where the node has and input and output with the same name. In that case the convention is to add suffixes "In" and "Out" respectively.
Example:

Blender node has one input "Color" and one output "Color"

-> OSL parameter names should be "ColorIn" and "ColorOut"

7 years agoOSL implementation of RGB ramp node.
Lukas Toenne [Sat, 15 Sep 2012 15:41:37 +0000 (15:41 +0000)]
OSL implementation of RGB ramp node.

The sampled color ramp data is passed to OSL as a color array. This has to be done as actual float[3] array though, since the Cycles float3 type actually contains 4 floats, leading to shifting color components in the array.

Additional parameter set functions for arrays have been added to the Cycles OSL interface for this purpose.

7 years agoMerged this part of code by mistake.
Sergey Sharybin [Sat, 15 Sep 2012 15:17:51 +0000 (15:17 +0000)]
Merged this part of code by mistake.

7 years agoCycles / OSL:
Thomas Dinges [Sat, 15 Sep 2012 15:03:43 +0000 (15:03 +0000)]
Cycles / OSL:
* Fix Musgrave Texture, used wrong Perlin Noise (0..1) instead of -1..1. Also added comment to noise_basis() to make it clear which noise type is used there.

7 years agoCycles / OSL:
Thomas Dinges [Sat, 15 Sep 2012 13:56:09 +0000 (13:56 +0000)]
Cycles / OSL:
* Fixes for Voronoi, Gradient and Magic Textures. SVM and OSL renders excactly the same now.

7 years ago* Disable building of Legacy Compositor in Scons.
Thomas Dinges [Sat, 15 Sep 2012 12:32:30 +0000 (12:32 +0000)]
* Disable building of Legacy Compositor in Scons.

7 years agocode cleanup: replace macro for BLI_rect size/center with inline functions.
Campbell Barton [Sat, 15 Sep 2012 11:48:20 +0000 (11:48 +0000)]
code cleanup: replace macro for BLI_rect size/center with inline functions.

7 years agofix for bug in txt_undo_read_uint32() reading 4byte unicode values.
Campbell Barton [Sat, 15 Sep 2012 10:40:05 +0000 (10:40 +0000)]
fix for bug in txt_undo_read_uint32() reading 4byte unicode values.

7 years agoBuildbot: OpenColorIO should be enabled for buildbot now
Sergey Sharybin [Sat, 15 Sep 2012 10:29:59 +0000 (10:29 +0000)]
Buildbot: OpenColorIO should be enabled for buildbot now

7 years agoFix for collada -- some intermediate patch remained untweaked there
Sergey Sharybin [Sat, 15 Sep 2012 10:11:58 +0000 (10:11 +0000)]
Fix for collada -- some intermediate patch remained untweaked there

7 years agoColor Management, Stage 2: Switch color pipeline to use OpenColorIO
Sergey Sharybin [Sat, 15 Sep 2012 10:05:07 +0000 (10:05 +0000)]
Color Management, Stage 2: Switch color pipeline to use OpenColorIO

Replace old color pipeline which was supporting linear/sRGB color spaces
only with OpenColorIO-based pipeline.

This introduces two configurable color spaces:

- Input color space for images and movie clips. This space is used to convert
  images/movies from color space in which file is saved to Blender's linear
  space (for float images, byte images are not internally converted, only input
  space is stored for such images and used later).

  This setting could be found in image/clip data block settings.

- Display color space which defines space in which particular display is working.

  This settings could be found in scene's Color Management panel.

When render result is being displayed on the screen, apart from converting image
to display space, some additional conversions could happen.

This conversions are:

- View, which defines tone curve applying before display transformation.
  These are different ways to view the image on the same display device.
  For example it could be used to emulate film view on sRGB display.

- Exposure affects on image exposure before tone map is applied.

- Gamma is post-display gamma correction, could be used to match particular
  display gamma.

- RGB curves are user-defined curves which are applying before display
  transformation, could be used for different purposes.

All this settings by default are only applying on render result and does not
affect on other images. If some particular image needs to be affected by this
transformation, "View as Render" setting of image data block should be set to
truth. Movie clips are always affected by all display transformations.

This commit also introduces configurable color space in which sequencer is
working. This setting could be found in scene's Color Management panel and
it should be used if such stuff as grading needs to be done in color space
different from sRGB (i.e. when Film view on sRGB display is use, using VD16
space as sequencer's internal space would make grading working in space
which is close to the space using for display).

Some technical notes:

- Image buffer's float buffer is now always in linear space, even if it was
  created from 16bit byte images.

- Space of byte buffer is stored in image buffer's rect_colorspace property.

- Profile of image buffer was removed since it's not longer meaningful.

- OpenGL and GLSL is supposed to always work in sRGB space. It is possible
  to support other spaces, but it's quite large project which isn't so
  much important.

- Legacy Color Management option disabled is emulated by using None display.
  It could have some regressions, but there's no clear way to avoid them.

- If OpenColorIO is disabled on build time, it should make blender behaving
  in the same way as previous release with color management enabled.

More details could be found at this page (more details would be added soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.64/Color_Management

--
Thanks to Xavier Thomas, Lukas Toene for initial work on OpenColorIO
integration and to Brecht van Lommel for some further development and code/
usecase review!

7 years agoColor Management, Stage 1: Initial OpenColorIO library integration
Sergey Sharybin [Sat, 15 Sep 2012 10:03:17 +0000 (10:03 +0000)]
Color Management, Stage 1: Initial OpenColorIO library integration

This commit integrates support of OpenColorIO library into build systems.

It also contains C-API for OpenColorIO library which could be used by Blender.

CMake has got find rules familiar to OpenImageIO's one which makes it easier
for build system to find needed libraries and includes. Scons only could use
explicitly defined paths to libraries and includes.

C-API would be compiled and Blender would be linked against C-API and OpenColorIO
but it wouldn't affect on Blender behavior at all.

OpenColorIO could be disabled by setting up WITH_OCIO to Off in CMake and
setting WITH_BF_OCIO in Scons.

7 years agoFix compilers warnings when legacy compositor is disabled
Sergey Sharybin [Sat, 15 Sep 2012 07:50:14 +0000 (07:50 +0000)]
Fix compilers warnings when legacy compositor is disabled

7 years agocode cleanup: remove more invalid/paranoid NULL checks
Campbell Barton [Sat, 15 Sep 2012 07:42:30 +0000 (07:42 +0000)]
code cleanup: remove more invalid/paranoid NULL checks

7 years agocode cleanup: remove paranoid/invalid NULL checks and also reduce some unneeded size_...
Campbell Barton [Sat, 15 Sep 2012 07:31:17 +0000 (07:31 +0000)]
code cleanup: remove paranoid/invalid NULL checks and also reduce some unneeded size_t -> int conversions.

7 years agofix for error in own recent commit adding node undo pushes. (bad use of sizeof)
Campbell Barton [Sat, 15 Sep 2012 07:30:11 +0000 (07:30 +0000)]
fix for error in own recent commit adding node undo pushes. (bad use of sizeof)

7 years agofix for 3 obvious mistakes/bugs.
Campbell Barton [Sat, 15 Sep 2012 06:30:40 +0000 (06:30 +0000)]
fix for 3 obvious mistakes/bugs.

7 years agocode cleanup: remove paranoid NULL checks (these cases would crash earlier of the...
Campbell Barton [Sat, 15 Sep 2012 06:29:32 +0000 (06:29 +0000)]
code cleanup: remove paranoid NULL checks (these cases would crash earlier of the vars were in fact NULL)

7 years agofix incorrect macro for mask handle selection checking.
Campbell Barton [Sat, 15 Sep 2012 06:10:48 +0000 (06:10 +0000)]
fix incorrect macro for mask handle selection checking.

7 years agocode cleanup: replace memcpy for copy_v3_v3(), and fix for unlikely crash - if (ob...
Campbell Barton [Sat, 15 Sep 2012 06:03:49 +0000 (06:03 +0000)]
code cleanup: replace memcpy for copy_v3_v3(), and fix for unlikely crash - if (ob->mat == NULL && ob->totcol)

7 years agosyntax error in previous commit
Campbell Barton [Sat, 15 Sep 2012 05:09:42 +0000 (05:09 +0000)]
syntax error in previous commit

7 years agoSilent compiler's warnings about tracking module
Sergey Sharybin [Sat, 15 Sep 2012 05:01:52 +0000 (05:01 +0000)]
Silent compiler's warnings about tracking module

7 years agocode cleanup: quiet some windows warnings.
Campbell Barton [Sat, 15 Sep 2012 04:57:51 +0000 (04:57 +0000)]
code cleanup: quiet some windows warnings.

7 years agocode cleanup: modify DO_INLINE define to not use __inline with mingw
Campbell Barton [Sat, 15 Sep 2012 02:29:47 +0000 (02:29 +0000)]
code cleanup: modify DO_INLINE define to not use __inline with mingw
make RegisterBlendExtension_Fail a static func
       u

7 years agoquiet -Wmissing-prototypes warnings, and enable this warning by default for C with...
Campbell Barton [Sat, 15 Sep 2012 01:52:28 +0000 (01:52 +0000)]
quiet -Wmissing-prototypes warnings, and enable this warning by default for C with gcc.

helps for finding unused functions and making functions static, also did some minor code cleanup.

7 years agofix [#32381] Sculpt: crash when using radius sensitivity
Campbell Barton [Fri, 14 Sep 2012 23:34:00 +0000 (23:34 +0000)]
fix [#32381] Sculpt: crash when using radius sensitivity

7 years agostyle cleanup
Campbell Barton [Fri, 14 Sep 2012 23:11:47 +0000 (23:11 +0000)]
style cleanup

7 years agoCollada: #32549 partial fix: packed images now export correctly
Gaia Clary [Fri, 14 Sep 2012 22:31:26 +0000 (22:31 +0000)]
Collada: #32549 partial fix: packed images now export correctly

7 years agoImplemented the Particle Info for OSL. Uses the following attributes:
Lukas Toenne [Fri, 14 Sep 2012 19:09:25 +0000 (19:09 +0000)]
Implemented the Particle Info for OSL. Uses the following attributes:

* std::particle_index
* std::particle_age
* std::particle_lifetime
* std::particle_location
* std::particle_size
* std::particle_velocity
* std::particle_angular_velocity

Just as with SVM the rotation state attribute is currently disabled due to lack of a proper quaternion or matrix type in Cycles nodes.

7 years agoAdded Object Info node implementation for OSL. This uses an additional attribute...
Lukas Toenne [Fri, 14 Sep 2012 18:10:54 +0000 (18:10 +0000)]
Added Object Info node implementation for OSL. This uses an additional attribute check in the osl_services callback for special attribute names related to objects:

* std::object_location
* std::object_index
* std::material_index
* std::object_random

Other object-based attributes can be added for particle info in the same way.

7 years agoCorrection to rev50582: LABEL could have a1 = 1.0f and in this case a2 would be used...
Sergey Sharybin [Fri, 14 Sep 2012 16:41:00 +0000 (16:41 +0000)]
Correction to rev50582: LABEL could have a1 = 1.0f and in this case a2 would be used as alpha multiplier for icon

7 years agoDisable legacy compositor by default
Sergey Sharybin [Fri, 14 Sep 2012 15:21:56 +0000 (15:21 +0000)]
Disable legacy compositor by default

7 years agoMovie cache: made it thread safe to operate with memory limitor
Sergey Sharybin [Fri, 14 Sep 2012 14:55:59 +0000 (14:55 +0000)]
Movie cache: made it thread safe to operate with memory limitor

Movie cache is using global memory limitor, which isn't thread safe
in some of operations, so it required to add mutex around limitor
operations in movie cache.

It's probably could be solved in a way with less locks involved by
using different limitor for different areas (like use own limitor
for clips, own limitor for sequencer and so), but that wouldn't be
so easy to control overall memory usage.

--
svn merge -r50125:50126 ^/branches/soc-2011-tomato

7 years agoSequencer: clear cache and animation buffers for strips outside of cursor when rendering
Sergey Sharybin [Fri, 14 Sep 2012 14:28:24 +0000 (14:28 +0000)]
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.

--
svn merge -r50051:50052 ^/branches/soc-2011-tomato

7 years agoCycles / Test:
Thomas Dinges [Fri, 14 Sep 2012 13:11:48 +0000 (13:11 +0000)]
Cycles / Test:
* Enable progressive flag, tiles are not working properly (Image gets brighter with more samples and no visible updates until all tiles are finished).

7 years agoCode cleanup: removed unused Cocoa image load/save code.
Brecht Van Lommel [Fri, 14 Sep 2012 11:42:05 +0000 (11:42 +0000)]
Code cleanup: removed unused Cocoa image load/save code.

7 years agofix for sharp edge selection being inverted, change default angle from 1 to 30deg.
Campbell Barton [Fri, 14 Sep 2012 11:10:03 +0000 (11:10 +0000)]
fix for sharp edge selection being inverted, change default angle from 1 to 30deg.

7 years agofixes for NULL checks, remove some redundant checks and add some in that have been...
Campbell Barton [Fri, 14 Sep 2012 06:17:14 +0000 (06:17 +0000)]
fixes for NULL checks, remove some redundant checks and add some in that have been removed by accident as code has been updated.

7 years agofix for out-of-bounds checks for fcurve modifier and poselib, also check for NULL...
Campbell Barton [Fri, 14 Sep 2012 06:15:46 +0000 (06:15 +0000)]
fix for out-of-bounds checks for fcurve modifier and poselib, also check for NULL members of avi structure (since they are checked for NULL later.)

7 years agocode cleanup: correct misleading use of LABEL button type.
Campbell Barton [Fri, 14 Sep 2012 05:44:47 +0000 (05:44 +0000)]
code cleanup: correct misleading use of LABEL button type.

7 years agoadd checking target `check_smatch`
Campbell Barton [Fri, 14 Sep 2012 05:08:48 +0000 (05:08 +0000)]
add checking target `check_smatch`

7 years agonode transform was using PET mode (drawing a circle - but it did nothing), disable...
Campbell Barton [Fri, 14 Sep 2012 01:28:26 +0000 (01:28 +0000)]
node transform was using PET mode (drawing a circle - but it did nothing), disable PET for nodes.

7 years agofix for 2 crashes freeing masks
Campbell Barton [Fri, 14 Sep 2012 01:15:08 +0000 (01:15 +0000)]
fix for 2 crashes freeing masks
- freeing a mask from RNA BKE_libblock_free() twice on the mask.
- loading a new blend file would only free the mask and not unlink it from nodes - it would access freed memory.

7 years agobge cleanup caught by accident while going over the code, it seems someone forgot...
Dalai Felinto [Thu, 13 Sep 2012 23:39:09 +0000 (23:39 +0000)]
bge cleanup caught by accident while going over the code, it seems someone forgot to use rect_height everywhere (no functional change)

7 years agoFix #32547: unwrap on default cube got broken in recent commit.
Brecht Van Lommel [Thu, 13 Sep 2012 13:29:10 +0000 (13:29 +0000)]
Fix #32547: unwrap on default cube got broken in recent commit.

7 years agoSequencer: add missed cache invalidation
Sergey Sharybin [Thu, 13 Sep 2012 10:51:18 +0000 (10:51 +0000)]
Sequencer: add missed cache invalidation

Invalidation was missed for:

- Strip (Un)Muting
- Changing speed effect
- Strip translating

7 years agoSequencer: fix invalid update when translating strip which is behind semi-transparent...
Sergey Sharybin [Thu, 13 Sep 2012 10:51:13 +0000 (10:51 +0000)]
Sequencer: fix invalid update when translating strip which is behind semi-transparent strip

7 years agofix [#31946] Masking doesn't respect pixel ratio
Campbell Barton [Thu, 13 Sep 2012 05:29:38 +0000 (05:29 +0000)]
fix [#31946] Masking doesn't respect pixel ratio

7 years agofix for drawing non 1:1 aspect masks, transform and selection still need support.
Campbell Barton [Thu, 13 Sep 2012 02:28:48 +0000 (02:28 +0000)]
fix for drawing non 1:1 aspect masks, transform and selection still need support.

7 years ago- cmake macro list_insert_after/list_insert_before now error when the item passed...
Campbell Barton [Thu, 13 Sep 2012 01:52:58 +0000 (01:52 +0000)]
- cmake macro list_insert_after/list_insert_before now error when the item passed is not found in the list.
- BKE_pose_copy_data() check for target pointer is no longer valid and infact comparing against un-initialized memory in some cases.