kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
32,763 Commits 2 Branches 0 Tags 753 MiB
161c3861bc
Commit Graph

360 Commits

Author SHA1 Message Date
Campbell Barton
161c3861bc svn merge ^/trunk/blender -r40395:40405 2011-09-23 10:58:20 +00:00
Campbell Barton
049c18405a svn merge ^/trunk/blender -r40382:r40389 2011-09-23 06:43:06 +00:00
Campbell Barton
91587ed302 svn merge ^/trunk/blender -r40381:40382 2011-09-23 06:35:49 +00:00
Campbell Barton
d7e5f348c8 svn merge ^/trunk/blender -r40368:40370 2011-09-22 16:17:27 +00:00
Campbell Barton
7126a4699e svn merge ^/trunk/blender -r40367:40368 --- raddish weight paint merge 2011-09-22 16:09:27 +00:00
Campbell Barton
14475d07cd svn merge -r40295:40367 ^/trunk/blender 2011-09-21 17:15:54 +00:00
Brecht Van Lommel
219eeb3e54 Internationalization: fix OS X scons install to copy font and language files 
correctly.
 2011-09-20 15:55:28 +00:00
Sergey Sharybin
07ed73caee - Fix for compiling without international support 
- Enable international support for win64 msvc by default
 2011-09-20 14:07:40 +00:00
Nathan Letwory
a199c9a4bb Don't set BF_NUMJOBS in default config, but instead let users do that in user-config.py. 2011-09-20 07:53:20 +00:00
Campbell Barton
13dfd82997 changes for materials to treat them as shorts not int/chars (since they are stored as shorts intermally) 
- converting nurbs to mesh was casting the material to unsigned char.
- subsurf was casting to char, then int -> short in a loop.
- have material functions take & return shorts.
 2011-09-20 06:25:15 +00:00
Campbell Barton
b2e97edc35 remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset. 2011-09-19 16:41:29 +00:00
Jason Hays
2cbf475fb2 Merged 40338-40364 2011-09-19 15:36:30 +00:00
Campbell Barton
83a2f02a78 cleanup endian handling 
- define __BIG_ENDIAN__ or __LITTLE_ENDIAN__ with cmake & scons.
- ENDIAN_ORDER is now a define rather than a global short.
- replace checks like this with single ifdef: #if defined(__sgi) || defined (__sparc) || defined (__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__hppa__) || defined (__BIG_ENDIAN__)
- remove BKE_endian.h which isn't used
 2011-09-19 08:02:17 +00:00
Campbell Barton
96ada15d79 svn merge -r40197:40311 ^/trunk/blender 2011-09-18 02:35:26 +00:00
Campbell Barton
1ff373ef5b svn merge -r40166:40279 ^/trunk/blender 2011-09-17 04:59:14 +00:00
Guillermo S. Romero
43259c978e SVN maintenance. 2011-09-16 17:18:12 +00:00
Campbell Barton
d87fcb0760 - fix for memory leak in findFreeNavPolyIndex() 
- also correct own script for running cppcheck.
 2011-09-16 14:02:44 +00:00
Campbell Barton
2222f536f8 use replace 0 with NULL for pointers, set some functions static 
also fixed own errors in recent static check commit.
 2011-09-16 08:20:21 +00:00
Campbell Barton
0849eaebbf new convenience makefile targets for static source code cheching: check_splint/check_sparse/check_cppcheck 2011-09-16 06:58:20 +00:00
Sergey Sharybin
86d05b3144 Update build rules to deal with new gettext libraries. 2011-09-15 11:37:42 +00:00
Campbell Barton
ac51152ec5 svn merge -r40179:40195 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-14 01:32:59 +00:00
Campbell Barton
dd2a2ec699 removed nodes from CMake's BLENDER_LINK_LIBS, rewrote find-pcre using own template. 2011-09-14 01:23:17 +00:00
Campbell Barton
21253def7c - removed some duplicate library links from cmake (which were needed because of bad level calls) 
- FindXML2 we had copied from another project was always running and not using cached value, rewrote based on template used for most of our other find modules which makes use of 'FindPackageHandleStandardArgs'
- mark statuc collada libs as advanced.
 2011-09-14 01:02:57 +00:00
Sergey Sharybin
a47144a8d2 Enable FFTW3 library for buildslaves 2011-09-13 16:52:42 +00:00
Campbell Barton
7d02e66256 svn merge -r40000:40179 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-13 10:05:30 +00:00
Campbell Barton
92089e3c4d svn merge -r39900:40000 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-13 09:07:20 +00:00
Campbell Barton
9c4165fde0 svn merge -r39800:39900 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-13 07:19:36 +00:00
Campbell Barton
b310a76a1b svn merge -r39558:39800 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-13 06:39:17 +00:00
Campbell Barton
a04003d648 svn merge -rr40148:40166 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-12 14:28:21 +00:00
Campbell Barton
297f14a1d6 fix for error linking opencollada on linux. 2011-09-12 13:58:13 +00:00
Campbell Barton
38b2618319 svn merge -r40034:40051 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-09 02:29:44 +00:00
Sergey Sharybin
899bd19c71 Forgot to add FFmpeg DLLs list to linuxcross config. 2011-09-08 19:05:52 +00:00
Campbell Barton
61b6fcd804 svn merge -r39991:40034 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-08 08:29:49 +00:00
Campbell Barton
c61827ed25 patch from Uncle_Entity on IRC for fedora/collada 2011-09-08 03:57:11 +00:00
Jens Verwiebe
7983627500 OSX: revert default compile to i386, for it breakes QTKit-condition for some unknown reason 2011-09-07 14:44:52 +00:00
Campbell Barton
a167ee1262 svn merge -r39951:39986 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-07 00:46:11 +00:00
Campbell Barton
47ffe63c86 remove -Wundef for code we don't maintain & generated code. 2011-09-06 13:00:46 +00:00
Antony Riakiotakis
aabd702dbd fix link issues with MinGW - a substitute declaration(correctByteOrder) for itoln that was not present in MinGW was being used. Duplicated the declaration from <winsock2.h>(tried including but gave some errors) and added the appropriate link library, wsock32, according to MinGW documentation. 2011-09-06 11:17:29 +00:00
Campbell Barton
fb3f7d9566 svn merge -r39792:39829 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-01 00:56:21 +00:00
Jens Verwiebe
d8394b9d67 set OSX default python to static 2011-08-31 14:46:27 +00:00
Jens Verwiebe
5e8d191930 OSX/scons: fix compile with static python, my patch was a bit outdates, sorry 2011-08-31 14:15:14 +00:00
Jens Verwiebe
2457c2134a OSX: additionally choice to link against python-framework again 2011-08-30 23:52:12 +00:00
Nathan Letwory
24ea5fe424 Enable libsndfile by default on win32 too. 2011-08-30 12:40:15 +00:00
Campbell Barton
5065d4c744 svn merge -r39664:39762 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-08-29 00:46:56 +00:00
Jens Verwiebe
3b1192431f OSX/scons: don´t link to system stubs with 10.7 sdk 2011-08-25 09:41:36 +00:00
Campbell Barton
81a8f3e885 part of a patch from Dan Eicher for cmake packaging. 2011-08-24 18:23:21 +00:00
Campbell Barton
18d66643f4 this should finally fix collada & ubuntu building with cmake 2011-08-24 18:13:11 +00:00
Campbell Barton
242035fa2d attempt to fix issue with opencollada + ubuntu ppa 2011-08-24 17:09:25 +00:00
Campbell Barton
9ad6434c4e opencollada find module. hopefully solves the problem where includes can in an /include subdir or not. 2011-08-24 16:04:35 +00:00
Campbell Barton
82e622f158 fix [#28356] Import export STL files, problem in script in version r39307 
& correct some bad comments.
 2011-08-24 14:22:41 +00:00