Cleanup: style
This commit is contained in:
parent
112540da62
commit
122d0d1504
|
@ -35,7 +35,7 @@
|
||||||
|
|
||||||
#define BLF_BATCH_DRAW_LEN_MAX 2048 /* in glyph */
|
#define BLF_BATCH_DRAW_LEN_MAX 2048 /* in glyph */
|
||||||
|
|
||||||
typedef struct BatchBLF{
|
typedef struct BatchBLF {
|
||||||
struct FontBLF *font; /* can only batch glyph from the same font */
|
struct FontBLF *font; /* can only batch glyph from the same font */
|
||||||
struct Gwn_Batch *batch;
|
struct Gwn_Batch *batch;
|
||||||
struct Gwn_VertBuf *verts;
|
struct Gwn_VertBuf *verts;
|
||||||
|
|
|
@ -5967,12 +5967,12 @@ static int dynamicPaint_doStep(struct Depsgraph *depsgraph, Scene *scene, Object
|
||||||
|
|
||||||
/* Apply brush on the surface depending on it's collision type */
|
/* Apply brush on the surface depending on it's collision type */
|
||||||
if (brush->psys && brush->psys->part &&
|
if (brush->psys && brush->psys->part &&
|
||||||
ELEM(brush->psys->part->type, PART_EMITTER, PART_FLUID) &&
|
ELEM(brush->psys->part->type, PART_EMITTER, PART_FLUID) &&
|
||||||
psys_check_enabled(brushObj, brush->psys, G.is_rendering))
|
psys_check_enabled(brushObj, brush->psys, G.is_rendering))
|
||||||
{
|
{
|
||||||
/* Paint a particle system */
|
/* Paint a particle system */
|
||||||
BKE_animsys_evaluate_animdata(scene, &brush->psys->part->id, brush->psys->part->adt,
|
BKE_animsys_evaluate_animdata(scene, &brush->psys->part->id, brush->psys->part->adt,
|
||||||
BKE_scene_frame_get(scene), ADT_RECALC_ANIM);
|
BKE_scene_frame_get(scene), ADT_RECALC_ANIM);
|
||||||
dynamicPaint_paintParticles(surface, brush->psys, brush, timescale);
|
dynamicPaint_paintParticles(surface, brush->psys, brush, timescale);
|
||||||
}
|
}
|
||||||
/* Object center distance: */
|
/* Object center distance: */
|
||||||
|
|
|
@ -693,22 +693,22 @@ static const float blackbody_table_b[6][4] = {
|
||||||
|
|
||||||
static void blackbody_temperature_to_rgb(float rgb[3], float t)
|
static void blackbody_temperature_to_rgb(float rgb[3], float t)
|
||||||
{
|
{
|
||||||
if(t >= 12000.0f) {
|
if (t >= 12000.0f) {
|
||||||
rgb[0] = 0.826270103f;
|
rgb[0] = 0.826270103f;
|
||||||
rgb[1] = 0.994478524f;
|
rgb[1] = 0.994478524f;
|
||||||
rgb[2] = 1.56626022f;
|
rgb[2] = 1.56626022f;
|
||||||
}
|
}
|
||||||
else if(t < 965.0f) {
|
else if (t < 965.0f) {
|
||||||
rgb[0] = 4.70366907f;
|
rgb[0] = 4.70366907f;
|
||||||
rgb[1] = 0.0f;
|
rgb[1] = 0.0f;
|
||||||
rgb[2] = 0.0f;
|
rgb[2] = 0.0f;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
int i = (t >= 6365.0f)? 5:
|
int i = (t >= 6365.0f) ? 5 :
|
||||||
(t >= 3315.0f)? 4:
|
(t >= 3315.0f) ? 4 :
|
||||||
(t >= 1902.0f)? 3:
|
(t >= 1902.0f) ? 3 :
|
||||||
(t >= 1449.0f)? 2:
|
(t >= 1449.0f) ? 2 :
|
||||||
(t >= 1167.0f)? 1: 0;
|
(t >= 1167.0f) ? 1 : 0;
|
||||||
|
|
||||||
const float *r = blackbody_table_r[i];
|
const float *r = blackbody_table_r[i];
|
||||||
const float *g = blackbody_table_g[i];
|
const float *g = blackbody_table_g[i];
|
||||||
|
|
|
@ -533,8 +533,8 @@ void do_versions_after_linking_280(Main *main)
|
||||||
/* Due to several changes to particle RNA and draw code particles from older files may no longer
|
/* Due to several changes to particle RNA and draw code particles from older files may no longer
|
||||||
* be visible. Here we correct this by setting a default draw size for those files. */
|
* be visible. Here we correct this by setting a default draw size for those files. */
|
||||||
for (Object *object = main->object.first; object; object = object->id.next) {
|
for (Object *object = main->object.first; object; object = object->id.next) {
|
||||||
for (ParticleSystem *psys = object->particlesystem.first; psys; psys=psys->next) {
|
for (ParticleSystem *psys = object->particlesystem.first; psys; psys = psys->next) {
|
||||||
if(psys->part->draw_size == 0.0f) {
|
if (psys->part->draw_size == 0.0f) {
|
||||||
psys->part->draw_size = 0.1f;
|
psys->part->draw_size = 0.1f;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -617,7 +617,7 @@ void do_versions_after_linking_280(Main *main)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (object->transflag & OB_DUPLI){
|
else if (object->transflag & OB_DUPLI) {
|
||||||
object->duplicator_visibility_flag = OB_DUPLI_FLAG_VIEWPORT;
|
object->duplicator_visibility_flag = OB_DUPLI_FLAG_VIEWPORT;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@ -837,7 +837,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main)
|
||||||
}
|
}
|
||||||
|
|
||||||
for (Group *group = main->group.first; group; group = group->id.next) {
|
for (Group *group = main->group.first; group; group = group->id.next) {
|
||||||
if (group->view_layer != NULL){
|
if (group->view_layer != NULL) {
|
||||||
do_version_view_layer_visibility(group->view_layer);
|
do_version_view_layer_visibility(group->view_layer);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -933,7 +933,8 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main)
|
||||||
/* Blender Internal removal */
|
/* Blender Internal removal */
|
||||||
for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
|
for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
|
||||||
if (STREQ(scene->r.engine, "BLENDER_RENDER") ||
|
if (STREQ(scene->r.engine, "BLENDER_RENDER") ||
|
||||||
STREQ(scene->r.engine, "BLENDER_GAME")) {
|
STREQ(scene->r.engine, "BLENDER_GAME"))
|
||||||
|
{
|
||||||
BLI_strncpy(scene->r.engine, RE_engine_id_BLENDER_EEVEE, sizeof(scene->r.engine));
|
BLI_strncpy(scene->r.engine, RE_engine_id_BLENDER_EEVEE, sizeof(scene->r.engine));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -207,7 +207,7 @@ static void eevee_draw_background(void *vedata)
|
||||||
bool taa_use_reprojection = (stl->effects->enabled_effects & EFFECT_TAA_REPROJECT) != 0;
|
bool taa_use_reprojection = (stl->effects->enabled_effects & EFFECT_TAA_REPROJECT) != 0;
|
||||||
|
|
||||||
if (DRW_state_is_image_render() ||
|
if (DRW_state_is_image_render() ||
|
||||||
taa_use_reprojection ||
|
taa_use_reprojection ||
|
||||||
((stl->effects->enabled_effects & EFFECT_TAA) != 0))
|
((stl->effects->enabled_effects & EFFECT_TAA) != 0))
|
||||||
{
|
{
|
||||||
int samp = taa_use_reprojection
|
int samp = taa_use_reprojection
|
||||||
|
|
|
@ -196,7 +196,7 @@ int EEVEE_temporal_sampling_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data
|
||||||
|
|
||||||
int repro_flag = 0;
|
int repro_flag = 0;
|
||||||
if (!DRW_state_is_image_render() &&
|
if (!DRW_state_is_image_render() &&
|
||||||
BKE_collection_engine_property_value_get_bool(props, "taa_reprojection"))
|
BKE_collection_engine_property_value_get_bool(props, "taa_reprojection"))
|
||||||
{
|
{
|
||||||
repro_flag = EFFECT_TAA_REPROJECT | EFFECT_VELOCITY_BUFFER | EFFECT_DEPTH_DOUBLE_BUFFER | EFFECT_DOUBLE_BUFFER | EFFECT_POST_BUFFER;
|
repro_flag = EFFECT_TAA_REPROJECT | EFFECT_VELOCITY_BUFFER | EFFECT_DEPTH_DOUBLE_BUFFER | EFFECT_DOUBLE_BUFFER | EFFECT_POST_BUFFER;
|
||||||
effects->taa_reproject_sample = ((effects->taa_reproject_sample + 1) % 16);
|
effects->taa_reproject_sample = ((effects->taa_reproject_sample + 1) % 16);
|
||||||
|
|
|
@ -61,7 +61,8 @@ static void get_material_solid_color(WORKBENCH_PrivateData *wpd, Object *ob, flo
|
||||||
unsigned int obhash = BLI_ghashutil_strhash(ob->id.name);
|
unsigned int obhash = BLI_ghashutil_strhash(ob->id.name);
|
||||||
cpack_to_rgb(obhash, &color[0], &color[1], &color[2]);
|
cpack_to_rgb(obhash, &color[0], &color[1], &color[2]);
|
||||||
|
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
copy_v3_v3(color, ob->col);
|
copy_v3_v3(color, ob->col);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -142,7 +143,7 @@ void workbench_materials_solid_cache_populate(WORKBENCH_Data *vedata, Object *ob
|
||||||
DRW_shgroup_call_add(stl->g_data->depth_shgrp, geom, ob->obmat);
|
DRW_shgroup_call_add(stl->g_data->depth_shgrp, geom, ob->obmat);
|
||||||
|
|
||||||
/* Solid */
|
/* Solid */
|
||||||
GPUShader *shader = wpd->drawtype_lighting == V3D_LIGHTING_FLAT?e_data.solid_flat_sh:e_data.solid_studio_sh;
|
GPUShader *shader = wpd->drawtype_lighting == V3D_LIGHTING_FLAT ? e_data.solid_flat_sh : e_data.solid_studio_sh;
|
||||||
|
|
||||||
float color[3];
|
float color[3];
|
||||||
get_material_solid_color(wpd, ob, color);
|
get_material_solid_color(wpd, ob, color);
|
||||||
|
|
|
@ -984,7 +984,8 @@ static void drw_engines_enable_from_mode(int mode)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void drw_engines_enable_from_overlays(int draw_overlays) {
|
static void drw_engines_enable_from_overlays(int draw_overlays)
|
||||||
|
{
|
||||||
if (draw_overlays) {
|
if (draw_overlays) {
|
||||||
use_drw_engine(&draw_engine_overlay_type);
|
use_drw_engine(&draw_engine_overlay_type);
|
||||||
}
|
}
|
||||||
|
|
|
@ -565,13 +565,13 @@ static void draw_clipping_setup_from_view(void)
|
||||||
/* distance to view Z axis */
|
/* distance to view Z axis */
|
||||||
f = len_v2(farpoint);
|
f = len_v2(farpoint);
|
||||||
/* get corresponding point on the near plane */
|
/* get corresponding point on the near plane */
|
||||||
mul_v2_v2fl(farxy, farpoint, s/e);
|
mul_v2_v2fl(farxy, farpoint, s / e);
|
||||||
/* this formula preserve the sign of n */
|
/* this formula preserve the sign of n */
|
||||||
sub_v2_v2(nearpoint, farxy);
|
sub_v2_v2(nearpoint, farxy);
|
||||||
n = f * s / e - len_v2(nearpoint);
|
n = f * s / e - len_v2(nearpoint);
|
||||||
c = len_v2(farcenter) / e;
|
c = len_v2(farcenter) / e;
|
||||||
/* the big formula, it simplifies to (F-N)/(2(e-s)) for the symmetric case */
|
/* the big formula, it simplifies to (F-N)/(2(e-s)) for the symmetric case */
|
||||||
z = (F-N) / (2.0f * (e-s + c*(f-n)));
|
z = (F - N) / (2.0f * (e - s + c * (f - n)));
|
||||||
|
|
||||||
bsphere->center[0] = farcenter[0] * z / e;
|
bsphere->center[0] = farcenter[0] * z / e;
|
||||||
bsphere->center[1] = farcenter[1] * z / e;
|
bsphere->center[1] = farcenter[1] * z / e;
|
||||||
|
|
|
@ -110,8 +110,7 @@ static void overlay_cache_init(void *vedata)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Face Orientation Pass */
|
/* Face Orientation Pass */
|
||||||
if (stl->g_data->overlays & V3D_OVERLAY_FACE_ORIENTATION)
|
if (stl->g_data->overlays & V3D_OVERLAY_FACE_ORIENTATION) {
|
||||||
{
|
|
||||||
int state = DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_EQUAL | bm_face_orientation;
|
int state = DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_EQUAL | bm_face_orientation;
|
||||||
psl->face_orientation_pass = DRW_pass_create("Face Orientation", state);
|
psl->face_orientation_pass = DRW_pass_create("Face Orientation", state);
|
||||||
stl->g_data->face_orientation_shgrp = DRW_shgroup_create(e_data.face_orientation_sh, psl->face_orientation_pass);
|
stl->g_data->face_orientation_shgrp = DRW_shgroup_create(e_data.face_orientation_sh, psl->face_orientation_pass);
|
||||||
|
|
|
@ -1482,8 +1482,7 @@ static int edbm_face_make_planar_exec(bContext *C, wmOperator *op)
|
||||||
const int repeat = RNA_int_get(op->ptr, "repeat");
|
const int repeat = RNA_int_get(op->ptr, "repeat");
|
||||||
const float fac = RNA_float_get(op->ptr, "factor");
|
const float fac = RNA_float_get(op->ptr, "factor");
|
||||||
|
|
||||||
for (uint ob_index = 0; ob_index < objects_len; ob_index++)
|
for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
|
||||||
{
|
|
||||||
Object *obedit = objects[ob_index];
|
Object *obedit = objects[ob_index];
|
||||||
BMEditMesh *em = BKE_editmesh_from_object(obedit);
|
BMEditMesh *em = BKE_editmesh_from_object(obedit);
|
||||||
if (em->bm->totfacesel == 0) {
|
if (em->bm->totfacesel == 0) {
|
||||||
|
@ -1491,8 +1490,8 @@ static int edbm_face_make_planar_exec(bContext *C, wmOperator *op)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!EDBM_op_callf(
|
if (!EDBM_op_callf(
|
||||||
em, op, "planar_faces faces=%hf iterations=%i factor=%f",
|
em, op, "planar_faces faces=%hf iterations=%i factor=%f",
|
||||||
BM_ELEM_SELECT, repeat, fac))
|
BM_ELEM_SELECT, repeat, fac))
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -4488,8 +4487,8 @@ static int edbm_decimate_exec(bContext *C, wmOperator *op)
|
||||||
}
|
}
|
||||||
|
|
||||||
BM_mesh_decimate_collapse(
|
BM_mesh_decimate_collapse(
|
||||||
em->bm, ratio_adjust, vweights, vertex_group_factor, false,
|
em->bm, ratio_adjust, vweights, vertex_group_factor, false,
|
||||||
symmetry_axis, symmetry_eps);
|
symmetry_axis, symmetry_eps);
|
||||||
|
|
||||||
MEM_freeN(vweights);
|
MEM_freeN(vweights);
|
||||||
|
|
||||||
|
@ -6093,9 +6092,9 @@ static int mesh_symmetrize_exec(bContext *C, wmOperator *op)
|
||||||
const float thresh = RNA_float_get(op->ptr, "threshold");
|
const float thresh = RNA_float_get(op->ptr, "threshold");
|
||||||
|
|
||||||
EDBM_op_init(
|
EDBM_op_init(
|
||||||
em, &bmop, op,
|
em, &bmop, op,
|
||||||
"symmetrize input=%hvef direction=%i dist=%f",
|
"symmetrize input=%hvef direction=%i dist=%f",
|
||||||
BM_ELEM_SELECT, RNA_enum_get(op->ptr, "direction"), thresh);
|
BM_ELEM_SELECT, RNA_enum_get(op->ptr, "direction"), thresh);
|
||||||
BMO_op_exec(em->bm, &bmop);
|
BMO_op_exec(em->bm, &bmop);
|
||||||
|
|
||||||
EDBM_flag_disable_all(em, BM_ELEM_SELECT);
|
EDBM_flag_disable_all(em, BM_ELEM_SELECT);
|
||||||
|
|
|
@ -2221,7 +2221,7 @@ void ED_region_header(const bContext *C, ARegion *ar)
|
||||||
UI_view2d_view_ortho(&ar->v2d);
|
UI_view2d_view_ortho(&ar->v2d);
|
||||||
|
|
||||||
xco = maxco = start_ofs;
|
xco = maxco = start_ofs;
|
||||||
yco = headery + (ar->winy - headery)/2 - floor(0.2f * UI_UNIT_Y);
|
yco = headery + (ar->winy - headery) / 2 - floor(0.2f * UI_UNIT_Y);
|
||||||
|
|
||||||
/* XXX workaround for 1 px alignment issue. Not sure what causes it... Would prefer a proper fix - Julian */
|
/* XXX workaround for 1 px alignment issue. Not sure what causes it... Would prefer a proper fix - Julian */
|
||||||
if (CTX_wm_area(C)->spacetype == SPACE_TOPBAR) {
|
if (CTX_wm_area(C)->spacetype == SPACE_TOPBAR) {
|
||||||
|
|
|
@ -1527,7 +1527,7 @@ ScrArea *ED_screen_state_toggle(bContext *C, wmWindow *win, ScrArea *sa, const s
|
||||||
for (ar = newa->regionbase.first; ar; ar = ar->next) {
|
for (ar = newa->regionbase.first; ar; ar = ar->next) {
|
||||||
ar->flagfullscreen = ar->flag;
|
ar->flagfullscreen = ar->flag;
|
||||||
|
|
||||||
if (ELEM(ar->regiontype, RGN_TYPE_UI, RGN_TYPE_HEADER, RGN_TYPE_TOOLS)){
|
if (ELEM(ar->regiontype, RGN_TYPE_UI, RGN_TYPE_HEADER, RGN_TYPE_TOOLS)) {
|
||||||
ar->flag |= RGN_FLAG_HIDDEN;
|
ar->flag |= RGN_FLAG_HIDDEN;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1592,7 +1592,7 @@ void postTrans(bContext *C, TransInfo *t)
|
||||||
FOREACH_TRANS_DATA_CONTAINER (t, tc) {
|
FOREACH_TRANS_DATA_CONTAINER (t, tc) {
|
||||||
/* free data malloced per trans-data */
|
/* free data malloced per trans-data */
|
||||||
if (ELEM(t->obedit_type, OB_CURVE, OB_SURF) ||
|
if (ELEM(t->obedit_type, OB_CURVE, OB_SURF) ||
|
||||||
(t->spacetype == SPACE_IPO))
|
(t->spacetype == SPACE_IPO))
|
||||||
{
|
{
|
||||||
TransData *td = tc->data;
|
TransData *td = tc->data;
|
||||||
for (int a = 0; a < tc->data_len; a++, td++) {
|
for (int a = 0; a < tc->data_len; a++, td++) {
|
||||||
|
|
|
@ -1597,7 +1597,7 @@ static void WIDGETGROUP_xform_cage_setup(const bContext *UNUSED(C), wmManipulato
|
||||||
ED_MANIPULATOR_CAGE2D_XFORM_FLAG_TRANSLATE);
|
ED_MANIPULATOR_CAGE2D_XFORM_FLAG_TRANSLATE);
|
||||||
|
|
||||||
mpr->color[0] = 1;
|
mpr->color[0] = 1;
|
||||||
mpr->color_hi[0] =1;
|
mpr->color_hi[0] = 1;
|
||||||
|
|
||||||
mgroup->customdata = xmgroup;
|
mgroup->customdata = xmgroup;
|
||||||
|
|
||||||
|
|
|
@ -753,7 +753,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, ViewLayer *view_layer, Obje
|
||||||
|
|
||||||
/* For more efficiency first transfer the entire buffer to vram. */
|
/* For more efficiency first transfer the entire buffer to vram. */
|
||||||
Gwn_Batch *loop_batch = immBeginBatchAtMost(GWN_PRIM_LINE_LOOP, bm->totloop);
|
Gwn_Batch *loop_batch = immBeginBatchAtMost(GWN_PRIM_LINE_LOOP, bm->totloop);
|
||||||
Gwn_VertBuf* loop_vbo = loop_batch->verts[0];
|
Gwn_VertBuf *loop_vbo = loop_batch->verts[0];
|
||||||
BM_ITER_MESH(efa, &iter, bm, BM_FACES_OF_MESH) {
|
BM_ITER_MESH(efa, &iter, bm, BM_FACES_OF_MESH) {
|
||||||
if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
|
if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
|
||||||
continue;
|
continue;
|
||||||
|
|
|
@ -43,7 +43,7 @@ typedef struct GPUAttachment {
|
||||||
int mip, layer;
|
int mip, layer;
|
||||||
} GPUAttachment;
|
} GPUAttachment;
|
||||||
|
|
||||||
typedef enum GPUFrameBufferBits{
|
typedef enum GPUFrameBufferBits {
|
||||||
GPU_COLOR_BIT = (1 << 0),
|
GPU_COLOR_BIT = (1 << 0),
|
||||||
GPU_DEPTH_BIT = (1 << 1),
|
GPU_DEPTH_BIT = (1 << 1),
|
||||||
GPU_STENCIL_BIT = (1 << 2),
|
GPU_STENCIL_BIT = (1 << 2),
|
||||||
|
|
|
@ -248,7 +248,7 @@ GPUMaterial *GPU_material_from_nodetree_find(
|
||||||
GPUMaterial *GPU_material_from_nodetree(
|
GPUMaterial *GPU_material_from_nodetree(
|
||||||
struct Scene *scene, struct bNodeTree *ntree, struct ListBase *gpumaterials, const void *engine_type, int options);
|
struct Scene *scene, struct bNodeTree *ntree, struct ListBase *gpumaterials, const void *engine_type, int options);
|
||||||
void GPU_material_generate_pass(
|
void GPU_material_generate_pass(
|
||||||
GPUMaterial *mat, const char *vert_code, const char *geom_code, const char *frag_lib, const char *defines);
|
GPUMaterial *mat, const char *vert_code, const char *geom_code, const char *frag_lib, const char *defines);
|
||||||
void GPU_material_free(struct ListBase *gpumaterial);
|
void GPU_material_free(struct ListBase *gpumaterial);
|
||||||
|
|
||||||
void GPU_materials_free(void);
|
void GPU_materials_free(void);
|
||||||
|
|
|
@ -51,7 +51,7 @@ static struct GPUTextureGlobal {
|
||||||
/* Maximum number of FBOs a texture can be attached to. */
|
/* Maximum number of FBOs a texture can be attached to. */
|
||||||
#define GPU_TEX_MAX_FBO_ATTACHED 8
|
#define GPU_TEX_MAX_FBO_ATTACHED 8
|
||||||
|
|
||||||
typedef enum GPUTextureFormatFlag{
|
typedef enum GPUTextureFormatFlag {
|
||||||
GPU_FORMAT_DEPTH = (1 << 0),
|
GPU_FORMAT_DEPTH = (1 << 0),
|
||||||
GPU_FORMAT_STENCIL = (1 << 1),
|
GPU_FORMAT_STENCIL = (1 << 1),
|
||||||
GPU_FORMAT_INTEGER = (1 << 2),
|
GPU_FORMAT_INTEGER = (1 << 2),
|
||||||
|
|
|
@ -296,11 +296,11 @@ typedef enum eSpaceOutliner_Filter {
|
||||||
SO_FILTER_NO_OB_CAMERA = (1 << 10),
|
SO_FILTER_NO_OB_CAMERA = (1 << 10),
|
||||||
SO_FILTER_NO_OB_OTHERS = (1 << 11),
|
SO_FILTER_NO_OB_OTHERS = (1 << 11),
|
||||||
|
|
||||||
SO_FILTER_OB_STATE = (1 << 12),
|
SO_FILTER_OB_STATE = (1 << 12),
|
||||||
SO_FILTER_OB_STATE_VISIBLE = (1 << 13), /* Not set via DNA. */
|
SO_FILTER_OB_STATE_VISIBLE = (1 << 13), /* Not set via DNA. */
|
||||||
SO_FILTER_OB_STATE_SELECTED= (1 << 14), /* Not set via DNA. */
|
SO_FILTER_OB_STATE_SELECTED = (1 << 14), /* Not set via DNA. */
|
||||||
SO_FILTER_OB_STATE_ACTIVE = (1 << 15), /* Not set via DNA. */
|
SO_FILTER_OB_STATE_ACTIVE = (1 << 15), /* Not set via DNA. */
|
||||||
SO_FILTER_NO_COLLECTION = (1 << 16),
|
SO_FILTER_NO_COLLECTION = (1 << 16),
|
||||||
} eSpaceOutliner_Filter;
|
} eSpaceOutliner_Filter;
|
||||||
|
|
||||||
#define SO_FILTER_NO_OB_ALL (SO_FILTER_NO_OB_MESH | \
|
#define SO_FILTER_NO_OB_ALL (SO_FILTER_NO_OB_MESH | \
|
||||||
|
|
|
@ -81,7 +81,7 @@ enum {
|
||||||
};
|
};
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
V3D_DRAWOPTION_RANDOMIZE = (1<<0),
|
V3D_DRAWOPTION_RANDOMIZE = (1 << 0),
|
||||||
};
|
};
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
|
|
|
@ -273,8 +273,7 @@ static DerivedMesh *uvprojectModifier_do(UVProjectModifierData *umd,
|
||||||
best_projector = &projectors[0];
|
best_projector = &projectors[0];
|
||||||
|
|
||||||
for (j = 1; j < num_projectors; ++j) {
|
for (j = 1; j < num_projectors; ++j) {
|
||||||
float tmp_dot = dot_v3v3(projectors[j].normal,
|
float tmp_dot = dot_v3v3(projectors[j].normal, face_no);
|
||||||
face_no);
|
|
||||||
if (tmp_dot > best_dot) {
|
if (tmp_dot > best_dot) {
|
||||||
best_dot = tmp_dot;
|
best_dot = tmp_dot;
|
||||||
best_projector = &projectors[j];
|
best_projector = &projectors[j];
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
* ***** END GPL LICENSE BLOCK *****
|
* ***** END GPL LICENSE BLOCK *****
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/** \file blender/windowmanager/intern/message_bus/wm_message_bus_static.c
|
/** \file blender/windowmanager/message_bus/intern/wm_message_bus_static.c
|
||||||
* \ingroup wm
|
* \ingroup wm
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue