Revision: 50119
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50119
Author: nazgul
Date: 2012-08-22 13:46:23 +0000 (Wed, 22 Aug 2012)
Log Message:
-----------
Merging r50113 through r50118 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50113
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50118
Modified Paths:
--------------
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2011-tomato/source/blender/blenkernel/intern/anim.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2011-tomato/source/blender/editors/space_image/space_image.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_intern.h
branches/soc-2011-tomato/source/blender/editors/space_node/node_ops.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_select.c
branches/soc-2011-tomato/source/blender/imbuf/intern/dds/dds_api.cpp
branches/soc-2011-tomato/source/blender/imbuf/intern/tiff.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_particle_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_particle.c
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-50112
+
/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-50118
Modified:
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_particle.py
===================================================================
---
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_particle.py
2012-08-22 13:45:20 UTC (rev 50118)
+++
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_particle.py
2012-08-22 13:46:23 UTC (rev 50119)
@@ -849,6 +849,7 @@
sub = col.row()
sub.prop(part, "use_global_dupli")
sub.prop(part, "use_rotation_dupli")
+ sub.prop(part, "use_scale_dupli")
elif part.render_type == 'GROUP':
col.prop(part, "dupli_group")
split = layout.split()
@@ -865,6 +866,7 @@
sub.active = (part.use_whole_group is False)
sub.prop(part, "use_global_dupli")
sub.prop(part, "use_rotation_dupli")
+ sub.prop(part, "use_scale_dupli")
if part.use_group_count and not part.use_whole_group:
row = layout.row()
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/anim.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/anim.c
2012-08-22 13:45:20 UTC (rev 50118)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/anim.c
2012-08-22 13:46:23 UTC (rev 50119)
@@ -1469,6 +1469,18 @@
quat_to_mat4(obmat, q);
obmat[3][3] = 1.0f;
+ /* add scaling if requested */
+ if ((part->draw &
PART_DRAW_NO_SCALE_OB) == 0)
+ mult_m4_m4m4(obmat, obmat,
size_mat);
+ }
+ else if (part->draw & PART_DRAW_NO_SCALE_OB) {
+ /* remove scaling */
+ float size_mat[4][4], original_size[3];
+
+ mat4_to_size(original_size, obmat);
+ size_to_mat4(size_mat, original_size);
+ invert_m4(size_mat);
+
mult_m4_m4m4(obmat, obmat, size_mat);
}
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
2012-08-22 13:45:20 UTC (rev 50118)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
2012-08-22 13:46:23 UTC (rev 50119)
@@ -2565,7 +2565,8 @@
is_proxy_image = (ibuf != NULL);
}
- ibuf = do_render_strip_uncached(context, seq, cfra);
+ if (ibuf == NULL)
+ ibuf = do_render_strip_uncached(context, seq,
cfra);
if (ibuf)
BKE_sequencer_preprocessed_cache_put(context,
seq, cfra, SEQ_STRIPELEM_IBUF, ibuf);
Modified: branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
2012-08-22 13:45:20 UTC (rev 50118)
+++ branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
2012-08-22 13:46:23 UTC (rev 50119)
@@ -7925,10 +7925,17 @@
}
if (main->versionfile < 263 || (main->versionfile == 263 &&
main->subversionfile < 14)) {
+ ParticleSettings *part;
bNodeTreeType *ntreetype = ntreeGetType(NTREE_COMPOSIT);
if (ntreetype && ntreetype->foreach_nodetree)
ntreetype->foreach_nodetree(main, NULL,
do_version_ntree_keying_despill_balance);
+
+ /* keep compatibility for dupliobject particle size */
+ for (part=main->particle.first; part; part=part->id.next)
+ if (ELEM(part->ren_as, PART_DRAW_OB, PART_DRAW_GR))
+ if ((part->draw & PART_DRAW_ROTATE_OB) == 0)
+ part->draw |= PART_DRAW_NO_SCALE_OB;
}
if (main->versionfile < 263 || (main->versionfile == 263 &&
main->subversionfile < 17)) {
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-50112
+ /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-50118
Modified:
branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
2012-08-22 13:45:20 UTC (rev 50118)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
2012-08-22 13:46:23 UTC (rev 50119)
@@ -42,7 +42,6 @@
#include "BLI_math.h"
#include "BLI_listbase.h"
#include "BLI_rect.h"
-#include "BLI_lasso.h"
#include "BLI_blenlib.h"
#include "BKE_main.h"
Modified:
branches/soc-2011-tomato/source/blender/editors/space_image/space_image.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_image/space_image.c
2012-08-22 13:45:20 UTC (rev 50118)
+++ branches/soc-2011-tomato/source/blender/editors/space_image/space_image.c
2012-08-22 13:46:23 UTC (rev 50119)
@@ -42,6 +42,7 @@
#include "BKE_colortools.h"
#include "BKE_context.h"
#include "BKE_image.h"
+#include "BKE_global.h"
#include "BKE_scene.h"
#include "BKE_screen.h"
#include "BKE_tessmesh.h"
@@ -378,7 +379,10 @@
/* check if we have to set the image from the editmesh */
if (ima && (ima->source == IMA_SRC_VIEWER && sima->mode ==
SI_MODE_MASK)) {
- if (sima->lock) {
+ if (sima->lock == FALSE && G.moving) {
+ /* pass */
+ }
+ else {
if (scene->nodetree) {
Mask *mask = ED_space_image_get_mask(sima);
if (mask) {
Modified:
branches/soc-2011-tomato/source/blender/editors/space_node/node_intern.h
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_node/node_intern.h
2012-08-22 13:45:20 UTC (rev 50118)
+++ branches/soc-2011-tomato/source/blender/editors/space_node/node_intern.h
2012-08-22 13:46:23 UTC (rev 50119)
@@ -107,6 +107,7 @@
void NODE_OT_select_linked_to(wmOperatorType *ot);
void NODE_OT_select_linked_from(wmOperatorType *ot);
void NODE_OT_select_border(struct wmOperatorType *ot);
+void NODE_OT_select_lasso(struct wmOperatorType *ot);
void NODE_OT_select_same_type(struct wmOperatorType *ot);
void NODE_OT_select_same_type_next(wmOperatorType *ot);
void NODE_OT_select_same_type_prev(wmOperatorType *ot);
Modified: branches/soc-2011-tomato/source/blender/editors/space_node/node_ops.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_node/node_ops.c
2012-08-22 13:45:20 UTC (rev 50118)
+++ branches/soc-2011-tomato/source/blender/editors/space_node/node_ops.c
2012-08-22 13:46:23 UTC (rev 50119)
@@ -55,6 +55,7 @@
WM_operatortype_append(NODE_OT_select_linked_to);
WM_operatortype_append(NODE_OT_select_linked_from);
WM_operatortype_append(NODE_OT_select_border);
+ WM_operatortype_append(NODE_OT_select_lasso);
WM_operatortype_append(NODE_OT_select_same_type);
WM_operatortype_append(NODE_OT_select_same_type_next);
WM_operatortype_append(NODE_OT_select_same_type_prev);
@@ -217,6 +218,11 @@
kmi = WM_keymap_add_item(keymap, "NODE_OT_select_border", EVT_TWEAK_S,
KM_ANY, 0, 0);
RNA_boolean_set(kmi->ptr, "tweak", TRUE);
+ kmi = WM_keymap_add_item(keymap, "NODE_OT_select_lasso", EVT_TWEAK_A,
KM_ANY, KM_CTRL | KM_ALT, 0);
+ RNA_boolean_set(kmi->ptr, "deselect", FALSE);
+ kmi = WM_keymap_add_item(keymap, "NODE_OT_select_lasso", EVT_TWEAK_A,
KM_ANY, KM_CTRL | KM_SHIFT | KM_ALT, 0);
+ RNA_boolean_set(kmi->ptr, "deselect", TRUE);
+
/* each of these falls through if not handled... */
WM_keymap_add_item(keymap, "NODE_OT_link", LEFTMOUSE, KM_PRESS, 0, 0);
kmi = WM_keymap_add_item(keymap, "NODE_OT_link", LEFTMOUSE, KM_PRESS,
KM_CTRL, 0);
Modified:
branches/soc-2011-tomato/source/blender/editors/space_node/node_select.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_node/node_select.c
2012-08-22 13:45:20 UTC (rev 50118)
+++ branches/soc-2011-tomato/source/blender/editors/space_node/node_select.c
2012-08-22 13:46:23 UTC (rev 50119)
@@ -35,6 +35,7 @@
#include "BKE_node.h"
#include "BLI_rect.h"
+#include "BLI_lasso.h"
#include "BLI_utildefines.h"
#include "ED_node.h" /* own include */
@@ -48,7 +49,9 @@
#include "WM_types.h"
#include "UI_view2d.h"
-
+
+#include "MEM_guardedalloc.h"
+
#include "node_intern.h" /* own include */
/* ****** helpers ****** */
@@ -534,6 +537,92 @@
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
