Commit: e7af5cbbb7e641df9815a6a9ffc0e8abee46fc72
Author: Julian Eisel
Date: Sun Jun 5 17:30:06 2016 +0200
Branches: soc-2016-layer_manager
https://developer.blender.org/rBe7af5cbbb7e641df9815a6a9ffc0e8abee46fc72
Correction to previous commit
===================================================================
M source/blender/editors/space_layers/layers_ops.c
M source/blender/makesdna/DNA_space_types.h
===================================================================
diff --git a/source/blender/editors/space_layers/layers_ops.c
b/source/blender/editors/space_layers/layers_ops.c
index 6402ca6..ba52fc7 100644
--- a/source/blender/editors/space_layers/layers_ops.c
+++ b/source/blender/editors/space_layers/layers_ops.c
@@ -105,7 +105,7 @@ static void layers_remove_layer_objects(bContext *C,
SpaceLayers *slayer, LayerT
Base *base = base_link->data;
/* remove object from other layers */
/* XXX bases could have info about the layers they are in, then
- * we could avoid loop in loop and do this all on BKE_level */
+ * we could avoid loop in loop and do this all on BKE_ level */
GHASH_ITER(gh_iter, slayer->tiles) {
BKE_objectlayer_base_unassign(base,
BLI_ghashIterator_getKey(&gh_iter));
}
diff --git a/source/blender/makesdna/DNA_space_types.h
b/source/blender/makesdna/DNA_space_types.h
index b7bcda3..f8e73db 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -1369,7 +1369,6 @@ typedef struct LayerTreeItem {
/* Optional free callback. Don't free item itself! */
void (*free)(struct LayerTreeItem *);
- void *free_customdata;
} LayerTreeItem;
/* SpaceLayers->flag */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
