1ff373ef5b
svn merge -r40166:40279 ^/trunk/blender
2011-09-17 04:59:14 +00:00
0d355a8a2c
replace BLI_strncpy with BLI_strncpy_utf8 where input isnt ensured to be valid.
...
also replace strcpy's which copy using "" with str[0]='\0'
2011-09-15 12:26:48 +00:00
101937e2dd
replace rna_update_active_object with NC_GEOM|ND_DATA notifier (as pointed out by Matt Ebb), also some whitespace edits to match trunk.
2011-09-15 07:06:45 +00:00
86777f46e1
- use a flag define for bDeformGroup->flag rather than setting TRUE/FALSE
...
- rename RNA bDeformGroup.flag to "lock_weight"
2011-09-14 07:07:17 +00:00
7d02e66256
svn merge -r40000:40179 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-13 10:05:30 +00:00
92089e3c4d
svn merge -r39900:40000 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-13 09:07:20 +00:00
b310a76a1b
svn merge -r39558:39800 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-13 06:39:17 +00:00
297fb6d7f7
svn merge -r40117:40124 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-11 13:23:30 +00:00
933a19c997
Game Engine:
...
Fixed some more abbreviations in the UI.
2011-09-11 10:00:43 +00:00
75b3936128
svn merge -r40075:40104 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-10 23:49:39 +00:00
dbd6658d73
svn merge -r 37306:39975 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-07 15:34:04 +00:00
e74e245030
svn merge -r39890:39951 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-06 03:16:12 +00:00
Lukas Toenne
8e0fe8bff7
Merged the particles-2010 branch with node improvements into trunk.
...
This branch adds mostly organizational improvements to the node system by renaming the node folders and files. A couple of internal features have been added too.
Detailed information can be found on the wiki page:
http://wiki.blender.org/index.php/User:Phonybone/Particles2010
2011-09-05 21:01:50 +00:00
f1eab8e853
Fix #28503 : Selecting a Grease Pencil from the Properties panel does not update 3D View
...
Added missing notifiers.
2011-09-04 15:53:12 +00:00
9bc92b2146
svn merge -r39781:39792 https://svn.blender.org/svnroot/bf-blender/trunk/blender , merge pepper, manually merged source/blender/editors/transform/transform_generics.c
2011-09-01 00:35:30 +00:00
c58fb76f1a
Merged 39338-39558
2011-08-19 17:15:30 +00:00
23807d1fb4
Merging trunk up to r39447.
2011-08-16 14:11:58 +00:00
74ca6070b4
svn merge -r39384:39433 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-08-16 06:53:03 +00:00
cdb5d11c5f
patch [ #22523 ] Expose Object.parentinv matrix via RNA
...
from Balajee R C (balajeerc)
2011-08-15 17:29:07 +00:00
3e85ec432e
3D Audio GSoC:
...
Adds new speaker object type.
Notes:
* Needs some nice icons
* Quickily review by Joshua Leung (5 mins)
* Properties UI updated (with help of Thomans Dinges)
* Speakers have their own theme color
* No real audio functionality yet.
* Minor bug regarding lamps/lattices fixed in interface_templates.c
I personality tested:
* Creation, Deletion, Duplication
* Saving, Loading
* Library linking (incl. make local)
* Tracking
* Dope Sheet, Outliner
* Animation
* Drawing (incl. Theme)
2011-08-01 11:44:20 +00:00
6d5080783e
svn merge -r38500:38600 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-07-26 04:17:15 +00:00
fc95382a97
svn merge -r38400:38500 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-07-26 03:55:23 +00:00
cadfac5a0f
svn merge -r38000:38200 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-07-25 17:51:30 +00:00
2dc6b8f835
svn merge -r37700:37800 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-07-25 14:34:36 +00:00
a7815053ef
svn merge -r37600:37700 https://svn.blender.org/svnroot/bf-blender/trunk/blender
...
manually merged source/blender/editors/uvedit/uvedit_unwrap_ops.c
2011-07-25 12:59:54 +00:00
05c6d22af1
Merged from trunk 38474-38568
2011-07-21 16:51:36 +00:00
c608288d76
add tip that duplicator system doesnt support xray / transp object draw options since we keep getting reports about this.
2011-07-21 01:37:15 +00:00
52d12852e7
svn merge -r38157:38474 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-07-18 14:49:05 +00:00
9fa20e6d88
fix [ #28003 ] Unable to delete vgroup
...
still need to find how an invalid defgroup index is set, but at least dont show the vertex group as selected when its not.
2011-07-18 07:38:44 +00:00
7858d9348e
Merged 37865-38124
2011-07-06 13:49:47 +00:00
0e0eba9f79
fix for crash when setting layers or saving when there is no active scene - only really happens when running python scripts on startup.
2011-07-04 05:23:36 +00:00
84ea89e25f
Merged from trunk with revision range 36835-37865,
...
(No conflicts had to be manually resolved)
Gave weight paint a basic ability to draw edges and vertices with an option
(with colors for selected/unselected),
but I didn't make any vertex selection functions available in weight paint mode yet
(tested with edit mode for now).
2011-06-27 17:21:08 +00:00
53bf66a579
checks in rna range functions that the max value cant be less than the min.
...
also fix for invalid rage for FILE_OT_filenum.
2011-06-23 06:13:21 +00:00
418d2ce49e
allow rna to set vertex parent indices, blender checks for invalid values on access.
...
build blenderplayer by default on linux with scons.
2011-06-21 07:41:49 +00:00
42e062fc88
Made the Multi-Paint check box control what was being drawn so that it doesn't always draw the groups together when multiple bones are selected.
2011-06-09 16:38:47 +00:00
f122a74b1e
svn merge -r37078:37335 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-06-09 15:20:29 +00:00
Nick Samarin
5ceb8b3d35
synched with trunk at revision 37212
2011-06-05 18:51:00 +00:00
3a6adc0ed3
fix [ #27554 ] vertex group names
...
- duplicate vertex group names were not being checked for.
- also made the first duplicate end with .001 rather than .000
2011-06-05 04:52:32 +00:00
9d2abb445a
svn merge -r37030:37035 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-05-31 06:39:57 +00:00
08d6932c86
svn merge -r36900:37028 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-05-31 05:11:04 +00:00
348f947d80
tag unused rna args.
2011-05-31 02:14:25 +00:00
3cde378fea
2011-05-27 19:13:54 +00:00
155d589333
add the property as an argument to enum item functions, not used yet but needed for dynamic python enums.
2011-05-26 13:38:16 +00:00
4514be8f4f
svn merge -r36672:36725 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-05-17 07:03:12 +00:00
Nick Samarin
a918040902
synched with trunk at revision 36569
2011-05-16 20:30:59 +00:00
7459133648
Patch [ #27344 ] 300+ New/changed tooltips by Davis Sorenson (dsavi). Thanks a lot!
...
Reviewed by Tom Musgrove and myself.
From the patch description:
ValterVB on #blendercoders submitted a long list of missing tooltips in Blender, and I went through the list and added all I knew. After that I crowdsourced the rest by putting a spreadsheet on Google docs and having people fill in the missing ones that I didn't know. So if there's some weird tooltip in there that doesn't make sense, that's why.
Thanks to Wolter, spacetug and others on BlenderArtists for contributing tooltips.
2011-05-15 17:59:48 +00:00
21a9dc8d8b
svn merge -r36564:36583 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-05-10 00:45:06 +00:00
885141c9de
patch [ #21740 ] Image support for Empty Objects
...
from Andy Braham (andybraham)
This adds support for empties to reference images and draw in the 3D view.
Modifications from the original patch.
- use an empty draw 'image' type
- use image aspect ratio for non-square-pixels
- when the image is not found, still draw the frame.
2011-05-09 16:31:54 +00:00
14a2330d7b
copied across changes which were missed by merging.
2011-05-09 02:45:52 +00:00
6ef77cf95a
=bmesh= merge from trunk at r36529
2011-05-08 23:43:18 +00:00
