8 years agoCMake: update cmake.txt documentation to remove some old information and link
Brecht Van Lommel [Tue, 26 Feb 2013 00:49:45 +0000 (00:49 +0000)]
CMake: update cmake.txt documentation to remove some old information and link
to the wiki for detailed cmake build setup instructions.

8 years agoOpenGL: implemenation of fixed function lighting as per pixel GLSL shaders. The
Brecht Van Lommel [Tue, 26 Feb 2013 00:49:42 +0000 (00:49 +0000)]
OpenGL: implemenation of fixed function lighting as per pixel GLSL shaders. The
code is still unused, but the intention is to use this to solve the double sided
lighting problem on NVidia, and to make the materials work on OpenGL ES 2.0

The code works and matches the fixed function lighting pretty much exactly, but
still needs optimizations. The actual integration in object draw will be
committed later when more fixing & testing, there's lots of different combinations
and unclear OpenGL state here.

8 years agoFix OS X build error with Quicktime, need <stdio.h> for FILE usage.
Brecht Van Lommel [Tue, 26 Feb 2013 00:49:38 +0000 (00:49 +0000)]
Fix OS X build error with Quicktime, need <stdio.h> for FILE usage.

8 years agofix [#34423] Foreach_get crash for any non existant attribute
Campbell Barton [Tue, 26 Feb 2013 00:31:36 +0000 (00:31 +0000)]
fix [#34423] Foreach_get crash for any non existant attribute
also improve exception messages.

8 years agosimplify drag toggle operator, use BLI_rctf_isect_segment between mouse events rather...
Campbell Barton [Tue, 26 Feb 2013 00:09:26 +0000 (00:09 +0000)]
simplify drag toggle operator, use BLI_rctf_isect_segment between mouse events rather then many calls to ui_but_find_mouse_over().

8 years agoadd define for drag toggle.
Campbell Barton [Mon, 25 Feb 2013 23:27:32 +0000 (23:27 +0000)]
add define for drag toggle.

8 years agorigidbody: Don't set object to rigid body on dummy transform
Sergej Reich [Mon, 25 Feb 2013 22:36:50 +0000 (22:36 +0000)]
rigidbody: Don't set object to rigid body on dummy transform

Fixes [#34420] rigid objects not resetting original properly after running a simulation.

8 years agorevert some changes from own commit r54850 which broke undo for toggle buttons, also...
Campbell Barton [Mon, 25 Feb 2013 21:13:40 +0000 (21:13 +0000)]
revert some changes from own commit r54850 which broke undo for toggle buttons, also make toggle buttons auto-key.

8 years agoBye-bye, SSBA!
Sergey Sharybin [Mon, 25 Feb 2013 20:15:42 +0000 (20:15 +0000)]
Bye-bye, SSBA!

With new bundle adjustment based on Ceres we don't need
SSBA library anymore. This also means we don't need ldl
library and libmv is no longer depends on colamd as well.

8 years agoSwitch motion tracker bundle adjustment to Ceres.
Keir Mierle [Mon, 25 Feb 2013 20:00:48 +0000 (20:00 +0000)]
Switch motion tracker bundle adjustment to Ceres.

Patch originally written by me, then finished by Sergey. Big
thanks to Sergey for troopering through and fixing the many issues
with my original (not compilable) patch.

The Ceres implementation uses 2 parameter blocks for each camera
(1 for rotation and 1 for translation), 1 parameter block for
common intrinsics (focal length etc) and 1 parameter block for
each track (e.g. bundle or 3D point).

We turn on some fancy optimizer options to get better performance,
in particular:

  options.preconditioner_type = ceres::SCHUR_JACOBI;
  options.linear_solver_type = ceres::ITERATIVE_SCHUR;
  options.use_inner_iterations = true;
  options.use_nonmonotonic_steps = true;
  options.max_num_iterations = 100;

Special thanks to Sameer Agarwal of Ceres fame for splitting out
the SCHUR_JACOBI preconditioner so that it didn't depend on
CHOLMOD.  Previously we could not use that preconditioner in
Blender because CHOLMOD is too large of a dependency for Blender.

- Moved bunch of if(foo) LG << "bar" into this function, to make
  EuclideanBundleCommonIntrinsics a little bit easier to follow.

- Fix RMSE logging.

8 years agoSome minor UI messages fixes.
Bastien Montagne [Mon, 25 Feb 2013 19:16:04 +0000 (19:16 +0000)]
Some minor UI messages fixes.

8 years agoTame that stupid py code not to eat existing fuzzies in po’s when updating from POT...
Bastien Montagne [Mon, 25 Feb 2013 16:06:59 +0000 (16:06 +0000)]
Tame that stupid py code not to eat existing fuzzies in po’s when updating from POT file!

8 years agofix: #34427: Collada export crash with armature
Gaia Clary [Mon, 25 Feb 2013 16:02:40 +0000 (16:02 +0000)]
fix: #34427: Collada export crash with armature

8 years agorigidbody: Don't embed collision margin if object has no volume
Sergej Reich [Mon, 25 Feb 2013 15:51:53 +0000 (15:51 +0000)]
rigidbody: Don't embed collision margin if object has no volume

While it's not a good idea to create convex hull shapes from objects
with no volume, this makes them behave a little nicer.

Fixes [#34410] Planes with Rigid Body always keep distance to colliding objects

8 years agoFix compilation error with libmv disabled
Sergey Sharybin [Mon, 25 Feb 2013 13:15:42 +0000 (13:15 +0000)]
Fix compilation error with libmv disabled

8 years agoonly apply workaround for [#33223] when using intel cards on windows.
Campbell Barton [Mon, 25 Feb 2013 12:19:38 +0000 (12:19 +0000)]
only apply workaround for [#33223] when using intel cards on windows.

8 years agoCheck if the variable is a string and split nicely, so compile command stays intact...
Nathan Letwory [Mon, 25 Feb 2013 12:03:55 +0000 (12:03 +0000)]
Check if the variable is a string and split nicely, so compile command stays intact with proper include options.

8 years agois_crappy_intel_card() was checking strstr(glGetString(GL_VENDOR), "Intel") every...
Campbell Barton [Mon, 25 Feb 2013 12:03:26 +0000 (12:03 +0000)]
is_crappy_intel_card() was checking strstr(glGetString(GL_VENDOR), "Intel") every call,
better store in static var.

8 years agofix for toggle buttons not taking effect on mousedown.
Campbell Barton [Mon, 25 Feb 2013 11:52:18 +0000 (11:52 +0000)]
fix for toggle buttons not taking effect on mousedown.

8 years agoUpdate Carve to newest upstream version with some assorted fixes
Sergey Sharybin [Mon, 25 Feb 2013 10:02:43 +0000 (10:02 +0000)]
Update Carve to newest upstream version with some assorted fixes

Perhaps some warnings could be silenced, but not in mood of writing
local patches at this moment. They're all harmless anyway.

8 years agoCamera tracking, minor changes:
Sergey Sharybin [Mon, 25 Feb 2013 09:46:47 +0000 (09:46 +0000)]
Camera tracking, minor changes:

- Fill in image dimension for camera intrinsics used for
  solution refirement.
- Retrieve K3 from camera intrinsics after refining.

Shall be no functional changes, just makes things clear
and robust for further improvements.

8 years agocode cleanup: remove unused and unsupported functions from libmv-capi
Sergey Sharybin [Mon, 25 Feb 2013 09:38:59 +0000 (09:38 +0000)]
code cleanup: remove unused and unsupported functions from libmv-capi

svn merge -r52855:52856 ^/branches/soc-2011-tomato

8 years agoCamera tracking: libmv distortion API now also uses camera intrinsics
Sergey Sharybin [Mon, 25 Feb 2013 09:36:52 +0000 (09:36 +0000)]
Camera tracking: libmv distortion API now also uses camera intrinsics
structure instead of passing all the parameters to every function.

Makes it much easier to tweak distortion model.

svn merge -r52854:52855 ^/branches/soc-2011-tomato

8 years agoSynchronize libmv with own branch
Sergey Sharybin [Mon, 25 Feb 2013 09:27:57 +0000 (09:27 +0000)]
Synchronize libmv with own branch

Should be no functional changes, just would help a lot
checking on which stuff was/shall be merged from tomato
and which is not.

8 years agocode cleanup: camera tracking
Sergey Sharybin [Mon, 25 Feb 2013 09:24:31 +0000 (09:24 +0000)]
code cleanup: camera tracking

- Moved keyframes and refirement flags into reconstruction options structure
- Moved distortion coefficients and other camera intrinsics into own structure
- Cleaned up reconstruction functions in libmv c-api

svn merge -r52853:52854 ^/branches/soc-2011-tomato

8 years agoUpgrade Ceres library to current master which is current 1.5RC
Sergey Sharybin [Mon, 25 Feb 2013 08:59:26 +0000 (08:59 +0000)]
Upgrade Ceres library to current master which is current 1.5RC

This is helpful because it brings CHOLMOB-free ITERATIVE_SCHUR and
SCHUR_JACOBI which is really nice for new upcoming bundle adjustment.

If also includes all the local fixes we made locally.

There're lots of other improvements/fixed which are not currently
would be so much visible in Blender, but which opens doors for some
great improvements in future.

8 years agoUpdate bundled version of minilzo
Sergey Sharybin [Mon, 25 Feb 2013 08:16:28 +0000 (08:16 +0000)]
Update bundled version of minilzo

This updates minilzo from version 2.03 to version 2.06 which
is like 3 years newer.

The main reason of this update is that older minilzo had some
strange valgrind warnings. Likely they're harmless, but it was
still annoying to troubleshot bakes with valgrind.

8 years agoBGE: Fixing a crash reported by Ace Dragon on BA. It looks like Object->totcol can...
Mitchell Stokes [Mon, 25 Feb 2013 05:55:37 +0000 (05:55 +0000)]
BGE: Fixing a crash reported by Ace Dragon on BA. It looks like Object->totcol can give a number higher than the number of materials, so I've added some NULL checks.

8 years agofix for python exception getting the ID from an operator button:
Campbell Barton [Mon, 25 Feb 2013 04:19:28 +0000 (04:19 +0000)]
fix for python exception getting the ID from an operator button:
  attempting to select 'Online Manual' or 'Python Reference' from the UI of a running operator would give an error popup.

8 years agofix for regression in 'object.shape_key_transfer' operator since BMesh merge, using...
Campbell Barton [Mon, 25 Feb 2013 03:54:16 +0000 (03:54 +0000)]
fix for regression in 'object.shape_key_transfer' operator since BMesh merge, using the RELATIVE_FACE method failed.

8 years agofix for weight paint using values over 1.0 when blending,
Campbell Barton [Mon, 25 Feb 2013 03:45:56 +0000 (03:45 +0000)]
fix for weight paint using values over 1.0 when blending,
since its possible to have a brush strength over 1.0, it was possible to paint weights which would over-shoot the intended weight.

8 years agofix for own error r54703, the event->mval was relative to a different region.
Campbell Barton [Mon, 25 Feb 2013 00:45:20 +0000 (00:45 +0000)]
fix for own error r54703, the event->mval was relative to a different region.
also make recent image dnd patch add the new object at the mouse cursor.

8 years agoHidding the append: already linked message if G.debug is false. This gets rid of...
Mitchell Stokes [Mon, 25 Feb 2013 00:03:58 +0000 (00:03 +0000)]
Hidding the append: already linked message if G.debug is false. This gets rid of some noise in the console for BGE games that run into this case a lot.

8 years agoFix for collapse-edges crash in dyntopo
Nicholas Bishop [Mon, 25 Feb 2013 00:02:25 +0000 (00:02 +0000)]
Fix for collapse-edges crash in dyntopo

Was incorrectly testing for a vertex in a set with BLI_ghash_lookup
rather than BLI_ghash_haskey; the key in this case is always null so
the test failed.

This could leave the PBVH in an inconsistent state, since the
top-level map of BMesh vertices to PBVH nodes would indicate the
vertex was in a node, but that node wouldn't actually have any faces
using the vertex. That inconsistent state would eventually lead to a
crash in pbvh_bmesh_vert_remove().


8 years agopatch [#34411] Patch for image drag and drop to create Empty rather than BG image
Campbell Barton [Sun, 24 Feb 2013 23:18:21 +0000 (23:18 +0000)]
patch [#34411] Patch for image drag and drop to create Empty rather than BG image
from Kevin Mackay (yakca)

8 years agopatch [#34380] Fix Python console bug: "autocomplete" doesn't advance cursor properly...
Campbell Barton [Sun, 24 Feb 2013 21:51:48 +0000 (21:51 +0000)]
patch [#34380] Fix Python console bug: "autocomplete" doesn't advance cursor properly when completion includes UTF8 characters
from Shinsuke Irie (irie)

8 years agostyle cleanup
Campbell Barton [Sun, 24 Feb 2013 20:33:21 +0000 (20:33 +0000)]
style cleanup

8 years agopointcache: Fix freeing all bakes in particle mode
Sergej Reich [Sun, 24 Feb 2013 19:33:10 +0000 (19:33 +0000)]
pointcache: Fix freeing all bakes in particle mode

Freeing all bakes didn't free edited cache in particle mode, this lead
to unresponsive ui and crashes.

Now use same logic as for freeing single bake.

8 years agoBGE: Adding back the virtual destructor to PHY_IPhysicsController, which was accident...
Mitchell Stokes [Sun, 24 Feb 2013 18:48:57 +0000 (18:48 +0000)]
BGE: Adding back the virtual destructor to PHY_IPhysicsController, which was accidentally removed in r54807.

8 years agoSome UI messages fixes...
Bastien Montagne [Sun, 24 Feb 2013 18:04:10 +0000 (18:04 +0000)]
Some UI messages fixes...

8 years agoFix scons building...
Bastien Montagne [Sun, 24 Feb 2013 16:01:30 +0000 (16:01 +0000)]
Fix scons building...

8 years agorigidbody: Allow collision groups to be animated
Sergej Reich [Sun, 24 Feb 2013 15:53:30 +0000 (15:53 +0000)]
rigidbody: Allow collision groups to be animated

8 years agoAnother bunch of UI translation fixes, thanks to Leon Cheung, Gabriel Gazzán and...
Bastien Montagne [Sun, 24 Feb 2013 15:40:28 +0000 (15:40 +0000)]
Another bunch of UI translation fixes, thanks to Leon Cheung, Gabriel Gazzán and S. Lockal for spotting them!

8 years agoBug fix #34384
Ton Roosendaal [Sun, 24 Feb 2013 14:42:21 +0000 (14:42 +0000)]
Bug fix #34384

Border select in UV Image window crashed, if used when Image Window shows a render.
Made operators for UV vertex manipulations having a more strict check for this mode.
(Similar to other UV tools there).

8 years agoHopefully last round of fixes for all OSes
Antony Riakiotakis [Sun, 24 Feb 2013 14:27:59 +0000 (14:27 +0000)]
Hopefully last round of fixes for all OSes

8 years agoCompile fix round 2. Still trying to do this from linux :p
Antony Riakiotakis [Sun, 24 Feb 2013 14:02:45 +0000 (14:02 +0000)]
Compile fix round 2. Still trying to do this from linux :p

8 years agoAdd bogus stabs for fullscreen window mode for BGE in GHOST. Platform maintainers...
Antony Riakiotakis [Sun, 24 Feb 2013 13:51:12 +0000 (13:51 +0000)]
Add bogus stabs for fullscreen window mode for BGE in GHOST. Platform maintainers should change these to replicate X11 behaviour. Also moved X11 implementation to public methods, just like the IWindow interface. Should fix compilation

8 years
Thomas Dinges [Sun, 24 Feb 2013 11:54:28 +0000 (11:54 +0000)]
* Disable OIIO test and cmd tools per default, they are not needed for Blender.

8 years agofix for own commit r54806 with argument order and multisampling.
Campbell Barton [Sun, 24 Feb 2013 10:50:33 +0000 (10:50 +0000)]
fix for own commit r54806 with argument order and multisampling.

8 years agoBig i18n tools update, I/II.
Bastien Montagne [Sun, 24 Feb 2013 08:50:55 +0000 (08:50 +0000)]
Big i18n tools update, I/II.

* Everything is still a bit raw and sometimes hackish.
* Not every feature implemented yet.
* A bunch of cleanup is still needed.
* Doc needs to be updated too!

8 years agoFix for uiButGetStrInfo: We need a string value here, return BPY_I18NCONTEXT_DEFAULT_...
Bastien Montagne [Sun, 24 Feb 2013 08:46:01 +0000 (08:46 +0000)]
Fix for uiButGetStrInfo: We need a string value here, return BPY_I18NCONTEXT_DEFAULT_BPY when using default NULL label's context.

8 years agoBGE: Removing the source files for the PHY interfaces since they just contained virtu...
Mitchell Stokes [Sun, 24 Feb 2013 07:09:39 +0000 (07:09 +0000)]
BGE: Removing the source files for the PHY interfaces since they just contained virtual destructors. This means we had license and doc blocks for 3 lines of code, which seemed silly. This also means that ge_phys_common no longer needs to be built as a library. I tested this with CMake and SCons using GCC; hopefully this doesn't break other systems.

8 years agofix for fullscreen on X11 (used by the BGE, not blender application),
Campbell Barton [Sun, 24 Feb 2013 05:05:29 +0000 (05:05 +0000)]
fix for fullscreen on X11 (used by the BGE, not blender application),
changing the screen resolution wasn't still allowed for larger virtual desktops.

added an exclusive option to ghost so the fullscreen window is ignored by the window manager and we get all events. (common practice for games on X11).

8 years agorigidbody: Don't abort connect operator if last selected object is active
Sergej Reich [Sat, 23 Feb 2013 23:40:51 +0000 (23:40 +0000)]
rigidbody: Don't abort connect operator if last selected object is active

Was silly logic error.

8 years agoGHOST/X11 - free memory allocated by XF86VidModeGetAllModeLines(),
Campbell Barton [Sat, 23 Feb 2013 23:15:38 +0000 (23:15 +0000)]
GHOST/X11 - free memory allocated by XF86VidModeGetAllModeLines(),
Comment from Zr says this crashes but looks like this was because there was no check if the function failed to allocate to begin with.

8 years agorigidbody: Fix motion paths calculation being incorrect for rigid bodies
Sergej Reich [Sat, 23 Feb 2013 23:04:10 +0000 (23:04 +0000)]
rigidbody: Fix motion paths calculation being incorrect for rigid bodies

For the simulation to work properly the limited update the motion paths
calculation did wasn't enough so you got different results for for
motion paths than for the actual simulation.
Now do full frame update if rigid body sim is active.

TODO investigate if we can still limit this.

8 years agorigidbody: Add motor constraint
Sergej Reich [Sat, 23 Feb 2013 23:04:07 +0000 (23:04 +0000)]
rigidbody: Add motor constraint

It's implemented as a separate constraint instead of adding properties
to the existing constraints.
Motors only apply linear and angular impulses and don't limit the
movement of rigid bodies, so it's best to use them in conjunction with
other constraints to limit the degrees of freedom.

Thanks to Markus Kasten (markus111) for the initial patch.

8 years agorigidbody: Code cleanup
Sergej Reich [Sat, 23 Feb 2013 23:04:03 +0000 (23:04 +0000)]
rigidbody: Code cleanup

Clean up DNA comments.

8 years agoGHOST/X11 support for frequency, from SDL's mode switching.
Campbell Barton [Sat, 23 Feb 2013 22:48:16 +0000 (22:48 +0000)]
GHOST/X11 support for frequency, from SDL's mode switching.
also free the modes when done.

8 years agoRename CMake's Boost_USE_ICU to WITH_BOOST_ICU (update your CMake conf if you make...
Bastien Montagne [Sat, 23 Feb 2013 20:42:15 +0000 (20:42 +0000)]
Rename CMake's Boost_USE_ICU to WITH_BOOST_ICU (update your CMake conf if you make static builds!), and add it as CMake option.

Patch by gdh (Gavin Howard), many thanks!

8 years agoFix for image alpha version patch with library linked files where the image
Brecht Van Lommel [Sat, 23 Feb 2013 20:24:02 +0000 (20:24 +0000)]
Fix for image alpha version patch with library linked files where the image
datablock is in a different library than the texture datablock. Adjusted the
fix in 54790 to check for this case specifically so it keeps working on other
files that have packed images.

The problem is that blo_do_versions_newlibadr will not return a valid datablock
in some cases with linked libraries. This function is used in various places in
the version patching code and would likely cause problems there as well, needs
to be investigated further.

8 years agoFix #34358: shrinkwrap modifier project along normal did not work correctly
Brecht Van Lommel [Sat, 23 Feb 2013 20:23:59 +0000 (20:23 +0000)]
Fix #34358: shrinkwrap modifier project along normal did not work correctly
after other modifiers. It needs normals and those were not calculated.

8 years agoBug fix in 2.66 release, irc submitted.
Ton Roosendaal [Sat, 23 Feb 2013 14:52:40 +0000 (14:52 +0000)]
Bug fix in 2.66 release, irc submitted.

File with packed images crashes on load.

Do-versions now is copying Images, because texture "use alpha" has been removed...
However, it then also copied packaged images, which crashes for some reason.

For now I skip packed image copy, which keeps blender work. This versioning
code needs more checking though.

8 years agoBug fix #34347
Ton Roosendaal [Sat, 23 Feb 2013 14:31:46 +0000 (14:31 +0000)]
Bug fix #34347

If you move (with F5) the properties and tools region in 3d viewport to the same side,
the mini-axis and text overlays were drawing in wrong place.

8 years agoMissed instance of ThemeGeneric.back -> ThemeGradient.gradients.high_gradient
Antony Riakiotakis [Sat, 23 Feb 2013 12:55:19 +0000 (12:55 +0000)]
Missed instance of ThemeGeneric.back -> ThemeGradient.gradients.high_gradient

8 years agoBugfix #34374
Ton Roosendaal [Sat, 23 Feb 2013 11:51:10 +0000 (11:51 +0000)]
Bugfix #34374

Fixed tooltip for checker-select, it works on the active item, not selected ones.

8 years agocode cleanup: confusingly written and named function for BGE materuial conversion...
Campbell Barton [Sat, 23 Feb 2013 07:36:40 +0000 (07:36 +0000)]
code cleanup: confusingly written and named function for BGE materuial conversion: getImageFromMaterial() --> getMTexFromMaterial()

8 years agocode cleanup: bge material conversion was creating STR_String just to check for empty...
Campbell Barton [Sat, 23 Feb 2013 07:15:37 +0000 (07:15 +0000)]
code cleanup: bge material conversion was creating STR_String just to check for empty string for no reason (empty string was assigned irrespective).

8 years agofix [#34378] GLSL materials using multiple UV layers fail in editmode
Campbell Barton [Sat, 23 Feb 2013 06:56:10 +0000 (06:56 +0000)]
fix [#34378] GLSL materials using multiple UV layers fail in editmode
regression since BMesh merge.

8 years agocode cleanup: make editmode PASSATTRIB into static functions.
Campbell Barton [Sat, 23 Feb 2013 05:36:15 +0000 (05:36 +0000)]
code cleanup: make editmode PASSATTRIB into static functions.

8 years agoBGE: fix for uninitialized tangents
Campbell Barton [Sat, 23 Feb 2013 04:49:46 +0000 (04:49 +0000)]
BGE: fix for uninitialized tangents

8 years agoBGE: Fix for bug #34377 "Multi UV mesh's materials not backwards compatible and Odd...
Mitchell Stokes [Sat, 23 Feb 2013 04:15:47 +0000 (04:15 +0000)]
BGE: Fix for bug #34377 "Multi UV mesh's materials not backwards compatible and Odd UV Coord behavior" reported by Alex Mairs (ctbm). The problem was the unused texture slot was still trying to be used. Now unused texture slots' mappings are set to DISABLE so they don't mess up the rest of the conversion process.

8 years agoBGE: Finally moving material IPOs to the 2.60 BGE animation system (BL_Action). It...
Mitchell Stokes [Sat, 23 Feb 2013 02:47:22 +0000 (02:47 +0000)]
BGE: Finally moving material IPOs to the 2.60 BGE animation system (BL_Action). It was kind of a fluke that they worked before.

8 years agofix for error using uninitialized draw mode with 'm_failsafe_storage' in the BGE.
Campbell Barton [Sat, 23 Feb 2013 02:45:12 +0000 (02:45 +0000)]
fix for error using uninitialized draw mode with 'm_failsafe_storage' in the BGE.

8 years agoadd include for scons.
Campbell Barton [Sat, 23 Feb 2013 02:03:53 +0000 (02:03 +0000)]
add include for scons.

8 years agocode cleanup: bge - was converting float[] to MT_Vector's just to compare. use BLI_ma...
Campbell Barton [Sat, 23 Feb 2013 01:57:56 +0000 (01:57 +0000)]
code cleanup: bge - was converting float[] to MT_Vector's just to compare. use BLI_math instead.

8 years agofix for error in the blenderplayer caused by r54727 (can't assume G.main is valid...
Campbell Barton [Sat, 23 Feb 2013 01:33:47 +0000 (01:33 +0000)]
fix for error in the blenderplayer caused by r54727 (can't assume G.main is valid on load).

8 years agoBGE: Object color channels can now be animated separately without zeroing out the...
Mitchell Stokes [Sat, 23 Feb 2013 01:17:01 +0000 (01:17 +0000)]
BGE: Object color channels can now be animated separately without zeroing out the other channels. Problem reported by Dalai via IRC.

8 years agoInstall_deps script:
Thomas Dinges [Sat, 23 Feb 2013 00:52:59 +0000 (00:52 +0000)]
Install_deps script:
* Use OIIO 1.1.7, this removes the need for the ugly patch.
* Use official OSL 1.3.0 repo
* Print OSL path for scons

Tested on Ubuntu 12.10 x64.

8 years agoBGE: Second fix for #34330 "Action Actuator "caching" the previous ran actions" repor...
Mitchell Stokes [Sat, 23 Feb 2013 00:46:58 +0000 (00:46 +0000)]
BGE: Second fix for #34330 "Action Actuator "caching" the previous ran actions" reported by Dalai. Now the multiple layers should also be working. When doing fcurve/IPO animations, the controllers are cleared as soon as the action is done and must be setup again every time the action is played.

8 years agoBGE: For BL_Action, use the object's scene rather than the "active" scene, which...
Mitchell Stokes [Sat, 23 Feb 2013 00:28:25 +0000 (00:28 +0000)]
BGE: For BL_Action, use the object's scene rather than the "active" scene, which can potentially cause problems with multiple scenes.

8 years agoBGE: (partial?) fix for #34330 "Action Actuator "caching" the previous ran actions...
Mitchell Stokes [Fri, 22 Feb 2013 23:55:06 +0000 (23:55 +0000)]
BGE: (partial?) fix for #34330 "Action Actuator "caching" the previous ran actions" reported by Dalai. The test file now works if all of the actions are using the same layer, but multiple layers can still cause problems. However, I am unsure as to what the "correct" behavior should be with multiple layers. They should probably blend somehow...

8 years agoWITH_PYTHON_FRAMEWORK cmake option for OSX
Dalai Felinto [Fri, 22 Feb 2013 22:24:38 +0000 (22:24 +0000)]
This option allow Blender to be linked against the Framework python
It's useful if you want to have blenderplayer and bpy in the same application and need to avoid PyThread problems.

patch reviewed by Jens Verwiebe before 2.66. He may want to change something though.
(also small: I changed:
as the latter seems to be the norm)

8 years agoBGE: Fix for bug #34219 "Webcam support under Linux in Standalone broken" reported...
Mitchell Stokes [Fri, 22 Feb 2013 20:37:14 +0000 (20:37 +0000)]
BGE: Fix for bug #34219 "Webcam support under Linux in Standalone broken" reported by Thomas Achtner (offtools).

No one bothered to update the player for ffmpeg changes made in August 2012. This meant the player was no longer calling avdevice_register_all(), and  ffmpeg would fail to open web cam streams.

8 years agofixing typo in include (report and patch by Jochen Schmitt)
Dalai Felinto [Fri, 22 Feb 2013 17:45:04 +0000 (17:45 +0000)]
fixing typo in include (report and patch by Jochen Schmitt)

8 years agoWorkaround for compilation error introduced in r54755
Sergey Sharybin [Fri, 22 Feb 2013 17:35:53 +0000 (17:35 +0000)]
Workaround for compilation error introduced in r54755

Scons used to fail because of couple of reasons:

- CMake does have WITH_DNA_GHASH enabled, Scons not
  Which is a good question why?!
- This makes Cmake including BLI_utildefines in dna_genfile.c,
  but scons missed this include
- This damn "bool" thing requires BLI_utildefines

And last question here is why would we want to use bool here =\
It's just always ends up in headache without any visible benefit
of using it.

Well, at least now svn shall be compilable again..

8 years agoApplying patch #33709 for dead keys on windows.
Alexander Kuznetsov [Fri, 22 Feb 2013 16:42:19 +0000 (16:42 +0000)]
Applying patch #33709 for dead keys on windows.
Thanks Harley Acheson!

8 years agoFix #34357: image editor scope and clip editor track preview did not resize
Brecht Van Lommel [Fri, 22 Feb 2013 16:11:27 +0000 (16:11 +0000)]
Fix #34357: image editor scope and clip editor track preview did not resize
properly with different DPI settings.

8 years agoFix for windows size on win32
Alexander Kuznetsov [Fri, 22 Feb 2013 15:57:50 +0000 (15:57 +0000)]
Fix for windows size on win32

8 years agoFix for building without python.
Alexander Kuznetsov [Fri, 22 Feb 2013 15:54:10 +0000 (15:54 +0000)]
Fix for building without python.

8 years agogame engine: Revert to using regular gimpact for mesh shapes
Sergej Reich [Fri, 22 Feb 2013 14:47:11 +0000 (14:47 +0000)]
game engine: Revert to using regular gimpact for mesh shapes

This reverts part of r53019.
While the compound shape trick works well in some cases, overall it's
much slower and even causes crashes under certain conditions.

We could make this and option and fix the crashes, but it's better to
implement convex decomposition anyway so just reverting for now.

Fixes [#34353] Ray cast on Triangle mesh bounded Rigid Body Object causes blender crash to desktop without error.

8 years agopatch [#34103] - listbase.patch, insertlinkbefore.patch
Campbell Barton [Fri, 22 Feb 2013 14:12:55 +0000 (14:12 +0000)]
patch [#34103] - listbase.patch, insertlinkbefore.patch
from Lawrence D'Oliveiro (ldo)

notes from tracker:
use bool for return type from BLI_remlink_safe, necessitating including BLI_utildefines.h in BLI_listbase.h
get rid of duplicate BLI_insertlink, use BLI_insertlinkafter instead.

A few places which were using BLI_insertlinkafter (actually BLI_insertlink), when it would be simpler to use BLI_insertlinkbefore instead.

8 years agopatch [#34103] Add explanatory comments to dna_genfile.[ch]
Campbell Barton [Fri, 22 Feb 2013 13:35:32 +0000 (13:35 +0000)]
patch [#34103] Add explanatory comments to dna_genfile.[ch]
from Lawrence D'Oliveiro (ldo)

8 years agoFix for [#34356] Inputs list in file output doesn't appear properly.
Thomas Dinges [Fri, 22 Feb 2013 12:24:08 +0000 (12:24 +0000)]
Fix for [#34356] Inputs list in file output doesn't appear properly.

* This made File Output Node more or less useless in the 2.66 release, as the list did not appear.
Issue caused in r53355.

Should be back ported to "a" release.

8 years agoremove 'register' from drag-toggle operator (so it doesn't show in the redo panel).
Campbell Barton [Fri, 22 Feb 2013 11:06:25 +0000 (11:06 +0000)]
remove 'register' from drag-toggle operator (so it doesn't show in the redo panel).
update credits script.

8 years agoSimple preset function for setting common node sizes based on enum instead of explici...
Lukas Toenne [Fri, 22 Feb 2013 10:46:27 +0000 (10:46 +0000)]
Simple preset function for setting common node sizes based on enum instead of explicit numbers.
Most nodes use the default size now and don't need explicit function calls. Most remaining nodes can also use the preset variant instead of explicit size values, these are only needed for a few special nodes.
Thanks to Sebastian König for suggesting this and doing the monkey work of changing node definitions.

8 years agoMotion tracking dopesheet
Sergey Sharybin [Fri, 22 Feb 2013 10:13:15 +0000 (10:13 +0000)]
Motion tracking dopesheet

Highlight background depending on number of tracks existing on frame.

This is not so much mathematically accurate displaying where things
shall be improved, but it's nice feedback about which frames better
be reviewed.

Bad frames are tracks < 8, highlighted with red.
OK-ish frame  are 8 <= tracks < 16, highlighted with yellow.

Could be some artifacts with color region start/end, this is a bit
unclear what exactly expected to be highlighted -- frames are
displayed as dots, but in fact they're quite noticeable segments.

svn merge -r54572:54573 ^/branches/soc-2011-tomato

8 years agoRemove extern_ssba workaround
Sergey Sharybin [Fri, 22 Feb 2013 10:06:54 +0000 (10:06 +0000)]
Remove extern_ssba workaround

SSBA seemed to be working OK last time i've checked it
with MSVC and optimization enabled.

Also, we'll likely replace it with own BA soon, which
works fine with MSVC anyway.

8 years agoFix #34351: Displacement map Bake margin does not work
Sergey Sharybin [Fri, 22 Feb 2013 09:57:10 +0000 (09:57 +0000)]
Fix #34351: Displacement map Bake margin does not work

8 years agoFixing typos
Gaia Clary [Fri, 22 Feb 2013 09:31:42 +0000 (09:31 +0000)]
Fixing typos