9 years agoMerging r49400 through r49404 from trunk into soc-2011-tomato
Sergey Sharybin [Mon, 30 Jul 2012 17:12:55 +0000 (17:12 +0000)]
Merging r49400 through r49404 from trunk into soc-2011-tomato

9 years agoMinor code cleanup
Sergey Sharybin [Mon, 30 Jul 2012 17:12:01 +0000 (17:12 +0000)]
Minor code cleanup

9 years agoMango request: option to create nodes with hidden preview by default
Sergey Sharybin [Mon, 30 Jul 2012 17:11:59 +0000 (17:11 +0000)]
Mango request: option to create nodes with hidden preview by default

9 years agofix own mistake getting an image for the image open file selector.
Campbell Barton [Mon, 30 Jul 2012 17:02:28 +0000 (17:02 +0000)]
fix own mistake getting an image for the image open file selector.

9 years agofix for own error in r43796, 'Find Missing Files', could set the path to an empty...
Campbell Barton [Mon, 30 Jul 2012 16:42:26 +0000 (16:42 +0000)]
fix for own error in r43796, 'Find Missing Files', could set the path to an empty string.

9 years agoMerging r49390 through r49399 from trunk into soc-2011-tomato
Sergey Sharybin [Mon, 30 Jul 2012 16:40:23 +0000 (16:40 +0000)]
Merging r49390 through r49399 from trunk into soc-2011-tomato

9 years agoFixed own regression introduced in recent compositor commit
Sergey Sharybin [Mon, 30 Jul 2012 16:39:39 +0000 (16:39 +0000)]
Fixed own regression introduced in recent compositor commit

MuteNode could be used as a replacement for other nodes when
using fast calculation or when using unknown node from blender.

Should work properly now.

9 years agoColor management: initialize input color space for newly opening images
Sergey Sharybin [Mon, 30 Jul 2012 16:07:37 +0000 (16:07 +0000)]
Color management: initialize input color space for newly opening images

9 years agoColor management: abort execution when error happens in debug mode
Sergey Sharybin [Mon, 30 Jul 2012 16:07:30 +0000 (16:07 +0000)]
Color management: abort execution when error happens in debug mode

9 years agoTomato Cycles: resolve textures limit when using CPU render
Sergey Sharybin [Mon, 30 Jul 2012 15:26:06 +0000 (15:26 +0000)]
Tomato Cycles: resolve textures limit when using CPU render

Remove limit for number of textures when using CPU rendering,
so huge scenes from Mango could be rendered properly.

Re-arranged float and bytes textures for this, so now float
textures goes before byte. This is needed to make alignment
stuff easier for variable number of textures.

Also replace code-generated CPU kernel structure's members
with an array, which makes it easier to access textures
without adding bunch of cases in switch.

Should be no functional changes when rendering with GPU
or OpenCL devices.

9 years agoFix: "void" function returning value.
Daniel Genrich [Mon, 30 Jul 2012 12:33:28 +0000 (12:33 +0000)]
Fix: "void" function returning value.

9 years agofix for building docs
Campbell Barton [Mon, 30 Jul 2012 10:44:57 +0000 (10:44 +0000)]
fix for building docs

9 years agoColor management: fix crash in partial display buffer update
Sergey Sharybin [Mon, 30 Jul 2012 10:35:34 +0000 (10:35 +0000)]
Color management: fix crash in partial display buffer update

Crash was caused by the difference in how compositor walks tile
rectangles and how they were walked in partial update function:
compositor excludes right / top bound and partial update handled
it which lead to reading / writing to wrong memory.

Switch partial update routines to the same logic as it's used
in tile compositor, which made it kind of unified with render
rectangle update.

9 years agoMerging r49386 through r49389 from trunk into soc-2011-tomato
Sergey Sharybin [Mon, 30 Jul 2012 09:47:39 +0000 (09:47 +0000)]
Merging r49386 through r49389 from trunk into soc-2011-tomato

9 years agoFix incorrect connections for muted nodes in tile compositor
Sergey Sharybin [Mon, 30 Jul 2012 09:46:14 +0000 (09:46 +0000)]
Fix incorrect connections for muted nodes in tile compositor

Not tile compositor would use the same routines to detect which
links to add for muted node.

9 years agoTag unused variables
Sergey Sharybin [Mon, 30 Jul 2012 08:08:04 +0000 (08:08 +0000)]
Tag unused variables

9 years agoMerging r49362 through r49385 from trunk into soc-2011-tomato
Sergey Sharybin [Mon, 30 Jul 2012 07:53:05 +0000 (07:53 +0000)]
Merging r49362 through r49385 from trunk into soc-2011-tomato

9 years agoFixing [#32210] "Character physics type colliding with sensor type" reported by Danie...
Mitchell Stokes [Mon, 30 Jul 2012 03:45:15 +0000 (03:45 +0000)]
Fixing [#32210] "Character physics type colliding with sensor type" reported by Daniel Stokes (kupoman) by applying a patch found in this Bullet bug report:

9 years agoBGE: When using the "Restrict Animation Updates" option, animations are now truly...
Mitchell Stokes [Sun, 29 Jul 2012 23:53:21 +0000 (23:53 +0000)]
BGE: When using the "Restrict Animation Updates" option, animations are now truly frame rate independent. Thanks to vrav for reporting the issue in IRC.

9 years agoBGE: Fix for [#31993] "BGE Vertex deformer optimized method does not work properly...
Mitchell Stokes [Sun, 29 Jul 2012 23:49:17 +0000 (23:49 +0000)]
BGE: Fix for [#31993] "BGE Vertex deformer optimized method does not work properly" reported by Mario Mey plus some other cleanup. The bug was caused by not taking the object matrix into account when doing the transforms (when I developed the deformer, my test file had the object at the origin...).

9 years agomax value for distance was larger then a short.
Campbell Barton [Sun, 29 Jul 2012 20:00:16 +0000 (20:00 +0000)]
max value for distance was larger then a short.

9 years agoFix compile error, IK_STRETCH_STIFF_EPS was undefined.
Thomas Dinges [Sun, 29 Jul 2012 19:50:03 +0000 (19:50 +0000)]
Fix compile error, IK_STRETCH_STIFF_EPS was undefined.

9 years agoinpaint - gain some speed by not doing X/Y clamping in inner loops.
Campbell Barton [Sun, 29 Jul 2012 19:36:09 +0000 (19:36 +0000)]
inpaint - gain some speed by not doing X/Y clamping in inner loops.
add assert() so we can ensure its not happening still.

9 years ago- fix incorrect array delete use.
Campbell Barton [Sun, 29 Jul 2012 19:11:00 +0000 (19:11 +0000)]
- fix incorrect array delete use.
- replace 1.0f / sqrt(2) with M_SQRT1_2 define.
- use mini rather then MIN2.

9 years agostyle cleanup: use this->m_* for private members.
Campbell Barton [Sun, 29 Jul 2012 19:02:23 +0000 (19:02 +0000)]
style cleanup: use this->m_* for private members.

9 years agostyle cleanup
Campbell Barton [Sun, 29 Jul 2012 18:53:47 +0000 (18:53 +0000)]
style cleanup

9 years agosvn merge ^/trunk/blender -r49333:49361
Campbell Barton [Sun, 29 Jul 2012 18:48:34 +0000 (18:48 +0000)]
svn merge ^/trunk/blender -r49333:49361

9 years agoadd inline functions for max/min ints, good to use when the arguments are function...
Campbell Barton [Sun, 29 Jul 2012 18:14:20 +0000 (18:14 +0000)]
add inline functions for max/min ints, good to use when the arguments are function calls (we had a few of these).

9 years agocode cleanup:
Campbell Barton [Sun, 29 Jul 2012 17:49:14 +0000 (17:49 +0000)]
code cleanup:
- building without python works again
- rename maxi/mini to i_max/i_min (so thay are available for function names)
- some minor edits to IK stretch setting (no functional changes).

9 years agocode cleanup: replace MIN2/MAX2 with minf/maxf
Campbell Barton [Sun, 29 Jul 2012 16:59:51 +0000 (16:59 +0000)]
code cleanup: replace MIN2/MAX2 with minf/maxf

9 years ago== compositor ==
Peter Schlaile [Sun, 29 Jul 2012 15:48:38 +0000 (15:48 +0000)]
== compositor ==

This adds an inpaint node to blender.

In case, you don't know, inpainting does this:

It's use cases in blender are

* wire removal
* green screen background reconstruction

The node isn't tile based (for fundamental reasons), but very fast,
since it first builds a manhatten distance map and after that performs
color convolution only on the edges.

That's something, one should probably add also to the dilate node (in
step mode) to make it perform a lot better for dilate iterations greater
than 3.

It will bring it's computing time from O(n^3) down to O(n^2).
Take a look here for the details: )

9 years agoSupport for depth buffers in compositor and viewer node
Jeroen Bakker [Sun, 29 Jul 2012 15:06:50 +0000 (15:06 +0000)]
Support for depth buffers in compositor and viewer node
Support for only alpha images in compositor and viewer node

9 years agocode cleanup: assign mode to a variable in the 3d view header and remove some unused...
Campbell Barton [Sun, 29 Jul 2012 14:07:57 +0000 (14:07 +0000)]
code cleanup: assign mode to a variable in the 3d view header and remove some unused imports

9 years agoAdditional fix #32074, by Sven-Hendrik Haase (svenstaro). Boost version header must...
Lukas Toenne [Sun, 29 Jul 2012 13:52:38 +0000 (13:52 +0000)]
Additional fix #32074, by Sven-Hendrik Haase (svenstaro). Boost version header must be included in cycles in order to expand the version check macro.

9 years agostyle cleanup
Campbell Barton [Sun, 29 Jul 2012 12:07:06 +0000 (12:07 +0000)]
style cleanup

9 years agoUser Interface Scripts:
Thomas Dinges [Sun, 29 Jul 2012 10:03:46 +0000 (10:03 +0000)]
User Interface Scripts:
* Code cleanup, removed unneeded code.
* Style cleanup, don't break lines to early
(unless marked as pep8-80 or pep8-120 compliant)
* Keep 1 line after layout declaration empty.

9 years agoSequel of r49112 (raising average bitrate without min/max ones is a bit useless with...
Bastien Montagne [Sun, 29 Jul 2012 08:58:34 +0000 (08:58 +0000)]
Sequel of r49112 (raising average bitrate without min/max ones is a bit useless with vbr codecs ;) ). Used +/- 50% of max average br respectively for max/min br...

9 years agoFix for [#32213] "Action actuator doesn't finish playing if frame rate drops" reporte...
Mitchell Stokes [Sun, 29 Jul 2012 06:28:50 +0000 (06:28 +0000)]
Fix for [#32213] "Action actuator doesn't finish playing if frame rate drops" reported by Alex Fraser (z0r). The action actuator was calling StopAction when it's time ran out. Now I'm just letting BL_Action handle stopping. Hopefully this doesn't break something else now....

9 years agoFix for [#27484] "Run-time command line options don't work in Multi-texture mode...
Mitchell Stokes [Sun, 29 Jul 2012 05:59:03 +0000 (05:59 +0000)]
Fix for [#27484] "Run-time command line options don't work in Multi-texture mode." reported by Josiah Lane (solarlune). The -g nomipmap = 1 option only changed the mipmapping option for bf_gpu, which BL_Texture wasn't checking.

9 years agoscale down histogram button movement by 10, was very sensitive
Campbell Barton [Sun, 29 Jul 2012 01:41:46 +0000 (01:41 +0000)]
scale down histogram button movement by 10, was very sensitive

9 years agoDocumentation:
Thomas Dinges [Sun, 29 Jul 2012 01:38:31 +0000 (01:38 +0000)]
* Some UI docs for the Best Practise guide. Still WIP.

9 years agofix for own regression with handling of script paths, however this didnt work quite...
Campbell Barton [Sun, 29 Jul 2012 01:02:25 +0000 (01:02 +0000)]
fix for own regression with handling of script paths, however this didnt work quite right before either.

Handle these 2 kinds of script paths
* user script path: ~/.blender/scripts OR $BLENDER_USER_SCRIPTS
* pref script path: always bpy.context.user_preferences.filepaths.script_directory

now both are returned by bpy.utils.script_paths()

9 years agoBGE: Fixing a memory leaked caused by the character controller (CcdPhysicsController...
Mitchell Stokes [Sun, 29 Jul 2012 00:34:18 +0000 (00:34 +0000)]
BGE: Fixing a memory leaked caused by the character controller (CcdPhysicsController::m_characterController was not getting freed).

9 years agostyle cleanup
Campbell Barton [Sun, 29 Jul 2012 00:20:28 +0000 (00:20 +0000)]
style cleanup

9 years agoMerging r49300 through r49333 from trunk into soc-2011-tomato
Sergey Sharybin [Sat, 28 Jul 2012 18:42:54 +0000 (18:42 +0000)]
Merging r49300 through r49333 from trunk into soc-2011-tomato

9 years agoFix regression in clip reloading -- after recent change movie used
Sergey Sharybin [Sat, 28 Jul 2012 18:14:44 +0000 (18:14 +0000)]
Fix regression in clip reloading -- after recent change movie used
to be reset to default image size instead of it's actual size.

9 years agoBlender now compiles with recent clang
Sergey Sharybin [Sat, 28 Jul 2012 17:35:09 +0000 (17:35 +0000)]
Blender now compiles with recent clang

9 years agopatch [#32195] MASKS: Canonical Porter Duff algorithm for merge missing.
Campbell Barton [Sat, 28 Jul 2012 11:36:01 +0000 (11:36 +0000)]
patch [#32195] MASKS: Canonical Porter Duff algorithm for merge missing.
from Troy Sobotka (sobotka)

This gives nicer blending then 'ADD', setting as default for new masks.

9 years agoBGE: Fixing a performance regression with 2D filters. My changes caused a check to...
Mitchell Stokes [Sat, 28 Jul 2012 09:45:39 +0000 (09:45 +0000)]
BGE: Fixing a performance regression with 2D filters. My changes caused a check to fail every frame resulting in constant recreation of textures.

9 years agofix own error in recent commit - possible uninitialized value.
Campbell Barton [Sat, 28 Jul 2012 00:08:26 +0000 (00:08 +0000)]
fix own error in recent commit - possible uninitialized value.

9 years agodefines to make it easier to manage ik stretch constants (these may need to be tweake...
Campbell Barton [Fri, 27 Jul 2012 23:16:33 +0000 (23:16 +0000)]
defines to make it easier to manage ik stretch constants (these may need to be tweaked to fix [#32174])

9 years agostyle cleanup
Campbell Barton [Fri, 27 Jul 2012 22:35:27 +0000 (22:35 +0000)]
style cleanup

9 years agoIK's were converting double -> float -> double's in a few places, since precision...
Campbell Barton [Fri, 27 Jul 2012 22:27:06 +0000 (22:27 +0000)]
IK's were converting double -> float -> double's in a few places, since precision is important and doubles are used a lot here anyway. just use doubles, also quiet some double promotion warnings.

9 years agoGetting rid of some GLEW warnings when compiling ge_videotex in SCons.
Mitchell Stokes [Fri, 27 Jul 2012 21:54:07 +0000 (21:54 +0000)]
Getting rid of some GLEW warnings when compiling ge_videotex in SCons.

9 years agoFixed some knife cut failures.
Howard Trickey [Fri, 27 Jul 2012 20:12:29 +0000 (20:12 +0000)]
Fixed some knife cut failures.
Fixes #31391.  Some cases still fail but these
changes are good because they fix a bogus
calculation of the 'basef' of some cut segments.

9 years agoFix compile errors on VC++ 2012 RC1.
Daniel Genrich [Fri, 27 Jul 2012 18:18:13 +0000 (18:18 +0000)]
Fix compile errors on VC++ 2012 RC1.

Note: Compile still fails during ceres compile (namespace tr1 problems).

9 years agoFix #32199: Smooth Vertex no longer has X, Y and Z options.
Sergey Sharybin [Fri, 27 Jul 2012 17:35:02 +0000 (17:35 +0000)]
Fix #32199: Smooth Vertex no longer has X, Y and Z options.

9 years agoInitial support for numpy in scons
Sergey Sharybin [Fri, 27 Jul 2012 16:01:33 +0000 (16:01 +0000)]
Initial support for numpy in scons

Assumes numpy is installed to the BF_PYTHON/site-packages/numpy directory,
could be tweaked further, but this should be enough to setup release
building environment.

Seems blender can't import numpy, but that doesn't seem to be scons issue,
the same happens here with cmake too. Would ask Campbell to help looking
into this.

9 years agocode cleanup: pass mouse position as int[2] rather then wmEvent
Campbell Barton [Fri, 27 Jul 2012 15:15:55 +0000 (15:15 +0000)]
code cleanup: pass mouse position as int[2] rather then wmEvent

9 years agoMerging r49287 through r49299 from trunk into soc-2011-tomato
Sergey Sharybin [Fri, 27 Jul 2012 15:12:58 +0000 (15:12 +0000)]
Merging r49287 through r49299 from trunk into soc-2011-tomato

9 years agoMove sRGB conversion initialization to init_exit routines
Sergey Sharybin [Fri, 27 Jul 2012 14:53:57 +0000 (14:53 +0000)]
Move sRGB conversion initialization to init_exit routines

It was a threading issue in color management project which potentially
could happen in trunk as well.

9 years agouse B key to toggle 'boundary' option for modal inset.
Campbell Barton [Fri, 27 Jul 2012 14:17:05 +0000 (14:17 +0000)]
use B key to toggle 'boundary' option for modal inset.

9 years agofix usercount error with dropping images in the node view.
Campbell Barton [Fri, 27 Jul 2012 13:57:03 +0000 (13:57 +0000)]
fix usercount error with dropping images in the node view.

9 years agoFix crash in drawing socket names when zooming out a lot
Sergey Sharybin [Fri, 27 Jul 2012 13:49:55 +0000 (13:49 +0000)]
Fix crash in drawing socket names when zooming out a lot

svn merge -r49291:49292 ^/branches/soc-2011-tomato

9 years agoDisplay solver keyframes in cache line
Sergey Sharybin [Fri, 27 Jul 2012 13:49:26 +0000 (13:49 +0000)]
Display solver keyframes in cache line

svn merge -r49293:49294 ^/branches/soc-2011-tomato

9 years agoDisplay solver keyframes in cache line
Sergey Sharybin [Fri, 27 Jul 2012 13:48:23 +0000 (13:48 +0000)]
Display solver keyframes in cache line

9 years agoadd missing image/mask restore call when undo'ing
Campbell Barton [Fri, 27 Jul 2012 13:24:08 +0000 (13:24 +0000)]
add missing image/mask restore call when undo'ing

9 years agoFix crash in drawing socket names when zooming out a lot
Sergey Sharybin [Fri, 27 Jul 2012 13:16:04 +0000 (13:16 +0000)]
Fix crash in drawing socket names when zooming out a lot

9 years agoTomato Cycles: fix for wrong resolution used for rendering Render Layer node
Sergey Sharybin [Fri, 27 Jul 2012 12:16:23 +0000 (12:16 +0000)]
Tomato Cycles: fix for wrong resolution used for rendering Render Layer node

Issue was caused by Cycles using render options from rendering scene, not
from active scene.

For now solved by passing render resolution inside RenderEngine structure.
This probably could be solved in more general way, like adding bindings

for RenderEngine->Render, which would avoid passing options like
is_animation, came_override and so via RenderEngine. Would think about
this a bit more and probably would do that.

The same issue happens in trunk as well, but not consider such a change
trunk-ready, would want to make more tests and probably clean the code
a little bit before commiting this into trunk.

9 years agocode cleanup: mask keys now dont use space-clip keys - could give troubles later on.
Campbell Barton [Fri, 27 Jul 2012 11:56:36 +0000 (11:56 +0000)]
code cleanup: mask keys now dont use space-clip keys - could give troubles later on.

9 years agoMerging r49281 through r49286 from trunk into soc-2011-tomato
Sergey Sharybin [Fri, 27 Jul 2012 11:07:55 +0000 (11:07 +0000)]
Merging r49281 through r49286 from trunk into soc-2011-tomato

9 years agoTrack input node: more control on over output value
Sergey Sharybin [Fri, 27 Jul 2012 11:07:12 +0000 (11:07 +0000)]
Track input node: more control on over output value

Now supports output value of:

- Absolute marker position
- Marker position relative to the very first marker
- Marker position relative to given scene frame

9 years agoTrack input node: move all initializaiton to initExecution function
Sergey Sharybin [Fri, 27 Jul 2012 11:07:09 +0000 (11:07 +0000)]
Track input node: move all initializaiton to initExecution function

9 years agoclamp mask resolution, the occasional crash would happen failing to alloc when adding...
Campbell Barton [Fri, 27 Jul 2012 11:05:08 +0000 (11:05 +0000)]
clamp mask resolution, the occasional crash would happen failing to alloc when adding feather points very close together.

9 years agoup/down arrows were not switching mask keyframes in the image space
Campbell Barton [Fri, 27 Jul 2012 10:55:24 +0000 (10:55 +0000)]
up/down arrows were not switching mask keyframes in the image space

9 years agoGetStdHandle may return NULL, which isn't really an error, or INVALID_HANDLE_VALUE...
Jason Wilkins [Fri, 27 Jul 2012 10:48:33 +0000 (10:48 +0000)]
GetStdHandle may return NULL, which isn't really an error, or INVALID_HANDLE_VALUE which does indicate an error, but both should be checked.

9 years agosvn merge ^/trunk/blender -r49263:49280
Campbell Barton [Fri, 27 Jul 2012 10:27:28 +0000 (10:27 +0000)]
svn merge ^/trunk/blender -r49263:49280

9 years agomask motion blur shutter option
Campbell Barton [Fri, 27 Jul 2012 10:20:36 +0000 (10:20 +0000)]
mask motion blur shutter option

9 years agoAdded utility function to return marker's subframe position
Sergey Sharybin [Fri, 27 Jul 2012 10:12:58 +0000 (10:12 +0000)]
Added utility function to return marker's subframe position

Used in mask parenting stuff.

9 years agomotion blur for mask node:
Campbell Barton [Fri, 27 Jul 2012 09:32:47 +0000 (09:32 +0000)]
motion blur for mask node:

- add shutter speed option
- add blur option

9 years agoFix #32187: OpenGL preview does not take into account overwrite option
Sergey Sharybin [Fri, 27 Jul 2012 08:58:34 +0000 (08:58 +0000)]
Fix #32187: OpenGL preview does not take into account overwrite option

9 years agocopying a mask now copies its animation data too
Campbell Barton [Fri, 27 Jul 2012 08:36:48 +0000 (08:36 +0000)]
copying a mask now copies its animation data too

9 years agocopy support for mask datablocks
Campbell Barton [Fri, 27 Jul 2012 08:18:11 +0000 (08:18 +0000)]
copy support for mask datablocks

9 years agocode cleanup: remove unneeded 'struct' qualifiers
Campbell Barton [Thu, 26 Jul 2012 22:47:05 +0000 (22:47 +0000)]
code cleanup: remove unneeded 'struct' qualifiers

9 years agochange clip utility function arguments to take space data and region rather then...
Campbell Barton [Thu, 26 Jul 2012 22:41:40 +0000 (22:41 +0000)]
change clip utility function arguments to take space data and region rather then the context.

this allows a fix to be applied that corrects the helper line in the image view when transforming a mask.

9 years agocode cleanup: minor edits for mask/transform
Campbell Barton [Thu, 26 Jul 2012 21:22:42 +0000 (21:22 +0000)]
code cleanup: minor edits for mask/transform

9 years agoMerging r49261 through r49263 from trunk into soc-2011-tomato
Sergey Sharybin [Thu, 26 Jul 2012 18:05:42 +0000 (18:05 +0000)]
Merging r49261 through r49263 from trunk into soc-2011-tomato

9 years agoFix unworkable track position node
Sergey Sharybin [Thu, 26 Jul 2012 18:05:05 +0000 (18:05 +0000)]
Fix unworkable track position node

9 years agofix some types and incorrect info
Campbell Barton [Thu, 26 Jul 2012 17:41:09 +0000 (17:41 +0000)]
fix some types and incorrect info

9 years agosvn merge ^/trunk/blender -r49256:49260
Campbell Barton [Thu, 26 Jul 2012 17:15:28 +0000 (17:15 +0000)]
svn merge ^/trunk/blender -r49256:49260

9 years agoworkaround for depsgraph update issue with booleans.
Campbell Barton [Thu, 26 Jul 2012 17:14:23 +0000 (17:14 +0000)]
workaround for depsgraph update issue with booleans.

9 years agoOn windows with --debug flag, change "Press enter key to exit..." to "Press any key...
Jason Wilkins [Thu, 26 Jul 2012 16:56:09 +0000 (16:56 +0000)]
On windows with --debug flag, change "Press enter key to exit..." to "Press any key to exit . . .".  This is implemented by the new function wait_for_console_key.

9 years agofix for crash when displaying the tooltip for a non python menu (was introduced with...
Campbell Barton [Thu, 26 Jul 2012 16:55:34 +0000 (16:55 +0000)]
fix for crash when displaying the tooltip for a non python menu (was introduced with recent translation/ui edits)

9 years agoMerging r49255 through r49256 from trunk into soc-2011-tomato
Sergey Sharybin [Thu, 26 Jul 2012 16:12:41 +0000 (16:12 +0000)]
Merging r49255 through r49256 from trunk into soc-2011-tomato

9 years agoDisplay animation data from lamps' node trees in animation editor windows
Sergey Sharybin [Thu, 26 Jul 2012 16:11:59 +0000 (16:11 +0000)]
Display animation data from lamps' node trees in animation editor windows

9 years agoMerging r49253 through r49254 from trunk into soc-2011-tomato
Sergey Sharybin [Thu, 26 Jul 2012 15:51:33 +0000 (15:51 +0000)]
Merging r49253 through r49254 from trunk into soc-2011-tomato

9 years agoRun versioning stuff for animation summary color again
Sergey Sharybin [Thu, 26 Jul 2012 15:50:45 +0000 (15:50 +0000)]
Run versioning stuff for animation summary color again

Seems it was messed up at some point or changes weren't applied
synchronized, which lead to lots of files with wrong color used.

9 years agosvn merge ^/trunk/blender -r49250:49252
Campbell Barton [Thu, 26 Jul 2012 13:42:33 +0000 (13:42 +0000)]
svn merge ^/trunk/blender -r49250:49252

9 years agofix for crash when checking for locked action.
Campbell Barton [Thu, 26 Jul 2012 13:40:48 +0000 (13:40 +0000)]
fix for crash when checking for locked action.

9 years agosvn merge ^/trunk/blender -r49244:49250
Campbell Barton [Thu, 26 Jul 2012 13:30:37 +0000 (13:30 +0000)]
svn merge ^/trunk/blender -r49244:49250