Commit Graph

45534 Commits

Author SHA1 Message Date
Tamito Kajiyama
d120ec146d Merged changes in the trunk up to revision 54802. 2013-02-24 03:39:20 +00:00
Tamito Kajiyama
3df023ae82 Freestyle Python API improvements - part 8.
* Proper handling of keyword arguments was implemented in Operators and ContextFunctions,
as well as in methods of Interface0D, Interface1D, Iterator, their subclasses, Noise and
IntegrationType.

* Operators' methods and functions in the ContextFunctions module were renamed from
CamelCase to lower cases + underscores.  Style modules were updated accordingly.

* Additional code clean-up was also made.
2013-02-24 02:39:38 +00:00
Tamito Kajiyama
d38a335d47 Code clean-up and fix for typos in docstrings. 2013-02-24 02:32:56 +00:00
Sergej Reich
93c3593d82 rigidbody: Don't abort connect operator if last selected object is active
Was silly logic error.
2013-02-23 23:40:51 +00:00
Campbell Barton
c42b51ed96 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.
2013-02-23 23:15:38 +00:00
Sergej Reich
92f9db6628 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.
2013-02-23 23:04:10 +00:00
Sergej Reich
c82213359a 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.
2013-02-23 23:04:07 +00:00
Sergej Reich
47bd908e01 rigidbody: Code cleanup
Clean up DNA comments.
2013-02-23 23:04:03 +00:00
Campbell Barton
233b69f0bd GHOST/X11 support for frequency, from SDL's mode switching.
also free the modes when done.
2013-02-23 22:48:16 +00:00
Bastien Montagne
92189ab353 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!
2013-02-23 20:42:15 +00:00
Brecht Van Lommel
e8f6caa384 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.
2013-02-23 20:24:02 +00:00
Brecht Van Lommel
3862e757d0 Fix #34358: shrinkwrap modifier project along normal did not work correctly
after other modifiers. It needs normals and those were not calculated.
2013-02-23 20:23:59 +00:00
Tamito Kajiyama
3bd0b89716 Code style clean-up. 2013-02-23 18:50:33 +00:00
Tamito Kajiyama
ad7c43744c Added GNU GPL header blocks. 2013-02-23 18:32:28 +00:00
Ton Roosendaal
5de307122c 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.
2013-02-23 14:52:40 +00:00
Ton Roosendaal
89e0de3c35 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.
2013-02-23 14:31:46 +00:00
Antony Riakiotakis
6a55cd889c Missed instance of ThemeGeneric.back -> ThemeGradient.gradients.high_gradient 2013-02-23 12:55:19 +00:00
Tamito Kajiyama
7b3a5f6901 Fix for __repr__() depending on .getName() and .getExactTypeName().
API users no longer need to define them in user-defined Functions, Predicates and StrokeShaders.
Also removed all .getName() and .getExactTypeName() definitions in pre-defined Functions,
Predicates and StrokeShaders subclasses.
2013-02-23 12:17:40 +00:00
Ton Roosendaal
7d81fd8231 Bugfix #34374
Fixed tooltip for checker-select, it works on the active item, not selected ones.
2013-02-23 11:51:10 +00:00
Campbell Barton
166de48ca4 code cleanup: confusingly written and named function for BGE materuial conversion: getImageFromMaterial() --> getMTexFromMaterial() 2013-02-23 07:36:40 +00:00
Campbell Barton
dddee08f27 code cleanup: bge material conversion was creating STR_String just to check for empty string for no reason (empty string was assigned irrespective). 2013-02-23 07:15:37 +00:00
Campbell Barton
375c0144c8 fix [#34378] GLSL materials using multiple UV layers fail in editmode
regression since BMesh merge.
2013-02-23 06:56:10 +00:00
Campbell Barton
0c53fb3a92 code cleanup: make editmode PASSATTRIB into static functions. 2013-02-23 05:36:15 +00:00
Campbell Barton
e42e570ff4 BGE: fix for uninitialized tangents 2013-02-23 04:49:46 +00:00
Mitchell Stokes
87ab622463 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. 2013-02-23 04:15:47 +00:00
Tamito Kajiyama
47960a3d8a Minor docstring fixes. 2013-02-23 03:07:19 +00:00
Tamito Kajiyama
ec34bf3c67 Fix for texture images left unreleased. 2013-02-23 03:05:38 +00:00
Mitchell Stokes
e4febef1fb BGE: Finally moving material IPOs to the 2.60 BGE animation system (BL_Action). It was kind of a fluke that they worked before. 2013-02-23 02:47:22 +00:00
Campbell Barton
f924750463 fix for error using uninitialized draw mode with 'm_failsafe_storage' in the BGE. 2013-02-23 02:45:12 +00:00
Campbell Barton
6c0b8ec064 add include for scons. 2013-02-23 02:03:53 +00:00
Campbell Barton
a528cb9905 code cleanup: bge - was converting float[] to MT_Vector's just to compare. use BLI_math instead. 2013-02-23 01:57:56 +00:00
Campbell Barton
9ef5d2d905 fix for error in the blenderplayer caused by r54727 (can't assume G.main is valid on load). 2013-02-23 01:33:47 +00:00
Mitchell Stokes
c00191dbe3 BGE: Object color channels can now be animated separately without zeroing out the other channels. Problem reported by Dalai via IRC. 2013-02-23 01:17:01 +00:00
Tamito Kajiyama
68b0a8e390 Freestyle Python API improvements - part 7.
Fix for PyGetSetDef and proper handling of keyword arguments were done in
UnaryPredicate0D, UnaryPredicate1D, BinaryPredicate1D, and StrokeShader classes.
Style modules were updated accordingly.  Additional code clean-up was also made.
2013-02-23 01:12:23 +00:00
Thomas Dinges
31e6af92c8 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.
2013-02-23 00:52:59 +00:00
Mitchell Stokes
bd8f4cc4d6 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. 2013-02-23 00:46:58 +00:00
Tamito Kajiyama
0fb83d78fa Fixed typoes in docstrings. 2013-02-23 00:44:39 +00:00
Mitchell Stokes
eab8a25e03 BGE: For BL_Action, use the object's scene rather than the "active" scene, which can potentially cause problems with multiple scenes. 2013-02-23 00:28:25 +00:00
Mitchell Stokes
d05cb9bca5 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... 2013-02-22 23:55:06 +00:00
Dalai Felinto
3d9dc6a2e4 WITH_PYTHON_FRAMEWORK cmake option for OSX
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:
/Library/Frameworks/Python.framework/Versions//python
by
/Library/Frameworks/Python.framework/Versions//Python
as the latter seems to be the norm)
2013-02-22 22:24:38 +00:00
Mitchell Stokes
b3c0896967 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.
2013-02-22 20:37:14 +00:00
Dalai Felinto
0945c3b43b fixing typo in include (report and patch by Jochen Schmitt) 2013-02-22 17:45:04 +00:00
Sergey Sharybin
9f764e3aa7 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..
2013-02-22 17:35:53 +00:00
Alexander Kuznetsov
5f830a0863 Applying patch #33709 for dead keys on windows.
Thanks Harley Acheson!
2013-02-22 16:42:19 +00:00
Brecht Van Lommel
ce54cc111d Fix #34357: image editor scope and clip editor track preview did not resize
properly with different DPI settings.
2013-02-22 16:11:27 +00:00
Alexander Kuznetsov
7ae17e9ed4 Fix for windows size on win32 2013-02-22 15:57:50 +00:00
Alexander Kuznetsov
2c2a42a4e8 Fix for building without python. 2013-02-22 15:54:10 +00:00
Sergej Reich
c586159438 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.
2013-02-22 14:47:11 +00:00
Campbell Barton
4df5b943ed 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.
2013-02-22 14:12:55 +00:00
Campbell Barton
7ad0790189 patch [#34103] Add explanatory comments to dna_genfile.[ch]
from Lawrence D'Oliveiro (ldo)
2013-02-22 13:35:32 +00:00