kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

code cleanup:

Browse Source 
- blf doesnt have includes for TRUE/FALSE, use 1/0.
- rename ogl_multisamples -> multi_sample, also shorten enum strings.
This commit is contained in:
Campbell Barton 2012-11-11 10:55:32 +00:00
parent 47068e88fb
commit c4f332084f
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_ui/space_userpref.py
View File

@ -446,7 +446,7 @@ class USERPREF_PT_system(Panel):
#~ col.prop(system, "use_antialiasing")
col.label(text="Window Draw Method:")
col.prop(system, "window_draw_method", text="")
col.prop(system, "ogl_multisamples", text="")
col.prop(system, "multi_sample", text="")
col.label(text="Text Draw Options:")
col.prop(system, "use_text_antialiasing")
col.label(text="Textures:")

5
source/blender/blenfont/intern/blf.c
View File

@ -28,7 +28,6 @@
* \ingroup blf
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -149,10 +148,10 @@ static int blf_global_font_init(void)
if (global_font_default == -1) {
printf("Warning: Can't find default font!\n");
return FALSE;
return 0;
}
else {
return TRUE;
return 1;
}
}

12
source/blender/makesrna/intern/rna_userdef.c
View File

@ -3019,11 +3019,11 @@ static void rna_def_userdef_system(BlenderRNA *brna)
};
static EnumPropertyItem multi_sample_levels[] = {
{USER_MULTISAMPLE_NONE, "MULTISAMPLE_NONE", 0, "No MultiSample", "Do not use OpenGL MultiSample"},
{USER_MULTISAMPLE_2, "MULTISAMPLE_2", 0, "MultiSample: 2", "Use 2x OpenGL MultiSample (requires restart)"},
{USER_MULTISAMPLE_4, "MULTISAMPLE_4", 0, "MultiSample: 4", "Use 4x OpenGL MultiSample (requires restart)"},
{USER_MULTISAMPLE_8, "MULTISAMPLE_8", 0, "MultiSample: 8", "Use 8x OpenGL MultiSample (requires restart)"},
{USER_MULTISAMPLE_16, "MULTISAMPLE_16", 0, "MultiSample: 16", "Use 16x OpenGL MultiSample (requires restart)"},
{USER_MULTISAMPLE_NONE, "NONE", 0, "No MultiSample", "Do not use OpenGL MultiSample"},
{USER_MULTISAMPLE_2, "2", 0, "MultiSample: 2", "Use 2x OpenGL MultiSample (requires restart)"},
{USER_MULTISAMPLE_4, "4", 0, "MultiSample: 4", "Use 4x OpenGL MultiSample (requires restart)"},
{USER_MULTISAMPLE_8, "8", 0, "MultiSample: 8", "Use 8x OpenGL MultiSample (requires restart)"},
{USER_MULTISAMPLE_16, "16", 0, "MultiSample: 16", "Use 16x OpenGL MultiSample (requires restart)"},
{0, NULL, 0, NULL, NULL}
};
@ -3322,7 +3322,7 @@ static void rna_def_userdef_system(BlenderRNA *brna)
RNA_def_property_update(prop, 0, "rna_userdef_text_update");
/* Full scene anti-aliasing */
prop = RNA_def_property(srna, "ogl_multisamples", PROP_ENUM, PROP_NONE);
prop = RNA_def_property(srna, "multi_sample", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_bitflag_sdna(prop, NULL, "ogl_multisamples");
RNA_def_property_enum_items(prop, multi_sample_levels);
RNA_def_property_ui_text(prop, "MultiSample", "Enable OpenGL multi-sampling, only for systems that support it, requires restart");

2
source/blender/windowmanager/intern/wm_window.c
View File

@ -345,7 +345,7 @@ static void wm_window_add_ghostwindow(const char *title, wmWindow *win)
(GHOST_TWindowState)win->windowstate,
GHOST_kDrawingContextTypeOpenGL,
0 /* no stereo */,
U.ogl_multisamples /* AA */);
U.ogl_multisamples /* AA */);
if (ghostwin) {
/* needed so we can detect the graphics card below */