Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r--source/blender/makesdna/DNA_camera_types.h6
-rw-r--r--source/blender/makesdna/intern/dna_rename_defs.h6
2 files changed, 5 insertions, 7 deletions
diff --git a/source/blender/makesdna/DNA_camera_types.h b/source/blender/makesdna/DNA_camera_types.h
index cf62b034041..f73f3dc8def 100644
--- a/source/blender/makesdna/DNA_camera_types.h
+++ b/source/blender/makesdna/DNA_camera_types.h
@@ -90,11 +90,7 @@ typedef struct Camera {
float lens, ortho_scale, drawsize;
float sensor_x, sensor_y;
float shiftx, shifty;
-
- /* yafray: dof params */
- /* qdn: yafray var 'YF_dofdist' now enabled for defocus composite node as well.
- * The name was not changed so that no other files need to be modified */
- float YF_dofdist;
+ float dof_distance;
/** Old animation system, deprecated for 2.5. */
struct Ipo *ipo DNA_DEPRECATED;
diff --git a/source/blender/makesdna/intern/dna_rename_defs.h b/source/blender/makesdna/intern/dna_rename_defs.h
index cdf13e7103d..8e7b0be8471 100644
--- a/source/blender/makesdna/intern/dna_rename_defs.h
+++ b/source/blender/makesdna/intern/dna_rename_defs.h
@@ -38,10 +38,12 @@
/* No include guard (intentional). */
-/* Match RNA names where possible. */
+/* Match RNA names where possible, keep sorted. */
+
+DNA_STRUCT_RENAME_ELEM(Camera, YF_dofdist, dof_distance)
+
#if 0
DNA_STRUCT_RENAME(Lamp, Light)
DNA_STRUCT_RENAME(SpaceOops, SpaceOutliner)
-DNA_STRUCT_RENAME_ELEM(Camera, YF_dofdist, dof_distance)
DNA_STRUCT_RENAME_ELEM(Object, dup_group, instance_collection)
#endif