blender.git
7 years agostyle cleanyp: split > 120 width lines.
Campbell Barton [Sun, 19 Feb 2012 06:00:20 +0000 (06:00 +0000)]
style cleanyp: split > 120 width lines.

7 years agofix for incorrect check to find largest axis (was checking Y twice, not Z).
Campbell Barton [Sun, 19 Feb 2012 05:17:55 +0000 (05:17 +0000)]
fix for incorrect check to find largest axis (was checking Y twice, not Z).

7 years agoreplace MIN2 / MAX2 with minf / maxf to avoid calling functions multiple times.
Campbell Barton [Sun, 19 Feb 2012 05:11:24 +0000 (05:11 +0000)]
replace MIN2 / MAX2 with minf / maxf to avoid calling functions multiple times.

7 years agoChange texface draw to always use glShadeModel(GL_SMOOTH), with texface draw.
Campbell Barton [Sun, 19 Feb 2012 03:10:11 +0000 (03:10 +0000)]
Change texface draw to always use glShadeModel(GL_SMOOTH), with texface draw.

without this each face would get a solid color, this is the same method used in object mode.

also copy BLI_array.h fix from bmesh branch.

7 years agoFix rest of #27022, collada export: add bone parenting of objects
Juha Mäki-Kanto [Sat, 18 Feb 2012 16:55:41 +0000 (16:55 +0000)]
Fix rest of #27022, collada export: add bone parenting of objects

- SceneExporter collects a list of child-objects for armature-object and passes it onto ArmatureExporter
- SceneExporter's writeNodes is then called from ArmatureExporter for matching child-objects for bone.
- ArmatureExporter removes written child-objects from list, objects not exported as being bone parented are exported as direct children of the armature-node.
- Should play nice with current Second Life-compatibility.

A nicer implementation would require some design changes, will have to wait.

7 years agoCollada export: changes to joints/weights in skincontroller
Juha Mäki-Kanto [Sat, 18 Feb 2012 16:20:24 +0000 (16:20 +0000)]
Collada export: changes to joints/weights in skincontroller

- Collecting joints/weights in one place, it's easier to exclude zero weights or vertexgroups with no matching bone than trying to match same logic in multiple places.
- Still not exporting -1 joints for vertices without weights, but also not outputting -1 joint + weight for each vertexgroup without a matching bone.
- The exported weights are now normalized.

Last I tested this patch stopped 3ds Max crashing on import of file from #29465 (opencollada / internal .dae).

7 years agoMinor change collada export; don't even run the parentinv-test when ob->parent is...
Juha Mäki-Kanto [Sat, 18 Feb 2012 15:41:09 +0000 (15:41 +0000)]
Minor change collada export; don't even run the parentinv-test when ob->parent is NULL

7 years agoBGE bug #30173: ImageRender not working when initialized on frame 1. This was because...
Benoit Bolsee [Sat, 18 Feb 2012 15:25:31 +0000 (15:25 +0000)]
BGE bug #30173: ImageRender not working when initialized on frame 1. This was because the canvas display area was initialized on render frame 1, which happens after logic frame 1. Fixed in blender and player by initializing the area on canvas creation.

7 years agoRemesh modifier: extensive refactoring of the Octree class.
Nicholas Bishop [Sat, 18 Feb 2012 11:34:53 +0000 (11:34 +0000)]
Remesh modifier: extensive refactoring of the Octree class.

The changes mostly center around two new structures, InternalNode and
LeafNode. These provide an explicit representation of the Octree
nodes, which formerly were manipulated as opaque byte arrays.

A fair amount of commented out/unused code was also removed. This
includes the "CINDY" code, which may yet be useful, easy to bring back
if so.

There should be no difference in the output of the remesh modifier,
but memory usage may be slightly different. The flood fill bytes are
no longer optional; they will be allocated whether or not the 'remove
disconnect components' flag is set. The leaf node is probably not as
tightly packed due to alignment issues; this could be fixed with the
__attribute__((packed)) flag in gcc (probably there's an MSVC
equivalent), but not sure it's worth it. The internal nodes should
take up less space on 32-bit systems, allocating sizeof(pointer) now
rather than constant eight bytes.

These changes were made in persuit of bug #30158 (remesh crashes on
PowerPC). There's still a fair amount of bitwise stuff in the Octree,
so may still be endian issues and not yet sure if this fixes the bug,
but should be much easier to track down problems now.

7 years ago#collada animation import, bugfix #29082
Arystanbek Dyussenov [Sat, 18 Feb 2012 06:22:20 +0000 (06:22 +0000)]
#collada animation import, bugfix #29082

Fix skeletal animation import for <rotation>, <scale> and <translate> transform types.

Tested for correctness visually using Seymouranim2.dae from http://collada.org/owl and animated creatures from DKGamesModels folder (from private section of the same site). The results match the results in FXComposer-2.5.

Since this is a fix towards correct reading of collada, it shouldn't break existing compatibility with Second Life.

7 years ago- Fixed linking errors of blender player with CMake and XDND enabled
Sergey Sharybin [Fri, 17 Feb 2012 20:59:21 +0000 (20:59 +0000)]
- Fixed linking errors of blender player with CMake and XDND enabled
- Rest of changes to make XDND switch-off-able: link against extern_xdnd only
  if XDND is enabled

7 years agoglog should now compile fine at FreeBSD 9 platform
Sergey Sharybin [Fri, 17 Feb 2012 20:53:34 +0000 (20:53 +0000)]
glog should now compile fine at FreeBSD 9 platform

7 years agoXDND support now can be disabled using WITH_GHOST_XDND=OFF with CMake and WITH_GHOST_...
Sergey Sharybin [Fri, 17 Feb 2012 20:51:39 +0000 (20:51 +0000)]
XDND support now can be disabled using WITH_GHOST_XDND=OFF with CMake and WITH_GHOST_XDND=False with SCons

Disabled on FreeBSD platforms due to some linking errors.

7 years agoremove section in gotcha's doc about matrix col/row order since this has been changed.
Campbell Barton [Fri, 17 Feb 2012 20:41:41 +0000 (20:41 +0000)]
remove section in gotcha's doc about matrix col/row order since this has been changed.

7 years agoFixed compilation error cased by recent refactor of include guard defines.
Sergey Sharybin [Fri, 17 Feb 2012 19:45:27 +0000 (19:45 +0000)]
Fixed compilation error cased by recent refactor of include guard defines.

7 years agopatch [#30227] Various MSVC (32-bit) Warning and Typo Fixes
Campbell Barton [Fri, 17 Feb 2012 19:21:47 +0000 (19:21 +0000)]
patch [#30227] Various MSVC (32-bit) Warning and Typo Fixes

made some small edits
- removed changes to AVI reading since the data types are apart of the format spec.
- absf -> abs for a double value in render code.

7 years agounify include guard defines, __$FILENAME__
Campbell Barton [Fri, 17 Feb 2012 18:59:41 +0000 (18:59 +0000)]
unify include guard defines, __$FILENAME__

without the underscores these clogged up the namespace for autocompleation which was annoying.

7 years agoUse BLF API to check whether translation is enabled, when possible!
Bastien Montagne [Fri, 17 Feb 2012 18:04:49 +0000 (18:04 +0000)]
Use BLF API to check whether translation is enabled, when possible!

7 years agoadd note to avoid confusion with angle_v3v3v3, also minor change with angle compariso...
Campbell Barton [Fri, 17 Feb 2012 17:47:10 +0000 (17:47 +0000)]
add note to avoid confusion with angle_v3v3v3, also minor change with angle comparison, convert constant values to radians (not resulting angle to deg).

7 years agoReturning magic _USE_MATH_DEFINES to esm tracker.
Sergey Sharybin [Fri, 17 Feb 2012 17:34:16 +0000 (17:34 +0000)]
Returning magic _USE_MATH_DEFINES to esm tracker.
Needed to make constants like M_E defined in msvc. Was occasionally
removed on moving main changes in libmv from patch files in blender
repo to won repo (rev44190).

7 years agoIn fact, snapping in particle edit mode also might make sense.
Sergey Sharybin [Fri, 17 Feb 2012 17:25:51 +0000 (17:25 +0000)]
In fact, snapping in particle edit mode also might make sense.
Pardon for extra noise..

7 years agoRevert part of own recent header cleanup: pivot and manipulators in fact makes sense...
Sergey Sharybin [Fri, 17 Feb 2012 17:22:37 +0000 (17:22 +0000)]
Revert part of own recent header cleanup: pivot and manipulators in fact makes sense in particle edit mode.

7 years agoReverting changes made to build systems when was upgrading OpenAL.
Sergey Sharybin [Fri, 17 Feb 2012 16:58:34 +0000 (16:58 +0000)]
Reverting changes made to build systems when was upgrading OpenAL.

Reverting to openal from creative because own builds doesn't deal with 3D sound.
Hopefully it wouldn't lead to crashes caused by ffmpeg+openal (for resolving which
libraries were updated to openal-soft).

7 years agoDrag-n-drop support on Linux
Sergey Sharybin [Fri, 17 Feb 2012 16:58:09 +0000 (16:58 +0000)]
Drag-n-drop support on Linux

This commit implements drag-n-drop support from external applications into Blender.
Used xdnd implementation from Paul Sheer.

7 years agoMinor fixes found while working on keyingsets.
Bastien Montagne [Fri, 17 Feb 2012 16:34:28 +0000 (16:34 +0000)]
Minor fixes found while working on keyingsets.

7 years agoFix #25649: Image editor paint icon missing until enter weight paint
Sergey Sharybin [Fri, 17 Feb 2012 16:06:32 +0000 (16:06 +0000)]
Fix #25649: Image editor paint icon missing until enter weight paint

Issue was caused by starting Icon Preview render job from two places:
- Texture buttons for small icon preview
- Properties panel in image editor for large icon of texture

This preview job is starting in suspended mode and if new instance of the same job is
starting, suspended job will be totally stopped. This is normally for cases when you're
changing different settings -- in this case you'd wouldn't want re-render be triggered
on every slide change.
But what we've have with brush preview is that two instances of this job were creating for
large and small icon separately, but because of described policy only one icon was rendered.

If suspended job is getting to be stopped, check if it was started for the same icon
resolution and if not, that resolution will be also rendered in new job.
So it'll be still minimal re-rendering happens, but in cases when job was started from
two places for different icon sizes it'll work just fine.

7 years agoCamera tracking: switch to own repo of libmv where most of patches are applied
Sergey Sharybin [Fri, 17 Feb 2012 15:39:32 +0000 (15:39 +0000)]
Camera tracking: switch to own repo of libmv where most of patches are applied
and which includes latest changes from Keir's branch.

Hopefully it'll make backporting of changes back to main libmv repo easier.

7 years agofa_PE is no valid language code (how comes no one noted that yet?), fa_IR seems the...
Bastien Montagne [Fri, 17 Feb 2012 12:27:58 +0000 (12:27 +0000)]
fa_PE is no valid language code (how comes no one noted that yet?), fa_IR seems the right one!

Else, persian was just unavailable on Linux (at least, on Debian...).

7 years agoFix for recent changes in 3D viewport header: object might be missed and in this
Sergey Sharybin [Fri, 17 Feb 2012 11:46:28 +0000 (11:46 +0000)]
Fix for recent changes in 3D viewport header: object might be missed and in this
case check for current mode isn't needed

7 years agoMissed this changes needed to fully support animation data in movie clips.
Sergey Sharybin [Fri, 17 Feb 2012 10:54:21 +0000 (10:54 +0000)]
Missed this changes needed to fully support animation data in movie clips.

Thanks to Joshua pointed into missed changes!

7 years agoOSX: since XCode 4.3 the developer directory is inside XCode.app bundle, so we handle...
Jens Verwiebe [Fri, 17 Feb 2012 10:44:21 +0000 (10:44 +0000)]
OSX: since XCode 4.3 the developer directory is inside XCode.app bundle, so we handle path according XCODE_VERSION now

7 years agoCamera tracking: configurable filter type for 2d stabilization
Sergey Sharybin [Fri, 17 Feb 2012 08:27:19 +0000 (08:27 +0000)]
Camera tracking: configurable filter type for 2d stabilization

--
svn merge -r44151:44152 ^/branches/soc-2011-tomato

7 years agoCamera tracking: run aspect correction before stabilizing shot
Sergey Sharybin [Fri, 17 Feb 2012 08:23:42 +0000 (08:23 +0000)]
Camera tracking: run aspect correction before stabilizing shot

This commit fixes image stopped being an orthogonal rectangle because of horizontal
scaling caused by pixel aspect ratio happening after rotating image which used to
make orthogonal angles from footage not actually orthogonal.

--
svn merge -r44150:44151 ^/branches/soc-2011-tomato

7 years agoCamera tracking: fixed issue when track used for rotation stabilization points to...
Sergey Sharybin [Fri, 17 Feb 2012 08:20:21 +0000 (08:20 +0000)]
Camera tracking: fixed issue when track used for rotation stabilization points to a freed memory after re-tracking this track.

--
svn merge -r44148:44149 ^/branches/soc-2011-tomato

7 years agoCamera tracking: fixed default value for pixel aspect which wasn't 1.0
Sergey Sharybin [Fri, 17 Feb 2012 08:19:14 +0000 (08:19 +0000)]
Camera tracking: fixed default value for pixel aspect which wasn't 1.0

--
svn merge -r44147:44148 ^/branches/soc-2011-tomato

7 years agoCamera tracking: fixed incorrect auto-scale calculation for 2d stabilization
Sergey Sharybin [Fri, 17 Feb 2012 08:17:46 +0000 (08:17 +0000)]
Camera tracking: fixed incorrect auto-scale calculation for 2d stabilization

--
svn merge -r44146:44147 ^/branches/soc-2011-tomato

7 years agoCamera tracking: fix for missing cache invalidation when disabling/enabling channels...
Sergey Sharybin [Fri, 17 Feb 2012 08:16:29 +0000 (08:16 +0000)]
Camera tracking: fix for missing cache invalidation when disabling/enabling channels for stabilized shot

--
svn merge -r44140:44141 ^/branches/soc-2011-tomato

7 years agoCamera tracking: animation datablock for MovieClip
Sergey Sharybin [Fri, 17 Feb 2012 08:13:45 +0000 (08:13 +0000)]
Camera tracking: animation datablock for MovieClip

Added AnimData block to MovieClip datablock which allows to animate different properties in clip.
Currently supports animation of stabilization influence only.

--
svn merge -r44129:44130 ^/branches/soc-2011-tomato

7 years agoBuild proxy from meta and image strips used resolution used for display,
Sergey Sharybin [Fri, 17 Feb 2012 07:32:18 +0000 (07:32 +0000)]
Build proxy from meta and image strips used resolution used for display,
not set by building job which leads to unusable proxies.

This change should resolve issues reported in #30229: Sequencer Meta strip Proxy Fails
and probably #30196 will work nicer too.

7 years agoCleanup of 3D viewport header in painting modes:
Sergey Sharybin [Fri, 17 Feb 2012 06:59:32 +0000 (06:59 +0000)]
Cleanup of 3D viewport header in painting modes:

- Hide Manipulate center points in sculpt and particle edit modes
- Hide 3D manipulators and orientation from sculpt mode
- Hide snap buttons in sculpt, weight, texture, vertex and particle painting modes

All this options weren't make sense in this modes and might only confuse user.

This will resolve issue #30180: 3D View header buttons and modes

7 years agoRelease Cycle for 2.63:
Thomas Dinges [Thu, 16 Feb 2012 20:04:33 +0000 (20:04 +0000)]
Release Cycle for 2.63:
* BCon1, alpha.

7 years agoSculpt/Paint UI: Add a new menu for brush options.
Nicholas Bishop [Thu, 16 Feb 2012 18:06:38 +0000 (18:06 +0000)]
Sculpt/Paint UI: Add a new menu for brush options.

For vertex/weight/texture paint, this has only the flags for using
unified size/strength. (Addresses TODO in code, before only sculpt
menu had these settings.)

For sculpt, moved the brush-related settings from the sculpt menu to
the brush menu.

Note that these menus are still very out of date (missing lots of
options), will address that in a different commit.

7 years agoSculpt UI: add missing sculpt options to menu
Nicholas Bishop [Thu, 16 Feb 2012 16:38:05 +0000 (16:38 +0000)]
Sculpt UI: add missing sculpt options to menu

7 years agoBugfix: update the sculpt menu to use the correct path to the unified paint settings.
Nicholas Bishop [Thu, 16 Feb 2012 16:33:50 +0000 (16:33 +0000)]
Bugfix: update the sculpt menu to use the correct path to the unified paint settings.

7 years agoTypo in previous own commit.
Sergey Sharybin [Thu, 16 Feb 2012 15:55:23 +0000 (15:55 +0000)]
Typo in previous own commit.

7 years agoClear PROP_TRANSLATE flag for Macro Operator's bl_label as well.
Sergey Sharybin [Thu, 16 Feb 2012 15:53:44 +0000 (15:53 +0000)]
Clear PROP_TRANSLATE flag for Macro Operator's bl_label as well.

7 years agoReverting changes in commit r43458.
Sergey Sharybin [Thu, 16 Feb 2012 15:53:30 +0000 (15:53 +0000)]
Reverting changes in commit r43458.

That was intended change to clear PROP_TRANSLATE flag from bl_label property of
operators, panels and menus (see rev40570)

If this flag leads to another issues it should be fixed in another way.

This fixes #30210: International Font Problem

7 years agoTomato: configurable filter type for 2d stabilization
Sergey Sharybin [Thu, 16 Feb 2012 15:03:37 +0000 (15:03 +0000)]
Tomato: configurable filter type for 2d stabilization

7 years agoTomato: run aspect correction before stabilizing shot.
Sergey Sharybin [Thu, 16 Feb 2012 15:03:18 +0000 (15:03 +0000)]
Tomato: run aspect correction before stabilizing shot.

7 years agoTomato: fixed issue when track used for rotation stabilization points to a freed...
Sergey Sharybin [Thu, 16 Feb 2012 13:15:01 +0000 (13:15 +0000)]
Tomato: fixed issue when track used for rotation stabilization points to a freed memory after re-tracking this track.

7 years agoTomato: fixed default value for pixel aspect.
Sergey Sharybin [Thu, 16 Feb 2012 13:14:49 +0000 (13:14 +0000)]
Tomato: fixed default value for pixel aspect.

7 years agoTomato: fixed incorrect auto-scale calculation for 2d stabilization
Sergey Sharybin [Thu, 16 Feb 2012 13:14:28 +0000 (13:14 +0000)]
Tomato: fixed incorrect auto-scale calculation for 2d stabilization

7 years agoffmpeg: take back 44142, conditional was wrong
Jens Verwiebe [Thu, 16 Feb 2012 11:52:02 +0000 (11:52 +0000)]
ffmpeg: take back 44142, conditional was wrong

7 years agoffmpeg: only suppress loopfilter for .mov ( compatibility ), but keep for .avi (quality )
Jens Verwiebe [Thu, 16 Feb 2012 08:48:28 +0000 (08:48 +0000)]
ffmpeg: only suppress loopfilter for .mov ( compatibility ), but keep for .avi (quality )

7 years agoTomato: fix for missing cache invalidation when disabling/enabling channels for stabi...
Sergey Sharybin [Thu, 16 Feb 2012 07:45:01 +0000 (07:45 +0000)]
Tomato: fix for missing cache invalidation when disabling/enabling channels for stabilized shot

7 years agoMerging r44129 through r44139 from trunk into soc-2011-tomato
Sergey Sharybin [Thu, 16 Feb 2012 07:11:50 +0000 (07:11 +0000)]
Merging r44129 through r44139 from trunk into soc-2011-tomato

7 years agofix for replacing a generated image with a file, the image would stay generated.
Campbell Barton [Thu, 16 Feb 2012 04:21:40 +0000 (04:21 +0000)]
fix for replacing a generated image with a file, the image would stay generated.

not a show-stopper but confusing.

7 years agofix [#30201] bpy_extras.image_utils.load_image always returns placeholder
Campbell Barton [Thu, 16 Feb 2012 04:08:52 +0000 (04:08 +0000)]
fix [#30201] bpy_extras.image_utils.load_image always returns placeholder

in existing addons this only effects OBJ import.

interestingly even though this is a bug (in that its returning a placeholder when it should load the image), since the placeholder points to the correct path, the image will load correctly when refreshed, so the bug's not too bad.

7 years agoreadfile update after version/subversion bump
Dalai Felinto [Wed, 15 Feb 2012 18:17:31 +0000 (18:17 +0000)]
readfile update after version/subversion bump
Note, there is no need to leave doversion code outside a version/subversion nest.
e.g. having if version < 262   in a 2.61 file will make the code to double-run.
however this is the same case for the code nested outside the if versions ...
with the advantage of making ahoys/version bumping easier.

Ton himself was unaware of how we were doing this and suggested to get rid of the /* put subversion code here */ practise.

7 years agoTomato: fixed incorrect behavior of textures buffer used in MCE together with 2d...
Sergey Sharybin [Wed, 15 Feb 2012 18:11:10 +0000 (18:11 +0000)]
Tomato: fixed incorrect behavior of textures buffer used in MCE together with 2d stabilization.

7 years agoautogenerated rna api changelog (no rebuilds needed)
Campbell Barton [Wed, 15 Feb 2012 17:41:48 +0000 (17:41 +0000)]
autogenerated rna api changelog (no rebuilds needed)

7 years agoSet BLENDER_VERSION_CYCLE to release.
Thomas Dinges [Wed, 15 Feb 2012 17:19:26 +0000 (17:19 +0000)]
Set BLENDER_VERSION_CYCLE to release.

7 years agoThe traditional release commit, 2.62!
Ton Roosendaal [Wed, 15 Feb 2012 16:44:44 +0000 (16:44 +0000)]
The traditional release commit, 2.62!

Special thanks to splash committee:
Kevin Hays, Per Gantelius and Wray Bowling.

Splash by Alexey Lugovoy.

7 years agoCamera tracking: animation datablock for MovieClip
Sergey Sharybin [Wed, 15 Feb 2012 16:06:48 +0000 (16:06 +0000)]
Camera tracking: animation datablock for MovieClip

Added AnimData block to MovieClip datablock which allows to animate different
properties in clip. Currently supports animation of stabilization influence only.

7 years agoMerging r44109 through r44128 from trunk into soc-2011-tomato
Sergey Sharybin [Wed, 15 Feb 2012 16:04:57 +0000 (16:04 +0000)]
Merging r44109 through r44128 from trunk into soc-2011-tomato

7 years agoFix another padding error in cycles, to complete the previous bugfix.
Brecht Van Lommel [Wed, 15 Feb 2012 14:56:08 +0000 (14:56 +0000)]
Fix another padding error in cycles, to complete the previous bugfix.

7 years agoFix #30139: multi render layer not working with CUDA render, due to padding error
Brecht Van Lommel [Wed, 15 Feb 2012 14:32:07 +0000 (14:32 +0000)]
Fix #30139: multi render layer not working with CUDA render, due to padding error
in render pass code.

7 years agoFFmpeg settings can't be animated. Clear animation flag to prevent confusing
Sergey Sharybin [Wed, 15 Feb 2012 14:05:28 +0000 (14:05 +0000)]
FFmpeg settings can't be animated. Clear animation flag to prevent confusing
warnings appear on the screen.

7 years agoMovie clip: comment what magic constant 768 means in DNA structure
Sergey Sharybin [Wed, 15 Feb 2012 13:41:33 +0000 (13:41 +0000)]
Movie clip: comment what magic constant 768 means in DNA structure

7 years agoCMake: determine if python should be bundled into "lib" or "lib64" folder.
Sergey Sharybin [Wed, 15 Feb 2012 08:53:28 +0000 (08:53 +0000)]
CMake: determine if python should be bundled into "lib" or "lib64" folder.

Needed to deal with OS like openSUSE where Python is installed to /usr/lib64
and don't work if it's getting bundled into <blender_version>/python/lib.

Thanks to Campbell to making this patch cleaner :)

7 years agofont objects in blenderplayer fail when object with alpha is rendered
Dalai Felinto [Tue, 14 Feb 2012 18:23:58 +0000 (18:23 +0000)]
font objects in blenderplayer fail when object with alpha is rendered
the embed bge has its own DisableForText() routine which prepares the GL flags for the text render.

For some reason blenderplayer is taking a slim approach and going straight for the rendering. This routine helps to address this bug/case (non reported, foundin my own project files). If need arises we should move this to its own routine incorporating the other GL tests the embed bge performs.

7 years agoBuildbot: WITH_BF_CYCLES_CUDA_BINARIES should be set for packing stage too.
Sergey Sharybin [Tue, 14 Feb 2012 17:03:27 +0000 (17:03 +0000)]
Buildbot: WITH_BF_CYCLES_CUDA_BINARIES should be set for packing stage too.

7 years agoCamera tracking: corrected default values for some reconstruction-related properties.
Sergey Sharybin [Tue, 14 Feb 2012 17:03:06 +0000 (17:03 +0000)]
Camera tracking: corrected default values for some reconstruction-related properties.

7 years agoBuildbot: another attempt to make Windows builds support CUDA
Sergey Sharybin [Tue, 14 Feb 2012 15:59:10 +0000 (15:59 +0000)]
Buildbot: another attempt to make Windows builds support CUDA

Set BF_CYCLES_CUDA_NVCC to nvcc.exe, hopefully it's on search path at builder machine.

7 years agoSCons: command line options should be coma-separated when adding to options list
Sergey Sharybin [Tue, 14 Feb 2012 15:44:17 +0000 (15:44 +0000)]
SCons: command line options should be coma-separated when adding to options list

7 years agoBuildbot: enable building CUDA binaries on Windows slaves.
Sergey Sharybin [Tue, 14 Feb 2012 15:26:20 +0000 (15:26 +0000)]
Buildbot: enable building CUDA binaries on Windows slaves.
Should make CUDA available for rendering in buildbot builds.

7 years agoMerging r44070 through r44108 from trunk into soc-2011-tomato
Sergey Sharybin [Tue, 14 Feb 2012 15:19:49 +0000 (15:19 +0000)]
Merging r44070 through r44108 from trunk into soc-2011-tomato

7 years agoFix related to #30152, rainbow colours produced when loading hdr image to 3D viewport...
Antony Riakiotakis [Tue, 14 Feb 2012 13:25:23 +0000 (13:25 +0000)]
Fix related to #30152, rainbow colours produced when loading hdr image to 3D viewport/ the Nyan cat bug.

Issue is caused by scaling for power of 2 dimensions and mipmapping that happens through GLU. It looks like the library cannot handle float colour values above 1.0 correctly. Since we are close to release I will just clamp the srgb result for now even though it will result in a small performance loss for 16 bit textures only.

I tried a few things before that, glGenerateMipmaps + no scaling (supported for 2.0 GL hardware and up), or using our own scaling instead of glu among them which worked very nicely and gave a speedup too. However, since we are close to release and there may be issues with GPU mipmap generation, see:

http://www.gamedev.net/topic/495747-another-glgeneratemipmap-question/
(old discussion but better be sure than sorry)

I went for the most compatible solution. Maybe after release this can be tested if other devs agree.

7 years agoCarve fixes and optimizations:
Sergey Sharybin [Tue, 14 Feb 2012 13:24:04 +0000 (13:24 +0000)]
Carve fixes and optimizations:

- Fixed memory lead in Carve_getIntersectedOperandMeshes
- Union manifolds only if they intersects second operand, leave manifolds
  which doesn't intersect second operand as-is.

7 years agoffmpeg: don't use flags:loop for .h264, this allows to see the video in OSX quickview...
Jens Verwiebe [Tue, 14 Feb 2012 12:24:17 +0000 (12:24 +0000)]
ffmpeg: don't use flags:loop for .h264, this allows to see the video in OSX quickview and Quicktimeplayer( windows ? )

7 years agoCarve: improved handling of meshes with interesting manifolds
Sergey Sharybin [Tue, 14 Feb 2012 09:43:35 +0000 (09:43 +0000)]
Carve: improved handling of meshes with interesting manifolds

Unioning of intersecting manifold tried to perform as little union operations
as possible, but there were some not totally correct assumption which lead to
cases when unioning of manifolds of some mesh might be happened when one of
mesh sets already had got intersecting manifolds.

This commit corrects this incorrect behavior.

Discovered this when was looking into #30175: Boolean Difference causes 2.62 RC1 crash.

7 years agoFixing up some buggy cleanup code in BL_ShapeDeformer. This code was causing crashes...
Mitchell Stokes [Tue, 14 Feb 2012 07:54:12 +0000 (07:54 +0000)]
Fixing up some buggy cleanup code in BL_ShapeDeformer. This code was causing crashes and corrupting shape keys. This commit fixes the following bugs:

[#30059] Shape Keys is gone in Blender if you use Add Object Actuator in BGE
[#30024] Segmentation fault after addObject when using shape keys
[#28683] segfault in shapekey conversion code when running a game (YF, level home) twice

7 years agoOSX: to make transition for mediaimports to ffmpeg reliable, ffmpeg_0.10 is mandatory
Jens Verwiebe [Tue, 14 Feb 2012 07:47:29 +0000 (07:47 +0000)]
OSX: to make transition for mediaimports to ffmpeg reliable, ffmpeg_0.10 is mandatory

7 years agoFix for [#30171] "Audio Muted" Does Not Mute Audio
Joerg Mueller [Mon, 13 Feb 2012 21:27:11 +0000 (21:27 +0000)]
Fix for [#30171] "Audio Muted" Does Not Mute Audio

7 years agoFix #30170: with file saved in texture painting mode, when going to object mode
Brecht Van Lommel [Mon, 13 Feb 2012 21:12:14 +0000 (21:12 +0000)]
Fix #30170: with file saved in texture painting mode, when going to object mode
the image texture is missing. The flag to indicate that the mipmap levels were
already loaded into GPU memory was incorrectly set then.

7 years agoFix #30155: crash with popup menu open while new .blend file is loaded,
Brecht Van Lommel [Mon, 13 Feb 2012 21:05:04 +0000 (21:05 +0000)]
Fix #30155: crash with popup menu open while new .blend file is loaded,
CTX_wm_window is then set to NULL and checked in the event queue, but it
should be checked for removing handlers too.

7 years agouse tabs for indentation
Campbell Barton [Mon, 13 Feb 2012 20:54:36 +0000 (20:54 +0000)]
use tabs for indentation

7 years agoFix quicktime export being broken in various ways: callback was missing
Brecht Van Lommel [Mon, 13 Feb 2012 20:47:29 +0000 (20:47 +0000)]
Fix quicktime export being broken in various ways: callback was missing
parameter, codec RNA wrapping was wrong, and there was a python script error.

7 years agoOSX: let almost all animation imports handle by ffmpeg now, this is faster in many...
Jens Verwiebe [Mon, 13 Feb 2012 19:00:02 +0000 (19:00 +0000)]
OSX: let almost all animation imports handle by ffmpeg now, this is faster in many cases

7 years agoFix for [#27349] Sequencer: Meta Strips plays unavailable audio
Joerg Mueller [Mon, 13 Feb 2012 17:31:33 +0000 (17:31 +0000)]
Fix for [#27349] Sequencer: Meta Strips plays unavailable audio

Hopefully at least... Sequencer code is like <insert name of random ancient language that nobody knows anymore here>.

7 years agoFixed copy-paste of sound strips in sequencer.
Sergey Sharybin [Mon, 13 Feb 2012 17:29:10 +0000 (17:29 +0000)]
Fixed copy-paste of sound strips in sequencer.

Copy operator used to remove scene_sound from strips, but Paste operator didn't
restore which lead to total silence of newly added strips.

7 years agoFix #30159: Boolean modifier creating non-concave faces
Sergey Sharybin [Mon, 13 Feb 2012 13:23:23 +0000 (13:23 +0000)]
Fix #30159: Boolean modifier creating non-concave faces

Issue was caused by merging triangles into quads policy which used to think
triangulation of non-planar/non-concave quads happens by 1-3 diagonal which
isn't actually correct in some OpenGL implementations.

Added check for non-concave faces when merging triangles. It will work fine if
original faces are flat. In case if original faces aren't flat this check might
fail and triangulate face when it's not actually needed or merge triangles in
a way which leads to OpenGL artifacts.

7 years agofix for typo
Campbell Barton [Mon, 13 Feb 2012 12:57:46 +0000 (12:57 +0000)]
fix for typo

7 years agothemes to be distributed with release
Campbell Barton [Mon, 13 Feb 2012 11:29:34 +0000 (11:29 +0000)]
themes to be distributed with release

7 years agomore tweaks, outline is lighter then the color given so compensate a bit.
Campbell Barton [Mon, 13 Feb 2012 11:14:12 +0000 (11:14 +0000)]
more tweaks, outline is lighter then the color given so compensate a bit.

7 years agoremove unused var
Campbell Barton [Mon, 13 Feb 2012 04:12:40 +0000 (04:12 +0000)]
remove unused var

7 years agofix for bug introduced with weight paint vertex selection.
Campbell Barton [Mon, 13 Feb 2012 03:32:47 +0000 (03:32 +0000)]
fix for bug introduced with weight paint vertex selection.

heat weighting ignored selected faces.

7 years ago2.6 UI Modifier Icons:
Thomas Dinges [Sun, 12 Feb 2012 19:57:47 +0000 (19:57 +0000)]
2.6 UI Modifier Icons:

* New Ocean Icon, created by Leon Cheung. Thanks! Approved by Lukas and myself.
* New Warp Icon, created by "Zafio"

Blender artists Thread where the Icons come from: http://blenderartists.org/forum/showthread.php?243354-Call-for-Modifier-Icons!

7 years agopy api docs - remove sphinx .doctree before zipping, saves some space 18mb --> 3...
Campbell Barton [Sun, 12 Feb 2012 19:55:25 +0000 (19:55 +0000)]
py api docs - remove sphinx .doctree before zipping, saves some space 18mb --> 3.1 mb

7 years agoMerging r44003 through r44069 from trunk into soc-2011-tomato
Sergey Sharybin [Sun, 12 Feb 2012 19:00:13 +0000 (19:00 +0000)]
Merging r44003 through r44069 from trunk into soc-2011-tomato