Revision: 49635
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49635
Author: campbellbarton
Date: 2012-08-06 19:37:35 +0000 (Mon, 06 Aug 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r49628:49634
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49628
Modified Paths:
--------------
branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_parametrizer.h
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2011-tomato/source/blender/nodes/intern/node_common.c
branches/soc-2011-tomato/source/blender/nodes/intern/node_common.h
branches/soc-2011-tomato/source/blender/nodes/shader/node_shader_tree.c
branches/soc-2011-tomato/source/blender/nodes/texture/node_texture_tree.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-49628
+
/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-49634
Modified:
branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
===================================================================
---
branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
2012-08-06 19:31:34 UTC (rev 49634)
+++
branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
2012-08-06 19:37:35 UTC (rev 49635)
@@ -297,6 +297,7 @@
"gimbal",
"grayscale",
"icosphere",
+ "inpaint",
"lightmap",
"lossless", "lossy",
"midtones",
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
2012-08-06 19:31:34 UTC (rev 49634)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
2012-08-06 19:37:35 UTC (rev 49635)
@@ -1660,8 +1660,6 @@
else if (node->typeinfo->updatefunc)
node->typeinfo->updatefunc(ntree, node);
}
- /* clear update flag */
- node->update = 0;
}
/* check link validity */
@@ -1683,7 +1681,10 @@
/* XXX hack, should be done by depsgraph!! */
ntreeVerifyNodes(G.main, &ntree->id);
- /* clear the update flag */
+ /* clear update flags */
+ for (node = ntree->nodes.first; node; node = node->next) {
+ node->update = 0;
+ }
ntree->update = 0;
}
Modified:
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
2012-08-06 19:31:34 UTC (rev 49634)
+++
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
2012-08-06 19:37:35 UTC (rev 49635)
@@ -154,12 +154,9 @@
}
SocketConnection *ExecutionSystemHelper::addNodeLink(NodeRange &node_range,
vector<SocketConnection *>& links, bNodeLink *b_nodelink)
{
- /// @note: cyclic lines will be ignored. This has been copied from
node.c
- if (b_nodelink->tonode != 0 && b_nodelink->fromnode != 0) {
- if (!(b_nodelink->fromnode->level >= b_nodelink->tonode->level
&& b_nodelink->tonode->level != 0xFFF)) { // only add non cyclic lines! so
execution will procede
- return NULL;
- }
- }
+ /// @note: ignore invalid links
+ if (!(b_nodelink->flag & NODE_LINK_VALID))
+ return NULL;
InputSocket *inputSocket = find_input(node_range, b_nodelink->tonode,
b_nodelink->tosock);
OutputSocket *outputSocket = find_output(node_range,
b_nodelink->fromnode, b_nodelink->fromsock);
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-49628
+ /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-49634
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-49628
+
/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-49634
Modified: branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_ops.c
2012-08-06 19:31:34 UTC (rev 49634)
+++ branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_ops.c
2012-08-06 19:37:35 UTC (rev 49635)
@@ -165,6 +165,8 @@
/************************* assign image ************************/
+//#define USE_SWITCH_ASPECT
+
void ED_uvedit_assign_image(Main *bmain, Scene *scene, Object *obedit, Image
*ima, Image *previma)
{
BMEditMesh *em;
@@ -196,6 +198,7 @@
}
else {
/* old shading system, assign image to selected faces */
+#ifdef USE_SWITCH_ASPECT
float prev_aspect[2], fprev_aspect;
float aspect[2], faspect;
@@ -204,6 +207,7 @@
fprev_aspect = prev_aspect[0]/prev_aspect[1];
faspect = aspect[0]/aspect[1];
+#endif
/* ensure we have a uv map */
if (!CustomData_has_layer(&em->bm->pdata, CD_MTEXPOLY)) {
@@ -223,8 +227,12 @@
if (ima->id.us == 0)
id_us_plus(&ima->id);
else id_lib_extern(&ima->id);
+#ifdef USE_SWITCH_ASPECT
/* we also need to correct the aspect
of uvs */
- if (tf->unwrap & TF_CORRECT_ASPECT) {
+ if (scene->toolsettings->uvcalc_flag &
UVCALC_NO_ASPECT_CORRECT) {
+ /* do nothing */
+ }
+ else {
BMIter liter;
BMLoop *l;
@@ -235,6 +243,7 @@
luv->uv[0] /= faspect;
}
}
+#endif
}
else {
tf->tpage = NULL;
Modified:
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_parametrizer.c
===================================================================
---
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_parametrizer.c
2012-08-06 19:31:34 UTC (rev 49634)
+++
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_parametrizer.c
2012-08-06 19:37:35 UTC (rev 49635)
@@ -145,8 +145,6 @@
struct PEdge *edge;
unsigned char flag;
- short *unwrap_flag;
-
} PFace;
enum PVertFlag {
@@ -236,9 +234,6 @@
char do_aspect;
} PHandle;
-/* duplicate, to avoid including DNA_mesh_types.h */
-#define TF_CORRECT_ASPECT 256
-
/* PHash
* - special purpose hash that keeps all its elements in a single linked list.
* - after construction, this hash is thrown away, and the list remains.
@@ -650,7 +645,6 @@
static void p_flush_uvs(PHandle *handle, PChart *chart)
{
PEdge *e;
- PFace *f;
for (e = chart->edges; e; e = e->nextlink) {
if (e->orig_uv) {
@@ -658,17 +652,6 @@
e->orig_uv[1] = e->vert->uv[1] / handle->aspy;
}
}
-
- for (f = chart->faces; f; f = f->nextlink) {
- if (f->unwrap_flag) {
- if (handle->do_aspect) {
- *f->unwrap_flag |= TF_CORRECT_ASPECT;
- }
- else {
- *f->unwrap_flag &= ~TF_CORRECT_ASPECT;
- }
- }
- }
}
static void p_flush_uvs_blend(PHandle *handle, PChart *chart, float blend)
@@ -1058,7 +1041,6 @@
/* allocate */
f = (PFace *)BLI_memarena_alloc(handle->arena, sizeof *f);
f->flag = 0; // init !
- f->unwrap_flag = NULL;
e1 = (PEdge *)BLI_memarena_alloc(handle->arena, sizeof *e1);
e2 = (PEdge *)BLI_memarena_alloc(handle->arena, sizeof *e2);
@@ -1085,7 +1067,7 @@
static PFace *p_face_add_construct(PHandle *handle, ParamKey key, ParamKey
*vkeys,
float *co[3], float *uv[3], int i1, int i2,
int i3,
- ParamBool *pin, ParamBool *select, short
*unwrap_flag)
+ ParamBool *pin, ParamBool *select)
{
PFace *f = p_face_add(handle);
PEdge *e1 = f->edge, *e2 = e1->next, *e3 = e2->next;
@@ -1112,7 +1094,6 @@
/* insert into hash */
f->u.key = key;
- f->unwrap_flag = unwrap_flag;
phash_insert(handle->hash_faces, (PHashLink *)f);
e1->u.key = PHASH_edge(vkeys[i1], vkeys[i2]);
@@ -4151,7 +4132,7 @@
void param_face_add(ParamHandle *handle, ParamKey key, int nverts,
ParamKey *vkeys, float **co, float **uv,
- ParamBool *pin, ParamBool *select, short *unwrap_flag)
+ ParamBool *pin, ParamBool *select)
{
PHandle *phandle = (PHandle *)handle;
@@ -4161,16 +4142,16 @@
if (nverts == 4) {
if (p_quad_split_direction(phandle, co, vkeys)) {
- p_face_add_construct(phandle, key, vkeys, co, uv, 0, 1,
2, pin, select, unwrap_flag);
- p_face_add_construct(phandle, key, vkeys, co, uv, 0, 2,
3, pin, select, unwrap_flag);
+ p_face_add_construct(phandle, key, vkeys, co, uv, 0, 1,
2, pin, select);
+ p_face_add_construct(phandle, key, vkeys, co, uv, 0, 2,
3, pin, select);
}
else {
- p_face_add_construct(phandle, key, vkeys, co, uv, 0, 1,
3, pin, select, unwrap_flag);
- p_face_add_construct(phandle, key, vkeys, co, uv, 1, 2,
3, pin, select, unwrap_flag);
+ p_face_add_construct(phandle, key, vkeys, co, uv, 0, 1,
3, pin, select);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
