[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38616] branches/soc-2011-salad: Merging r38563 through r38615 from trunk into soc-2011-salad
Sergey Sharybin
g.ulairi at gmail.com
Fri Jul 22 19:00:09 CEST 2011
Revision: 38616
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38616
Author: nazgul
Date: 2011-07-22 17:00:09 +0000 (Fri, 22 Jul 2011)
Log Message:
-----------
Merging r38563 through r38615 from trunk into soc-2011-salad
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38563
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38615
Modified Paths:
--------------
branches/soc-2011-salad/CMakeLists.txt
branches/soc-2011-salad/release/scripts/startup/bl_operators/object_align.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_image.py
branches/soc-2011-salad/source/blender/blenkernel/CMakeLists.txt
branches/soc-2011-salad/source/blender/blenkernel/SConscript
branches/soc-2011-salad/source/blender/blenkernel/intern/writeavi.c
branches/soc-2011-salad/source/blender/blenkernel/intern/writeframeserver.c
branches/soc-2011-salad/source/blender/editors/include/ED_node.h
branches/soc-2011-salad/source/blender/editors/render/render_shading.c
branches/soc-2011-salad/source/blender/editors/space_node/drawnode.c
branches/soc-2011-salad/source/blender/editors/space_node/node_edit.c
branches/soc-2011-salad/source/blender/editors/transform/transform.c
branches/soc-2011-salad/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-salad/source/blender/editors/transform/transform_ops.c
branches/soc-2011-salad/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-salad/source/blender/makesdna/DNA_node_types.h
branches/soc-2011-salad/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-salad/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2011-salad/source/blender/makesrna/intern/SConscript
branches/soc-2011-salad/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-salad/source/blender/render/intern/source/convertblender.c
branches/soc-2011-salad/source/gameengine/Expressions/PyObjectPlus.cpp
branches/soc-2011-salad/source/gameengine/Expressions/PyObjectPlus.h
Property Changed:
----------------
branches/soc-2011-salad/
Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38208
/branches/soc-2011-tomato:36831-38572
/trunk/blender:36834-38562
+ /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38208
/branches/soc-2011-tomato:36831-38572
/trunk/blender:36834-38615
Modified: branches/soc-2011-salad/CMakeLists.txt
===================================================================
--- branches/soc-2011-salad/CMakeLists.txt 2011-07-22 16:58:22 UTC (rev 38615)
+++ branches/soc-2011-salad/CMakeLists.txt 2011-07-22 17:00:09 UTC (rev 38616)
@@ -155,6 +155,7 @@
option(WITH_IMAGE_CINEON "Enable CINEON and DPX Image Support" ON)
option(WITH_IMAGE_HDR "Enable HDR Image Support" ON)
option(WITH_IMAGE_REDCODE "Enable RedCode Image Support" OFF)
+option(WITH_IMAGE_FRAMESERVER "Enable image FrameServer Support for rendering" ON)
# Audio/Video format support
option(WITH_CODEC_FFMPEG "Enable FFMPeg Support (http://ffmpeg.org)" OFF)
Modified: branches/soc-2011-salad/release/scripts/startup/bl_operators/object_align.py
===================================================================
--- branches/soc-2011-salad/release/scripts/startup/bl_operators/object_align.py 2011-07-22 16:58:22 UTC (rev 38615)
+++ branches/soc-2011-salad/release/scripts/startup/bl_operators/object_align.py 2011-07-22 17:00:09 UTC (rev 38616)
@@ -340,7 +340,7 @@
bb_quality = BoolProperty(
name="High Quality",
description="Enables high quality calculation of the bounding box for perfect results on complex shape meshes with rotation/scale (Slow)",
- default=False)
+ default=True)
align_mode = EnumProperty(items=(
('OPT_1', "Negative Sides", ""),
@@ -380,4 +380,4 @@
self.report({'WARNING'}, "No objects with bound-box selected")
return {'CANCELLED'}
else:
- return {'FINISHED'}
\ No newline at end of file
+ return {'FINISHED'}
Modified: branches/soc-2011-salad/release/scripts/startup/bl_ui/space_image.py
===================================================================
--- branches/soc-2011-salad/release/scripts/startup/bl_ui/space_image.py 2011-07-22 16:58:22 UTC (rev 38615)
+++ branches/soc-2011-salad/release/scripts/startup/bl_ui/space_image.py 2011-07-22 17:00:09 UTC (rev 38616)
@@ -198,7 +198,11 @@
layout.operator("transform.rotate")
layout.operator("transform.resize")
+ layout.separator()
+ layout.operator("transform.shear")
+
+
class IMAGE_MT_uvs_snap(bpy.types.Menu):
bl_label = "Snap"
Modified: branches/soc-2011-salad/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- branches/soc-2011-salad/source/blender/blenkernel/CMakeLists.txt 2011-07-22 16:58:22 UTC (rev 38615)
+++ branches/soc-2011-salad/source/blender/blenkernel/CMakeLists.txt 2011-07-22 17:00:09 UTC (rev 38616)
@@ -286,6 +286,10 @@
add_definitions(-DWITH_CINEON)
endif()
+if(WITH_IMAGE_FRAMESERVER)
+ add_definitions(-DWITH_FRAMESERVER)
+endif()
+
if(WITH_IMAGE_HDR)
add_definitions(-DWITH_HDR)
endif()
Modified: branches/soc-2011-salad/source/blender/blenkernel/SConscript
===================================================================
--- branches/soc-2011-salad/source/blender/blenkernel/SConscript 2011-07-22 16:58:22 UTC (rev 38615)
+++ branches/soc-2011-salad/source/blender/blenkernel/SConscript 2011-07-22 17:00:09 UTC (rev 38616)
@@ -22,6 +22,7 @@
defs = [ 'GLEW_STATIC' ]
defs.append('WITH_SMOKE') # TODO, make optional
+defs.append('WITH_FRAMESERVER') # TODO, make optional
if env['WITH_BF_PYTHON']:
incs += ' ../python'
Modified: branches/soc-2011-salad/source/blender/blenkernel/intern/writeavi.c
===================================================================
--- branches/soc-2011-salad/source/blender/blenkernel/intern/writeavi.c 2011-07-22 16:58:22 UTC (rev 38615)
+++ branches/soc-2011-salad/source/blender/blenkernel/intern/writeavi.c 2011-07-22 17:00:09 UTC (rev 38616)
@@ -105,13 +105,18 @@
mh.get_movie_path = filepath_ffmpeg;
}
#endif
+#ifdef WITH_FRAMESERVER
if (imtype == R_FRAMESERVER) {
mh.start_movie = start_frameserver;
mh.append_movie = append_frameserver;
mh.end_movie = end_frameserver;
mh.get_next_frame = frameserver_loop;
}
-
+#endif
+
+ /* incase all above are disabled */
+ (void)imtype;
+
return &mh;
}
Modified: branches/soc-2011-salad/source/blender/blenkernel/intern/writeframeserver.c
===================================================================
--- branches/soc-2011-salad/source/blender/blenkernel/intern/writeframeserver.c 2011-07-22 16:58:22 UTC (rev 38615)
+++ branches/soc-2011-salad/source/blender/blenkernel/intern/writeframeserver.c 2011-07-22 17:00:09 UTC (rev 38616)
@@ -22,6 +22,7 @@
*
*/
+#ifdef WITH_FRAMESERVER
#include <string.h>
#include <stdio.h>
@@ -381,3 +382,4 @@
shutdown_socket_system();
}
+#endif /* WITH_FRAMESERVER */
Modified: branches/soc-2011-salad/source/blender/editors/include/ED_node.h
===================================================================
--- branches/soc-2011-salad/source/blender/editors/include/ED_node.h 2011-07-22 16:58:22 UTC (rev 38615)
+++ branches/soc-2011-salad/source/blender/editors/include/ED_node.h 2011-07-22 17:00:09 UTC (rev 38616)
@@ -39,6 +39,7 @@
struct bContext;
struct bNode;
struct ID;
+struct ScrArea;
/* drawnode.c */
void ED_init_node_butfuncs(void);
@@ -51,6 +52,8 @@
void ED_node_shader_default(struct Material *ma);
void ED_node_composit_default(struct Scene *sce);
void ED_node_texture_default(struct Tex *tex);
+void ED_node_link_intersect_test(struct ScrArea *sa, int test);
+void ED_node_link_insert(struct ScrArea *sa);
/* node ops.c */
void ED_operatormacros_node(void);
Modified: branches/soc-2011-salad/source/blender/editors/render/render_shading.c
===================================================================
--- branches/soc-2011-salad/source/blender/editors/render/render_shading.c 2011-07-22 16:58:22 UTC (rev 38615)
+++ branches/soc-2011-salad/source/blender/editors/render/render_shading.c 2011-07-22 17:00:09 UTC (rev 38616)
@@ -108,7 +108,7 @@
/* identifiers */
ot->name= "Add Material Slot";
ot->idname= "OBJECT_OT_material_slot_add";
- ot->description="Add a new material slot or duplicate the selected one";
+ ot->description="Add a new material slot";
/* api callbacks */
ot->exec= material_slot_add_exec;
Modified: branches/soc-2011-salad/source/blender/editors/space_node/drawnode.c
===================================================================
--- branches/soc-2011-salad/source/blender/editors/space_node/drawnode.c 2011-07-22 16:58:22 UTC (rev 38615)
+++ branches/soc-2011-salad/source/blender/editors/space_node/drawnode.c 2011-07-22 17:00:09 UTC (rev 38616)
@@ -1877,10 +1877,17 @@
else {
/* check cyclic */
if(link->fromnode->level >= link->tonode->level && link->tonode->level!=0xFFF) {
- if(link->fromnode->flag & SELECT)
- th_col1= TH_EDGE_SELECT;
- if(link->tonode->flag & SELECT)
- th_col2= TH_EDGE_SELECT;
+ /* special indicated link, on drop-node */
+ if(link->flag & NODE_LINKFLAG_HILITE) {
+ th_col1= th_col2= TH_ACTIVE;
+ }
+ else {
+ /* regular link */
+ if(link->fromnode->flag & SELECT)
+ th_col1= TH_EDGE_SELECT;
+ if(link->tonode->flag & SELECT)
+ th_col2= TH_EDGE_SELECT;
+ }
do_shaded= 1;
do_triple= 1;
}
Modified: branches/soc-2011-salad/source/blender/editors/space_node/node_edit.c
===================================================================
--- branches/soc-2011-salad/source/blender/editors/space_node/node_edit.c 2011-07-22 16:58:22 UTC (rev 38615)
+++ branches/soc-2011-salad/source/blender/editors/space_node/node_edit.c 2011-07-22 17:00:09 UTC (rev 38616)
@@ -2492,6 +2492,151 @@
RNA_def_int(ot->srna, "cursor", BC_KNIFECURSOR, 0, INT_MAX, "Cursor", "", 0, INT_MAX);
}
+/* ********************* automatic node insert on dragging ******************* */
+
+/* assumes sockets in list */
+static bNodeSocket *socket_best_match(ListBase *sockets, int type)
+{
+ bNodeSocket *sock;
+
+ /* first, match type */
+ for(sock= sockets->first; sock; sock= sock->next)
+ if(!(sock->flag & SOCK_HIDDEN))
+ if(type == sock->type)
+ return sock;
+
+ /* then just use first unhidden socket */
+ for(sock= sockets->first; sock; sock= sock->next)
+ if(!(sock->flag & SOCK_HIDDEN))
+ return sock;
+
+ /* OK, let's unhide proper one */
+ for(sock= sockets->first; sock; sock= sock->next) {
+ if(type == sock->type) {
+ sock->flag &= ~SOCK_HIDDEN;
+ return sock;
+ }
+ }
+
+ /* just the first */
+ sock= sockets->first;
+ sock->flag &= ~SOCK_HIDDEN;
+
+ return sockets->first;
+}
+
+/* prevent duplicate testing code below */
+static SpaceNode *ed_node_link_conditions(ScrArea *sa, bNode **select)
+{
+ SpaceNode *snode= sa?sa->spacedata.first:NULL;
+ bNode *node;
+ bNodeLink *link;
+
+ /* no unlucky accidents */
+ if(sa==NULL || sa->spacetype!=SPACE_NODE) return NULL;
+
+ *select= NULL;
+
+ for(node= snode->edittree->nodes.first; node; node= node->next) {
+ if(node->flag & SELECT) {
+ if(*select)
+ break;
+ else
+ *select= node;
+ }
+ }
+ /* only one selected */
+ if(node || *select==NULL) return NULL;
+
+ /* correct node */
+ if((*select)->inputs.first==NULL || (*select)->outputs.first==NULL) return NULL;
+
+ /* test node for links */
+ for(link= snode->edittree->links.first; link; link=link->next) {
+ if(link->tonode == *select || link->fromnode == *select)
+ return NULL;
+ }
+
+ return snode;
+}
+
+/* assumes link with NODE_LINKFLAG_HILITE set */
+void ED_node_link_insert(ScrArea *sa)
+{
+ bNode *node, *select;
+ SpaceNode *snode= ed_node_link_conditions(sa, &select);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list