2007-12-27 22:16:54 +00:00
|
|
|
#!/usr/bin/python
|
|
|
|
|
Import ('env')
|
|
|
|
|
|
|
|
|
|
sources = env.Glob('intern/*.c')
|
|
|
|
|
|
|
|
|
|
#incs = '#/intern/guardedalloc ../blenlib ../makesdna ../blenkernel'
|
|
|
|
|
#incs += ' ../imbuf ../editors/include ../render/extern/include ../render/intern/include'
|
|
|
|
|
|
|
|
|
|
incs = '. ../editors/include ../python ../makesdna ../blenlib ../blenkernel'
|
|
|
|
|
incs += ' ../nodes ../imbuf ../blenloader ../render/extern/include'
|
2009-05-23 03:24:15 +00:00
|
|
|
incs += ' ../radiosity/extern/include ../../kernel/gen_system'
|
2009-01-29 05:19:27 +00:00
|
|
|
incs += ' ../makesrna ../gpu ../blenfont'
|
2007-12-27 22:16:54 +00:00
|
|
|
|
2009-05-23 03:24:15 +00:00
|
|
|
incs += ' #/intern/guardedalloc #/intern/memutil #/intern/ghost'
|
Merge of trunk into blender 2.5:
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r12987:17416
Issues:
* GHOST/X11 had conflicting changes. Some code was added in 2.5, which was
later added in trunk also, but reverted partially, specifically revision
16683. I have left out this reversion in the 2.5 branch since I think it is
needed there.
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16683
* Scons had various conflicting changes, I decided to go with trunk version
for everything except priorities and some library renaming.
* In creator.c, there were various fixes and fixes for fixes related to the -w
-W and -p options. In 2.5 -w and -W is not coded yet, and -p is done
differently. Since this is changed so much, and I don't think those fixes
would be needed in 2.5, I've left them out.
* Also in creator.c: there was code for a python bugfix where the screen was not
initialized when running with -P. The code that initializes the screen there
I had to disable, that can't work in 2.5 anymore but left it commented as a
reminder.
Further I had to disable some new function calls. using src/ and python/, as
was done already in this branch, disabled function calls:
* bpath.c: error reporting
* BME_conversions.c: editmesh conversion functions.
* SHD_dynamic: disabled almost completely, there is no python/.
* KX_PythonInit.cpp and Ketsji/ build files: Mathutils is not there, disabled.
* text.c: clipboard copy call.
* object.c: OB_SUPPORT_MATERIAL.
* DerivedMesh.c and subsurf_ccg, stipple_quarttone.
Still to be done:
* Go over files and functions that were moved to a different location but could
still use changes that were done in trunk.
2008-11-12 21:16:53 +00:00
|
|
|
incs += ' #/intern/elbeem #/extern/glew/include'
|
2008-12-27 20:22:22 +00:00
|
|
|
|
|
|
|
|
defs = []
|
|
|
|
|
|
|
|
|
|
if not env['WITH_BF_PYTHON']:
|
|
|
|
|
defs.append('DISABLE_PYTHON')
|
|
|
|
|
|
Printf-style method of calling operations now take a modified format string,
like so:
[opname] [slotname]=%[format code]
Before it was relying on the input format codes being in the same proper
order as the slots, which seemed like a potential maintainance nightmare to
me. Also the flags for creating buffers from bmop flags or header flags,
now support additional modifiers for combining vert/edge/face inputs.
E.g. %hfvef would accept all geometry with a header flag, and
%fef would accept edges and faces with a certain bmop flag set.
Example from the UI code:
if (!EDBM_CallOpf(em, op, "del geom=%hf context=%d", BM_SELECT, DEL_ONLYFACES))
return OPERATOR_CANCELLED;
(remember EDBM_CallOpf is the UI wrapper for this that does conversion,
error reporting, etc).
On todo is cleaning up/splitting bmesh_operators.h,
since it's kindof a mesh right now. I'm thinking of adding the slot
names in comments next to the slot ids, but I definitely would have to
clean up bmesh_operators.h first, or it'd just be too chaotic for me.
BTW, the operator API should now have enough meta info to wrap with
a scripting language, not that it matters since that's not happening till
much much later.
Also hopefully corrected some SConscripts, fix mostly provided by Elia Sarti,
though I also copied some SConscripts from 2.5 (not sure if doing
so was especially helpful).
Finally, I refactored a few places to use the new operator calling api,
as an example of how this is beneficial.
2009-03-04 08:21:10 +00:00
|
|
|
env.BlenderLib ( 'bf_windowmanager', sources, Split(incs), defs, libtype=['core'], priority=[5] )
|