kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
29,044 Commits 2 Branches 0 Tags 753 MiB
bbbbea6024
Commit Graph

114 Commits

Author SHA1 Message Date
Joseph Eagar
f01261d040 merge with/from trunk at r35190 2011-02-27 06:19:40 +00:00
Campbell Barton
e06eea4fba fix for scons with recent change to how BINRELOC is enabled via cmake. 
also add WITH_PYTHON define to qtcreator project generator until we get a way to add them properly.
 2011-02-25 14:45:45 +00:00
Nathan Letwory
1bb465141d doxygen: tag blenderplayer stubs. 2011-02-25 13:46:54 +00:00
Nathan Letwory
5b607701a7 doxygen: prevent GPL license block from being parsed as doxygen comment. 2011-02-23 10:52:22 +00:00
Nathan Letwory
3459c1b26c Finally got around to fixing priorities, so cleanup in stubs.c can be done. blenderplayer builds again with cmake. 2011-02-21 16:41:36 +00:00
Campbell Barton
9ef0eed4b6 build python module without binreloc, add dummy argv[0] to initialize bprogname. 2011-02-21 13:13:08 +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
efb21625bf ...and for blenderplayer 2011-02-15 12:43:34 +00:00
Sergey Sharybin
329e2d8037 Todo issue: sculpting on deformed mesh 
Used a crazyspace approach (like in edit mode), but only modifiers with
deformMatricies are allowed atm (currently shapekeys and armature modifiers only).
All the rest modifiers had an warning message that they aren't applied because
of sculpt mode. Deformation of multires is also unsupported.

With all this restictions users will always see the actual "layer" (or maybe
mesh state would be more correct word) they are sculpting on.

Internal changes:
- All modifiers could have deformMatricies callback (the same as deformMatriciesEM but
  for non-edit mode usage)
- Added function to build crazyspace for sculpting (sculpt_get_deform_matrices), but it
  could be generalized for usage in other painting modes (particle edit mode, i.e)

Todo:
- Implement crazyspace correction to support all kinds of deformation modifiers
- Maybe deformation of multires isn't so difficult?
- And maybe we could avoid extra bad-level-stub for ED_sculpt_modifiers_changed
  without code duplicating?
 2011-01-31 20:02:51 +00:00
Campbell Barton
89c617a116 remove nan-makefiles 2011-01-30 15:29:22 +00:00
Mitchell Stokes
cac2c016b0 stubs.c updates provided by Kupoman. 2011-01-09 02:43:26 +00:00
Campbell Barton
e6d1f25842 remove rna func scene.collada_export(), export functions dont exist for any other formats, calling operators should suffice. 2011-01-03 07:42:30 +00:00
Mitchell Stokes
97e84765cd stubs.c updates for uiLayoutGetRedAlert and uiLayoutSetRedAlert 2011-01-03 06:08:17 +00:00
Mitchell Stokes
24ae6f8c91 stubs update for multitex_ext_safe 2010-12-27 21:58:07 +00:00
Campbell Barton
5e382eb8e5 rename blenderlib to blender_add_lib 2010-12-22 23:09:30 +00:00
Guillermo S. Romero
29799bf09c Compact -I paths in makefiles for more readble files/output. 
Also some white space cleaning and removal of redundant parameter.
 2010-12-22 22:15:20 +00:00
Campbell Barton
5c621bd7f5 cmake was complaining when there was no libs skipped. 2010-12-17 04:41:48 +00:00
Campbell Barton
566bda734a last commit to fix warnings didnt set them at all, not it works as it should. 
also made cmakes output a lot quieter, messages can be uncommented for debugging or added back if other devs need this for some reason.
 2010-12-16 12:48:30 +00:00
Campbell Barton
afacd18498 use lowercase for cmake builtin names and macros, remove contents in else() and endif() which is no longer needed. 2010-12-08 08:43:06 +00:00
Campbell Barton
d64f46e0bb CMake: use a global list to store libraries built rather then cmake_blender_libs.txt file. 2010-12-06 10:56:37 +00:00
Campbell Barton
42d6603cae Add option for CMake to build libredcode, also use CODEC prefix for ffmpeg, quicktime & sndfile options. 2010-11-30 18:52:39 +00:00
Campbell Barton
ee1d2adc16 partial fix for [#23532] 
- Python calling operators didn't run WM_operator_properties_sanitize() so enum functions called from python were given a NULL context.
- PROP_ENUM_NO_CONTEXT and PROP_NEVER_NULL used the same value in the enum (possible conflict).
 2010-11-23 12:05:35 +00:00
Campbell Barton
4816f8fd00 fix for player with recent update. 2010-11-22 23:47:00 +00:00
Campbell Barton
39b7bfe6bd - check IF WIN32 AND NOT UNIX (for cygwin) 
- patch from Mike S to enable OpenMP and xcode
 2010-11-21 13:41:43 +00:00
Campbell Barton
dcd5d7b99d region.tag_redraw() broke building with the player. 2010-11-20 14:39:03 +00:00
Campbell Barton
3066d82662 patch [#24800] Make scene type buttons from material preview optional 
from Wenzel Jakob (wenzel)
 2010-11-19 07:46:23 +00:00
Campbell Barton
da1f288f50 rename libs internal libs for CMake + SCons (used in MSVC project files) 
for game engine use "ge_" prefix & make names generally more descriptive.
 2010-11-18 11:42:05 +00:00
Nathan Letwory
1994fc80ed r33039 added dependency to COLLADA for blenderplayer, but it's really not needed there. 
Stubbing for now.
 2010-11-14 20:40:55 +00:00
Mitchell Stokes
d43d5d7690 Getting BLF to work with the Blenderplayer. 2010-11-12 07:16:33 +00:00
Campbell Barton
da402c937e fix for linking the player, also fixes building without python and bullet. 2010-11-05 01:47:55 +00:00
Campbell Barton
50dab4fc37 rename definition for enabling the game engine GAMEBLENDER==1 --> WITH_GAMEENGINE 2010-10-31 03:20:33 +00:00
Nathan Letwory
b6880139e2 Revert 32710 for now, otherwise can't test release building with scons. 2010-10-26 21:16:11 +00:00
Dalai Felinto
05abc0d3eb blenderplayer building again in CMake+MSVC 
(I basically commented out functions already defined in other places)
 2010-10-26 01:55:06 +00:00
Campbell Barton
c7ff23cc34 Added CMake macro REMOVE_STRICT_FLAGS(), this means developers can build with -Werror in their CMAKE_C_FLAGS_DEBUG (so all warnings give errors). 
but external libs which we don't maintain & generated code will have -Werror removed.

This is GCC only, MSVC can be added easily.
 2010-10-24 03:57:07 +00:00
Campbell Barton
f4415ce84a - CMake now only uses SOURCE_GROUP with MSVC lib configuration, saves recursive header search when not using msvc. 
- uv layout export wasn't setting the default filename.
 2010-10-23 04:18:53 +00:00
Campbell Barton
c6976e7351 use explicit file paths for CMake rather then globing, This is recommended by cmake devs. 
globbing vs explicit is discussed here.
http://www.cmake.org/pipermail/cmake/2008-December/025694.html

Practical implications are:
- developers need to keep CMakeLists.txt files up to date.
- Users wont get strange linking errors if they build after a file is added, since CMake detects CMakeLists.txt is modified and automatically reconfigure.
 2010-10-23 04:05:55 +00:00
Mitchell Stokes
00b7422f9b stubs.c update for revision 32607, which introduced the BLC ED_space_image_paint_update(). 2010-10-20 02:47:53 +00:00
Campbell Barton
77867dfab1 remove annoying warnings for blenderplayers stub.c 2010-10-18 13:22:34 +00:00
Campbell Barton
30b79ddcc6 - fixed remaining unused warnings. 
- omit render code from this warning (cmake only), until render branch is merged.
- moved -Wunused-parameter warning to apply to all C code in blender (not just ./source/blender), (cmake only).
 2010-10-17 06:38:56 +00:00
Campbell Barton
8268a4be71 most unused arg warnings corrected. 
- removed deprecated bitmap arg from IMB_allocImBuf (plugins will need updating).
- mostly tagged UNUSED() since some of these functions look like they may need to have the arguments used later.
 2010-10-16 14:32:17 +00:00
Campbell Barton
bc1cca8d00 - blender player builds again with CMake. 
- remove duplicate entries for libs for blender binary (where possible)
 2010-10-16 09:27:02 +00:00
Campbell Barton
68dea6591d bugfix [#24247] Duplicating a Composite Group Node no User Count Icon 
duplicating nodes wasnt changing the usercount of the referenced ID but file loading deleting was.

also removed some unused args.
 2010-10-15 04:27:09 +00:00
Nathan Letwory
63b4c93e44 Update stubs for recent changes (BKE_utildefines.h and header printing). 2010-10-04 23:52:53 +00:00
Brecht Van Lommel
d08a40450e Fix cmake/osx blenderplayer linking. 2010-09-15 19:03:52 +00:00
Joseph Eagar
82432d0d99 merge from trunk at r31523 2010-09-07 05:47:34 +00:00
Campbell Barton
fd53393a5d patch [#23650] fix stubs.c for optimized build 
from Filiciss Muhgue (filiciss)

--- from the tracker submission
if compile Blender with /GL on msvc, linker error LNK1237 occur on building blenderplayer.exe.
http://msdn.microsoft.com/en-us/library/at5twzkt(v=VS.90).aspx
 2010-09-07 02:39:32 +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
Mitchell Stokes
fb1a0598e9 Updating stubs.c. 
* WM_keyconfig_add -> WM_keyconfig_new
  * WM_keyconfig_add_user -> WM_keyconfig_new_user
 2010-08-30 20:35:24 +00:00
Mitchell Stokes
766e83f742 stubs.c updates 2010-08-30 02:04:22 +00:00
Nathan Letwory
6c113b54b3 Finally change SConscript tabs to spaces. 2010-08-29 20:52:05 +00:00