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:
authorCampbell Barton <ideasman42@gmail.com>2018-11-14 09:12:52 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-11-14 09:21:34 +0300
commit55e719ec35a10c3f9e7231dee13d4b05aad7d965 (patch)
tree563ed5b1b27e9613de8384da90197ce2c3e1924b /source/blender/makesrna/intern/rna_scene.c
parentc279f879ab86e03dff0dbfd3a36b14bebb4956f9 (diff)
parentd7f55c4ff58f87b80f0ce2fa43ce2f7cd2b72675 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_scene.c')
-rw-r--r--source/blender/makesrna/intern/rna_scene.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index b9876d8595f..e0ebe1c29c8 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -828,8 +828,8 @@ static void rna_Scene_active_keying_set_set(PointerRNA *ptr, PointerRNA value)
}
/* get KeyingSet index stuff for list of Keying Sets editing UI
- * - active_keyingset-1 since 0 is reserved for 'none'
- * - don't clamp, otherwise can never set builtins types as active...
+ * - active_keyingset-1 since 0 is reserved for 'none'
+ * - don't clamp, otherwise can never set builtins types as active...
*/
static int rna_Scene_active_keying_set_index_get(PointerRNA *ptr)
{
@@ -838,7 +838,7 @@ static int rna_Scene_active_keying_set_index_get(PointerRNA *ptr)
}
/* get KeyingSet index stuff for list of Keying Sets editing UI
- * - value+1 since 0 is reserved for 'none'
+ * - value+1 since 0 is reserved for 'none'
*/
static void rna_Scene_active_keying_set_index_set(PointerRNA *ptr, int value)
{