[Bf-blender-cvs] [75808620ce4] master: Made ob param of `modifiers_getVirtualModifierList` const

Sybren A. Stüvel noreply at git.blender.org
Tue Nov 26 16:31:06 CET 2019


Commit: 75808620ce495b61e7e7188cc1c040d05929b7dd
Author: Sybren A. Stüvel
Date:   Tue Nov 26 15:11:20 2019 +0100
Branches: master
https://developer.blender.org/rB75808620ce495b61e7e7188cc1c040d05929b7dd

Made ob param of `modifiers_getVirtualModifierList` const

The `modifiers_getVirtualModifierList()` function previously took a non-
const `Object *ob` parameter, preventing it from being called from more
restrictive functions. Since the function doesn't modify the passed
object, it could easily be made const.

No functional changes.

===================================================================

M	source/blender/blenkernel/BKE_modifier.h
M	source/blender/blenkernel/intern/modifier.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h
index 0977a406aa0..07dee83e5ca 100644
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@ -417,7 +417,7 @@ typedef struct VirtualModifierData {
   ShapeKeyModifierData smd;
 } VirtualModifierData;
 
-struct ModifierData *modifiers_getVirtualModifierList(struct Object *ob,
+struct ModifierData *modifiers_getVirtualModifierList(const struct Object *ob,
                                                       struct VirtualModifierData *data);
 
 /* ensure modifier correctness when changing ob->data */
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 8f04596da3e..fd7d2fd4a03 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -614,7 +614,7 @@ ModifierData *modifiers_getLastPreview(struct Scene *scene, ModifierData *md, in
 
 /* This is to include things that are not modifiers in the evaluation of the modifier stack, for
  * example parenting to an armature. */
-ModifierData *modifiers_getVirtualModifierList(Object *ob,
+ModifierData *modifiers_getVirtualModifierList(const Object *ob,
                                                VirtualModifierData *virtualModifierData)
 {
   ModifierData *md;



More information about the Bf-blender-cvs mailing list