Revision: 49654
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49654
Author: campbellbarton
Date: 2012-08-07 13:38:35 +0000 (Tue, 07 Aug 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r49644:49653
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49644
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/intern/cycles/kernel/kernel_types.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/particle.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_draw.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_props.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-49644
+
/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-49653
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2012-08-07 13:37:16 UTC (rev
49653)
+++ branches/soc-2011-tomato/CMakeLists.txt 2012-08-07 13:38:35 UTC (rev
49654)
@@ -1523,9 +1523,14 @@
# set the endian define
-if(MSVC OR ${XCODE_VERSION} VERSION_GREATER 4.3) # no more ppc support in
xcode > 4.3
+if(MSVC)
# for some reason this fails on msvc
add_definitions(-D__LITTLE_ENDIAN__)
+elseif(APPLE)
+ if (${XCODE_VERSION} VERSION_GREATER 4.3)
+ # no more ppc support in xcode > 4.3
+ add_definitions(-D__LITTLE_ENDIAN__)
+ endif()
else()
include(TestBigEndian)
test_big_endian(_SYSTEM_BIG_ENDIAN)
Modified: branches/soc-2011-tomato/intern/cycles/kernel/kernel_types.h
===================================================================
--- branches/soc-2011-tomato/intern/cycles/kernel/kernel_types.h
2012-08-07 13:37:16 UTC (rev 49653)
+++ branches/soc-2011-tomato/intern/cycles/kernel/kernel_types.h
2012-08-07 13:38:35 UTC (rev 49654)
@@ -61,12 +61,12 @@
#endif
#ifdef __KERNEL_OPENCL_APPLE__
-#define __SVM__
-#define __EMISSION__
-#define __IMAGE_TEXTURES__
-#define __HOLDOUT__
-#define __PROCEDURAL_TEXTURES__
-#define __EXTRA_NODES__
+//#define __SVM__
+//#define __EMISSION__
+//#define __IMAGE_TEXTURES__
+//#define __HOLDOUT__
+//#define __PROCEDURAL_TEXTURES__
+//#define __EXTRA_NODES__
#endif
#ifdef __KERNEL_OPENCL_AMD__
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/particle.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/particle.c
2012-08-07 13:37:16 UTC (rev 49653)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/particle.c
2012-08-07 13:38:35 UTC (rev 49654)
@@ -3876,7 +3876,10 @@
case TEXCO_PARTICLE:
/* texture coordinates in range [-1, 1]
*/
texvec[0] = 2.f * (cfra - pa->time) /
(pa->dietime - pa->time) - 1.f;
- texvec[1] = 0.f;
+ if (sim->psys->totpart > 0)
+ texvec[1] = 2.f * (float)(pa -
sim->psys->particles) / (float)sim->psys->totpart - 1.f;
+ else
+ texvec[1] = 0.0f;
texvec[2] = 0.f;
break;
}
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-49644
+ /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-49653
Modified: branches/soc-2011-tomato/source/blender/editors/mask/mask_draw.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/mask/mask_draw.c
2012-08-07 13:37:16 UTC (rev 49653)
+++ branches/soc-2011-tomato/source/blender/editors/mask/mask_draw.c
2012-08-07 13:38:35 UTC (rev 49654)
@@ -368,6 +368,7 @@
const short is_spline_sel = (spline->flag & SELECT) &&
(masklay->restrictflag & MASK_RESTRICT_SELECT) == 0;
const short is_smooth = (draw_flag & MASK_DRAWFLAG_SMOOTH);
+ const short is_fill = (spline->flag & MASK_SPLINE_NOFILL) == 0;
int tot_diff_point;
float (*diff_points)[2];
@@ -394,8 +395,26 @@
TRUE, is_smooth, is_active,
rgb_tmp, draw_type);
- /* TODO, draw mirror values when MASK_SPLINE_NOFILL is set */
+ if (!is_fill) {
+ float *fp = &diff_points[0][0];
+ float *fp_feather = &feather_points[0][0];
+ float tvec[2];
+ int i;
+
+ BLI_assert(tot_diff_point == tot_feather_point);
+
+ for (i = 0; i < tot_diff_point; i++, fp += 2, fp_feather += 2) {
+ sub_v2_v2v2(tvec, fp, fp_feather);
+ add_v2_v2v2(fp_feather, fp, tvec);
+ }
+
+ /* same as above */
+ mask_draw_curve_type(spline, feather_points, tot_feather_point,
+ TRUE, is_smooth, is_active,
+ rgb_tmp, draw_type);
+ }
+
MEM_freeN(feather_points);
/* draw main curve */
Modified: branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_knife.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_knife.c
2012-08-07 13:37:16 UTC (rev 49653)
+++ branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_knife.c
2012-08-07 13:38:35 UTC (rev 49654)
@@ -339,14 +339,13 @@
return kfv;
}
-/**
- * get a KnifeEdge wrapper for an existing BMEdge
- * \note #knife_get_face_kedges / #get_bm_knife_edge are called recursively -
KEEP STACK MEM USAGE LOW */
+/* get a KnifeEdge wrapper for an existing BMEdge */
static KnifeEdge *get_bm_knife_edge(KnifeTool_OpData *kcd, BMEdge *e)
{
KnifeEdge *kfe = BLI_ghash_lookup(kcd->origedgemap, e);
if (!kfe) {
- BMLoop *l_iter, *l_first;
+ BMIter bmiter;
+ BMFace *f;
kfe = new_knife_edge(kcd);
kfe->e = e;
@@ -357,17 +356,9 @@
BLI_ghash_insert(kcd->origedgemap, e, kfe);
- /* avoid BM_ITER because of stack memory usage
- * otherwise we could use BM_FACES_OF_EDGE */
- l_iter = l_first = e->l;
- do {
- knife_append_list(kcd, &kfe->faces, l_iter->f);
-
- /* ensures the kedges lst for this f is initialized,
- * it automatically adds kfe by itself */
- knife_get_face_kedges(kcd, l_iter->f);
-
- } while ((l_iter = l_iter->radial_next) != l_first);
+ BM_ITER_ELEM(f, &bmiter, e, BM_FACES_OF_EDGE) {
+ knife_append_list(kcd, &kfe->faces, f);
+ }
}
return kfe;
@@ -397,23 +388,19 @@
}
}
-/**
- * \note #knife_get_face_kedges / #get_bm_knife_edge are called recursively -
KEEP STACK MEM USAGE LOW */
static ListBase *knife_get_face_kedges(KnifeTool_OpData *kcd, BMFace *f)
{
ListBase *lst = BLI_ghash_lookup(kcd->kedgefacemap, f);
if (!lst) {
- BMLoop *l_iter, *l_first;
+ BMIter bmiter;
+ BMEdge *e;
lst = knife_empty_list(kcd);
- /* avoid BM_ITER because of stack memory usage
- * otherwise we could use BM_EDGES_OF_FACE */
- l_iter = l_first = BM_FACE_FIRST_LOOP(f);
- do {
- knife_append_list(kcd, lst, get_bm_knife_edge(kcd,
l_iter->e));
- } while ((l_iter = l_iter->next) != l_first);
+ BM_ITER_ELEM(e, &bmiter, f, BM_EDGES_OF_FACE) {
+ knife_append_list(kcd, lst, get_bm_knife_edge(kcd, e));
+ }
BLI_ghash_insert(kcd->kedgefacemap, f, lst);
}
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-49644
+
/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-49653
Modified: branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c
2012-08-07 13:37:16 UTC (rev 49653)
+++ branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c
2012-08-07 13:38:35 UTC (rev 49654)
@@ -3450,7 +3450,7 @@
StructRNA *srna;
static EnumPropertyItem anim_player_presets[] = {
- {0, "INTERNAL", 0, "Internal", "Built-in animation player"}, /*
doesn't work yet! */
+ {0, "INTERNAL", 0, "Internal", "Built-in animation player"},
{1, "BLENDER24", 0, "Blender 2.4", "Blender command line
animation playback - path to Blender 2.4"},
{2, "DJV", 0, "Djv", "Open source frame player:
http://djv.sourceforge.net"},
{3, "FRAMECYCLER", 0, "FrameCycler", "Frame player from
IRIDAS"},
Modified: branches/soc-2011-tomato/source/blender/python/intern/bpy_props.c
===================================================================
--- branches/soc-2011-tomato/source/blender/python/intern/bpy_props.c
2012-08-07 13:37:16 UTC (rev 49653)
+++ branches/soc-2011-tomato/source/blender/python/intern/bpy_props.c
2012-08-07 13:38:35 UTC (rev 49654)
@@ -1327,7 +1327,7 @@
if (is_itemf == FALSE) {
/* note: this must be postponed until after
#RNA_def_property_duplicate_pointers
- * otherwise if this is a generator it may free the
strings before we get copy them */
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
