archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup, format

Browse Source
This commit is contained in:
Kévin Dietrich
2021-08-20 02:30:11 +02:00
parent 962153dbed
commit 5b51df0f33
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/BKE_modifier.h
View File

@@ -427,9 +427,7 @@ void BKE_modifier_copydata(struct ModifierData *md, struct ModifierData *target)
void BKE_modifier_copydata_ex(struct ModifierData *md, void BKE_modifier_copydata_ex(struct ModifierData *md,
struct ModifierData *target, struct ModifierData *target,
const int flag); const int flag);
bool BKE_modifier_depends_ontime(struct Scene *scene, bool BKE_modifier_depends_ontime(struct Scene *scene, struct ModifierData *md, int dag_eval_mode);
struct ModifierData *md,
int dag_eval_mode);
bool BKE_modifier_supports_mapping(struct ModifierData *md); bool BKE_modifier_supports_mapping(struct ModifierData *md);
bool BKE_modifier_supports_cage(struct Scene *scene, struct ModifierData *md); bool BKE_modifier_supports_cage(struct Scene *scene, struct ModifierData *md);
bool BKE_modifier_couldbe_cage(struct Scene *scene, struct ModifierData *md); bool BKE_modifier_couldbe_cage(struct Scene *scene, struct ModifierData *md);

3
source/blender/editors/interface/interface_templates.c
View File

@@ -6469,7 +6469,8 @@ void uiTemplateCacheFile(uiLayout *layout,
const struct RenderEngineType *engine_type = CTX_data_engine_type(C); const struct RenderEngineType *engine_type = CTX_data_engine_type(C);
Scene *scene = CTX_data_scene(C); Scene *scene = CTX_data_scene(C);
const bool engine_supports_procedural = RE_engine_supports_alembic_procedural(engine_type, scene); const bool engine_supports_procedural = RE_engine_supports_alembic_procedural(engine_type,
scene);
if (!engine_supports_procedural) { if (!engine_supports_procedural) {
row = uiLayoutRow(layout, false); row = uiLayoutRow(layout, false);

4
source/blender/modifiers/intern/MOD_volume_displace.cc
View File

@@ -95,7 +95,9 @@ static void foreachTexLink(ModifierData *md, Object *ob, TexWalkFunc walk, void
walk(userData, ob, md, "texture"); walk(userData, ob, md, "texture");
} }
static bool dependsOnTime(struct Scene *UNUSED(scene), ModifierData *md, const int UNUSED(dag_eval_mode)) static bool dependsOnTime(struct Scene *UNUSED(scene),
ModifierData *md,
const int UNUSED(dag_eval_mode))
{ {
VolumeDisplaceModifierData *vdmd = reinterpret_cast<VolumeDisplaceModifierData *>(md); VolumeDisplaceModifierData *vdmd = reinterpret_cast<VolumeDisplaceModifierData *>(md);
if (vdmd->texture) { if (vdmd->texture) {