griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
58,616 Commits 1 Branch 0 Tags
da170d9dc3dd84f1b77f737a94d5863b0d67dd21
Commit Graph

363 Commits

Author SHA1 Message Date
Tamito Kajiyama
1c153b011d Merged changes in the trunk up to revision 39759. 2011-08-28 23:25:13 +00:00
Miika Hamalainen
39b66f9ad4 Merge with trunk r39750 2011-08-28 16:46:40 +00:00
Campbell Barton
fa2ba5fbf5 - use static vars and functions where possible. 
- use NULL rather than 0 when used as pointers.
 2011-08-28 05:06:30 +00:00
Campbell Barton
fd4575b2e3 svn merge -r39493:39664 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-08-24 02:29:45 +00:00
Tamito Kajiyama
33bb1ed53e Merged changes in the trunk up to revision 39661. 2011-08-24 00:18:26 +00:00
Joerg Mueller
f0d5abfcb2 Merging trunk up to r39637. 2011-08-22 20:31:46 +00:00
Miika Hamalainen
c5106fd097 Merge with trunk r39589 2011-08-21 19:37:19 +00:00
Campbell Barton
d4dec1c3bc use ghash for DNA_struct_find_nr(), gives ~18% speedup on loading sintel lite, will also speedup undo. 
note: only works with CMake, wasn't able to get this working with scons, complains about same file being built in different environments.
 2011-08-20 14:23:43 +00:00
Joerg Mueller
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
Campbell Barton
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
Miika Hamalainen
c896fcae79 Merge with trunk r37849 2011-06-27 08:11:05 +00:00
Tamito Kajiyama
d65ebf8c84 Merged changes in the trunk up to revision 37799. 
Note for VS2008 plus CMake users:
I had to remove OpenEXR debug libs from the "blender" project properties >
Linker > Additional Dependencies.  Otherwise I got a number of linker errors
concerning duplicated symbols between libcmt.lib and libcmtd.lib.
 2011-06-25 00:49:53 +00:00
Campbell Barton
f7e22c729e throw an error if preprocessor definitions are used for DNA array lengths (previously would fail silently & not work right). 2011-06-18 03:14:24 +00:00
Miika Hamalainen
b937a4f5b6 Merge with trunk r37546 2011-06-16 12:00:03 +00:00
Tamito Kajiyama
32c7e22d36 Merged changes in the trunk up to revision 37388. 
Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py
source/creator/SConscript
source/blender/blenlib/intern/bpath.c
source/blender/editors/space_outliner/outliner.c
 2011-06-11 00:22:10 +00:00
Campbell Barton
8949387186 svn merge -r37028:37030 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-05-31 05:28:00 +00:00
Campbell Barton
09da9d4393 cmake maintenance 
blender_add_lib now takes a separate include argument to suppress warnings in system includes (mostly ffmpeg & python).
also only build wm_apple.c on apple+carbon configuration.
 2011-05-31 01:15:44 +00:00
Miika Hamalainen
3b41ab432b Applied Dynamic Paint 1.18f patch as a codebase for GSoC. 2011-05-24 07:08:58 +00:00
Campbell Barton
671cb93f1b svn merge -r36801:36840 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-05-24 04:35:21 +00:00
Campbell Barton
d0e4f7b9f2 remove unused code, comment some that may be useful (maintainers can remove). 2011-05-23 15:23:31 +00:00
Campbell Barton
14a2330d7b copied across changes which were missed by merging. 2011-05-09 02:45:52 +00:00
Joseph Eagar
6ef77cf95a =bmesh= merge from trunk at r36529 2011-05-08 23:43:18 +00:00
Tamito Kajiyama
bd860f89e7 Merged changes in the trunk up to revision 36301. 2011-04-23 22:08:18 +00:00
Campbell Barton
f9f771cd01 converted more mixed tab/space indentations to tabs. only whitespace changes. 2011-04-21 15:53:30 +00:00
Campbell Barton
210ee1ade4 whitespace only, no functional change mixed tabs/spaces --> tabs. 2011-04-21 13:11:51 +00:00
Joseph Eagar
c98148a963 =bmesh= merge from trunk at r36153 2011-04-15 01:19:13 +00:00
Tamito Kajiyama
3df52d4e19 Merged changes in the trunk up to revision 36092. 
Conflicts resolved:
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/render/intern/source/pipeline.c
 2011-04-11 00:09:56 +00:00
Campbell Barton
a7507e945d fix [#26803] Libs paths are case sensitive in windows 
use case insensitive path comparison on windows: BLI_path_cmp
 2011-04-06 06:03:48 +00:00
Joseph Eagar
3cb70bd2c5 scons fix 2011-03-17 23:35:51 +00:00
Joseph Eagar
bbbbea6024 scons fix 2011-03-17 23:30:29 +00:00
Tamito Kajiyama
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
Campbell Barton
c7fccc84bf use NULL rather then 0 for pointer assignments & comparison, modifier, imbuf & editors. 2011-03-05 10:29:10 +00:00
Campbell Barton
709c727c51 replace 0 with NULL when used as a pointer 2011-03-03 17:58:06 +00:00
Joseph Eagar
f01261d040 merge with/from trunk at r35190 2011-02-27 06:19:40 +00:00
Tamito Kajiyama
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
6aae3bb5c8 doxygen: small fixes and tag adding 2011-02-25 10:20:37 +00:00
Campbell Barton
12e4c52c5a cmake was using dna source list with the variable out of scope, possibly causing dependency problems. 2011-02-22 06:23:07 +00:00
Nathan Letwory
322ff7dfe4 I swear, it was just an innocence change in guardedalloc! 
The butterfly wing flap, causing a nice storm in the rest of blender.

Now all dependencies should point ok again. CMakers, do double-test.
 2011-02-21 12:35:04 +00:00
Tamito Kajiyama
70aa63306a Merged changes in the trunk up to revision 34996. 
Conflicts resolved:
C:\bf-blender\soc-2008-mxcurioni\doc\python_api\sphinx_doc_gen.py
C:\bf-blender\soc-2008-mxcurioni\source\blender\makesrna\RNA_types.h
C:\bf-blender\soc-2008-mxcurioni\source\blender\render\SConscript
 2011-02-19 23:51:18 +00:00
Nathan Letwory
f697247f0e Start simple intros for intern and extern libs. 
Some reorg of modules/pages, start makesdna and makesrna.
In many places license block needs to be changed to not start with /**, because otherwise documentation will go weird.
 2011-02-17 16:17:40 +00:00
Nathan Letwory
f336b80d7f Starting work on doxygen cleanup. Many things still to be done. 2011-02-17 05:57:18 +00:00
Tamito Kajiyama
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
Campbell Barton
92672d0c1c quiet some clang warnings. 2011-02-12 05:12:26 +00:00
Tamito Kajiyama
5ed1597e26 Merged changes in the trunk up to revision 34670. 2011-02-06 18:05:05 +00:00
Campbell Barton
0d3cf5c8a6 Script to test import operators, so a single command can execute an operator on all files in a directory and optionally save out blend files for inspection. 
This comes in handy for testing importers against 100's of files, quickly showing breakages and easier to setup then unit tests.

Example usage:

  blender.bin --background --python source/tests/batch_import.py -- \
              --operator="bpy.ops.import_scene.obj" \
              --path="/data/testfiles/obj" \
              --match="*.obj" \
              --start=0 --end=50 \
              --save_path="/tmp/test"


Also found my name was spelt wrong in some places :)
 2011-02-01 12:47:50 +00:00
Tamito Kajiyama
4e9a519e22 Merged changes in the trunk up to revision 34574. 2011-01-30 23:41:58 +00:00
Campbell Barton
89c617a116 remove nan-makefiles 2011-01-30 15:29:22 +00:00
Tamito Kajiyama
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
Campbell Barton
7ad97b04b7 cmake: share the DNA_*.h list definition between makesrna and makesdna 2011-01-07 11:08:47 +00:00
Ton Roosendaal
7ec8761250 Fixing bugs in future: 
DNA reconstruct now terminates strings, when the new string
in a file is longer than in current definition. This will
enable a safer ID and other name lengthening, keeping at
least some forward compitability.
 2011-01-05 10:54:30 +00:00