diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2015-09-24 18:24:20 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2015-09-24 18:24:20 +0300 |
| commit | 27b3ea622f8bd313a8e2827dfec752bf2125566c (patch) | |
| tree | f212e49d224ce8e1cfc3b17a64ae524711494391 /intern/SConscript | |
| parent | 372dff8d1dc7e24d4b2cd37de245588ecfce8bfa (diff) | |
| parent | de80e687689032cb85179a1f7e89750573631d5d (diff) | |
Merge remote-tracking branch 'origin/master' into cycles_camera_nodescycles_camera_nodes
Note: the branch currently crashes in blender_camera_nodes.cpp:
BL::NodeTree b_ntree = b_data.node_groups[nodes_tree_name];
The crash was introduced in:
cb7cf523e5c000609f32a382e2c0fcc57f635a42
Conflicts:
intern/cycles/SConscript
intern/cycles/blender/addon/__init__.py
intern/cycles/blender/addon/properties.py
intern/cycles/blender/blender_camera.cpp
intern/cycles/kernel/kernel_types.h
intern/cycles/kernel/svm/svm.h
intern/cycles/kernel/svm/svm_types.h
intern/cycles/render/camera.cpp
intern/cycles/render/camera.h
Diffstat (limited to 'intern/SConscript')
| -rw-r--r-- | intern/SConscript | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/intern/SConscript b/intern/SConscript index 0b39fcb5d26..124afd4bbb9 100644 --- a/intern/SConscript +++ b/intern/SConscript @@ -27,9 +27,9 @@ Import ('env') -SConscript(['audaspace/SConscript', - 'string/SConscript', +SConscript(['string/SConscript', 'ghost/SConscript', + 'glew-mx/SConscript', 'guardedalloc/SConscript', 'moto/SConscript', 'memutil/SConscript/', @@ -44,6 +44,9 @@ SConscript(['audaspace/SConscript', # currently only contains headers # SConscript('container/SConscript') +if env['WITH_BF_AUDASPACE']: + SConscript(['audaspace/SConscript']) + if env ['WITH_BF_REMESH']: SConscript(['dualcon/SConscript']) @@ -62,3 +65,5 @@ if env['WITH_BF_BULLET']: if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-mingw', 'linuxcross', 'win64-vc'): SConscript(['utfconv/SConscript']) +if env['WITH_BF_OPENSUBDIV']: + SConscript (['opensubdiv/SConscript']) |