sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
47,953 Commits 2 Branches 0 Tags 753 MiB
fe02323632
Commit Graph

12 Commits

Author SHA1 Message Date
Campbell Barton
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
Tamito Kajiyama
385c72f5f2 Merged changes in the trunk up to revision 55546. 
Conflicts resolved:
source/blenderplayer/bad_level_call_stubs/SConscript

Partly reverted changes to intern/cycles/blender/addon/ui.py in revision 52899
to make it easier to merge trunk changes.
 2013-03-24 12:13:13 +00:00
Tamito Kajiyama
a462d69bbf Another big patch set by Bastien Montagne, thanks a lot! 
* Made Freestyle optional (turned on by default).

* Fix for missing bpath.c updates in the previous merge of trunk changes.
 2012-12-20 07:57:26 +00:00
Bastien Montagne
ab2c273b12 Added GPL header to sconscripts! 
Also changed shebang to '#!/usr/bin/env python', this is more portable across unixes...
 2012-12-17 08:01:43 +00:00
Nathan Letwory
322ff7dfe4 I swear, it was just an innocence change in guardedalloc! 
The butterfly wing flap, causing a nice storm in the rest of blender.

Now all dependencies should point ok again. CMakers, do double-test.
 2011-02-21 12:35:04 +00:00
Campbell Barton
50dab4fc37 rename definition for enabling the game engine GAMEBLENDER==1 --> WITH_GAMEENGINE 2010-10-31 03:20:33 +00:00
Mitchell Stokes
d67eedcef9 Adding intern/guardedalloc include dir for bad_level_call_stubs (stubs.c). This update is for cmake and scons. 
This is needed since RNA_types.h now includes BLO_sys_types.h
 2010-08-31 23:55:41 +00:00
Nathan Letwory
6c113b54b3 Finally change SConscript tabs to spaces. 2010-08-29 20:52:05 +00:00
Sergey Sharybin
271256ad33 Fixed typo in blenderplayer scons rules. 2010-03-10 21:21:14 +00:00
Campbell Barton
3d222c3de6 - scene sequencer camera override wasnt working for render strips (only opengl) 
- temp disable camera switching with override by clearning markers (hack)
- check for GAMEBLENDER define else eclipse gets confused by multiple definitions of functons in the stub.
 2010-03-10 08:17:18 +00:00
Nathan Letwory
9216efcba2 == SCons == 
* bring back 'player' libtype, after investigation with ideasman.
  scons/mingw works nicely, for some reason msvc fails to link still, will look further into it.
 2009-09-05 01:58:02 +00:00
Nathan Letwory
bade641408 == SCons == 
* first working changes to get blenderplayer linking
* blenderplayer/ moved into source/ (CMakeLists.txt changed for that too)
* added externs for bprogname to gp_ghost, so that it links properly
 2009-09-04 10:40:41 +00:00