[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49602] branches/soc-2011-tomato: svn merge ^/trunk/blender -r49573:49601
Campbell Barton
ideasman42 at gmail.com
Mon Aug 6 11:33:43 CEST 2012
Revision: 49602
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49602
Author: campbellbarton
Date: 2012-08-06 09:33:43 +0000 (Mon, 06 Aug 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r49573:49601
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49573
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/blenkernel/BKE_node.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-tomato/source/blender/blenlib/CMakeLists.txt
branches/soc-2011-tomato/source/blender/blenlib/intern/math_geom.c
branches/soc-2011-tomato/source/blender/blenlib/intern/math_rotation.c
branches/soc-2011-tomato/source/blender/collada/AnimationExporter.cpp
branches/soc-2011-tomato/source/blender/collada/AnimationExporter.h
branches/soc-2011-tomato/source/blender/collada/AnimationImporter.cpp
branches/soc-2011-tomato/source/blender/collada/AnimationImporter.h
branches/soc-2011-tomato/source/blender/editors/animation/anim_draw.c
branches/soc-2011-tomato/source/blender/editors/include/BIF_gl.h
branches/soc-2011-tomato/source/blender/editors/include/BIF_glutil.h
branches/soc-2011-tomato/source/blender/editors/interface/view2d.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_add.c
branches/soc-2011-tomato/source/blender/editors/screen/area.c
branches/soc-2011-tomato/source/blender/editors/screen/glutil.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2011-tomato/source/blender/editors/sound/sound_ops.c
branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_draw.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_relationships.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_view.c
branches/soc-2011-tomato/source/blender/editors/space_text/text_draw.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.h
branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_generics.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_skin.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_interface.c
branches/soc-2011-tomato/source/blender/render/extern/include/RE_render_ext.h
branches/soc-2011-tomato/source/blender/render/intern/include/texture.h
branches/soc-2011-tomato/source/blender/render/intern/raytrace/bvh.h
branches/soc-2011-tomato/source/blender/render/intern/raytrace/rayobject_instance.cpp
branches/soc-2011-tomato/source/blender/render/intern/source/imagetexture.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_subwindow.c
branches/soc-2011-tomato/source/gameengine/Ketsji/BL_Action.cpp
branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
Added Paths:
-----------
branches/soc-2011-tomato/source/blender/blenlib/BLI_stack.h
branches/soc-2011-tomato/source/blender/blenlib/intern/stack.c
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /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/vgroup_modifiers:38694-39989
/trunk/blender:36831-49573
+ /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/vgroup_modifiers:38694-39989
/trunk/blender:36831-49601
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_node.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_node.h 2012-08-06 09:20:12 UTC (rev 49601)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_node.h 2012-08-06 09:33:43 UTC (rev 49602)
@@ -359,6 +359,7 @@
void nodeToView(struct bNode *node, float x, float y, float *rx, float *ry);
void nodeFromView(struct bNode *node, float x, float y, float *rx, float *ry);
+int nodeAttachNodeCheck(struct bNode *node, struct bNode *parent);
void nodeAttachNode(struct bNode *node, struct bNode *parent);
void nodeDetachNode(struct bNode *node);
@@ -385,11 +386,13 @@
void nodeSocketSetType(struct bNodeSocket *sock, int type);
/* Node Clipboard */
-void nodeClipboardClear(void);
-void nodeClipboardAddNode(struct bNode *node);
-void nodeClipboardAddLink(struct bNodeLink *link);
-const struct ListBase *nodeClipboardGetNodes(void);
-const struct ListBase *nodeClipboardGetLinks(void);
+void BKE_node_clipboard_init(struct bNodeTree *ntree);
+void BKE_node_clipboard_clear(void);
+void BKE_node_clipboard_add_node(struct bNode *node);
+void BKE_node_clipboard_add_link(struct bNodeLink *link);
+const struct ListBase *BKE_node_clipboard_get_nodes(void);
+const struct ListBase *BKE_node_clipboard_get_links(void);
+int BKE_node_clipboard_get_type(void);
/* ************** NODE TYPE ACCESS *************** */
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c 2012-08-06 09:20:12 UTC (rev 49601)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c 2012-08-06 09:33:43 UTC (rev 49602)
@@ -1287,12 +1287,13 @@
void BKE_mask_point_add_uw(MaskSplinePoint *point, float u, float w)
{
if (!point->uw)
- point->uw = MEM_callocN(sizeof(*point->uw), "mask point uw");
+ point->uw = MEM_mallocN(sizeof(*point->uw), "mask point uw");
else
point->uw = MEM_reallocN(point->uw, (point->tot_uw + 1) * sizeof(*point->uw));
point->uw[point->tot_uw].u = u;
point->uw[point->tot_uw].w = w;
+ point->uw[point->tot_uw].flag = 0;
point->tot_uw++;
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c 2012-08-06 09:20:12 UTC (rev 49601)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c 2012-08-06 09:33:43 UTC (rev 49602)
@@ -592,9 +592,25 @@
}
}
+int nodeAttachNodeCheck(bNode *node, bNode *parent)
+{
+ bNode *parent_recurse;
+ for (parent_recurse = node; parent_recurse; parent_recurse = parent_recurse->parent) {
+ if (parent_recurse == parent) {
+ return TRUE;
+ }
+ }
+
+ return FALSE;
+}
+
void nodeAttachNode(bNode *node, bNode *parent)
{
float locx, locy;
+
+ BLI_assert(parent->type == NODE_FRAME);
+ BLI_assert(nodeAttachNodeCheck(parent, node) == FALSE);
+
nodeToView(node, 0.0f, 0.0f, &locx, &locy);
node->parent = parent;
@@ -607,6 +623,9 @@
float locx, locy;
if (node->parent) {
+
+ BLI_assert(node->parent->type == NODE_FRAME);
+
/* transform to view space */
nodeToView(node, 0.0f, 0.0f, &locx, &locy);
node->locx = locx;
@@ -1409,12 +1428,18 @@
typedef struct bNodeClipboard {
ListBase nodes;
ListBase links;
+ int type;
} bNodeClipboard;
bNodeClipboard node_clipboard;
-void nodeClipboardClear(void)
+void BKE_node_clipboard_init(struct bNodeTree *ntree)
{
+ node_clipboard.type = ntree->type;
+}
+
+void BKE_node_clipboard_clear(void)
+{
bNode *node, *node_next;
bNodeLink *link, *link_next;
@@ -1431,26 +1456,31 @@
node_clipboard.nodes.first = node_clipboard.nodes.last = NULL;
}
-void nodeClipboardAddNode(bNode *node)
+void BKE_node_clipboard_add_node(bNode *node)
{
BLI_addtail(&node_clipboard.nodes, node);
}
-void nodeClipboardAddLink(bNodeLink *link)
+void BKE_node_clipboard_add_link(bNodeLink *link)
{
BLI_addtail(&node_clipboard.links, link);
}
-const ListBase *nodeClipboardGetNodes(void)
+const ListBase *BKE_node_clipboard_get_nodes(void)
{
return &node_clipboard.nodes;
}
-const ListBase *nodeClipboardGetLinks(void)
+const ListBase *BKE_node_clipboard_get_links(void)
{
return &node_clipboard.links;
}
+int BKE_node_clipboard_get_type(void)
+{
+ return node_clipboard.type;
+}
+
/* ************** dependency stuff *********** */
/* node is guaranteed to be not checked before */
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c 2012-08-06 09:20:12 UTC (rev 49601)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c 2012-08-06 09:33:43 UTC (rev 49602)
@@ -3918,7 +3918,7 @@
AUD_SoundInfo info;
- sound = sound_new_file(CTX_data_main(C), seq_load->path); /* handles relative paths */
+ sound = sound_new_file(bmain, seq_load->path); /* handles relative paths */
if (sound == NULL || sound->playback_handle == NULL) {
//if (op)
Copied: branches/soc-2011-tomato/source/blender/blenlib/BLI_stack.h (from rev 49601, trunk/blender/source/blender/blenlib/BLI_stack.h)
===================================================================
--- branches/soc-2011-tomato/source/blender/blenlib/BLI_stack.h (rev 0)
+++ branches/soc-2011-tomato/source/blender/blenlib/BLI_stack.h 2012-08-06 09:33:43 UTC (rev 49602)
@@ -0,0 +1,54 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor(s): Nicholas Bishop
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ *
+ */
+
+#ifndef __BLI_STACK_H__
+#define __BLI_STACK_H__
+
+/** \file BLI_stack.h
+ * \ingroup bli
+ */
+
+typedef struct BLI_Stack BLI_Stack;
+
+/* Create a new homogeneous stack with elements of 'elem_size' bytes */
+BLI_Stack *BLI_stack_new(int elem_size, const char *description);
+
+/* Free the stack's data and the stack itself */
+void BLI_stack_free(BLI_Stack *stack);
+
+/* Copies the source value onto the stack (note that it copies
+ * elem_size bytes from 'src', the pointer itself is not stored) */
+void BLI_stack_push(BLI_Stack *stack, void *src);
+
+/* Retrieves and removes the top element from the stack. The value is
+ * copies to 'dst', which must be at least elem_size bytes.
+ *
+ * Does not reduce amount of allocated memory.
+ *
+ * If stack is empty, 'dst' will not be modified. */
+void BLI_stack_pop(BLI_Stack *stack, void *dst);
+
+/* Returns TRUE if the stack is empty, FALSE otherwise */
+int BLI_stack_empty(const BLI_Stack *stack);
+
+#endif
Modified: branches/soc-2011-tomato/source/blender/blenlib/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/source/blender/blenlib/CMakeLists.txt 2012-08-06 09:20:12 UTC (rev 49601)
+++ branches/soc-2011-tomato/source/blender/blenlib/CMakeLists.txt 2012-08-06 09:33:43 UTC (rev 49602)
@@ -81,6 +81,7 @@
intern/rct.c
intern/scanfill.c
intern/smallhash.c
+ intern/stack.c
intern/storage.c
intern/string.c
intern/string_cursor_utf8.c
@@ -135,6 +136,7 @@
BLI_rect.h
BLI_scanfill.h
BLI_smallhash.h
+ BLI_stack.h
BLI_string.h
BLI_string_cursor_utf8.h
BLI_string_utf8.h
Modified: branches/soc-2011-tomato/source/blender/blenlib/intern/math_geom.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenlib/intern/math_geom.c 2012-08-06 09:20:12 UTC (rev 49601)
+++ branches/soc-2011-tomato/source/blender/blenlib/intern/math_geom.c 2012-08-06 09:33:43 UTC (rev 49602)
@@ -430,7 +430,7 @@
{
#define CCW(A, B, C) ((C[1] - A[1]) * (B[0] - A[0]) > (B[1]-A[1]) * (C[0]-A[0]))
- return CCW(v1, v3, v4) != CCW(v2, v3, v4) && CCW(v1, v2, v3) != CCW(v1, v2, v4);
+ return CCW(v1, v3, v4) != CCW(v2, v3, v4) && CCW(v1, v2, v3) != CCW(v1, v2, v4);
#undef CCW
}
Modified: branches/soc-2011-tomato/source/blender/blenlib/intern/math_rotation.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenlib/intern/math_rotation.c 2012-08-06 09:20:12 UTC (rev 49601)
+++ branches/soc-2011-tomato/source/blender/blenlib/intern/math_rotation.c 2012-08-06 09:33:43 UTC (rev 49602)
@@ -1660,12 +1660,12 @@
{
/* rotations are hard coded to match vec_to_quat */
const float quat_track[][4] = {
- {0.70710676908493, 0.0, -0.70710676908493, 0.0}, /* pos-y90 */
+ {M_SQRT1_2, 0.0, -M_SQRT1_2, 0.0}, /* pos-y90 */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list