Commit Graph

62 Commits

Author SHA1 Message Date
9bd0c63382 Merge branch 'master' into blender2.8 2018-06-29 08:05:38 +02:00
af36dd4664 Cleanup: trailing newlines 2018-06-29 08:02:49 +02:00
da53c3f020 Merge branch 'master' into blender2.8 2018-06-04 18:50:14 +02:00
58e8c71cbd Cleanup: strip ghost trailing space 2018-06-04 18:47:57 +02:00
fc348a563e Fix bad merge resolution from previous commit 2018-03-26 14:59:55 +02:00
21aca14e43 Merge branch 'master' into blender2.8 2018-03-26 14:56:00 +02:00
3c45fdd171 GHOST: Solve compilation error of test programs 2018-03-26 14:51:56 +02:00
b69f0479a4 OpenGL: remove GLU option from build system
Also remove linking in glu libs.

T49042 is now done!
2017-03-22 21:33:53 -04:00
225b02fcd6 Fix for building ghost-tests 2015-12-28 21:40:49 +11:00
cfbbf72d89 Revert "Increase CMake minimum version to 3.0"
This reverts commit ff3cf93405.

Turns out distros only a year old still use CMake 2.8x
2015-11-10 02:53:10 +11:00
ff3cf93405 Increase CMake minimum version to 3.0
This allows us to use newer features of CMake, and less hassles having to test & support older versions.
2015-11-09 23:37:53 +11:00
72565fbf30 Cleanup: style, spelling 2015-07-06 17:45:11 +10:00
e84b0e4c35 Ghost: update tests for recent changes 2015-04-04 17:21:18 +11:00
8d084e8c8f Ghost Context Refactor
https://developer.blender.org/D643
Separates graphics context creation from window code in Ghost so that they can vary separately.
2014-10-07 15:47:32 -05:00
ea9d94cf28 Spelling 2014-08-06 05:41:14 +10:00
1f58bfb8be Code cleanup: de-duplicate cotangent weight function & add arg sizes 2014-03-30 11:08:33 +11:00
1bfa64895e Ghost: update multitest for changes in BLF 2014-01-11 23:53:23 +11:00
c1c26c36f6 Style Cleanup: remove preprocessor indentation (updated wiki style guide too) 2013-12-22 14:12:19 +11:00
ecf2f55667 Fix #37187: ghost/test/multitest fails to build
Commited patch provided by Lawrence D'Oliveiro, thanks.
2013-10-28 12:54:18 +00:00
43c83e2458 fix double free in ghost c++ gears test program. 2013-09-11 01:15:13 +00:00
be42cd54df Ghost test application could be compiled again
Was an IRC request to have Ghost application up
and running for investigation purposes.
2013-09-05 16:22:07 +00:00
225c5fee6b move BLO_sys_types.h -> BLI_sys_types.h (it had nothing todo with loading)
remove MEM_sys_types.h which was a duplicate.
2013-05-28 19:35:26 +00:00
e903701450 style cleanup 2012-10-27 01:46:47 +00:00
4d4664d98f code cleanup: check for msvc directly when using warning pragma's. 2012-10-15 02:15:07 +00:00
f6251a1f32 code cleanup: warning and style 2012-09-17 22:34:42 +00:00
1a7eb3454e style cleanup 2012-09-08 08:59:47 +00:00
47ec91e8d3 code clenup: comments and some style edits on ghost/osx (odd indentation) 2012-09-06 02:10:09 +00:00
8b865c01cd style cleanup: comments 2012-06-30 22:49:33 +00:00
f5f25b81e8 style cleanup:
also fix for building ghost test and fix double free in one of the tests
2012-06-17 09:58:26 +00:00
5189356d58 style cleanup 2012-06-04 20:11:09 +00:00
b33f0ef0e3 style cleanup 2012-05-27 19:40:36 +00:00
857dedbc58 style cleanup 2012-05-27 00:36:50 +00:00
9abd6e7651 style cleanup 2012-05-24 13:18:53 +00:00
9c9a5b882d style cleanup: ghost 2012-05-19 09:57:55 +00:00
7001747cdc ghost tests weren't building and added some comments to ghost docs. 2012-01-18 10:16:39 +00:00
e84c0980a3 correct indentation and some whitespace edits (no functional changes) 2011-11-11 13:09:14 +00:00
4a04f72069 remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n 2011-10-23 17:52:20 +00:00
74017cb020 header cleanup and typo's 2011-10-22 01:53:35 +00:00
f9ea19ac12 spaces -> tabs (only whitespace changes) 2011-10-06 22:02:50 +00:00
65d1e27ff5 fix for using uninitialized value in gpu_shader_material 2011-07-09 19:16:32 +00:00
c50b5ee320 ghost multi-test builds again, now uses BLF font library 2011-07-09 16:18:15 +00:00
5913179f85 CMake file to build ghost tests again. 2011-07-03 16:17:38 +00:00
f86565c90e whitespace edits for bpy api, split some really long lines. 2011-04-30 13:58:31 +00:00
89c617a116 remove nan-makefiles 2011-01-30 15:29:22 +00:00
f383e2e0e6 Remove msvc build files which are not needed anymore. 2010-10-23 15:14:54 +00:00
568cb06616 rename Command key to OSKey, Window manager already called it the OSKey but internally it was mixed. 2010-10-05 19:10:15 +00:00
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
081c1205a3 correct fsf address 2010-02-12 13:34:04 +00:00
405cf80eb8 Big, big commit!!
1) Remove WITH_FREETYPE2 from code, so now blender always need freetype2
2) Remove the old bmfont
3) Remove ftfont and bFTGL library
4) Implement a new BLF_draw_default function for place that still need/use
   the old BMF api.

I try to update both, scons and cmake, but I only can test with make, so
hope all work fine.

MSVC is broken, but I don't have Windows, things to search and fix are
any reference to WITH_FREETYPE2, FTGL and BMFONT (take in care that
blenkernel also have a BKE_bmfont.h, this don't have anything to do with bmfont).
        Always have to link/include the freetype2 library
        Remove any reference to libbmfont
        Remove any reference to libftfont
        Remove any reference to libbftgl (or libbFTGL)
2009-05-05 23:10:32 +00:00
874c29cea8 2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19323:HEAD
Notes:
* blenderbuttons and ICON_SNAP_PEEL_OBJECT were not merged.
2009-04-20 15:06:46 +00:00