Commit Graph

699 Commits

Author SHA1 Message Date
Campbell Barton
aa6d7ebd14 svn merge ^/trunk/blender -r40720:40872 2011-10-09 07:31:15 +00:00
Campbell Barton
f9ea19ac12 spaces -> tabs (only whitespace changes) 2011-10-06 22:02:50 +00:00
Campbell Barton
8695bedda2 svn merge ^/trunk/blender -r40644:40720 2011-10-06 16:59:58 +00:00
Campbell Barton
ce1ac3412d dont define the ghost PREFIX for scons, since this means our portable downloadable binary would find the system blender files (if installed).
this should stay disabled until scons supports system/portable installs as with cmake.
2011-10-06 02:29:15 +00:00
Jens Verwiebe
39300a5079 OSX: Correct copy/paste error and exclude endianess switch from darwin 2011-10-05 08:58:32 +00:00
Jens Verwiebe
b05a3f7e42 Cgange compile cindition for gcc-4.6-objC++ workaround 2011-09-30 20:26:14 +00:00
Jens Verwiebe
47ca7e23c0 Now in proper english, hehe 2011-09-28 17:52:07 +00:00
Jens Verwiebe
ce714341b9 Using non ASCII-conform char in comment broke compile 2011-09-28 17:45:32 +00:00
Jens Verwiebe
6088d460ef OSX: Give clear commenting and more up-to-date defaults 2011-09-28 17:28:37 +00:00
Jens Verwiebe
416885aad4 OSX: always compile GHOST and Quicktime with Apple-gcc-4.2, simplifies for non-apple compilers 2011-09-28 17:15:28 +00:00
Campbell Barton
4a157de23d svn merge ^/trunk/blender -r40587:40643 2011-09-28 07:34:48 +00:00
Jens Verwiebe
6f2d937a63 OSX: introduced a workaround for compiling with non-apple gcc-4.6.1, ghost must be compiled with apple-gcc nevertheless due objc incompatibilities 2011-09-27 13:18:34 +00:00
Campbell Barton
e4c299d975 comment warnings as errors for MSVC - it too easily made small problems like unused vars into errors which gets annoying for non developers.
with GCC we have *some* warnings as errors which works out better.
2011-09-27 12:08:35 +00:00
Campbell Barton
effea8c29b svn merge ^/trunk/blender -r40511:40587 2011-09-27 03:12:31 +00:00
Campbell Barton
274b9c8fb8 whitespace cleanup 2011-09-25 12:31:21 +00:00
Campbell Barton
5bd83eede0 svn merge ^/trunk/blender -r40405:40431 2011-09-23 11:30:55 +00:00
Campbell Barton
4b449aefea remove support for irix 2011-09-21 08:40:30 +00:00
Campbell Barton
e74e245030 svn merge -r39890:39951 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-06 03:16:12 +00:00
Nathan Letwory
0c992c73a1 Typofix 2011-09-05 22:15:07 +00:00
Nathan Letwory
3efe867051 Put dead zone printout behind debug. 2011-09-05 21:52:06 +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
Dalai Felinto
22676a434e making carbon to build again (note: NDOF is not working here)
- fix typo
- isolate NDOF callsi in #ifdefs
2011-09-01 00:03:20 +00:00
Campbell Barton
471c005137 typo fix: end of lines ;; --> ; 2011-08-31 01:07:55 +00:00
Mitchell Stokes
2475ad0ab9 When creating a multisample window for Win32, the first context created, which checks for multisample support, was never being deleted. 2011-08-30 17:30:35 +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
Campbell Barton
98f87b77f4 svn merge -r39433:39493 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-08-24 01:44:54 +00:00
Sergey Sharybin
36f20f162c Fix #28154: linux3-config.py doesn't exist
Change OURPLATFORM from "linux<major_version>" to simple "linux".
Since new policy for linux kernel versions that major version in
platform doesn't make much sense for building rules so the same
rules could be used for both of linux2 and linux3 now/

Tested on both of linux2 and linux3 systems.
2011-08-21 13:31:46 +00:00
Brecht Van Lommel
37f9d916fa Fix #28265: blender 2.59 not starting on OS X with old ndof driver.
Patch by Jens Verwiebe.
2011-08-17 15:01:26 +00:00
Campbell Barton
45cf8d673e add numpad key input for ghost/sdl 2011-08-16 13:07:46 +00:00
Campbell Barton
74ca6070b4 svn merge -r39384:39433 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-08-16 06:53:03 +00:00
Campbell Barton
55a560c0c4 svn merge -r39286:39385 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-08-16 06:30:14 +00:00
Alexander Kuznetsov
39cbcdf187 Window was losing focus when switching from full screen via Alt+F11
Fixes [#28243]
2011-08-15 16:26:37 +00:00
Sergey Sharybin
c9216e390c Commiting patch from jensverwiebe for NDOF support on OSX 2011-08-11 15:59:19 +00:00
Campbell Barton
226e424cb2 svn merge -r39057:39286 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-08-11 04:53:57 +00:00
Campbell Barton
ffd5fa3eea off by 1 error with number keys in ghost/sdl 2011-08-09 07:09:49 +00:00
Campbell Barton
8eec116d0e add missing keys for ghost/sdl 2011-08-08 06:54:07 +00:00
Campbell Barton
0160901c90 - update X3D and FBX testing checksums
- building with GHOST/SDL now adds the PREFIX
- image.external_edit operator errors out if the filepath isnt set (was annoying and loaded gimp while running tests)
2011-08-08 03:31:25 +00:00
Campbell Barton
5681380db0 simplify x11 path code, had unneeded NULL checks and std namespace 2011-08-07 17:38:36 +00:00
Mike Erwin
479c203dad stricter WITH_INPUT_NDOF guards, general cleanup 2011-08-07 16:44:10 +00:00
Mike Erwin
6c821f4078 stricter NDOF guards for Windows (forgot in earlier commit) 2011-08-06 23:13:36 +00:00
Campbell Barton
4d319f8059 fix for GHOST/SDL key input with uppercase keys. 2011-08-05 17:39:44 +00:00
Campbell Barton
aa1477cce1 https://svn.blender.org/svnroot/bf-blender/trunk/blender, in sync with trunk now 2011-08-05 08:28:03 +00:00
Campbell Barton
5c26223106 svn merge -r38804:38971 https://svn.blender.org/svnroot/bf-blender/trunk/blender, manual merge of source/blender/editors/transform/transform.c 2011-08-05 08:02:04 +00:00
Mike Erwin
a6fed14da4 stricter guards for disabling NDOF code (will test in 3.. 2.. 1..) 2011-08-04 03:14:00 +00:00
Sergey Sharybin
d4909c5628 - Do not add GHOST_NDOFManager.cpp to list of sources if
NDOF is disabled in CMake.
- Added "default" section to switch in sendMotionEvent.
  It's what strict gcc rules don't like much and it's
  And it's good practice in general, imo.
2011-08-03 07:30:24 +00:00
Nathan Letwory
02ab2b473c Debug print removed. 2011-08-03 07:08:28 +00:00
Mike Erwin
3b541b259f removed attempted WITH_BF_3DMOUSE detection, fixed just one indention (left the others in their ugly new state) 2011-08-03 06:42:55 +00:00
Campbell Barton
6c9d0f2b7a whitespace edits. 2011-08-03 06:27:44 +00:00
Mike Erwin
6233430c23 compensate for lack of 3D mouse calibration on Windows 2011-08-03 05:01:55 +00:00
Sergey Sharybin
13eefec9dd More flexible configuration for 3dmouse library for scons.
Needed for release environment and buildbot.

Buildbot rules would be updated with next commit after
environment will be tested.
2011-08-02 17:59:43 +00:00