[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48412] branches/soc-2011-tomato: svn merge ^/trunk/blender -r48409:48411

Campbell Barton ideasman42 at gmail.com
Fri Jun 29 16:39:39 CEST 2012


Revision: 48412
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48412
Author:   campbellbarton
Date:     2012-06-29 14:39:38 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r48409:48411

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48409

Modified Paths:
--------------
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_node.py
    branches/soc-2011-tomato/source/blender/editors/include/ED_node.h
    branches/soc-2011-tomato/source/blender/editors/include/ED_transform.h
    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/transform/transform.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform.h
    branches/soc-2011-tomato/source/blender/editors/transform/transform_constraints.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_snap.c
    branches/soc-2011-tomato/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2011-tomato/source/blender/makesrna/RNA_enum_types.h
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene.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-48409
   + /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-48411

Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_node.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_node.py	2012-06-29 14:34:46 UTC (rev 48411)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_node.py	2012-06-29 14:39:38 UTC (rev 48412)
@@ -90,6 +90,9 @@
         # Snap
         row = layout.row(align=True)
         row.prop(toolsettings, "use_snap", text="")
+        row.prop(toolsettings, "snap_node_element", text="", icon_only=True)
+        if toolsettings.snap_node_element != 'INCREMENT':
+            row.prop(toolsettings, "snap_target", text="")
 
         layout.template_running_jobs()
 

Modified: branches/soc-2011-tomato/source/blender/editors/include/ED_node.h
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/include/ED_node.h	2012-06-29 14:34:46 UTC (rev 48411)
+++ branches/soc-2011-tomato/source/blender/editors/include/ED_node.h	2012-06-29 14:39:38 UTC (rev 48412)
@@ -41,10 +41,20 @@
 struct bNode;
 struct bNodeTree;
 struct ScrArea;
+struct View2D;
 
+typedef enum {
+	NODE_TOP    = 1,
+	NODE_BOTTOM = 2,
+	NODE_LEFT   = 4,
+	NODE_RIGHT  = 8
+} NodeBorder;
+
 /* drawnode.c */
 void ED_init_node_butfuncs(void);
 
+void drawnodesnap(struct View2D *v2d, const float cent[2], float size, NodeBorder border);
+
 /* node_draw.c */
 void ED_node_tree_update(struct SpaceNode *snode, struct Scene *scene);
 void ED_node_changed_update(struct ID *id, struct bNode *node);

Modified: branches/soc-2011-tomato/source/blender/editors/include/ED_transform.h
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/include/ED_transform.h	2012-06-29 14:34:46 UTC (rev 48411)
+++ branches/soc-2011-tomato/source/blender/editors/include/ED_transform.h	2012-06-29 14:39:38 UTC (rev 48412)
@@ -180,6 +180,8 @@
 int peelObjectsContext(struct bContext *C, struct ListBase *depth_peels, const float mval[2], SnapMode mode);
 int snapObjectsTransform(struct TransInfo *t, const float mval[2], int *r_dist, float r_loc[3], float r_no[3], SnapMode mode);
 int snapObjectsContext(struct bContext *C, const float mval[2], int *r_dist, float r_loc[3], float r_no[3], SnapMode mode);
+int snapNodesTransform(struct TransInfo *t, const int mval[2], int *r_dist, float r_loc[2], char *r_node_border, SnapMode mode);
+int snapNodesContext(struct bContext *C, const int mval[2], int *r_dist, float r_loc[2], char *r_node_border, SnapMode mode);
 
 #endif
 


Property changes on: branches/soc-2011-tomato/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/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-48409
   + /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/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-48411

Modified: branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c	2012-06-29 14:34:46 UTC (rev 48411)
+++ branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c	2012-06-29 14:39:38 UTC (rev 48412)
@@ -3390,3 +3390,28 @@
 	node_draw_link_bezier(v2d, snode, link, th_col1, do_shaded, th_col2, do_triple, th_col3);
 //	node_draw_link_straight(v2d, snode, link, th_col1, do_shaded, th_col2, do_triple, th_col3);
 }
+
+void drawnodesnap(View2D *v2d, const float cent[2], float size, NodeBorder border)
+{
+	glBegin(GL_LINES);
+	
+	if (border & (NODE_LEFT | NODE_RIGHT)) {
+		glVertex2f(cent[0], v2d->cur.ymin);
+		glVertex2f(cent[0], v2d->cur.ymax);
+	}
+	else {
+		glVertex2f(cent[0], cent[1] - size);
+		glVertex2f(cent[0], cent[1] + size);
+	}
+	
+	if (border & (NODE_TOP | NODE_BOTTOM)) {
+		glVertex2f(v2d->cur.xmin, cent[1]);
+		glVertex2f(v2d->cur.xmax, cent[1]);
+	}
+	else {
+		glVertex2f(cent[0] - size, cent[1]);
+		glVertex2f(cent[0] + size, cent[1]);
+	}
+	
+	glEnd();
+}

Modified: branches/soc-2011-tomato/source/blender/editors/space_node/node_draw.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_node/node_draw.c	2012-06-29 14:34:46 UTC (rev 48411)
+++ branches/soc-2011-tomato/source/blender/editors/space_node/node_draw.c	2012-06-29 14:39:38 UTC (rev 48412)
@@ -65,6 +65,7 @@
 
 #include "ED_node.h"
 #include "ED_gpencil.h"
+#include "ED_space_api.h"
 
 #include "UI_interface.h"
 #include "UI_interface_icons.h"
@@ -1087,6 +1088,8 @@
 	
 	//uiFreeBlocksWin(&sa->uiblocks, sa->win);
 
+	ED_region_draw_cb_draw(C, ar, REGION_DRAW_PRE_VIEW);
+
 	/* only set once */
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	glEnable(GL_MAP1_VERTEX_3);
@@ -1139,6 +1142,8 @@
 	glDisable(GL_LINE_SMOOTH);
 	glDisable(GL_BLEND);
 	
+	ED_region_draw_cb_draw(C, ar, REGION_DRAW_POST_VIEW);
+	
 	/* draw grease-pencil ('canvas' strokes) */
 	if (snode->nodetree)
 		draw_gpencil_view2d(C, 1);


Property changes on: branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-48409
   + /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-48411

Modified: branches/soc-2011-tomato/source/blender/editors/transform/transform.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/transform/transform.c	2012-06-29 14:34:46 UTC (rev 48411)
+++ branches/soc-2011-tomato/source/blender/editors/transform/transform.c	2012-06-29 14:39:38 UTC (rev 48412)
@@ -1655,6 +1655,12 @@
 		unit_m3(t->spacemtx);
 		t->draw_handle_view = ED_region_draw_cb_activate(t->ar->type, drawTransformView, t, REGION_DRAW_POST_VIEW);
 	}
+	else if (t->spacetype == SPACE_NODE) {
+		unit_m3(t->spacemtx);
+		/*t->draw_handle_apply = ED_region_draw_cb_activate(t->ar->type, drawTransformApply, t, REGION_DRAW_PRE_VIEW);*/
+		t->draw_handle_view = ED_region_draw_cb_activate(t->ar->type, drawTransformView, t, REGION_DRAW_POST_VIEW);
+		/*t->draw_handle_cursor = WM_paint_cursor_activate(CTX_wm_manager(C), helpline_poll, drawHelpline, t);*/
+	}
 	else
 		unit_m3(t->spacemtx);
 

Modified: branches/soc-2011-tomato/source/blender/editors/transform/transform.h
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/transform/transform.h	2012-06-29 14:34:46 UTC (rev 48411)
+++ branches/soc-2011-tomato/source/blender/editors/transform/transform.h	2012-06-29 14:39:38 UTC (rev 48412)
@@ -86,6 +86,7 @@
 	float	snapTarget[3]; /* to this point */
 	float	snapNormal[3];
 	float	snapTangent[3];
+	char	snapNodeBorder;
 	ListBase points;
 	TransSnapPoint	*selectedPoint;
 	float	dist; // Distance from snapPoint to snapTarget

Modified: branches/soc-2011-tomato/source/blender/editors/transform/transform_constraints.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/transform/transform_constraints.c	2012-06-29 14:34:46 UTC (rev 48411)
+++ branches/soc-2011-tomato/source/blender/editors/transform/transform_constraints.c	2012-06-29 14:39:38 UTC (rev 48412)
@@ -640,7 +640,7 @@
 {
 	TransCon *tc = &(t->con);
 
-	if (!ELEM(t->spacetype, SPACE_VIEW3D, SPACE_IMAGE))
+	if (!ELEM3(t->spacetype, SPACE_VIEW3D, SPACE_IMAGE, SPACE_NODE))
 		return;
 	if (!(tc->mode & CON_APPLY))
 		return;

Modified: branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c	2012-06-29 14:34:46 UTC (rev 48411)
+++ branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c	2012-06-29 14:39:38 UTC (rev 48412)
@@ -5516,8 +5516,11 @@
 	}
 
 	td->loc = td2d->loc;

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list