[Bf-blender-cvs] [01369f14000] temp-lanpr-staging: Cleanup: make format.
YimingWu
noreply at git.blender.org
Sun Aug 11 11:40:25 CEST 2019
Commit: 01369f14000b2d7d2f77817149f98376bb57b56c
Author: YimingWu
Date: Sun Aug 11 17:40:06 2019 +0800
Branches: temp-lanpr-staging
https://developer.blender.org/rB01369f14000b2d7d2f77817149f98376bb57b56c
Cleanup: make format.
===================================================================
M source/blender/blenkernel/BKE_gpencil.h
M source/blender/blenkernel/intern/gpencil.c
M source/blender/draw/engines/lanpr/lanpr_cpu.c
M source/blender/draw/engines/lanpr/lanpr_dpix.c
M source/blender/draw/engines/lanpr/lanpr_engine.c
M source/blender/draw/engines/lanpr/lanpr_snake.c
M source/blender/editors/include/ED_lanpr.h
M source/blender/makesrna/intern/rna_collection.c
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/modifiers/intern/MOD_featureline.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h
index f4807c00ebf..2265666c345 100644
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@ -136,7 +136,6 @@ struct bGPDframe *BKE_gpencil_layer_getframe(struct bGPDlayer *gpl,
struct bGPDframe *BKE_gpencil_layer_find_frame(struct bGPDlayer *gpl, int cframe);
bool BKE_gpencil_layer_delframe(struct bGPDlayer *gpl, struct bGPDframe *gpf);
-
struct bGPDlayer *BKE_gpencil_layer_get_index(struct bGPdata *gpd,
int index,
int first_if_not_found);
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index dcb920280ce..6988fd0f6c9 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -1009,7 +1009,6 @@ bGPDlayer *BKE_gpencil_layer_get_index(bGPdata *gpd, int index, int first_if_not
return NULL;
}
-
/* set the active gp-layer */
void BKE_gpencil_layer_setactive(bGPdata *gpd, bGPDlayer *active)
{
diff --git a/source/blender/draw/engines/lanpr/lanpr_cpu.c b/source/blender/draw/engines/lanpr/lanpr_cpu.c
index f4081fc979a..29def5bfd92 100644
--- a/source/blender/draw/engines/lanpr/lanpr_cpu.c
+++ b/source/blender/draw/engines/lanpr/lanpr_cpu.c
@@ -217,7 +217,7 @@ void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, int is_render)
static int zero_value = 0;
copy_v3_v3(use_background_color, &scene->world->horr);
- use_background_color[3] = scene->r.alphamode?0.0f:1.0f;
+ use_background_color[3] = scene->r.alphamode ? 0.0f : 1.0f;
GPU_framebuffer_bind(fbl->software_ms);
GPU_framebuffer_clear(
@@ -447,9 +447,9 @@ void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, int is_render)
}
}
-void ED_lanpr_update_render_progress(const char* text)
+void ED_lanpr_update_render_progress(const char *text)
{
- if(lanpr_share.re_render){
- RE_engine_update_stats(lanpr_share.re_render,NULL,text);
+ if (lanpr_share.re_render) {
+ RE_engine_update_stats(lanpr_share.re_render, NULL, text);
}
}
diff --git a/source/blender/draw/engines/lanpr/lanpr_dpix.c b/source/blender/draw/engines/lanpr/lanpr_dpix.c
index c9401211840..62dfb5b3209 100644
--- a/source/blender/draw/engines/lanpr/lanpr_dpix.c
+++ b/source/blender/draw/engines/lanpr/lanpr_dpix.c
@@ -500,7 +500,7 @@ void lanpr_dpix_draw_scene(LANPR_TextureList *txl,
pd->dpix_zfar = camera ? ((Camera *)camera->data)->clip_end : v3d->clip_end;
copy_v3_v3(use_background_color, &scene->world->horr);
- use_background_color[3] = scene->r.alphamode?0.0f:1.0f;
+ use_background_color[3] = scene->r.alphamode ? 0.0f : 1.0f;
GPU_point_size(1);
/* GPU_line_width(2); */
diff --git a/source/blender/draw/engines/lanpr/lanpr_engine.c b/source/blender/draw/engines/lanpr/lanpr_engine.c
index 12e3901877d..9f1a2394722 100644
--- a/source/blender/draw/engines/lanpr/lanpr_engine.c
+++ b/source/blender/draw/engines/lanpr/lanpr_engine.c
@@ -337,7 +337,7 @@ static void lanpr_cache_init(void *vedata)
1);
static float use_background_color[4];
copy_v3_v3(use_background_color, &scene->world->horr);
- use_background_color[3] = scene->r.alphamode?0.0f:1.0f;
+ use_background_color[3] = scene->r.alphamode ? 0.0f : 1.0f;
DRW_shgroup_uniform_vec4(
stl->g_data->dpix_preview_shgrp, "background_color", use_background_color, 1);
diff --git a/source/blender/draw/engines/lanpr/lanpr_snake.c b/source/blender/draw/engines/lanpr/lanpr_snake.c
index 124c79f3ea5..a27b996cc0c 100644
--- a/source/blender/draw/engines/lanpr/lanpr_snake.c
+++ b/source/blender/draw/engines/lanpr/lanpr_snake.c
@@ -549,11 +549,10 @@ void lanpr_snake_draw_scene(LANPR_TextureList *txl,
float use_background_color[4] = {0.0f, 0.0f, 0.0f, 1.0f};
copy_v3_v3(use_background_color, &scene->world->horr);
- use_background_color[3] = scene->r.alphamode?0.0f:1.0f;
+ use_background_color[3] = scene->r.alphamode ? 0.0f : 1.0f;
GPU_framebuffer_bind(DefaultFB);
- GPU_framebuffer_clear(
- DefaultFB, clear_bits, use_background_color, clear_depth, clear_stencil);
+ GPU_framebuffer_clear(DefaultFB, clear_bits, use_background_color, clear_depth, clear_stencil);
GPU_framebuffer_bind(fbl->edge_intermediate);
clear_bits = GPU_COLOR_BIT;
diff --git a/source/blender/editors/include/ED_lanpr.h b/source/blender/editors/include/ED_lanpr.h
index e8f7695ecdb..593dc105ad0 100644
--- a/source/blender/editors/include/ED_lanpr.h
+++ b/source/blender/editors/include/ED_lanpr.h
@@ -358,7 +358,7 @@ typedef struct LANPR_SharedResource {
SpinLock render_flag_lock;
/** Set before rendering and cleared upon finish! */
- struct RenderEngine* re_render;
+ struct RenderEngine *re_render;
} LANPR_SharedResource;
#define DBL_TRIANGLE_LIM 1e-8
@@ -855,7 +855,7 @@ struct SceneLANPR;
void ED_lanpr_rebuild_all_command(struct SceneLANPR *lanpr);
-void ED_lanpr_update_render_progress(const char* text);
+void ED_lanpr_update_render_progress(const char *text);
void ED_lanpr_calculate_normal_object_vector(LANPR_LineLayer *ll, float *normal_object_direction);
diff --git a/source/blender/makesrna/intern/rna_collection.c b/source/blender/makesrna/intern/rna_collection.c
index d7db437e662..aba310e888c 100644
--- a/source/blender/makesrna/intern/rna_collection.c
+++ b/source/blender/makesrna/intern/rna_collection.c
@@ -422,12 +422,13 @@ static void rna_def_collection_lanpr(BlenderRNA *brna, StructRNA *srna)
prop = RNA_def_property(srna, "layer", PROP_INT, PROP_NONE);
RNA_def_property_range(prop, 0, 100);
RNA_def_property_ui_range(prop, 0, 100, 1, -1);
- RNA_def_property_ui_text(prop, "Layer", "GPencil layer to put the results into");
+ RNA_def_property_ui_text(prop, "Layer", "Grease Pencil layer to put the results into");
prop = RNA_def_property(srna, "material", PROP_INT, PROP_NONE);
RNA_def_property_range(prop, 0, 100);
RNA_def_property_ui_range(prop, 0, 100, 1, -1);
- RNA_def_property_ui_text(prop, "Material", "GPencil material to use to generate the results");
+ RNA_def_property_ui_text(
+ prop, "Material", "Grease Pencil material to use to generate the results");
prop = RNA_def_property(srna, "use_multiple_levels", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "use_multiple_levels", 0);
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index b62c4f374b1..072ab791f9b 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -5982,13 +5982,14 @@ static void rna_def_modifier_featureline(BlenderRNA *brna)
prop = RNA_def_property(srna, "layer", PROP_INT, PROP_NONE);
RNA_def_property_range(prop, 0, 100);
RNA_def_property_ui_range(prop, 0, 100, 1, -1);
- RNA_def_property_ui_text(prop, "Layer", "GPencil layer to put the results into");
+ RNA_def_property_ui_text(prop, "Layer", "Grease Pencil layer to put the results into");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "material", PROP_INT, PROP_NONE);
RNA_def_property_range(prop, 0, 100);
RNA_def_property_ui_range(prop, 0, 100, 1, -1);
- RNA_def_property_ui_text(prop, "Material", "GPencil material to use to generate the results");
+ RNA_def_property_ui_text(
+ prop, "Material", "Grease Pencil material to use to generate the results");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "use_multiple_levels", PROP_BOOLEAN, PROP_NONE);
diff --git a/source/blender/modifiers/intern/MOD_featureline.c b/source/blender/modifiers/intern/MOD_featureline.c
index 173a22c5f51..0d2e3c7ae6b 100644
--- a/source/blender/modifiers/intern/MOD_featureline.c
+++ b/source/blender/modifiers/intern/MOD_featureline.c
@@ -74,12 +74,6 @@ static bool dependsOnTime(ModifierData *UNUSED(md))
{
return true; /* ?? */
}
-static void requiredDataMask(Object *UNUSED(ob),
- ModifierData *md,
- CustomData_MeshMasks *r_cddata_masks)
-{
- FeatureLineModifierData *flmd = (FeatureLineModifierData *)md;
-}
static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh)
{
FeatureLineModifierData *flmd = (FeatureLineModifierData *)md;
@@ -96,7 +90,7 @@ static void foreachObjectLink(ModifierData *md, Object *ob, ObjectWalkFunc walk,
static bool isDisabled(const struct Scene *scene, struct ModifierData *md, bool userRenderParams)
{
FeatureLineModifierData *flmd = (FeatureLineModifierData *)md;
- if (!flmd->target){
+ if (!flmd->target) {
return true;
}
return false;
@@ -117,7 +111,7 @@ ModifierTypeInfo modifierType_FeatureLine = {
/* applyModifier */ applyModifier,
/* initData */ initData,
- /* requiredDataMask */ requiredDataMask,
+ /* requiredDataMask */ NULL,
/* freeData */ freeData,
/* isDisabled */ isDisabled,
/* updateDepsgraph */ NULL,
More information about the Bf-blender-cvs
mailing list