[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59570] branches/soc-2013-paint: Revert that hell.
Antony Riakiotakis
kalast at gmail.com
Tue Aug 27 21:58:37 CEST 2013
Revision: 59570
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59570
Author: psy-fi
Date: 2013-08-27 19:58:36 +0000 (Tue, 27 Aug 2013)
Log Message:
-----------
Revert that hell. Thanks git for the trouble and the rescue.
Revert "Fix [#36289] Not change children object on freez layer when change frame."
Modified Paths:
--------------
branches/soc-2013-paint/release/scripts/startup/bl_ui/properties_freestyle.py
branches/soc-2013-paint/source/blender/blenkernel/intern/treehash.c
branches/soc-2013-paint/source/blender/blenlib/BLI_edgehash.h
branches/soc-2013-paint/source/blender/blenlib/BLI_ghash.h
branches/soc-2013-paint/source/blender/blenlib/BLI_mempool.h
branches/soc-2013-paint/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2013-paint/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2013-paint/source/blender/blenlib/intern/edgehash.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_scene.c
Modified: branches/soc-2013-paint/release/scripts/startup/bl_ui/properties_freestyle.py
===================================================================
--- branches/soc-2013-paint/release/scripts/startup/bl_ui/properties_freestyle.py 2013-08-27 19:26:16 UTC (rev 59569)
+++ branches/soc-2013-paint/release/scripts/startup/bl_ui/properties_freestyle.py 2013-08-27 19:58:36 UTC (rev 59570)
@@ -576,7 +576,7 @@
# End of columns
row = layout.row(align=True)
row.prop(linestyle, "use_split_pattern", text="")
- sub = row.row(align=True)
+ sub = row.row()
sub.active = linestyle.use_split_pattern
sub.prop(linestyle, "split_dash1", text="D1")
sub.prop(linestyle, "split_gap1", text="G1")
@@ -612,7 +612,7 @@
layout.label(text="Dashed Line:")
row = layout.row(align=True)
row.prop(linestyle, "use_dashed_line", text="")
- sub = row.row(align=True)
+ sub = row.row()
sub.active = linestyle.use_dashed_line
sub.prop(linestyle, "dash1", text="D1")
sub.prop(linestyle, "gap1", text="G1")
Modified: branches/soc-2013-paint/source/blender/blenkernel/intern/treehash.c
===================================================================
--- branches/soc-2013-paint/source/blender/blenkernel/intern/treehash.c 2013-08-27 19:26:16 UTC (rev 59569)
+++ branches/soc-2013-paint/source/blender/blenkernel/intern/treehash.c 2013-08-27 19:58:36 UTC (rev 59570)
@@ -30,9 +30,9 @@
#include "BKE_treehash.h"
-#include "BLI_utildefines.h"
#include "BLI_ghash.h"
#include "BLI_mempool.h"
+#include "BLI_utildefines.h"
#include "DNA_outliner_types.h"
@@ -113,7 +113,7 @@
void *BKE_treehash_rebuild_from_treestore(void *treehash, BLI_mempool *treestore)
{
- BLI_ghash_clear_ex(treehash, NULL, free_treehash_group, BLI_mempool_count(treestore));
+ BLI_ghash_clear(treehash, NULL, free_treehash_group);
fill_treehash(treehash, treestore);
return treehash;
}
Modified: branches/soc-2013-paint/source/blender/blenlib/BLI_edgehash.h
===================================================================
--- branches/soc-2013-paint/source/blender/blenlib/BLI_edgehash.h 2013-08-27 19:26:16 UTC (rev 59569)
+++ branches/soc-2013-paint/source/blender/blenlib/BLI_edgehash.h 2013-08-27 19:58:36 UTC (rev 59570)
@@ -45,7 +45,7 @@
EdgeHash *BLI_edgehash_new(const char *info);
void BLI_edgehash_free(EdgeHash *eh, EdgeHashFreeFP valfreefp);
void BLI_edgehash_insert(EdgeHash *eh, unsigned int v0, unsigned int v1, void *val);
-bool BLI_edgehash_reinsert(EdgeHash *eh, unsigned int v0, unsigned int v1, void *val);
+void BLI_edgehash_reinsert(EdgeHash *eh, unsigned int v0, unsigned int v1, void *val);
void *BLI_edgehash_lookup(EdgeHash *eh, unsigned int v0, unsigned int v1);
void **BLI_edgehash_lookup_p(EdgeHash *eh, unsigned int v0, unsigned int v1);
bool BLI_edgehash_haskey(EdgeHash *eh, unsigned int v0, unsigned int v1);
@@ -65,28 +65,4 @@
#define BLI_EDGEHASH_SIZE_GUESS_FROM_LOOPS(totloop) ((totloop) / 2)
#define BLI_EDGEHASH_SIZE_GUESS_FROM_POLYS(totpoly) ((totpoly) * 2)
-/* *** EdgeSet *** */
-
-struct EdgeSet;
-struct EdgeSetIterator;
-typedef struct EdgeSet EdgeSet;
-typedef struct EdgeSetIterator EdgeSetIterator;
-
-EdgeSet *BLI_edgeset_new_ex(const char *info,
- const unsigned int nentries_reserve);
-EdgeSet *BLI_edgeset_new(const char *info);
-int BLI_edgeset_size(EdgeSet *es);
-bool BLI_edgeset_reinsert(EdgeSet *es, unsigned int v0, unsigned int v1);
-void BLI_edgeset_insert(EdgeSet *es, unsigned int v0, unsigned int v1);
-bool BLI_edgeset_haskey(EdgeSet *eh, unsigned int v0, unsigned int v1);
-void BLI_edgeset_free(EdgeSet *es);
-
-/* rely on inline api for now */
-BLI_INLINE EdgeSetIterator *BLI_edgesetIterator_new(EdgeSet *gs) { return (EdgeSetIterator *)BLI_edgehashIterator_new((EdgeHash *)gs); }
-BLI_INLINE void BLI_edgesetIterator_free(EdgeSetIterator *esi) { BLI_edgehashIterator_free((EdgeHashIterator *)esi); }
-BLI_INLINE void BLI_edgesetIterator_getKey(EdgeSetIterator *esi, unsigned int *v0_r, unsigned int *v1_r) { return BLI_edgehashIterator_getKey((EdgeHashIterator *)esi, v0_r, v1_r); }
-BLI_INLINE void BLI_edgesetIterator_step(EdgeSetIterator *esi) { BLI_edgehashIterator_step((EdgeHashIterator *)esi); }
-BLI_INLINE bool BLI_edgesetIterator_isDone(EdgeSetIterator *esi) { return BLI_edgehashIterator_isDone((EdgeHashIterator *)esi); }
-
-
#endif /* __BLI_EDGEHASH_H__ */
Modified: branches/soc-2013-paint/source/blender/blenlib/BLI_ghash.h
===================================================================
--- branches/soc-2013-paint/source/blender/blenlib/BLI_ghash.h 2013-08-27 19:26:16 UTC (rev 59569)
+++ branches/soc-2013-paint/source/blender/blenlib/BLI_ghash.h 2013-08-27 19:58:36 UTC (rev 59570)
@@ -63,13 +63,11 @@
GHash *BLI_ghash_new(GHashHashFP hashfp, GHashCmpFP cmpfp, const char *info);
void BLI_ghash_free(GHash *gh, GHashKeyFreeFP keyfreefp, GHashValFreeFP valfreefp);
void BLI_ghash_insert(GHash *gh, void *key, void *val);
-bool BLI_ghash_reinsert(GHash *gh, void *key, void *val, GHashKeyFreeFP keyfreefp, GHashValFreeFP valfreefp);
+void BLI_ghash_reinsert(GHash *gh, void *key, void *val, GHashKeyFreeFP keyfreefp, GHashValFreeFP valfreefp);
void *BLI_ghash_lookup(GHash *gh, const void *key);
void **BLI_ghash_lookup_p(GHash *gh, const void *key);
bool BLI_ghash_remove(GHash *gh, void *key, GHashKeyFreeFP keyfreefp, GHashValFreeFP valfreefp);
void BLI_ghash_clear(GHash *gh, GHashKeyFreeFP keyfreefp, GHashValFreeFP valfreefp);
-void BLI_ghash_clear_ex(GHash *gh, GHashKeyFreeFP keyfreefp, GHashValFreeFP valfreefp,
- const unsigned int nentries_reserve);
void *BLI_ghash_pop(GHash *gh, void *key, GHashKeyFreeFP keyfreefp);
bool BLI_ghash_haskey(GHash *gh, const void *key);
int BLI_ghash_size(GHash *gh);
@@ -78,17 +76,62 @@
/* *** */
+/**
+ * Create a new GHashIterator. The hash table must not be mutated
+ * while the iterator is in use, and the iterator will step exactly
+ * BLI_ghash_size(gh) times before becoming done.
+ *
+ * \param gh The GHash to iterate over.
+ * \return Pointer to a new DynStr.
+ */
GHashIterator *BLI_ghashIterator_new(GHash *gh);
+/**
+ * Init an already allocated GHashIterator. The hash table must not
+ * be mutated while the iterator is in use, and the iterator will
+ * step exactly BLI_ghash_size(gh) times before becoming done.
+ *
+ * \param ghi The GHashIterator to initialize.
+ * \param gh The GHash to iterate over.
+ */
+void BLI_ghashIterator_init(GHashIterator *ghi, GHash *gh);
+/**
+ * Free a GHashIterator.
+ *
+ * \param ghi The iterator to free.
+ */
+void BLI_ghashIterator_free(GHashIterator *ghi);
-void BLI_ghashIterator_init(GHashIterator *ghi, GHash *gh);
-void BLI_ghashIterator_free(GHashIterator *ghi);
+/**
+ * Retrieve the key from an iterator.
+ *
+ * \param ghi The iterator.
+ * \return The key at the current index, or NULL if the
+ * iterator is done.
+ */
+void *BLI_ghashIterator_getKey(GHashIterator *ghi);
+/**
+ * Retrieve the value from an iterator.
+ *
+ * \param ghi The iterator.
+ * \return The value at the current index, or NULL if the
+ * iterator is done.
+ */
+void *BLI_ghashIterator_getValue(GHashIterator *ghi);
+/**
+ * Steps the iterator to the next index.
+ *
+ * \param ghi The iterator.
+ */
+void BLI_ghashIterator_step(GHashIterator *ghi);
+/**
+ * Determine if an iterator is done (has reached the end of
+ * the hash table).
+ *
+ * \param ghi The iterator.
+ * \return True if done, False otherwise.
+ */
+bool BLI_ghashIterator_done(GHashIterator *ghi);
-void *BLI_ghashIterator_getKey(GHashIterator *ghi);
-void *BLI_ghashIterator_getValue(GHashIterator *ghi);
-
-void BLI_ghashIterator_step(GHashIterator *ghi);
-bool BLI_ghashIterator_done(GHashIterator *ghi);
-
#define GHASH_ITER(gh_iter_, ghash_) \
for (BLI_ghashIterator_init(&gh_iter_, ghash_); \
BLI_ghashIterator_done(&gh_iter_) == false; \
@@ -133,62 +176,6 @@
int BLI_ghashutil_paircmp(const void *a, const void *b);
void BLI_ghashutil_pairfree(void *ptr);
-
-/* *** */
-
-typedef struct GSet GSet;
-
-typedef GHashHashFP GSetHashFP;
-typedef GHashCmpFP GSetCmpFP;
-typedef GHashKeyFreeFP GSetKeyFreeFP;
-
-/* so we can cast but compiler sees as different */
-typedef struct GSetIterator {
- GHashIterator _ghi
-#ifdef __GNUC__
- __attribute__ ((deprecated))
-#endif
- ;
-} GSetIterator;
-
-GSet *BLI_gset_new_ex(GSetHashFP hashfp, GSetCmpFP cmpfp, const char *info,
- const unsigned int nentries_reserve);
-GSet *BLI_gset_new(GSetHashFP hashfp, GSetCmpFP cmpfp, const char *info);
-int BLI_gset_size(GSet *gs);
-void BLI_gset_free(GSet *gs, GSetKeyFreeFP keyfreefp);
-void BLI_gset_insert(GSet *gh, void *key);
-bool BLI_gset_reinsert(GSet *gh, void *key, GSetKeyFreeFP keyfreefp);
-bool BLI_gset_haskey(GSet *gs, const void *key);
-bool BLI_gset_remove(GSet *gs, void *key, GSetKeyFreeFP keyfreefp);
-void BLI_gset_clear_ex(GSet *gs, GSetKeyFreeFP keyfreefp,
- const unsigned int nentries_reserve);
-void BLI_gset_clear(GSet *gs, GSetKeyFreeFP keyfreefp);
-
-GSet *BLI_gset_ptr_new_ex(const char *info,
- const unsigned int nentries_reserve);
-GSet *BLI_gset_ptr_new(const char *info);
-GSet *BLI_gset_pair_new_ex(const char *info,
- const unsigned int nentries_reserve);
-GSet *BLI_gset_pair_new(const char *info);
-
-/* rely on inline api for now */
-BLI_INLINE GSetIterator *BLI_gsetIterator_new(GSet *gs) { return (GSetIterator *)BLI_ghashIterator_new((GHash *)gs); }
-BLI_INLINE void BLI_gsetIterator_init(GSetIterator *gsi, GSet *gs) { BLI_ghashIterator_init((GHashIterator *)gsi, (GHash *)gs); }
-BLI_INLINE void BLI_gsetIterator_free(GSetIterator *gsi) { BLI_ghashIterator_free((GHashIterator *)gsi); }
-BLI_INLINE void *BLI_gsetIterator_getKey(GSetIterator *gsi) { return BLI_ghashIterator_getKey((GHashIterator *)gsi); }
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list