Revision: 44440
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44440
Author: campbellbarton
Date: 2012-02-25 21:27:45 +0000 (Sat, 25 Feb 2012)
Log Message:
-----------
minor style edits
- use GL_TRUE/FALSE for glLightModeli
- use set for python checks against multiple string values.
Modified Paths:
--------------
trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/gpu/intern/gpu_extensions.c
Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2012-02-25
21:15:02 UTC (rev 44439)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2012-02-25
21:27:45 UTC (rev 44440)
@@ -88,7 +88,7 @@
row = layout.row(align=True)
row.prop(toolsettings, "use_snap", text="")
row.prop(toolsettings, "snap_element", text="", icon_only=True)
- if snap_element not in ('INCREMENT', 'VOLUME'):
+ if snap_element not in {'INCREMENT', 'VOLUME'}:
row.prop(toolsettings, "snap_target", text="")
if obj:
if obj.mode == 'OBJECT':
Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c
2012-02-25 21:15:02 UTC (rev 44439)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c
2012-02-25 21:27:45 UTC (rev 44440)
@@ -3013,7 +3013,7 @@
else {
/* 3 floats for position,
* 3 for normal and times two because the faces may
actually be quads instead of triangles */
- glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, me->flag &
ME_TWOSIDED);
+ glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, (me->flag &
ME_TWOSIDED) ? GL_TRUE : GL_FALSE);
glEnable(GL_LIGHTING);
glFrontFace((ob->transflag&OB_NEG_SCALE)?GL_CW:GL_CCW);
@@ -3021,7 +3021,7 @@
glFrontFace(GL_CCW);
glDisable(GL_LIGHTING);
- glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, 0);
+ glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, GL_FALSE);
}
// Setup for drawing wire over, disable zbuffer
@@ -3338,7 +3338,7 @@
draw_mesh_object_outline(v3d, ob, dm);
}
- glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, me->flag &
ME_TWOSIDED );
+ glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, (me->flag &
ME_TWOSIDED) ? GL_TRUE : GL_FALSE);
glEnable(GL_LIGHTING);
glFrontFace((ob->transflag&OB_NEG_SCALE)?GL_CW:GL_CCW);
@@ -3366,7 +3366,7 @@
glFrontFace(GL_CCW);
glDisable(GL_LIGHTING);
- glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, 0);
+ glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, GL_FALSE);
if (base->flag & SELECT) {
UI_ThemeColor(is_obact ? TH_ACTIVE : TH_SELECT);
Modified: trunk/blender/source/blender/gpu/intern/gpu_extensions.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_extensions.c 2012-02-25
21:15:02 UTC (rev 44439)
+++ trunk/blender/source/blender/gpu/intern/gpu_extensions.c 2012-02-25
21:27:45 UTC (rev 44440)
@@ -181,7 +181,7 @@
/* make sure double side isn't used by defautl and only getting enabled
in places where it's
* really needed to prevent different unexpected behaviors like with
intel gme965 card (sergey) */
- glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, 0);
+ glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, GL_FALSE);
GG.os = GPU_OS_UNIX;
#ifdef _WIN32
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
