[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49176] branches/soc-2011-tomato: svn merge ^/trunk/blender -r49167:49175
Campbell Barton
ideasman42 at gmail.com
Tue Jul 24 14:38:37 CEST 2012
Revision: 49176
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49176
Author: campbellbarton
Date: 2012-07-24 12:38:37 +0000 (Tue, 24 Jul 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r49167:49175
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49167
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/context.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-tomato/source/blender/editors/include/ED_sequencer.h
branches/soc-2011-tomato/source/blender/editors/mask/mask_draw.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_edit.c
branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_node_types.h
branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.c
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_CameraActuator.cpp
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-49167
+ /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-49175
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_sequencer.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_sequencer.h 2012-07-24 12:35:41 UTC (rev 49175)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_sequencer.h 2012-07-24 12:38:37 UTC (rev 49176)
@@ -182,8 +182,8 @@
int BKE_sequencer_active_get_pair(struct Scene *scene,
struct Sequence **seq_act, struct Sequence **seq_other);
void BKE_sequencer_active_set(struct Scene *scene, struct Sequence *seq);
+struct Mask *BKE_sequencer_mask_get(struct Scene *scene);
-
/* apply functions recursively */
int seqbase_recursive_apply(struct ListBase *seqbase, int (*apply_func)(struct Sequence *seq, void *), void *arg);
int seq_recursive_apply(struct Sequence *seq, int (*apply_func)(struct Sequence *, void *), void *arg);
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/context.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/context.c 2012-07-24 12:35:41 UTC (rev 49175)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/context.c 2012-07-24 12:38:37 UTC (rev 49176)
@@ -370,8 +370,15 @@
{
PointerRNA ptr = CTX_data_pointer_get(C, member);
- if (ptr.data && RNA_struct_is_a(ptr.type, type))
- return ptr;
+ if (ptr.data) {
+ if (RNA_struct_is_a(ptr.type, type)) {
+ return ptr;
+ }
+ else {
+ printf("%s: warning, member '%s' is '%s', not '%s'\n",
+ __func__, member, RNA_struct_identifier(ptr.type), RNA_struct_identifier(type));
+ }
+ }
return PointerRNA_NULL;
}
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c 2012-07-24 12:35:41 UTC (rev 49175)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c 2012-07-24 12:38:37 UTC (rev 49176)
@@ -3810,6 +3810,18 @@
}
}
+Mask *BKE_sequencer_mask_get(Scene *scene)
+{
+ Sequence *seq_act = BKE_sequencer_active_get(scene);
+
+ if (seq_act && seq_act->type == SEQ_TYPE_MASK) {
+ return seq_act->mask;
+ }
+ else {
+ return NULL;
+ }
+}
+
/* api like funcs for adding */
void seq_load_apply(Scene *scene, Sequence *seq, SeqLoadInfo *seq_load)
Modified: branches/soc-2011-tomato/source/blender/editors/include/ED_sequencer.h
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/include/ED_sequencer.h 2012-07-24 12:35:41 UTC (rev 49175)
+++ branches/soc-2011-tomato/source/blender/editors/include/ED_sequencer.h 2012-07-24 12:38:37 UTC (rev 49176)
@@ -29,10 +29,15 @@
struct Scene;
struct Sequence;
+struct SpaceSeq;
void ED_sequencer_select_sequence_single(struct Scene *scene, struct Sequence *seq, int deselect_all);
void ED_sequencer_deselect_all(struct Scene *scene);
+int ED_space_sequencer_maskedit_mask_poll(struct bContext *C);
+int ED_space_sequencer_check_show_maskedit(struct SpaceSeq *sseq, struct Scene *scene);
+int ED_space_sequencer_maskedit_poll(bContext *C);
+
void ED_operatormacros_sequencer(void);
#endif /* __ED_SEQUENCER_H__ */
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-49167
+ /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-49175
Modified: branches/soc-2011-tomato/source/blender/editors/mask/mask_draw.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/mask/mask_draw.c 2012-07-24 12:35:41 UTC (rev 49175)
+++ branches/soc-2011-tomato/source/blender/editors/mask/mask_draw.c 2012-07-24 12:38:37 UTC (rev 49176)
@@ -129,7 +129,8 @@
if (!spline->tot_point)
return;
- hsize = UI_GetThemeValuef(TH_HANDLE_VERTEX_SIZE);
+ /* TODO, add this to sequence editor */
+ hsize = 4; /* UI_GetThemeValuef(TH_HANDLE_VERTEX_SIZE); */
glPointSize(hsize);
Modified: branches/soc-2011-tomato/source/blender/editors/mask/mask_edit.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/mask/mask_edit.c 2012-07-24 12:35:41 UTC (rev 49175)
+++ branches/soc-2011-tomato/source/blender/editors/mask/mask_edit.c 2012-07-24 12:38:37 UTC (rev 49176)
@@ -44,6 +44,7 @@
#include "ED_mask.h" /* own include */
#include "ED_object.h" /* ED_keymap_proportional_maskmode only */
#include "ED_clip.h"
+#include "ED_sequencer.h"
#include "ED_transform.h"
#include "RNA_access.h"
@@ -54,23 +55,29 @@
int ED_maskedit_poll(bContext *C)
{
- SpaceClip *sc = CTX_wm_space_clip(C);
-
- if (sc) {
- return ED_space_clip_maskedit_poll(C);
+ ScrArea *sa = CTX_wm_area(C);
+ if (sa) {
+ switch (sa->spacetype) {
+ case SPACE_CLIP:
+ return ED_space_clip_maskedit_poll(C);
+ case SPACE_SEQ:
+ return ED_space_sequencer_maskedit_poll(C);
+ }
}
-
return FALSE;
}
int ED_maskedit_mask_poll(bContext *C)
{
- SpaceClip *sc = CTX_wm_space_clip(C);
-
- if (sc) {
- return ED_space_clip_maskedit_mask_poll(C);
+ ScrArea *sa = CTX_wm_area(C);
+ if (sa) {
+ switch (sa->spacetype) {
+ case SPACE_CLIP:
+ return ED_space_clip_maskedit_mask_poll(C);
+ case SPACE_SEQ:
+ return ED_space_sequencer_maskedit_mask_poll(C);
+ }
}
-
return FALSE;
}
Modified: branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c 2012-07-24 12:35:41 UTC (rev 49175)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c 2012-07-24 12:38:37 UTC (rev 49176)
@@ -1072,10 +1072,10 @@
UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_STANDARD, ar->winx, ar->winy);
- /* own keymap */
keymap = WM_keymap_find(wm->defaultconf, "Mask Editing", 0, 0);
WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct);
+ /* own keymap */
keymap = WM_keymap_find(wm->defaultconf, "Clip", SPACE_CLIP, 0);
WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct);
Modified: branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c 2012-07-24 12:35:41 UTC (rev 49175)
+++ branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c 2012-07-24 12:38:37 UTC (rev 49176)
@@ -796,8 +796,15 @@
bNode *node;
/* make sure nothing has group editing on */
- for (node = snode->nodetree->nodes.first; node; node = node->next)
+ for (node = snode->nodetree->nodes.first; node; node = node->next) {
nodeGroupEditClear(node);
+
+ /* while we're here, clear texture active */
+ if (node->typeinfo->nclass == NODE_CLASS_TEXTURE) {
+ /* this is not 100% sure to be reliable, see comment on the flag */
+ node->flag &= ~NODE_ACTIVE_TEXTURE;
+ }
+ }
if (gnode == NULL) {
/* with NULL argument we do a toggle */
@@ -809,8 +816,14 @@
snode->edittree = nodeGroupEditSet(gnode, 1);
/* deselect all other nodes, so we can also do grabbing of entire subtree */
- for (node = snode->nodetree->nodes.first; node; node = node->next)
+ for (node = snode->nodetree->nodes.first; node; node = node->next) {
node_deselect(node);
+
+ if (node->typeinfo->nclass == NODE_CLASS_TEXTURE) {
+ /* this is not 100% sure to be reliable, see comment on the flag */
+ node->flag &= ~NODE_ACTIVE_TEXTURE;
+ }
+ }
node_select(gnode);
}
else
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-49167
+ /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list