svn merge ^/trunk/blender -r49653:49658
authorCampbell Barton <ideasman42@gmail.com>
Tue, 7 Aug 2012 15:04:46 +0000 (15:04 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 7 Aug 2012 15:04:46 +0000 (15:04 +0000)
CMakeLists.txt
release/scripts/startup/bl_ui/space_sequencer.py
source/blender/compositor/operations/COM_ScaleOperation.cpp

index f01c625af10f72bd5359e1a8cc1953fb3b72d7c9..5eb49b3e979efdbc3839e63c088560e1e3fee08b 100644 (file)
@@ -1526,11 +1526,16 @@ endif()
 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)
index 28e9e2d711cc88c30cbe62614630ef09788ebe6f..c98e3d47dc841b63d789a8b09a2f61c4da9292a7 100644 (file)
@@ -763,20 +763,26 @@ class SEQUENCER_PT_filter(SequencerButtonsPanel, Panel):
 
         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):
index 642d18780498e694768eb7b7f817ba2e073b0987..23c13518b1d90e56cafe4749ee264ff7890e0cdd 100644 (file)
 
 #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::deinitExecution()
 
 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::deinitExecution()
 
 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::deinitExecution()
 
 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) {