Commit graph

41719 commits

Author SHA1 Message Date
Sergey Sharybin
81985657da Merging revision 51226 and 51227 from trunk into 2.64a tag 2012-10-09 18:20:56 +00:00
Daniel Genrich
a580c891a7 Bugfix [#32703] elbeem's isSimworldOk() will never return FALSE
Fixed as suggested by Campbell, thank you!
2012-10-09 13:09:03 +00:00
Daniel Genrich
f92305fcb4 Bugfix [#32677] Cloth Pinning Does Not Obey Weight Map
Problem occured when having more than one weight map available.
2012-10-09 12:59:20 +00:00
Campbell Barton
35504d627b style cleanup: also made functions static 2012-10-09 12:41:37 +00:00
Ove Murberg Henriksen
cb42de588d Adding weightpaint transfer tool.
From: https://svn.blender.org/svnroot/bf-blender/branches/meshdata_transfer

Bachelor project at Narvik university collage (Norway).
By Ove M Henriksen (Cyborgmuppet)
 
Thesis will be published at Cyborgmuppets blender page.

Thanks for letting me participate!
2012-10-09 12:25:10 +00:00
Sergey Sharybin
685bda4b98 Merging commits 51219 and 51220 from trunk into 2.64a tag 2012-10-09 11:40:33 +00:00
Sergey Sharybin
affb060c20 Revert part of 51209 -- MOUSEZOOM inversion should be done in lots of other
places as well, but it's quite large change to be done before 'a' release.

For now ignore zoom inverse for 2d view to keep things consistent,
would be re-implemented for all areas after this.
2012-10-09 11:38:42 +00:00
Sergey Sharybin
4550864f07 Fix #32824: Color management configuration check was missed on file link/append 2012-10-09 11:31:25 +00:00
Ove Murberg Henriksen
ec689d650d Fix based on code review Issue 6347064 2012-10-09 11:29:29 +00:00
Campbell Barton
8730b390fb patch [#31919] limit the number of bone deform weights per vertex. Many game engines require a limit of 4.
from Kesten Broughton (kestion)


Usage: In weight paint mode, select the mesh to have its weights culled. Click on "Limit Weights" button. A sub-panel will appear "Limit Number of Vertex Weights" with a slider field "Limit" which you can set to the appropriate level. The default level is 4, and it gets executed upon pressing "Limit Weights" so you will need to do an "undo" if your max bone limit is above 4. The checkbox "All Deform Weights" will consider all vertex weights, not just bone deform weights.
2012-10-09 10:56:35 +00:00
Ove Murberg Henriksen
7247af6af5 svn merge ^/trunk/blender -r48592:HEAD 2012-10-09 10:53:20 +00:00
Joshua Leung
27aa05ec36 Autokey warning - trying with a slight "calmer" color
Now it uses the same color used for indicating keyframes instead of using
"error" indications.
2012-10-09 10:41:51 +00:00
Joshua Leung
fca582a2da Autokey warning - Only show for the active region
In response to some of the feedback, I've taken a second look at the situation
when multiple views are open, and indeed in that situation having it display in
every region and blinking was quite overwhelming (admittedly, I've mainly been
testing on single-view setups). Now it only shows for the region that was used
for initiating the transform.
2012-10-09 10:36:07 +00:00
Sergey Sharybin
6712e74282 Motion Tracking; expose View All and Center to Current Frame to View menu of graph view 2012-10-09 10:33:24 +00:00
Sergey Sharybin
33f35647e9 Motion Tracking: move keyframe settings to per-tracking object settings 2012-10-09 10:33:18 +00:00
Joshua Leung
66edeae182 Style cleanup - replace #define lists with enums 2012-10-09 10:20:25 +00:00
Sergey Sharybin
f98428c39f Merge commit 51209 from trunk into 2.64a tag 2012-10-09 09:42:18 +00:00
Sergey Sharybin
58e8d0b57e OSX zoom pinch was using inverted direction 2012-10-09 09:38:05 +00:00
Bastien Montagne
9e0dd17813 Another refactor for 3D view's edit Transform panel. Main changes:
*Get rid of the magic numbers for median arrays, use defines instead, should make things a bit more clear and easy to edit (though there are still a bit of "array magic" on median here and there).
*Restore and extend use of RNA prop when a single (control)point of curve or lattice is selected, to allow keyframing (was added by sergey for curve radius in r41494, see [#29122], and reverted by myself in previous refactor r44599).
2012-10-09 09:14:37 +00:00
Bastien Montagne
0f8c99e585 RNA minor fixes:
*Bezier points' softbody weight was called just "weight", when it is "weight_softbody" for NURBS ones, made it the same!
*Added "weight_softbody" to Lattice points as well.
2012-10-09 08:40:20 +00:00
Sergey Sharybin
2a61fc47ad Merge commit 51191 from trunk into 2.64a tag 2012-10-09 07:13:11 +00:00
Campbell Barton
f45acb2bba patch [#31709] Text editor: scroll margin column along with text
by Sebastian Nell (codemanx)

The margin ignored horizontal scrolling.
2012-10-09 06:15:07 +00:00
Campbell Barton
b1c4809f50 rename BGE KX_GameObject attrs
* group -> group_parent
* members -> group_children

so its more clear what direction the relationship is.
2012-10-09 06:03:57 +00:00
Campbell Barton
8d2835b5e5 patch [#31875] Patch to get scene access through a game object
from Jay Parker (battery)
2012-10-09 05:58:09 +00:00
Campbell Barton
62d3754a40 fix for r51198, text wasn't flashing (gcc4.7, 64bit linux) 2012-10-09 03:44:29 +00:00
Campbell Barton
b16ca24d98 code cleanup: quiet -Wreorder 2012-10-09 03:14:38 +00:00
Campbell Barton
acf3a2790e api changelog for 2.64 and 2.63 (which I missed last release) 2012-10-09 01:07:08 +00:00
Joshua Leung
a2a9b6b9a3 Made the autokeying warning optional by adding a user pref for this
By default, this is enabled, so that newbie users who are most likely to be
caught short by this will get the benefits of this option, while seasoned
animators are likely to know where to go to turn things off (i.e. the scratch-
an-itch urge is quite a powerful motivating force...)
2012-10-09 00:59:40 +00:00
Campbell Barton
216e1c63b0 merge part of r51070 manually (the part that stops selecting unelectable bones.) 2012-10-08 21:48:56 +00:00
Bastien Montagne
6536e2d01a And more UI messages fixes... 2012-10-08 21:03:35 +00:00
Campbell Barton
0929364028 merge theme corrections
svn merge ^/trunk/blender -r51175
svn merge ^/trunk/blender -r51176
2012-10-08 21:01:09 +00:00
Bastien Montagne
bfadb9c272 Minor UI messages typo fixes. 2012-10-08 20:25:07 +00:00
Bastien Montagne
1d6dff7e34 Some minor fixes about curves' tilt... 2012-10-08 20:01:36 +00:00
Sergey Sharybin
de6e47ab3d Correction to zoom-t-mouse formula which was broken since view2d drag zoom refactoring 2012-10-08 17:41:27 +00:00
Sergey Sharybin
3469471520 Merging different fixes from trunk into 2.64a tag
This includes revisions: 51050, 51057, 51070, 51072, 51074,
                         51075, 51083, 51084, 51105, 51106,
						 51111, 51112, 51143, 51149, 51162,
						 51185.
2012-10-08 14:40:15 +00:00
Sergey Sharybin
8863b24fea Merging rendering fixes from trunk into 2.64a tag
This includes revisions: 51132, 51079, 51181, 51081, 51080
2012-10-08 14:11:04 +00:00
Sergey Sharybin
783d255379 Merging color management fixes from trunk into 2.64a tag
This includes revisions: 51041-51043, 51060, 51076, 51108, 51158, 51056, 51168, 51184
2012-10-08 14:07:03 +00:00
Sergey Sharybin
188319fd40 Merging 'a' commit from trunk 2012-10-08 13:58:56 +00:00
Sergey Sharybin
82310c2f59 committing 'a' to merge into the tag 2012-10-08 13:57:49 +00:00
Gaia Clary
018195ffae fix:[#32784] Crash when Exporting to Collada file (.dae) (was a utf8-character conversion problem) 2012-10-08 12:59:12 +00:00
Sergey Sharybin
4a5f09fc65 Fix #32795: Memory leak when rendering to video file 2012-10-08 12:58:37 +00:00
Brecht Van Lommel
6a82b985c3 Fix #32815: cycles environment render as lamp crash with resolution >= 1024. 2012-10-08 12:15:18 +00:00
Lukas Toenne
5a9bb39e34 Fix for own commit r51178, duplicate line. 2012-10-08 12:02:55 +00:00
Sergey Sharybin
db54caf430 Fix #32800: Cycles viewport incredible slow with high number of tiles
Final rendering is clamping tile resolution if it's too small, which was missing for viewport
2012-10-08 11:48:51 +00:00
Lukas Toenne
10547d4c67 Allow user config files in qtcreator project.
The blender.config file used for local #defines in qtcreator projects is rewritten on every project update. To avoid losing user settings these can now be written to an optional blender_custom.config file, which is then merged into the main blender.config on updates.
2012-10-08 11:02:11 +00:00
Campbell Barton
ea3db4a71a resize info header (was too much white space) 2012-10-08 10:50:18 +00:00
Campbell Barton
5a721a4071 speaker and empty where hardly visible 2012-10-08 10:19:59 +00:00
Campbell Barton
5b14ce7218 update to ubuntu theme 2012-10-08 10:04:36 +00:00
Campbell Barton
7614428c09 style cleanup: pep8 2012-10-08 10:03:01 +00:00
Campbell Barton
1487ef9828 quiet msvc warning & allow zero arguments to add functions. 2012-10-08 09:39:35 +00:00