Commit Graph

211 Commits

Author SHA1 Message Date
Brecht Van Lommel
dca15b215d Cycles: svn merge -r41613:41627 ^/trunk/blender 2011-11-07 17:13:32 +00:00
Campbell Barton
9ced8a23fe quiet warnings when building without libmv 2011-11-07 16:26:23 +00:00
Brecht Van Lommel
a6828b9c6f CMake: add delayed_install macro to specify files to be installed from modules
other than source/creator.
2011-11-07 15:53:40 +00:00
Brecht Van Lommel
b06db617a0 CMake: Boost and OpenImageIO building support (unused still). 2011-11-07 15:44:09 +00:00
Brecht Van Lommel
942d2fe3b7 Cycles: svn merge -r41467:41531 ^/trunk/blender 2011-11-04 20:21:40 +00:00
Campbell Barton
209ceb6969 correct some warnings, also sensor_x was being paassed to object_camera_matrix(...) for x and y args, looks like an accident 2011-11-04 15:21:34 +00:00
Campbell Barton
b07d92408b cmake could ignore defines for python lib/include passed from the command line if both weren't defined. 2011-11-02 21:35:00 +00:00
Brecht Van Lommel
2f453773f6 Cycles: svn merge -r41266:41467 ^/trunk/blender 2011-11-02 16:17:05 +00:00
Campbell Barton
d7de4d28dd quiet some warnings. 2011-11-01 22:51:10 +00:00
Campbell Barton
e4896c999f name qtcreator projects based on branch names (if svn is found and its a branch), was too confusing with multiple IDE's open calling all projects 'Blender'. 2011-11-01 02:24:40 +00:00
Campbell Barton
a5959e767e hopefully fix problem with cmake on osx (older gcc version) 2011-11-01 00:34:09 +00:00
Campbell Barton
f708318833 correct flags for older GCC's which dont suppport -Wno-deprecated-declarations,
detect if the flag is supported before use
2011-10-30 04:48:00 +00:00
Campbell Barton
c936c61bac tweak remove_strict_flags so it can be used with gcc's -Wall 2011-10-27 07:26:41 +00:00
Campbell Barton
7dd63e6c40 update is_c() utility function to include '.cc' and '.inl' files. 2011-10-24 23:29:28 +00:00
Brecht Van Lommel
47463742e2 Cycles: svn merge -r41232:41266 ^/trunk/blender 2011-10-24 22:51:44 +00:00
Brecht Van Lommel
4cd1e6337e Cycles: svn merge -r41225:41232 ^/trunk/blender 2011-10-24 22:32:00 +00:00
Sergey Sharybin
8afc509be4 Some small fixes and changes:
- Add *.cc files to qtcreator project as well as .cpp and .cxx
  (would be needed for correct generating projects with libmv library).
- Added negate_v2 and negate_v2_v2 functions. They'll be needed for
  camera tracking project.
- Fixed issue with generating proxies from 32bit images.
  (generated jpg-s opened fine in blender, but were dark in osx viewer).
- Marked unused arg in indexer as UNUSED.
2011-10-24 17:09:31 +00:00
Campbell Barton
4a04f72069 remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n 2011-10-23 17:52:20 +00:00
Brecht Van Lommel
10af15b85b Cycles: svn merge -r40934:41157 ^/trunk/blender 2011-10-21 20:13:12 +00:00
Campbell Barton
67c15da97d docs / clenup (no functional code changes)
- added API examples for mathutils.Color/Euler/Quaternion/Matrix.
- corrected own bad spelling matricies --> matrices.
- minor pep8 edits.
- update CMake ignore file list.
2011-10-17 02:20:53 +00:00
Campbell Barton
9252d425d2 cmake: use cached results for RPM build & dont print annoying rpmbuild missing on every re-run of cmake. 2011-10-14 14:01:39 +00:00
Campbell Barton
43de42824f cmake's find glew wasnt working right - if glew wasnt found installing the package would not help since the not-found result was cached. 2011-10-14 12:17:35 +00:00
Campbell Barton
fa3b4e1830 correct collada lib linking order (wasnt building for me), and sphinx doc syntax warning. 2011-10-13 14:10:38 +00:00
Brecht Van Lommel
4f33d65ba1 Cycles: svn merge -r40411:40934 ^/trunk/blender 2011-10-11 14:30:53 +00:00
Campbell Barton
da73642ed1 remove find samplerate module, use -msse2 flag for intel c++ since its supported. 2011-10-02 17:16:28 +00:00
Joerg Mueller
07ad83a439 * Removing libsamplerate from build systems
* Enabling OpenAL for scons win64-vc in default config; Nathan or Sergey: please update the build bot to build with OpenAL!
2011-10-02 17:09:39 +00:00
Campbell Barton
71f772a0ed minor cmake edits:
- osx was defaulting to -O3.
- clang wasnt detecting sse compiler args.
2011-10-02 16:43:39 +00:00
Campbell Barton
077fd13416 cmake:
- fix for cmake's SSE detection which would fail because of strict warnings and also had redundant cache setting.
- was incorrectly initializing variables (own bad)
- python was searching for libs on every run, now only do this if there not cached.
2011-10-01 19:52:33 +00:00
Campbell Barton
622e8ee363 cmake: sse flags were being defined in 2 different places 2011-10-01 18:29:40 +00:00
Campbell Barton
7b9f3eac42 fix for odd linking error with ffmpeg. 2011-09-30 16:54:11 +00:00
Campbell Barton
7ef5464236 sse flags for intel c++ compiler 2011-09-30 16:37:46 +00:00
Campbell Barton
cf3956f450 formatting edits only 2011-09-30 15:51:58 +00:00
Campbell Barton
ca2528d551 removing duplicate library linking from cmake, fingers crossed that this wont break on other systems (works here). 2011-09-30 15:21:10 +00:00
Campbell Barton
8a423f59ea pep8 cleanup and fix for keymap test operator from my own recent fix. 2011-09-26 15:39:15 +00:00
Dalai Felinto
2d91b6cda7 wm.py needs import os in some of its execute funcs + now we can have blender2.60x version :)
I guess someone did a cleanup in the file and forgot to test "add an Add-On" ;)
+ a bug I found while studying the cmake files
2011-09-26 06:29:58 +00:00
Campbell Barton
7aa14fdbb9 use the systems number of processes for running static checks - multiple jobs. 2011-09-22 04:41:12 +00:00
Brecht Van Lommel
a2c6db0b44 Cycles: svn merge -r40358:40411 ^/trunk/blender 2011-09-20 18:48:28 +00:00
Campbell Barton
8f5112f191 pep8 update & some minor cmake edits. 2011-09-20 18:29:19 +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
Brecht Van Lommel
153e4cad4b Cycles: svn merge -r40266:40358 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-19 14:20:15 +00:00
Campbell Barton
08d52fcc85 added FindOpenImageIO cmake module. 2011-09-18 04:55:22 +00:00
Campbell Barton
96ada15d79 svn merge -r40197:40311 ^/trunk/blender 2011-09-18 02:35:26 +00:00
Brecht Van Lommel
f4a9215d7c Cycles: svn merge -r39870:r40266 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Merging the node changes required a lot of conflict resolution, fixed the
issues I could find but if you want stability you might want to wait a bit
before updating.
2011-09-17 13:28:40 +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
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