15e6d6cd75
svn merge ^/trunk/blender -r41226:41227 .
2011-10-24 12:43:08 +00:00
809131bc80
added function BKE_library_filepath_set which sync's the libraries absolute path when setting to a relative value, before this you could never be sure if a libraries absolute path was valid or not because the user might have changed the relative library path in the outliner, now setting from the outliner and py/rna syncs the absolute path.
2011-10-24 04:52:43 +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
d546002476
Merged changes in the trunk up to revision 40911.
...
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
2011-10-10 21:15:11 +00:00
aa6d7ebd14
svn merge ^/trunk/blender -r40720:40872
2011-10-09 07:31:15 +00:00
8714fb7019
replace sprintf with strcpy where no formatting is done and return value isn't used.
2011-10-09 06:03:38 +00:00
7db432d29d
Merged changes in the trunk up to revision 39826.
...
Made a major amount of conflict resolution for code adaptation to
the animation system updates introduced in the Pepper branch recently
merged to the trunk.
Resolved conflicts:
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/library.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/animation/keyframes_edit.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/space_nla/nla_buttons.c
source/blender/editors/space_nla/nla_channels.c
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_main_api.c
2011-09-03 20:48:43 +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
43ab8e8624
* Merge trunk up to r39790.
...
* Subversion bump (also for init_userdef_do_versions).
* Minor fix for compilation without ffmpeg.
2011-08-30 08:22:03 +00:00
5065d4c744
svn merge -r39664:39762 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-08-29 00:46:56 +00:00
1c153b011d
Merged changes in the trunk up to revision 39759.
2011-08-28 23:25:13 +00:00
cd0e92c5b7
fix for building with msvc, ssize_t is more correct but in this case its not going to give issues.
2011-08-27 07:06:44 +00:00
95c5611570
subtraction on unsigned values didnt work as intended for copying ID's.
2011-08-27 02:45:35 +00:00
13249b925e
3D Audio GSoC:
...
Speaker objects fully functional!
Minor changes:
* Fixed three memory bugs found via valgrind.
* Fixed bug with jack transport crashing after file loading.
* Sound NLA Strips now start at CFRA instead of 0.
2011-08-09 08:38:14 +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
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
2f10ded896
Compiler warning fixes
2011-06-29 05:07:12 +00:00
2f60a5030f
Actions can now be made single-user from the Outliner
...
* Use the same method as from unlinking actions to do this.
* Split off the make single-user code used for the ID-browser into a
function in blenkernel which can be used elsewhere. Getting materials
to also work using this method proved to be a bit too tricky (due to
the whole messy ob vs obdata situation), so I haven't done that.
2011-06-29 04:34:20 +00:00
31471f644c
Merged changes in the trunk up to revision 36551.
...
Conflicts resolved:
source/creator/SConscript
2011-05-09 01:38:29 +00:00
6ef77cf95a
=bmesh= merge from trunk at r36529
2011-05-08 23:43:18 +00:00
1093f69e50
Style Cleanup
...
- duplicate cases in if/else
- calc inside sizeof(...)
- redundant NULL checks.
- assignment to self.
- fix error getting text prefix for screen ID button.
2011-05-01 10:14:09 +00:00
bd860f89e7
Merged changes in the trunk up to revision 36301.
2011-04-23 22:08: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
c98148a963
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
33efa9eeb6
Merged changes in the trunk up to revision 35367.
...
To branch builders: From this revision Python 3.2 will be used.
Don't forget svn update in the "lib" directory as well.
2011-03-06 12:13:32 +00:00
c9ee017fb5
Py/RNA API test code to prevent crashing blender when python references freed ID's.
...
This uses pythons GC so its no overhead during runtime but makes removing ID's slower.
Commented definition 'USE_PYRNA_INVALIDATE_GC' for now, so no functional change.
2011-03-01 09:02:54 +00:00
Nathan Letwory
0ff06e21cd
doxygen: blender/blenkernel tagged.
2011-02-27 20:40:57 +00:00
f01261d040
merge with/from trunk at r35190
2011-02-27 06:19:40 +00:00
63b31ef91b
Merged changes in the trunk up to revision 35203.
...
Conflicts resolved:
source/creator/creator.c
source/blender/python/intern/bpy.c
2011-02-26 20:21:09 +00:00
Nathan Letwory
5b607701a7
doxygen: prevent GPL license block from being parsed as doxygen comment.
2011-02-23 10:52:22 +00:00
3789c398ff
Merged changes in the trunk up to revision 34828.
...
Conflicts resolved:
source/blender/makesrna/RNA_enum_types.h
2011-02-13 23:47:30 +00:00
0955c664aa
fix for warnings from Sparse static source code checker, mostly BKE/BLI and python functions.
...
- use NULL rather then 0 where possible (makes code & function calls more readable IMHO).
- set static variables and functions (exposed some unused vars/funcs).
- use func(void) rather then func() for definitions.
2011-02-13 10:52:18 +00:00
55f68c3657
fix for more warnings.
...
- modifier code was using sizeof() without knowing the sizeof the array when clearing the modifier type array.
- use BLI_snprintf rather then sprintf where the size of the string is known.
- particle drawing code kept a reference to stack float values (not a problem at the moment but would crash if accessed later).
2011-02-12 16:54:24 +00:00
Lukas Toenne
69e72ea427
Removed the internal_select parameter from ntreeCopyTree. This was used just in one place when duplicating nodes, which is not an actual copying of the tree. The node duplicate operator now copies selected nodes itself.
2011-02-11 09:37:58 +00:00
0ec378f3fe
Merged changes in the trunk up to revision 34193.
...
Conflicts resolved:
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/animation/keyframes_edit.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/space_nla/nla_channels.c
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c
API changes resolved:
source/blender/freestyle/intern/system/PythonInterpreter.h
2011-01-09 15:07:14 +00:00
89c9aaaa25
remove references to BKE_utildefines where its not needed.
...
- move GS() define into DNA_ID.h
- add BLI_utildefines as an automatic include with makesrna generated files.
2011-01-07 19:18:31 +00:00
8f21a43535
split BKE_utildefines.h, now it only has blender specific defines like GS() MAKE_ID, FILE_MAXDIR, moved the generic defines to BLI_utildefines.h.
...
no functional changes.
2011-01-07 18:36:47 +00:00
370adc51ff
py api function to tag all ID blocks, was available in 2.4x as.
...
bpy.data.meshes.tag = True
But this was only useful for setting so make it a function for 2.5x.
bpy.data.objects.tag(False)
X3D: use tagging rather then a name dictionary, this fixes a bug where library name overlaps could mix up names.
2011-01-05 05:33:27 +00:00
3368a595da
Merged changes in the trunk up to revision 33765.
2010-12-18 11:49:12 +00:00
f90a2123ee
no functional change: only check against OB_RECALC_ALL but don't use for assignment.
...
Makes adding new flags give ambiguous results and also makes it less easy to tell whats intended.
In some places it looks like OB_RECALC_TIME should be left out too.
2010-12-17 15:51:42 +00:00
e5e039d626
Bugfix #25264
...
Bad user counting went on, ID users could be set zero whilst
having Fake user set. Also ensured the code using the BKE
calls for increment/decrement.
2010-12-17 14:20:20 +00:00
8a2eb1f590
* Merged changes in the trunk up to revision 33492.
...
* Fixed a bug in listing all style modules in source/blender/blenlib/intern/bpath.c.
2010-12-06 01:23:18 +00:00
263830f000
Enabled GCC -Wwrite-strings warning for CMake and replaced many 'char's for 'const char's,.
...
Only one functional change where Transform orientations passed "" to BIF_createTransformOrientation() which could then have the value written into.
2010-12-03 17:05:21 +00:00
a04603d2a0
Merged changes in the trunk up to revision 33348.
2010-11-27 12:48:35 +00:00
c88991adee
Small feature fix: zero-user blocks get indicated with "0" again in
...
browsing.
2010-11-23 19:06:54 +00:00
51dcbdde03
use 'const char *' by default with RNA functions except when the value is flagged as PROP_THICK_WRAP.
...
Also use const char in many other parts of blenders code.
Currently this gives warnings for setting operator id, label and description since these are an exception and allocated beforehand.
2010-11-17 09:45:45 +00:00
09ba291c55
Merged changes in the trunk up to revision 33112.
2010-11-17 00:58:03 +00:00
7a62c05204
bugfix [ #24403 ] Object.copy() duplicates armature action
...
now duplicating ID data wont duplicate actions by default and the user preference is used with duplicate operators.
2010-11-09 09:53:17 +00:00
20b16e4074
de-duplicate unique naming logic, was used in 7 different places, convert into a function call.
2010-11-07 08:49:07 +00:00
43f4dbceb4
Merged changes in the trunk up to revision 32886.
2010-11-05 21:49:36 +00:00
