Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2012-04-15 02:33:48 +0400
committerThomas Dinges <blender@dingto.org>2012-04-15 02:33:48 +0400
commit3f605bff4be79c642ebca58ffef5dc6b66d0858e (patch)
tree857ab8d6ac37820086c0ad8ebe03a621a62437ce
parent9e68c3cb3f556af749f6a53e32086316c64b74d5 (diff)
Scons:
* Add new scons options to 'blenderlite' target * Remove ancient yafray comment
-rw-r--r--SConstruct2
-rw-r--r--source/blender/editors/space_view3d/drawobject.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct
index ff668a97483..e73d654a0c8 100644
--- a/SConstruct
+++ b/SConstruct
@@ -251,6 +251,7 @@ if 'blenderlite' in B.targets:
target_env_defs['WITH_BF_REDCODE'] = False
target_env_defs['WITH_BF_DDS'] = False
target_env_defs['WITH_BF_CINEON'] = False
+ target_env_defs['WITH_BF_FRAMESERVER'] = False
target_env_defs['WITH_BF_HDR'] = False
target_env_defs['WITH_BF_ZLIB'] = False
target_env_defs['WITH_BF_SDL'] = False
@@ -261,6 +262,7 @@ if 'blenderlite' in B.targets:
target_env_defs['BF_BUILDINFO'] = False
target_env_defs['WITH_BF_FLUID'] = False
target_env_defs['WITH_BF_OCEANSIM'] = False
+ target_env_defs['WITH_BF_SMOKE'] = False
target_env_defs['WITH_BF_DECIMATE'] = False
target_env_defs['WITH_BF_BOOLEAN'] = False
target_env_defs['WITH_BF_REMESH'] = False
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 51b238eb586..bdc07ccc98c 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -1288,7 +1288,6 @@ static void drawlamp(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
if (la->mode & LA_SPHERE) {
drawcircball(GL_LINE_LOOP, vec, la->dist, imat);
}
- /* yafray: for photonlight also draw lightcone as for spot */
}
glPopMatrix(); /* back in object space */