bd86ba2c88
svn merge -r41335:41371
2011-10-30 01:27:49 +00:00
16702c1729
Merged changes in the trunk up to revision 41225.
...
Conflicts resolved:
source/blender/render/intern/source/pipeline.c
2011-10-29 15:46:14 +00:00
e28c2ce753
bug from revision 2!, error noticed kjym3 on IRC, buffer overrun on lbarray, was 30 but 39 items beting accessed, surprising this didnt crash earlier.
2011-10-29 11:15:12 +00:00
46ae692710
Merge with trunk r41342
2011-10-28 17:00:53 +00:00
15e6d6cd75
svn merge ^/trunk/blender -r41226:41227 .
2011-10-24 12:43:08 +00:00
70bf00a74c
svn merge ^/trunk/blender -r41200:41226 .
2011-10-24 08:45:55 +00:00
ad1d3dd30f
svn merge ^/trunk/blender -r41175:41200 --- will need to apply fix after
2011-10-24 07:56:42 +00:00
77a7ec7c61
svn merge ^/trunk/blender -r41150:41175
2011-10-24 05:00:53 +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
0664868aec
BLI_make_file_string wasn't guaranteed to initialize the resulting path, some parts of the code accounted for this but most not, always initialize the string to "".
2011-10-23 05:56:55 +00:00
d4541fd891
Merge with trunk r41197
2011-10-22 16:43:23 +00:00
e417e011d5
Code cleanup: file operations merged into single header, some function names
...
made less cryptic and changed to indicate if they work on files or directories.
2011-10-22 15:35:49 +00:00
04db8ad282
misc cleanup
...
- remove redundant casts
- replace strcmp's with "" to just check first char.
- added WM_event_print(), debug mode only to print events since the structs values are not that meaningful.
- added warnings if locale/font dirs cant be found.
2011-10-21 08:16:15 +00:00
ef218c75ed
- add convenience functions BLI_split_dir_part / BLI_split_file_part, which just call BLI_split_dirfile().
...
- add a fixed value for bprogdir (the dir of bprogname), since it was being used for resource lookups.
2011-10-21 02:13:36 +00:00
b4e7451cb0
Merged changes in the trunk up to revision 41099.
2011-10-18 23:36:43 +00:00
ef1a1e1451
svn merge ^/trunk/blender -r41005:41075
2011-10-17 03:40:10 +00:00
317b649bb2
fix for buffer overrun with BLI_split_dirfile(...), was simple to do since many places don't check for filename lengyj of 79 chars which is the limit for the file selector.
...
Add max dir and file length args.
2011-10-15 03:56:05 +00:00
c4cb393e45
Fix vertex paint face selection
2011-10-14 09:05:20 +00:00
e8bb972f3c
Merge with trunk r40782
2011-10-04 11:42:44 +00:00
c0c488d0b2
Merged changes in the trunk up to revision 40520.
2011-09-24 21:39:11 +00:00
9494340dae
svn merge ^/trunk/blender -r40432:40491
2011-09-23 13:04:01 +00:00
bf7f88566c
Remove checks for voxel data when texture type is known.
2011-09-22 17:52:27 +00:00
15cb47bf91
Merge with trunk r40409
2011-09-20 17:51:04 +00:00
f24255b5a0
Fix for the Link/Append commands not working when scenes had line styles.
...
The problem was reported by mato.sus304, thank you!
2011-09-15 00:06:49 +00:00
6be21a9125
Implemented a calligraphic thickness modifier in the Parameter Editor mode.
...
Also fixed a typo in the docstring of the CalligraphicShader.
2011-09-11 19:57:38 +00:00
75b3936128
svn merge -r40075:40104 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-10 23:49:39 +00:00
353713afe8
Merged changes in the trunk up to revision 40096.
...
Conflicts resolved:
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/CMakeLists.txt
Note for branch builders: Enabling Blender Player may cause linker errors.
2011-09-10 13:36:27 +00:00
c1c4743696
svn merge -r 39975:40061 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-09 12:21:41 +00:00
24c9369477
svn merge -r39990:39991 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-08 08:08:31 +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
bac64b39e9
Merging r39948 through r39988 from trunk into vgroup_modifiers.
2011-09-07 05:40:12 +00:00
a167ee1262
svn merge -r39951:39986 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-07 00:46:11 +00:00
c8a092789f
Node merge: some forward compatibility code to avoid crash loading files with
...
node groups in older version, and to keep unconnected/default socket values.
2011-09-06 16:51:10 +00:00
e74e245030
svn merge -r39890:39951 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-06 03:16:12 +00:00
c643363905
svn merge -r39930:39947 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-06 00:31:00 +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
42faf7ae41
Merge with trunk r39928
2011-09-05 17:06:09 +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
e4fd20c20c
Merging r39652 through r39842 from trunk into vgroup_modifiers.
2011-09-01 17:49:57 +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
5bac37f6d4
* Reverting Titlecard commit r37537
...
* Reverting update recent files commit r37155
* Turning reference counts into unsigned ints
* Minor things
2011-08-29 15:01:55 +00:00
39b66f9ad4
Merge with trunk r39750
2011-08-28 16:46:40 +00:00
fd4575b2e3
svn merge -r39493:39664 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-08-24 02:29:45 +00:00
33bb1ed53e
Merged changes in the trunk up to revision 39661.
2011-08-24 00:18:26 +00:00
a35b3c5b50
fix [ #28352 ] Deleting group name in particle system -> panel: Render crashes Blender
2011-08-23 20:49:06 +00:00
e890469073
Merging r39486 through r39651 from trunk into vgroup_modifiers.
2011-08-23 12:45:35 +00:00
f0d5abfcb2
Merging trunk up to r39637.
2011-08-22 20:31:46 +00:00
7d316b70b8
rename NAN_BUILDINFO --> WITH_BUILDINFO
2011-08-22 16:54:26 +00:00
c5106fd097
Merge with trunk r39589
2011-08-21 19:37:19 +00:00
