Commit Graph

608 Commits

Author SHA1 Message Date
Brecht Van Lommel
4cd1e6337e Cycles: svn merge -r41225:41232 ^/trunk/blender 2011-10-24 22:32:00 +00:00
Brecht Van Lommel
55ab66b455 Cycles: svn merge -r41205:41225 ^/trunk/blender 2011-10-24 20:19:04 +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
Thomas Dinges
f1cea89d99 Typo fixes for the typo fixes. :D 2011-10-23 15:43:12 +00:00
Campbell Barton
67e744ccf0 fix some typo's 2011-10-23 15:27:36 +00:00
Campbell Barton
8e2bc6cdbc Context menu 'Edit Source' operator no longer needs to be enabled as a build option, improved this so the python file:line lookups are only done when the operator runs (previously this was done for every button, every draw when the build option was enabled).
Perhaps this should be hidden when not running with --debug, easy to change.
2011-10-23 04:13:56 +00:00
Brecht Van Lommel
10af15b85b Cycles: svn merge -r40934:41157 ^/trunk/blender 2011-10-21 20:13:12 +00:00
Brecht Van Lommel
3c9d69744e Cycles: let cmake show error when not finding openimageio on linux. 2011-10-20 16:05:32 +00:00
Campbell Barton
445279524a debug build option WITH_PYTHON_UI_INFO, so you can right click and edit the python source for UI layout directly. 2011-10-20 00:48:00 +00:00
Campbell Barton
61389bba41 fix spelling mistakes in comments (and in some python error messages), nothing to effect translations. 2011-10-17 06:39:13 +00:00
Brecht Van Lommel
85818c8209 Cycles: add python render engine option to use new shading nodes or not, instead
of hardcoded check for cycles. Also some other minor code cleaning tweaks.
2011-10-11 17:19:55 +00:00
Brecht Van Lommel
4f33d65ba1 Cycles: svn merge -r40411:40934 ^/trunk/blender 2011-10-11 14:30:53 +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
91283853b2 fix [#28786] Large enum lists display columns in inverted order (right to left)
also cleared annoying intel c++ warnings.
2011-10-01 21:09:42 +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
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
f3ae228c9d minor changes, dont append with cmake platform flags which is a string and use enum values rather then ints in a few places. 2011-09-30 15:22:13 +00:00
Thomas Dinges
5689467b9a Cycles:
* Use different Boost versions for x86/x64 windows. 
Will commit OIIO and Boost for x64 windows later, needs more testing.
2011-09-27 21:25:25 +00:00
Campbell Barton
f4dec97cef fix for building on windows, clear some warnings too 2011-09-27 01:32:27 +00:00
Campbell Barton
fc8a7aba55 comment -Wundef for cmake default flags, this causes too many warnings with mingw. 2011-09-26 09:43:35 +00:00
Campbell Barton
274b9c8fb8 whitespace cleanup 2011-09-25 12:31:21 +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
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
Brecht Van Lommel
61f77fffac Cycles: fix openimageio build issues on mac/linux. 2011-09-18 15:00:39 +00:00
Campbell Barton
08d52fcc85 added FindOpenImageIO cmake module. 2011-09-18 04:55:22 +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
Sergey Sharybin
86d05b3144 Update build rules to deal with new gettext libraries. 2011-09-15 11:37:42 +00:00
Campbell Barton
297f14a1d6 fix for error linking opencollada on linux. 2011-09-12 13:58:13 +00:00
Brecht Van Lommel
ebc653463d Cycles:
* Fix missing update when editing objects with emission materials.
* Fix preview pass rendering set to 1 not showing full resolution.
* Fix CUDA runtime compiling failing due to missing cache directory.
* Use settings from first render layer for visibility and material override.

And a bunch of incomplete and still disabled code mostly related to closure
sampling.
2011-09-12 13:13:56 +00:00
Campbell Barton
c61827ed25 patch from Uncle_Entity on IRC for fedora/collada 2011-09-08 03:57:11 +00:00
Brecht Van Lommel
6b134ae357 Cycles: set minimum required boost version lower. 2011-09-06 17:48:06 +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
0991bed413 fix some complier warnings and add -Wundef to CMake's default GCC warnings. 2011-09-05 23:40:52 +00:00
Antony Riakiotakis
6edb09fe93 Compile fixes for MinGW, checked with basic initial setup, no CUDA, gcc 4.5.2.
OpenImageIO still gives link-time errors, will try to make a lib for MinGW, see if it is fixed.
2011-09-04 15:39:09 +00:00
Brecht Van Lommel
1135875ab1 Cycles:
* Fix crash in light path node
* Fix struct alignment issue for cuda
* Fix issue with instances taking up too much memory
* Fix issue with ray visibility working incorrect on some objects
* Enable OpenCL always and remove option, it has no dependencies so may as well
* Refuse to load kernel if OpenCL version < 1.1, recent drivers are needed
* Better error handling for OpenCL device
* 3D views with rendered draw mode will now revert to wireframe on file load
2011-09-02 14:55:06 +00:00
Brecht Van Lommel
b56ffd2cdb Cycles: svn merge -r39669:39870 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-02 12:33:29 +00:00
Thomas Dinges
fefbdc4376 Cycles: Remove warning of OpenCL not working from cmake, could be made enabled by default too, but will leave that for Brecht. :) 2011-09-02 00:53:00 +00:00
Campbell Barton
2365c64014 whitespace bge edits 2011-09-01 02:12:53 +00:00
Campbell Barton
681d073d94 mistake in own recent commit broke op[encollada with mingw 2011-08-27 08:19:26 +00:00
Brecht Van Lommel
dc557b7440 Cycles: linux build tweaks to allow static oiio/boost build.
Wiki build instructions have been updated to do static linking now:
http://wiki.blender.org/index.php/Dev:2.5/Source/Render/Cycles/Building
2011-08-24 19:21:04 +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
Brecht Van Lommel
29bdf37f9d Cycles: svn merge -r39457:39669 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-08-24 09:44:08 +00:00
Campbell Barton
8470418b91 cmake: skip rpath (paths to libs) for portable distrobution 2011-08-23 20:19:08 +00:00
Sergey Sharybin
a33a26ca07 FFmpeg library update:
- Update scons/cmake rules to use new versions of libs/dlls.
- Update rules for buildbot.
2011-08-22 18:49:42 +00:00
Campbell Barton
817273931a buildinfo is now quoted from the build systems, avoids stripping quotes on startup.
tested with linux/cmake linux/scons windows/cmake/mingw windows/cmake/msvc
2011-08-22 12:24:14 +00:00
Campbell Barton
bebee3fb60 new cmake doesn't consider CLang == GNUCC, set flags for clang explicitly. 2011-08-21 11:06:49 +00:00
Brecht Van Lommel
f7b9c85871 Cycles: fix some invalid memory access problems found by running the windows build in debug mode. 2011-08-21 10:32:15 +00:00