[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49659] branches/soc-2011-tomato: svn merge ^/trunk/blender -r49653:49658

Campbell Barton ideasman42 at gmail.com
Tue Aug 7 17:04:46 CEST 2012 

Revision: 49659
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49659
Author:   campbellbarton
Date:     2012-08-07 15:04:46 +0000 (Tue, 07 Aug 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r49653:49658

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49653

Modified Paths:
--------------
    branches/soc-2011-tomato/CMakeLists.txt
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ScaleOperation.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-49653
   + /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-49658

Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt	2012-08-07 15:01:48 UTC (rev 49658)
+++ branches/soc-2011-tomato/CMakeLists.txt	2012-08-07 15:04:46 UTC (rev 49659)
@@ -1526,11 +1526,16 @@
 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()
+	
+# OSX-Note: as we do crosscompiling with specific set architecture,
+# endianess-detection and autosetting is counterproductive
+# so we just set endianess according CMAKE_OSX_ARCHITECTURES
+
+elseif(CMAKE_OSX_ARCHITECTURES MATCHES i386 OR CMAKE_OSX_ARCHITECTURES MATCHES x86_64)
+	add_definitions(-D__LITTLE_ENDIAN__)
+elseif(CMAKE_OSX_ARCHITECTURES MATCHES ppc OR CMAKE_OSX_ARCHITECTURES MATCHES ppc64)		
+	add_definitions(-D__BIG_ENDIAN__)
+	
 else()
 	include(TestBigEndian)
 	test_big_endian(_SYSTEM_BIG_ENDIAN)

Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_sequencer.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_sequencer.py	2012-08-07 15:01:48 UTC (rev 49658)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_sequencer.py	2012-08-07 15:04:46 UTC (rev 49659)
@@ -763,20 +763,26 @@
 
         layout.prop(strip, "use_color_balance")
         if strip.use_color_balance and strip.color_balance:  # TODO - need to add this somehow
-            row = layout.row()
-            row.active = strip.use_color_balance
-            col = row.column()
+            col = layout.column()
+            col.label(text="Lift:")
             col.template_color_wheel(strip.color_balance, "lift", value_slider=False, cubic=True)
-            col.row().prop(strip.color_balance, "lift")
-            col.prop(strip.color_balance, "invert_lift", text="Inverse")
-            col = row.column()
+            row = col.row()
+            row.prop(strip.color_balance, "lift", text="")
+            row.prop(strip.color_balance, "invert_lift", text="Inverse")
+
+            col = layout.column()
+            col.label(text="Gamma:")
             col.template_color_wheel(strip.color_balance, "gamma", value_slider=False, lock_luminosity=True, cubic=True)
-            col.row().prop(strip.color_balance, "gamma")
-            col.prop(strip.color_balance, "invert_gamma", text="Inverse")
-            col = row.column()
+            row = col.row()
+            row.prop(strip.color_balance, "gamma", text="")
+            row.prop(strip.color_balance, "invert_gamma", text="Inverse")
+
+            col = layout.column()
+            col.label(text="Gain:")
             col.template_color_wheel(strip.color_balance, "gain", value_slider=False, lock_luminosity=True, cubic=True)
-            col.row().prop(strip.color_balance, "gain")
-            col.prop(strip.color_balance, "invert_gain", text="Inverse")
+            row = col.row()
+            row.prop(strip.color_balance, "gain", text="")
+            row.prop(strip.color_balance, "invert_gain", text="Inverse")
 
 
 class SEQUENCER_PT_proxy(SequencerButtonsPanel, Panel):

Modified: branches/soc-2011-tomato/source/blender/compositor/operations/COM_ScaleOperation.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/operations/COM_ScaleOperation.cpp	2012-08-07 15:01:48 UTC (rev 49658)
+++ branches/soc-2011-tomato/source/blender/compositor/operations/COM_ScaleOperation.cpp	2012-08-07 15:04:46 UTC (rev 49659)
@@ -22,9 +22,12 @@
 
 #include "COM_ScaleOperation.h"
 
-#define USE_FORCE_BICUBIC
+#define USE_FORCE_BILINEAR
 /* XXX - ignore input and use default from old compositor,
- * could become an option like the transform node - campbell */
+ * could become an option like the transform node - campbell
+ *
+ * note: use bilinear because bicubic makes fuzzy even when not scaling at all (1:1)
+ */
 
 ScaleOperation::ScaleOperation() : NodeOperation()
 {
@@ -56,8 +59,8 @@
 
 void ScaleOperation::executePixel(float *color, float x, float y, PixelSampler sampler)
 {
-#ifdef USE_FORCE_BICUBIC
-	sampler = COM_PS_BICUBIC;
+#ifdef USE_FORCE_BILINEAR
+	sampler = COM_PS_BILINEAR;
 #endif
 
 	float scaleX[4];
@@ -126,8 +129,8 @@
 
 void ScaleAbsoluteOperation::executePixel(float *color, float x, float y, PixelSampler sampler)
 {
-#ifdef USE_FORCE_BICUBIC
-	sampler = COM_PS_BICUBIC;
+#ifdef USE_FORCE_BILINEAR
+	sampler = COM_PS_BILINEAR;
 #endif
 
 	float scaleX[4];
@@ -247,8 +250,8 @@
 
 void ScaleFixedSizeOperation::executePixel(float *color, float x, float y, PixelSampler sampler)
 {
-#ifdef USE_FORCE_BICUBIC
-	sampler = COM_PS_BICUBIC;
+#ifdef USE_FORCE_BILINEAR
+	sampler = COM_PS_BILINEAR;
 #endif
 
 	if (this->m_is_offset) {


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-49653
   + /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-49658


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-49653
   + /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-49658

More information about the Bf-blender-cvs mailing list