[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59315] branches/soc-2013-depsgraph_mt: Merging r59303 through r59314 from trunk into soc-2013-depsgraph_mt
Sergey Sharybin
sergey.vfx at gmail.com
Tue Aug 20 09:59:50 CEST 2013
Revision: 59315
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59315
Author: nazgul
Date: 2013-08-20 07:59:50 +0000 (Tue, 20 Aug 2013)
Log Message:
-----------
Merging r59303 through r59314 from trunk into soc-2013-depsgraph_mt
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59303
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59314
Modified Paths:
--------------
branches/soc-2013-depsgraph_mt/intern/atomic/atomic_ops.h
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/brush.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/pbvh_bmesh.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_math_interp.h
branches/soc-2013-depsgraph_mt/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2013-depsgraph_mt/source/blender/editors/metaball/mball_edit.c
branches/soc-2013-depsgraph_mt/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2013-depsgraph_mt/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2013-depsgraph_mt/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-depsgraph_mt/source/blender/editors/transform/transform.h
branches/soc-2013-depsgraph_mt/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-depsgraph_mt/source/blender/editors/transform/transform_generics.c
branches/soc-2013-depsgraph_mt/source/blender/imbuf/intern/IMB_colormanagement_intern.h
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_meta.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2013-depsgraph_mt/source/gameengine/Ketsji/BL_ActionManager.h
Property Changed:
----------------
branches/soc-2013-depsgraph_mt/
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-depsgraph_mt
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-59302
+ /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-59314
Modified: branches/soc-2013-depsgraph_mt/intern/atomic/atomic_ops.h
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/atomic/atomic_ops.h 2013-08-20 06:04:46 UTC (rev 59314)
+++ branches/soc-2013-depsgraph_mt/intern/atomic/atomic_ops.h 2013-08-20 07:59:50 UTC (rev 59315)
@@ -26,8 +26,8 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef ATOMIC_OPS_H__
-#define ATOMIC_OPS_H__
+#ifndef __ATOMIC_OPS_H__
+#define __ATOMIC_OPS_H__
#include <assert.h>
@@ -304,4 +304,4 @@
#endif
}
-#endif /* ATOMIC_OPS_H__ */
+#endif /* __ATOMIC_OPS_H__ */
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/brush.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/brush.c 2013-08-20 06:04:46 UTC (rev 59314)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/brush.c 2013-08-20 07:59:50 UTC (rev 59315)
@@ -951,7 +951,6 @@
if (p >= len) return 0;
else p = p / len;
- curvemapping_initialize(br->curve);
strength = curvemapping_evaluateF(br->curve, 0, p);
CLAMP(strength, 0.0f, 1.0f);
@@ -967,7 +966,6 @@
else
p = p / len;
- curvemapping_initialize(br->curve);
return curvemapping_evaluateF(br->curve, 0, p);
}
@@ -1024,6 +1022,7 @@
int half = side / 2;
int i, j;
+ curvemapping_initialize(br->curve);
texcache = BKE_brush_gen_texture_cache(br, half);
im->rect_float = MEM_callocN(sizeof(float) * side * side, "radial control rect");
im->x = im->y = side;
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/pbvh_bmesh.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/pbvh_bmesh.c 2013-08-20 06:04:46 UTC (rev 59314)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/pbvh_bmesh.c 2013-08-20 07:59:50 UTC (rev 59315)
@@ -92,7 +92,7 @@
if (!G.background) {
int smooth = bvh->flags & PBVH_DYNTOPO_SMOOTH_SHADING;
n->draw_buffers = GPU_build_bmesh_buffers(smooth);
- n->flag |= PBVH_UpdateDrawBuffers;
+ n->flag |= PBVH_UpdateDrawBuffers | PBVH_UpdateNormals;
}
}
@@ -386,6 +386,7 @@
BLI_assert(BLI_ghash_haskey(bvh->bm_vert_to_node, v));
v_node = pbvh_bmesh_node_lookup(bvh, bvh->bm_vert_to_node, v);
+ BLI_ghash_remove(bvh->bm_vert_to_node, v, NULL, NULL);
BLI_ghash_remove(v_node->bm_unique_verts, v, NULL, NULL);
BLI_ghash_remove(bvh->bm_vert_to_node, v, NULL, NULL);
@@ -393,7 +394,9 @@
BM_ITER_ELEM (f, &bm_iter, v, BM_FACES_OF_VERT) {
PBVHNode *f_node = pbvh_bmesh_node_lookup(bvh, bvh->bm_face_to_node, f);
- BLI_ghash_remove(f_node->bm_unique_verts, v, NULL, NULL);
+ /* Remove current ownership */
+ /* Should be handled above by vert_to_node removal, leaving just in case - psy-fi */
+ //BLI_ghash_remove(f_node->bm_unique_verts, v, NULL, NULL);
BLI_ghash_remove(f_node->bm_other_verts, v, NULL, NULL);
BLI_assert(!BLI_ghash_haskey(f_node->bm_unique_verts, v));
@@ -426,6 +429,9 @@
if (new_node) {
pbvh_bmesh_vert_ownership_transfer(bvh, new_node, v);
+ } else {
+ BLI_ghash_remove(f_node->bm_unique_verts, v, NULL, NULL);
+ BLI_ghash_remove(bvh->bm_vert_to_node, v, NULL, NULL);
}
}
else {
@@ -686,7 +692,7 @@
ni = GET_INT_FROM_POINTER(nip);
/* Ensure node gets redrawn */
- bvh->nodes[ni].flag |= PBVH_UpdateDrawBuffers;
+ bvh->nodes[ni].flag |= PBVH_UpdateDrawBuffers | PBVH_UpdateNormals;
/* Find the vertex not in the edge */
v_opp = l_adj->prev->v;
@@ -1012,25 +1018,29 @@
return hit;
}
+
void pbvh_bmesh_normals_update(PBVHNode **nodes, int totnode)
{
int n;
for (n = 0; n < totnode; n++) {
PBVHNode *node = nodes[n];
- GHashIterator gh_iter;
- GHASH_ITER (gh_iter, node->bm_faces) {
- BM_face_normal_update(BLI_ghashIterator_getKey(&gh_iter));
- }
- GHASH_ITER (gh_iter, node->bm_unique_verts) {
+ if (node->flag & PBVH_UpdateNormals) {
+ GHashIterator gh_iter;
+
+ GHASH_ITER (gh_iter, node->bm_faces) {
+ BM_face_normal_update(BLI_ghashIterator_getKey(&gh_iter));
+ }
+ GHASH_ITER (gh_iter, node->bm_unique_verts) {
+ BM_vert_normal_update(BLI_ghashIterator_getKey(&gh_iter));
+ }
+ /* This should be unneeded normally */
+ GHASH_ITER (gh_iter, node->bm_other_verts) {
BM_vert_normal_update(BLI_ghashIterator_getKey(&gh_iter));
+ }
+ node->flag &= ~PBVH_UpdateNormals;
}
- /* This should be unneeded normally */
- GHASH_ITER (gh_iter, node->bm_other_verts) {
- BM_vert_normal_update(BLI_ghashIterator_getKey(&gh_iter));
- }
- node->flag &= ~PBVH_UpdateNormals;
}
}
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_math_interp.h
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_math_interp.h 2013-08-20 06:04:46 UTC (rev 59314)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_math_interp.h 2013-08-20 07:59:50 UTC (rev 59315)
@@ -26,8 +26,8 @@
*
*/
-#ifndef BLI_MATH_INTERP
-#define BLI_MATH_INTERP
+#ifndef __BLI_MATH_INTERP__
+#define __BLI_MATH_INTERP__
void BLI_bicubic_interpolation_fl(const float *buffer, float *output, int width, int height,
int components, float u, float v);
@@ -41,4 +41,4 @@
void BLI_bilinear_interpolation_char(const unsigned char *buffer, unsigned char *output, int width, int height,
int components, float u, float v);
-#endif
+#endif /* __BLI_MATH_INTERP__ */
Modified: branches/soc-2013-depsgraph_mt/source/blender/editors/gpencil/gpencil_edit.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/editors/gpencil/gpencil_edit.c 2013-08-20 06:04:46 UTC (rev 59314)
+++ branches/soc-2013-depsgraph_mt/source/blender/editors/gpencil/gpencil_edit.c 2013-08-20 07:59:50 UTC (rev 59315)
@@ -192,7 +192,16 @@
/* needed for offscreen rendering */
bGPdata *gpencil_data_get_active_v3d(Scene *scene)
{
- bGPdata *gpd = scene->basact ? scene->basact->object->gpd : NULL;
+ Base *base = scene->basact;
+ bGPdata *gpd = base ? base->object->gpd : NULL;
+ if (base && gpd) {
+ /* We have to make sure active object is actually visible, else we must use default scene gpd,
+ * to be consistent with gpencil_data_get_active's behavior.
+ */
+ if ((scene->lay & base->lay) == 0) {
+ gpd = NULL;
+ }
+ }
return gpd ? gpd : scene->gpd;
}
Property changes on: branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato/source/blender/editors/interface/interface.c:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/trunk/blender/source/blender/editors/interface/interface.c:57395-59302
+ /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list