blender.git
7 years agoMerging r49451 through r49462 from trunk into soc-2011-tomato
Sergey Sharybin [Wed, 1 Aug 2012 15:05:42 +0000 (15:05 +0000)]
Merging r49451 through r49462 from trunk into soc-2011-tomato

7 years agofix some more crashes when running skin operators on a mesh with no skin layer
Campbell Barton [Wed, 1 Aug 2012 15:04:10 +0000 (15:04 +0000)]
fix some more crashes when running skin operators on a mesh with no skin layer

7 years agoCode cleanup: silence some -Wnarrowing warnings from C++11
Sergey Sharybin [Wed, 1 Aug 2012 15:02:09 +0000 (15:02 +0000)]
Code cleanup: silence some -Wnarrowing warnings from C++11

7 years agoCycles:
Thomas Dinges [Wed, 1 Aug 2012 14:56:15 +0000 (14:56 +0000)]
Cycles:
* Removed outdated OpenCL comments, kernel features are defined in kernel_types.h now.

7 years agofix crash in sorting mesh elements when called without a viewport.
Campbell Barton [Wed, 1 Aug 2012 14:51:49 +0000 (14:51 +0000)]
fix crash in sorting mesh elements when called without a viewport.

7 years agoCode cleanup: remove some more unused includes of DNA_scene_types
Sergey Sharybin [Wed, 1 Aug 2012 14:51:12 +0000 (14:51 +0000)]
Code cleanup: remove some more unused includes of DNA_scene_types

7 years agoCode cleanup: Remove unused includes of DNA_scene_types.
Sergey Sharybin [Wed, 1 Aug 2012 14:48:51 +0000 (14:48 +0000)]
Code cleanup: Remove unused includes of DNA_scene_types.

7 years agoReplace scene pointer with scene name to prevent possible misusages
Sergey Sharybin [Wed, 1 Aug 2012 14:48:46 +0000 (14:48 +0000)]
Replace scene pointer with scene name to prevent possible misusages
of scene in node in future.

7 years agofix for crash in 'Skin Armature Create' when the mesh doesnt have any skin data.
Campbell Barton [Wed, 1 Aug 2012 14:37:13 +0000 (14:37 +0000)]
fix for crash in 'Skin Armature Create' when the mesh doesnt have any skin data.

7 years agofix crash when polling image sample outside image space.
Campbell Barton [Wed, 1 Aug 2012 14:29:24 +0000 (14:29 +0000)]
fix crash when polling image sample outside image space.

also remove historic comment which isnt helpful.

7 years agoRemove mask cache hack added for mango project a while ago
Sergey Sharybin [Wed, 1 Aug 2012 14:19:42 +0000 (14:19 +0000)]
Remove mask cache hack added for mango project a while ago

We've got new rasterizer which doesn't require cacheing anymore.

7 years agoMerging r49413 through r49450 from trunk into soc-2011-tomato
Sergey Sharybin [Wed, 1 Aug 2012 14:14:22 +0000 (14:14 +0000)]
Merging r49413 through r49450 from trunk into soc-2011-tomato

7 years agoTie compositor will now update render result when changing node setup
Sergey Sharybin [Wed, 1 Aug 2012 13:59:08 +0000 (13:59 +0000)]
Tie compositor will now update render result when changing node setup

Issue was caused by the way how render result was acquiring -- pointer
to render data was used to find needed render descriptor. It's not
reliable since render contains copy of scene's render data, not pointer
to this data.

Use node scene's id name for render result acquiring, the same way
as it was done in old compositor system.

7 years agomask selection invert wasnt working.
Campbell Barton [Wed, 1 Aug 2012 13:34:20 +0000 (13:34 +0000)]
mask selection invert wasnt working.

7 years agomake node select_all consistent with other select operators, also add Ctrl+I, select...
Campbell Barton [Wed, 1 Aug 2012 13:28:19 +0000 (13:28 +0000)]
make node select_all consistent with other select operators, also add Ctrl+I, select inverse to node space.

7 years agoFix blenderplayer link
Antony Riakiotakis [Wed, 1 Aug 2012 13:17:26 +0000 (13:17 +0000)]
Fix blenderplayer link

7 years agoFix #32205: Holdout shader + transparent background stays black with Alpha = 1
Sergey Sharybin [Wed, 1 Aug 2012 12:59:47 +0000 (12:59 +0000)]
Fix #32205: Holdout shader + transparent background stays black with Alpha = 1

It was read of initialized memory around holdout_weight in cases when
holdout material is used. Seems that it should be assigned to result
of shader_holdout_eval here.

If Brecht could double check this it'll be great.

This could potentially fix #32224: Holdout Error with CUDA Cycles Render

7 years ago- disable mask drawing in the sequencer, this isn't usable yet and likely wont be...
Campbell Barton [Wed, 1 Aug 2012 12:59:38 +0000 (12:59 +0000)]
- disable mask drawing in the sequencer, this isn't usable yet and likely wont be working in release.
- use define for max mask mblur samples, increase to 64 max.

7 years agoDocs / Templates:
Thomas Dinges [Wed, 1 Aug 2012 12:21:23 +0000 (12:21 +0000)]
Docs / Templates:
* Added a ui_panel template with more complex layouts.

7 years agomisc mask fixes
Campbell Barton [Wed, 1 Aug 2012 10:50:39 +0000 (10:50 +0000)]
misc mask fixes
- image space used wrong notifiers.
- image notifier now checks for mask mode before listening to mask edits.
- mask keyframes now draw in the image space.

7 years agostyle cleanup: >120 line length
Campbell Barton [Wed, 1 Aug 2012 10:44:55 +0000 (10:44 +0000)]
style cleanup: >120 line length

7 years agoAdd type RNA property to special nodes (e.g. frame)
Sergey Sharybin [Wed, 1 Aug 2012 10:31:45 +0000 (10:31 +0000)]
Add type RNA property to special nodes (e.g. frame)

7 years agoDo not highlight non-selected active node with active outline
Sergey Sharybin [Wed, 1 Aug 2012 09:44:25 +0000 (09:44 +0000)]
Do not highlight non-selected active node with active outline

This would match other areas in Blender.

7 years agoFix #32209: Autosave ignores multires sculpting
Sergey Sharybin [Wed, 1 Aug 2012 09:04:40 +0000 (09:04 +0000)]
Fix #32209: Autosave ignores multires sculpting

Use a bit different fix, which gets active scene from context and
uses this scene to figure out active object instead of itterating
through all the objects.

7 years agostyle cleanup: whitespace, also add '?' to save over popup since it wasnt totally...
Campbell Barton [Tue, 31 Jul 2012 23:06:12 +0000 (23:06 +0000)]
style cleanup: whitespace, also add '?' to save over popup since it wasnt totally clear it was a question (user pointed this out, they thought it was just notification and lost their work).

7 years agofix [#32232] Running script that changes area.type crashes blender.
Campbell Barton [Tue, 31 Jul 2012 22:15:54 +0000 (22:15 +0000)]
fix [#32232] Running script that changes area.type crashes blender.

(reported the bug to keep some reference to the script that crashes).

7 years agofill in dummy values when using movie clip distort node but compiled without libmv.
Campbell Barton [Tue, 31 Jul 2012 22:01:44 +0000 (22:01 +0000)]
fill in dummy values when using movie clip distort node but compiled without libmv.

7 years agoquiet spacenav output on linux for regular builds, ifdef signed int for msvc openmp.
Campbell Barton [Tue, 31 Jul 2012 21:26:14 +0000 (21:26 +0000)]
quiet spacenav output on linux for regular builds, ifdef signed int for msvc openmp.

7 years agoFixed own error in setting user counter to mask when changing clip editor's mask.
Sergey Sharybin [Tue, 31 Jul 2012 20:58:48 +0000 (20:58 +0000)]
Fixed own error in setting user counter to mask when changing clip editor's mask.

7 years agoExpand function for masks, so no masks could be properly linked
Sergey Sharybin [Tue, 31 Jul 2012 20:54:27 +0000 (20:54 +0000)]
Expand function for masks, so no masks could be properly linked
in cases when they've got parenting to motion tracking data.

7 years agoMask / Win64 compile fix: "Index variable in OpenMP 'for' statement must have signed...
Daniel Genrich [Tue, 31 Jul 2012 19:37:33 +0000 (19:37 +0000)]
Mask / Win64 compile fix: "Index variable in OpenMP 'for' statement must have signed integral type"

7 years agochanges to mask editing
Campbell Barton [Tue, 31 Jul 2012 17:31:34 +0000 (17:31 +0000)]
changes to mask editing
- use Alt to modify all mask feather at once while dragging.
- copying a multi-user mask from the interface works now.
- show masks when UV editing isnt used, rather then checking editmode (would give some odd/annoying image space header).
- add a fake mask user by default.
- moving points with LMB drag no longer selects them.

7 years agoCode cleanup: remove unused code
Sergey Sharybin [Tue, 31 Jul 2012 17:24:55 +0000 (17:24 +0000)]
Code cleanup: remove unused code

7 years agoFixed wrong mask display with clip's pixel aspect and image editor display aspect...
Sergey Sharybin [Tue, 31 Jul 2012 16:40:14 +0000 (16:40 +0000)]
Fixed wrong mask display with clip's pixel aspect and image editor display aspect != 1.0

7 years agomulti-threaded sequencer buffer calculation for masks.
Campbell Barton [Tue, 31 Jul 2012 16:37:47 +0000 (16:37 +0000)]
multi-threaded sequencer buffer calculation for masks.

7 years agoremove references to raskter from compositor and BKE mask.
Campbell Barton [Tue, 31 Jul 2012 16:04:47 +0000 (16:04 +0000)]
remove references to raskter from compositor and BKE mask.

7 years agouse the same rasterizer as the compositor for the sequencer.
Campbell Barton [Tue, 31 Jul 2012 15:45:01 +0000 (15:45 +0000)]
use the same rasterizer as the compositor for the sequencer.

7 years agoRemove "Loading byte/float" debug messages. They were added at the time
Sergey Sharybin [Tue, 31 Jul 2012 15:28:36 +0000 (15:28 +0000)]
Remove "Loading byte/float" debug messages. They were added at the time
we've been looking into texture limit for Mango and it's not needed now.

Anyway, this prints didn't cover all the cases when images were loading.

7 years agoFix cycles issue with wrong texture coordinates on a second render layer with
Brecht Van Lommel [Tue, 31 Jul 2012 15:05:16 +0000 (15:05 +0000)]
Fix cycles issue with wrong texture coordinates on a second render layer with
a mask layer enabled.

7 years agoTweak to commit related to non-power-of-two textures, some cards claim to
Brecht Van Lommel [Tue, 31 Jul 2012 15:05:14 +0000 (15:05 +0000)]
Tweak to commit related to non-power-of-two textures, some cards claim to
support this but actually don't, so use the function that checks for that.

7 years agoCode tweak removing comment, the fix here is indeed correct.
Brecht Van Lommel [Tue, 31 Jul 2012 15:05:11 +0000 (15:05 +0000)]
Code tweak removing comment, the fix here is indeed correct.

7 years agoFix warnings on old apple GCC compiler due to no support for alloc_size attribute.
Brecht Van Lommel [Tue, 31 Jul 2012 15:05:09 +0000 (15:05 +0000)]
Fix warnings on old apple GCC compiler due to no support for alloc_size attribute.

7 years agoResolve compilation error with MSVC
Sergey Sharybin [Tue, 31 Jul 2012 14:27:14 +0000 (14:27 +0000)]
Resolve compilation error with MSVC

7 years agoresolve glitch in the image space where mask editing and UVs would conflict.
Campbell Barton [Tue, 31 Jul 2012 14:16:27 +0000 (14:16 +0000)]
resolve glitch in the image space where mask editing and UVs would conflict.

now UV editing overrides mask.

7 years agosvn merge ^/trunk/blender -r49410:49412
Campbell Barton [Tue, 31 Jul 2012 13:44:51 +0000 (13:44 +0000)]
svn merge ^/trunk/blender -r49410:49412

7 years agosupport for curve orco uv's as UV's in cycles.
Campbell Barton [Tue, 31 Jul 2012 13:43:26 +0000 (13:43 +0000)]
support for curve orco uv's as UV's in cycles.

ideally these would be used as generated coordinates, but this is tricly because cycles calculates its own orco's and doesnt know about curve settings.

7 years agoMerging r49405 through r49410 from trunk into soc-2011-tomato
Sergey Sharybin [Tue, 31 Jul 2012 13:17:07 +0000 (13:17 +0000)]
Merging r49405 through r49410 from trunk into soc-2011-tomato

7 years agoTomato Cycles: use the same order of parts as Blender Internal
Sergey Sharybin [Tue, 31 Jul 2012 13:15:53 +0000 (13:15 +0000)]
Tomato Cycles: use the same order of parts as Blender Internal

7 years agoFixed [#32226] Black cadioptric lenses in CPU BokehBlur node
Jeroen Bakker [Tue, 31 Jul 2012 12:36:08 +0000 (12:36 +0000)]
Fixed [#32226] Black cadioptric lenses in CPU BokehBlur node

7 years agoprevent uninitialized memory use when writing avi's.
Campbell Barton [Tue, 31 Jul 2012 10:34:42 +0000 (10:34 +0000)]
prevent uninitialized memory use when writing avi's.

7 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

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

7 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

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

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

7 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

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

7 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

7 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

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

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

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

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

7 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

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

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

7 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

7 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: https://code.google.com/p/bullet/issues/detail?id=525

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

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

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

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

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

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

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

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

7 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

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

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

7 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

7 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:
http://en.wikipedia.org/wiki/Inpainting

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:
http://ostermiller.org/dilate_and_erode.html )

7 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

7 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

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

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

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

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

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

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

7 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

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

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

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

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

7 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

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

7 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

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

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

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