[Bf-blender-cvs] [f83ccbc673d] master: Cleanup: unused variable, spelling

Campbell Barton noreply at git.blender.org
Wed Apr 15 16:37:22 CEST 2020


Commit: f83ccbc673dee2a23a2d26e8efb1dae233db48b2
Author: Campbell Barton
Date:   Thu Apr 16 00:11:06 2020 +1000
Branches: master
https://developer.blender.org/rBf83ccbc673dee2a23a2d26e8efb1dae233db48b2

Cleanup: unused variable, spelling

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

M	source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
M	source/blender/editors/transform/transform_convert_armature.c
M	source/blender/makesrna/intern/rna_fluid.c

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

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
index d05385a7d7c..7fe7695f195 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
@@ -69,7 +69,7 @@ void DepsgraphRelationBuilder::build_ik_pose(Object *object,
                                              RootPChanMap *root_map)
 {
   if ((con->flag & CONSTRAINT_DISABLE) != 0) {
-    /* Do not add disabled IK constraints to the relations. If these needs to be temporarly
+    /* Do not add disabled IK constraints to the relations. If these needs to be temporarily
      * enabled, they will be added as temporary constraints during transform. */
     return;
   }
diff --git a/source/blender/editors/transform/transform_convert_armature.c b/source/blender/editors/transform/transform_convert_armature.c
index 91b8b1ff657..17d210f57b9 100644
--- a/source/blender/editors/transform/transform_convert_armature.c
+++ b/source/blender/editors/transform/transform_convert_armature.c
@@ -609,9 +609,9 @@ void pose_transform_mirror_update(TransInfo *t, TransDataContainer *tc, Object *
         /* TODO(germano): Realitve Mirror support */
       }
       data->flag |= CONSTRAINT_IK_AUTO;
-      /* Add a temporary auto IK constraint here, as we will only temporarly active this targetless
-       * bone during transform. (Targetless IK constraints are treated as if they are disabled
-       * unless they are transformed) */
+      /* Add a temporary auto IK constraint here, as we will only temporarily active this
+       * target-less bone during transform. (Target-less IK constraints are treated as if they are
+       * disabled unless they are transformed) */
       add_temporary_ik_constraint(pchan, data);
       Main *bmain = CTX_data_main(t->context);
       update_deg_with_temporary_ik(bmain, ob);
diff --git a/source/blender/makesrna/intern/rna_fluid.c b/source/blender/makesrna/intern/rna_fluid.c
index 8992e7d38bd..d89bdcd074f 100644
--- a/source/blender/makesrna/intern/rna_fluid.c
+++ b/source/blender/makesrna/intern/rna_fluid.c
@@ -174,9 +174,8 @@ static void rna_Fluid_domain_reset(Main *bmain, Scene *scene, PointerRNA *ptr)
 
 static void rna_Fluid_reset_dependency(Main *bmain, Scene *scene, PointerRNA *ptr)
 {
-  FluidDomainSettings *settings = (FluidDomainSettings *)ptr->data;
-
 #  ifdef WITH_FLUID
+  FluidDomainSettings *settings = (FluidDomainSettings *)ptr->data;
   BKE_fluid_modifier_reset(settings->mmd);
 #  endif



More information about the Bf-blender-cvs mailing list