0503a4f7a6
svn merge ^/trunk/blender -r41100:41150
2011-10-24 04:18:28 +00:00
4a04f72069
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
daf51fe6cd
A big set of UI messages fixes and tweaks! No functional changes.
2011-10-20 07:56:04 +00:00
9f8608a8ec
svn merge ^/trunk/blender -r40950:40997, bmesh is in sync with head again
2011-10-14 01:49:37 +00:00
4e118bb22f
svn merge ^/trunk/blender -r40890:40950
2011-10-14 01:35:20 +00:00
7eadd540d4
svn merge ^/trunk/blender -r40872:40890
2011-10-13 22:50:01 +00:00
d893ac690c
rename confusing constants (no functional change)
...
- OB_BOUND_POLYT --> OB_BOUND_CONVEX_HULL
- OB_BOUND_POLYH --> OB_BOUND_TRIANGLE_MESH
2011-10-13 22:14:41 +00:00
f0cd9f987d
- for some reason navmesh wasnt drawing when VBO was enabled.
...
- fix navmesh crash (may well have been from own changes)
- changing VBO's now redraws all windows - useful for checking if VBO draws differently.
2011-10-10 02:56:26 +00:00
17b66b46ad
fix crash for recent navmesh edits when setting a non-mesh object to a navmesh.
...
also minor cleanup.
2011-10-09 21:43:13 +00:00
7306eb84f0
move NavMesh draw code out of being a modifier and into DerivedMesh drawing hack (which IMHO is less bad then mis-using a modifier only to override drawing calls).
2011-10-09 21:11:51 +00:00
aa6d7ebd14
svn merge ^/trunk/blender -r40720:40872
2011-10-09 07:31:15 +00:00
cfb154ca58
fix [ #28800 ] Scene NULL in frame change callback, crashes on property update.
2011-10-07 00:08:40 +00:00
646a397297
add a collection function slot for assignment (not used yet).
2011-10-01 15:40:32 +00:00
effea8c29b
svn merge ^/trunk/blender -r40511:40587
2011-09-27 03:12:31 +00:00
9931c9442e
Minor: Other UI strings typos and tweaks. Also updated french po & mo.
2011-09-25 09:55:13 +00:00
81f7e361d2
make new rna variables more consistant with existing names.
2011-09-25 02:49:46 +00:00
37cd3368da
Minor: Other UI strings typos and tweaks. Also updated french po & mo
2011-09-24 09:57:47 +00:00
7126a4699e
svn merge ^/trunk/blender -r40367:40368 --- raddish weight paint merge
2011-09-22 16:09:27 +00:00
14475d07cd
svn merge -r40295:40367 ^/trunk/blender
2011-09-21 17:15:54 +00:00
2cbf475fb2
Merged 40338-40364
2011-09-19 15:36:30 +00:00
1794767171
/blender/makesrna: Removed final points in UI strings and messages.
...
Plus a few splits of very long lines…
2011-09-19 13:23:58 +00:00
73863a1da5
Split do_weight_paint_vertex() to isolate the simple case.
...
Added a tool-tip to the "fix deforms" op.
Removed code markers:
"Radish"
2011-09-18 17:10:28 +00:00
a9c99f58f4
Changed the branch code markers to say "Radish" in response to a review.
...
They weren't & aren't meant to show ownership, they just help me navigate my related code.
2011-09-18 03:49:00 +00:00
96ada15d79
svn merge -r40197:40311 ^/trunk/blender
2011-09-18 02:35:26 +00:00
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
