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>2012-03-04 00:19:11 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-03-04 00:19:11 +0400
commit95670e03a01d30cda5a0f685974f28790be6809d (patch)
treee6d5756cbe51edb083cda2fceff087bda35c361a /source/blender/blenkernel/intern/scene.c
parenta2c182e9233333fc3b8ff40d352113ec95e7e30c (diff)
style cleanup / comment formatting for bli/bke/bmesh
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
-rw-r--r--source/blender/blenkernel/intern/scene.c28
1 files changed, 15 insertions, 13 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 150bb05d2d9..3d84278c878 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -719,8 +719,8 @@ int next_object(Scene **scene, int val, Base **base, Object **ob)
if (fase!=F_DUPLI) {
if ( (*base)->object->transflag & OB_DUPLI) {
/* groups cannot be duplicated for mballs yet,
- this enters eternal loop because of
- makeDispListMBall getting called inside of group_duplilist */
+ * this enters eternal loop because of
+ * makeDispListMBall getting called inside of group_duplilist */
if ((*base)->object->dup_group == NULL) {
duplilist= object_duplilist((*scene), (*base)->object);
@@ -757,10 +757,12 @@ int next_object(Scene **scene, int val, Base **base, Object **ob)
}
}
}
-
- /* if (ob && *ob) {
+
+#if 0
+ if (ob && *ob) {
printf("Scene: '%s', '%s'\n", (*scene)->id.name+2, (*ob)->id.name+2);
- } */
+ }
+#endif
/* reset recursion test */
in_next_object= 0;
@@ -836,7 +838,7 @@ char *scene_find_marker_name(Scene *scene, int frame)
}
/* return the current marker for this frame,
-we can have more then 1 marker per frame, this just returns the first :/ */
+ * we can have more then 1 marker per frame, this just returns the first :/ */
char *scene_find_last_marker_name(Scene *scene, int frame)
{
TimeMarker *marker, *best_marker = NULL;
@@ -973,7 +975,7 @@ static void scene_update_tagged_recursive(Main *bmain, Scene *scene, Scene *scen
scene->customdata_mask= scene_parent->customdata_mask;
/* sets first, we allow per definition current scene to have
- dependencies on sets, but not the other way around. */
+ * dependencies on sets, but not the other way around. */
if (scene->set)
scene_update_tagged_recursive(bmain, scene->set, scene_parent);
@@ -1009,10 +1011,10 @@ void scene_update_tagged(Main *bmain, Scene *scene)
scene->physics_settings.quick_cache_step= 0;
/* update all objects: drivers, matrices, displists, etc. flags set
- by depgraph or manual, no layer check here, gets correct flushed
-
- in the future this should handle updates for all datablocks, not
- only objects and scenes. - brecht */
+ * by depgraph or manual, no layer check here, gets correct flushed
+ *
+ * in the future this should handle updates for all datablocks, not
+ * only objects and scenes. - brecht */
scene_update_tagged_recursive(bmain, scene, scene);
/* extra call here to recalc scene animation (for sequencer) */
@@ -1057,8 +1059,8 @@ void scene_update_for_newframe(Main *bmain, Scene *sce, unsigned int lay)
}
/* flush recalc flags to dependencies, if we were only changing a frame
- this would not be necessary, but if a user or a script has modified
- some datablock before scene_update_tagged was called, we need the flush */
+ * this would not be necessary, but if a user or a script has modified
+ * some datablock before scene_update_tagged was called, we need the flush */
DAG_ids_flush_tagged(bmain);
/* Following 2 functions are recursive