griefith/test
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
ddcb91fc21 Merged changes in the trunk up to revision 34010. 2011-01-02 18:34:32 +00:00
Campbell Barton
6fdfa97edb CMake: use blender_include_dirs("${OPENGL_INCLUDE_DIR}") rather then blender_include_dirs(${OPENGL_INCLUDE_DIR}) 
Apparently this is needed for MSVC in some cases, reported by Tamito Kajiyama r33895.
 2010-12-31 04:29:11 +00:00
Tamito Kajiyama
3ead3c4ff3 Merged changes in the trunk up to revision 33894. 
A note for branch users: CMake 2.8 on 64-bit Windows Vista raised
an error in line 948 of soc-2008-mxcurioni/CMakeLists.txt due to
an invalid argument for the blender_include_dirs macro:

  blender_include_dirs(${OPENGL_INCLUDE_DIR})

The command above should be:

  blender_include_dirs("${OPENGL_INCLUDE_DIR}")
 2010-12-27 01:38:23 +00:00
Campbell Barton
5e382eb8e5 rename blenderlib to blender_add_lib 2010-12-22 23:09:30 +00:00
Guillermo S. Romero
29799bf09c Compact -I paths in makefiles for more readble files/output. 
Also some white space cleaning and removal of redundant parameter.
 2010-12-22 22:15:20 +00:00
Tamito Kajiyama
3368a595da Merged changes in the trunk up to revision 33765. 2010-12-18 11:49:12 +00:00
Campbell Barton
566bda734a last commit to fix warnings didnt set them at all, not it works as it should. 
also made cmakes output a lot quieter, messages can be uncommented for debugging or added back if other devs need this for some reason.
 2010-12-16 12:48:30 +00:00
Campbell Barton
afacd18498 use lowercase for cmake builtin names and macros, remove contents in else() and endif() which is no longer needed. 2010-12-08 08:43:06 +00:00
Tamito Kajiyama
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
Campbell Barton
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
Campbell Barton
b45c3363fd fix for some pedantic warnings. 2010-12-03 01:52:28 +00:00
Campbell Barton
e8397e6193 include headers in cmake source, added a script to check for consistency, reporting missing headers & C files. 
this is important so IDE's using CMake integration always get blender headers. - QtCreator & MSVC for eg, probably others too.
 2010-11-29 04:35:56 +00:00
Tamito Kajiyama
a04603d2a0 Merged changes in the trunk up to revision 33348. 2010-11-27 12:48:35 +00:00
Campbell Barton
39b7bfe6bd - check IF WIN32 AND NOT UNIX (for cygwin) 
- patch from Mike S to enable OpenMP and xcode
 2010-11-21 13:41:43 +00:00
Tamito Kajiyama
df528a9209 Merged changes in the trunk up to revision 32124. 2010-09-25 21:03:16 +00:00
Campbell Barton
dea59cc5eb warning fixes and minor cmake changes. 2010-09-18 03:55:56 +00:00
Campbell Barton
d5e11d409f fix for a (probably harmless) bug in makesdna where 1 byte off the end of the buffer was used in a comparison. 
also fixed a memory leak.
 2010-09-18 03:46:13 +00:00
Joseph Eagar
82432d0d99 merge from trunk at r31523 2010-09-07 05:47:34 +00:00
Tamito Kajiyama
9c6feb1987 * Merged changes in the trunk up to revision 31789. 
* Made a local fix for a compilation error with VC++ 2008 and
CMake, reported to the bf-committers mailing list:
http://lists.blender.org/pipermail/bf-committers/2010-September/028643.html
 2010-09-06 23:26:36 +00:00
Campbell Barton
f96c7ebd9d committed by accident 2010-09-06 05:35:09 +00:00
Joseph Eagar
bb7339a7ae merge with trunk at r31523 2010-09-04 05:31:25 +00:00
Campbell Barton
d0c54d3d0e use set as a suffix (matches operators) 
- set_frame() --> frame_set()
 - set_context_pointer() --> context_pointer_set()

material adding works for curves and metaballs, new function to remove materials.

materials.link() didnt well fit how this is used elsewhere
 - order matters
 - it can be linked more than once.
 - remove(material), isnt that useful since you need to manage indicies.

... use list style functions instead. materials.append(mat) / materials.pop(index)
 2010-09-03 07:25:37 +00:00
Nathan Letwory
6c113b54b3 Finally change SConscript tabs to spaces. 2010-08-29 20:52:05 +00:00
Tamito Kajiyama
12f9a5de5b Merged changes in the trunk up to revision 31630. 2010-08-28 14:30:52 +00:00
Campbell Barton
4b40d73bfb rename most scons build targets to match cmake 2010-08-25 04:30:47 +00:00
Tamito Kajiyama
92478de0eb Merged changes in the trunk up to revision 31403. 2010-08-17 07:10:03 +00:00
Joerg Mueller
1964b2329e Scons: 
* Should now build again without problems
* Fixed scons having problems to execute makes(d/r)na if build path contains spaces
 2010-08-16 19:09:42 +00:00
Tamito Kajiyama
1a875f915d Merged changes in the trunk up to revision 31284. 2010-08-12 13:41:59 +00:00
Guillermo S. Romero
95aa8cfa4a Update address in license block. 2010-08-10 21:22:26 +00:00
Tamito Kajiyama
dd75ec4907 Merged changes in the trunk up to revision 31190. 2010-08-09 11:32:55 +00:00
Campbell Barton
708ef64663 include cleanup, no functional changes 
- removed DNA_brush_types.h from DNA_scene_types.h (and some other similar cases)
- removed DNA_wave_types.h (never used)
- removed Main.wave
 2010-08-04 04:01:27 +00:00
Tamito Kajiyama
be2e221608 Merged changes in the trunk up to revision 30781. 2010-07-27 00:08:15 +00:00
Campbell Barton
885bbe6999 from Luca's recent commit noticed there are more typo's: lenght -> length 2010-07-25 01:45:53 +00:00
Tamito Kajiyama
e423e085f8 Merged changes in the trunk up to revision 30551. 2010-07-20 19:39:07 +00:00
Tamito Kajiyama
bd68a72869 A WIP commit for proof-of-concept implementations of line style modifiers. 
A number of UI elements were newly introduced to control line color, alpha
transparency and line thickness by means of base color/alpha/thickness plus
modifiers that alter the base values.  To begin with, three basic modifiers
were prototyped with the aim of putting the new UI framework in practice
and evaluating if it works properly.

The Parameter Editor mode is still in a work-in-progress state and totally
useless from users' viewpoint.
 2010-07-20 17:57:33 +00:00
Campbell Barton
75410037fd - correct some spelling errors. 
- remove FreeCamera struct (wasnt used)
- remove world color alpha values (not used anywhre).
 2010-07-20 10:41:08 +00:00
Joseph Eagar
c11c196efa part 1 of merge from trunk at r30358; it compiles, but doesn't link quite yet :) 2010-07-19 04:44:37 +00:00
Campbell Barton
fd31436897 spelling correction: alredy --> already 2010-07-17 18:08:14 +00:00
Tamito Kajiyama
a1d0913afe Merged changes in the trunk up to revision 28536. 2010-05-02 23:10:22 +00:00
Campbell Barton
8f1500da00 remove config.h references, was added for automake build system rev around 124-126 but isnt used by any build systems now. 2010-04-18 10:28:37 +00:00
Tamito Kajiyama
048f357f41 Merged changes in the trunk up to revision 27752. 2010-03-25 21:40:08 +00:00
Campbell Barton
1e9bf0cfdb spaces -> tabs, (4 spaces == 1 tab, only for white space preceding text) 2010-03-22 09:30:00 +00:00
Joseph Eagar
71003b9bcc merge with trunk at r27259 and commit of a patch by anthony jones to fix msvc (though further work may be needed because changes made by the merge 2010-03-09 04:32:40 +00:00
Tamito Kajiyama
709678ca87 Merged changes in the trunk up to revision 26976. 2010-02-16 22:34:43 +00:00
Brecht Van Lommel
d0d47c70a9 Avoid a DNA parsing bug that would parse "float gravity [3];" as two 
struct members "gravity" and "[3]". Now it throws an error in this case,
safer than trying to fix the parsing code. Also patches the old DNA of
ClothSimSettings which had this problem .. very ugly code.

Fixes #20330: cloth sim settings getting corrupted when read from 2.49.
 2010-02-13 23:18:28 +00:00
Tamito Kajiyama
135a944c66 Merged changes in the trunk up to revision 26856. 2010-02-13 01:13:16 +00:00
Campbell Barton
081c1205a3 correct fsf address 2010-02-12 13:34:04 +00:00
Tamito Kajiyama
18a2b9940e Merged changes in the trunk up to revision 26533. 2010-02-01 20:47:23 +00:00
Tom Musgrove
f2a8bb3498 this restores building on mingw with Collada support, also it restores cross compiling, thanks to Sergey Sharybin for the patch. Note that the icons for linux cross might not be committed here, if not i'll add them in another commit 2010-02-01 18:39:41 +00:00
Tamito Kajiyama
2d8ee7efa3 Merged changes in the trunk up to revision 26409. 2010-01-30 02:58:48 +00:00