e936c78251
svn merge ^/trunk/blender -r41503:41575
2011-11-06 10:38:44 +00:00
440c1c2c17
As discussed on the mailing list, removing the non-functional,
...
incompatible, and unmaintainable Time Offset cruft.
- Slow Parenting lives another day (just), although it now carries
appropriate cautionary disclaimers. It's only really for the Game
Engine nowadays, as that's the only place where it can possibly work
with any reliability.
- "Animation Hacks" panel is now "Relations Extras". I could've merged
the two panels, though I figured these options weren't that frequently
used to justify taking up screen-space by default along with the panel
2011-11-06 05:46:45 +00:00
647447db58
Code refactoring: split lamp functions from object.c into new lamp.c.
2011-11-05 13:11:49 +00:00
9884129117
Code refactoring: split camera functions from object.c into new camera.c.
2011-11-05 13:00:39 +00:00
ff837cbe9b
svn merge -r41310:41329 ^/trunk/blender
2011-10-28 05:17:09 +00:00
4b635d1631
use generic path remapping when making all library data local, previously only image paths were getting corrected, now all paths will (scene image seq strips, pointcache etc)
2011-10-28 04:44:59 +00:00
15e6d6cd75
svn merge ^/trunk/blender -r41226:41227 .
2011-10-24 12:43:08 +00:00
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
5cf593a778
strcpy() --> BLI_strncpy(), where source strings are not fixed and target size is known.
2011-10-19 23:10:54 +00:00
aa6d7ebd14
svn merge ^/trunk/blender -r40720:40872
2011-10-09 07:31:15 +00:00
3b996ac1b3
add macro OB_TYPE_SUPPORT_MATERIAL, type checks were being done inline, some comparing range, some using ELEM#(), once was missing metaball check.
2011-10-03 17:29:43 +00:00
14475d07cd
svn merge -r40295:40367 ^/trunk/blender
2011-09-21 17:15:54 +00:00
f157a543c6
/blender/editors: Removed final points in UI strings and messages.
...
Plus a few cuts in very long lines…
2011-09-19 12:26:20 +00:00
dd204cb9f7
Fix for add hook/vertex parent for meshes
...
The only way to achieve this is to re-load editMesh.
After this commit you can't iterate through vertices and insert
hooks/parents from script anymore -- this operators are now
treated as topology-changing and shouldn't be used when iterating
via geometries.
2011-09-19 08:25:31 +00:00
1ff373ef5b
svn merge -r40166:40279 ^/trunk/blender
2011-09-17 04:59:14 +00:00
1741269d30
resolve bad level calls from blenkenel/ into editors/ & remove editors from the include path from CMake & SCons.
...
* ED_curve_editnurbs --> curve_editnurbs
* ED_sculpt_modifiers_changed --> object_sculpt_modifiers_changed
2011-09-14 00:37:27 +00:00
d44982508e
fix for make vertex parent (reported todo)
2011-09-06 05:04:26 +00:00
7495757553
svn merge -r39890:39889 source/blender/editors/object/object_relations.c source/blender/editors/object/object_hook.c
...
This change has been reverted in trunk so reverse merging the merge.
2011-09-06 01:23:43 +00:00
919bd181b7
Partial revert commit 39878 "Fix #28280 : Insert Hook wrong index"
...
Such load/make edit structures introduced regression into iterators
via object's geometry (vertices, edges, control points and so) when
adding hooks in the body of this iterator.
Fix for wrong index should be non-destructable for geometry.
This will fix #28506 : Unusual behavior in curves.
2011-09-05 08:20:11 +00:00
5c22d9f916
svn merge -r39877:39878 https://svn.blender.org/svnroot/bf-blender/trunk/blender , merged manually
2011-09-03 12:39:17 +00:00
2fb2075c5b
Fix #28280 : Insert Hook wrong index
...
Use quite easy and stupid approach like it used for shape keys:
re-make editmesh (editcurve or editlattice) before creating index array
for hook or storing vertex index in parenting object.
Even if hook was added in "current" edit mode, it should be re-mapped on
loading edit data because topology could be changed after it was created.
Such kind of re-loading edit structures is the easiest way for now to
update keyindexes to relevant state.
Also, fixed bug with not re-mapping indices for vertex-parented objects.
Really old error, not sure why it wasn't noticed yet.
2011-09-02 15:19:30 +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
ef18ec335f
svn merge -r39145:39286 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-08-11 05:04:01 +00:00
226e424cb2
svn merge -r39057:39286 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-08-11 04:53:57 +00:00
cc0ec3aa33
fix [ #28178 ] make single user copy of object data doesn't work
2011-08-08 08:22:01 +00:00
5c26223106
svn merge -r38804:38971 https://svn.blender.org/svnroot/bf-blender/trunk/blender , manual merge of source/blender/editors/transform/transform.c
2011-08-05 08:02:04 +00:00
c284725a1a
3D Audio GSoC:
...
* versioning stuff for btheme->tv3d.speaker
* separating object.c speaker functions in own source file
Thanks Brecht for the suggestions.
2011-08-04 07:12:03 +00:00
4e8e502c02
Merging trunk up to r38932.
2011-08-02 12:16:06 +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
f66ec41b6a
quiet some compiler warnings & fix possible (but unlikely) crash.
...
also added GPLv2+ header to resources.c.
2011-07-30 09:24:10 +00:00
794f3291fe
svn merge -r38200:38300 https://svn.blender.org/svnroot/bf-blender/trunk/blender , source/blender/gpu/intern/gpu_buffers.c updated from trunk and re-made edits to use getTessFace* functions.
2011-07-26 03:00:55 +00:00
cadfac5a0f
svn merge -r38000:38200 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-07-25 17:51:30 +00:00
cc0abf9963
svn merge -r37900:38000 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-07-25 16:12:54 +00:00
b709b52f46
svn merge -r37500:37600 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-07-24 13:21:54 +00:00
2bb08ee48e
Wrong tooltip for OBJECT_OT_make_links_scene() operator.
2011-07-09 17:09:28 +00:00
cf71712bba
Fix #27883 : object actions did not get duplicated on full scene copy.
2011-07-06 12:33:33 +00:00
1f2c93f9f7
Fix #27816 : Outliner does not update when parents are cleared
...
Added NC_OBJECT|ND_PARENT notifier to OBJECT_OT_parent_clear operator.
2011-07-01 05:58:28 +00:00
aaf7dae5f1
Code cleanup: remove unused shaded draw mode code.
2011-06-15 10:17:06 +00:00
08d6932c86
svn merge -r36900:37028 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-05-31 05:11:04 +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
671cb93f1b
svn merge -r36801:36840 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-05-24 04:35:21 +00:00
bf65ed9447
fix [ #27443 ] "Make single user Material+Tex" doesn't work for textures
2011-05-22 17:10:24 +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
5b920bc2ff
Some strings to store ID names were too small, could cause stack corruption.
...
corrected these and replaced 'sizeof(((ID *)NULL)->name)-2' with 'MAX_ID_NAME-2'.
2011-04-19 06:59:49 +00:00
6bdb5e75ce
fix [ #27015 ] RNA Bug: Unpacking sounds with a long ID name fails: sound ID length wrong?!
...
also fix for OBJECT_OT_proxy_make and RENDER_OT_render using incorrect lengths for ID names.
2011-04-18 15:20:19 +00:00
c98148a963
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
8b6b5341a5
move object re-linking into a function.
2011-03-25 08:43:41 +00:00
d8e6dd705f
fix [ #26607 ] blender won't duplicate or assign new drivers on duplication
2011-03-25 07:34:44 +00:00
