[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42193] branches/soc-2011-tomato: Merging r42178 through r42192 form trunk into soc-2011-tomato

Sergey Sharybin sergey.vfx at gmail.com
Sun Nov 27 20:35:49 CET 2011


Revision: 42193
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42193
Author:   nazgul
Date:     2011-11-27 19:35:46 +0000 (Sun, 27 Nov 2011)
Log Message:
-----------
Merging r42178 through r42192 form trunk into soc-2011-tomato

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

Modified Paths:
--------------
    branches/soc-2011-tomato/build_files/buildbot/config/user-config-i686.py
    branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-i686.py
    branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-x86_64.py
    branches/soc-2011-tomato/build_files/buildbot/config/user-config-x86_64.py
    branches/soc-2011-tomato/intern/cycles/blender/addon/__init__.py
    branches/soc-2011-tomato/intern/cycles/blender/addon/engine.py
    branches/soc-2011-tomato/intern/cycles/blender/addon/enums.py
    branches/soc-2011-tomato/intern/cycles/blender/addon/properties.py
    branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py
    branches/soc-2011-tomato/source/blender/blenkernel/intern/material.c
    branches/soc-2011-tomato/source/blender/blenlib/BLI_mempool.h
    branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_mempool.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_panel.c
    branches/soc-2011-tomato/source/blender/editors/screen/area.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_rna.c

Property Changed:
----------------
    branches/soc-2011-tomato/
    branches/soc-2011-tomato/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber:37517
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-42177
   + /branches/soc-2011-cucumber:37517
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-42192

Modified: branches/soc-2011-tomato/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/config/user-config-i686.py	2011-11-27 19:27:13 UTC (rev 42192)
+++ branches/soc-2011-tomato/build_files/buildbot/config/user-config-i686.py	2011-11-27 19:35:46 UTC (rev 42193)
@@ -58,6 +58,8 @@
 BF_PNG_LIB = 'libpng'
 BF_PNG_LIBPATH = '/home/sources/staticlibs/lib32'
 
+WITH_BF_STATICLIBSAMPLERATE = True
+
 WITH_BF_ZLIB = True
 WITH_BF_STATICZLIB = True
 BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
@@ -114,5 +116,5 @@
 
 # Compilation and optimization
 BF_DEBUG = False
-REL_CCFLAGS = ['-O2', '-msse', '-msse2']  # C & C++
+REL_CCFLAGS = ['-O2']  # C & C++
 PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib32']

Modified: branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-i686.py
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-i686.py	2011-11-27 19:27:13 UTC (rev 42192)
+++ branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-i686.py	2011-11-27 19:35:46 UTC (rev 42193)
@@ -52,6 +52,8 @@
 BF_PNG_LIB = 'libpng'
 BF_PNG_LIBPATH = '/home/sources/staticlibs/lib32'
 
+WITH_BF_STATICLIBSAMPLERATE = True
+
 WITH_BF_ZLIB = True
 WITH_BF_STATICZLIB = True
 BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
@@ -93,5 +95,5 @@
 
 # Compilation and optimization
 BF_DEBUG = False
-REL_CCFLAGS = ['-O2', '-msse', '-msse2']  # C & C++
+REL_CCFLAGS = ['-O2']  # C & C++
 PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib32']

Modified: branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-x86_64.py
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-x86_64.py	2011-11-27 19:27:13 UTC (rev 42192)
+++ branches/soc-2011-tomato/build_files/buildbot/config/user-config-player-x86_64.py	2011-11-27 19:35:46 UTC (rev 42193)
@@ -48,6 +48,8 @@
 BF_JPEG_LIB = 'libjpeg'
 BF_JPEG_LIBPATH = '/home/sources/staticlibs/lib64'
 
+WITH_BF_STATICLIBSAMPLERATE = True
+
 WITH_BF_PNG = True
 BF_PNG_LIB = 'libpng'
 BF_PNG_LIBPATH = '/home/sources/staticlibs/lib64'
@@ -93,5 +95,5 @@
 
 # Compilation and optimization
 BF_DEBUG = False
-REL_CCFLAGS = ['-O2', '-msse', '-msse2']  # C & C++
+REL_CCFLAGS = ['-O2']  # C & C++
 PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib64']

Modified: branches/soc-2011-tomato/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/config/user-config-x86_64.py	2011-11-27 19:27:13 UTC (rev 42192)
+++ branches/soc-2011-tomato/build_files/buildbot/config/user-config-x86_64.py	2011-11-27 19:35:46 UTC (rev 42193)
@@ -58,6 +58,8 @@
 BF_PNG_LIB = 'libpng'
 BF_PNG_LIBPATH = '/home/sources/staticlibs/lib64'
 
+WITH_BF_STATICLIBSAMPLERATE = True
+
 WITH_BF_ZLIB = True
 WITH_BF_STATICZLIB = True
 BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
@@ -114,5 +116,5 @@
 
 # Compilation and optimization
 BF_DEBUG = False
-REL_CCFLAGS = ['-O2', '-msse', '-msse2']  # C & C++
+REL_CCFLAGS = ['-O2']  # C & C++
 PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib64']

Modified: branches/soc-2011-tomato/intern/cycles/blender/addon/__init__.py
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/addon/__init__.py	2011-11-27 19:27:13 UTC (rev 42192)
+++ branches/soc-2011-tomato/intern/cycles/blender/addon/__init__.py	2011-11-27 19:35:46 UTC (rev 42193)
@@ -33,14 +33,9 @@
     "category": "Render"}
 
 import bpy
+from . import ui, properties, xml, engine, presets
 
-from cycles import ui
-from cycles import properties
-from cycles import xml
-from cycles import engine
-from cycles import presets
 
-
 class CyclesRender(bpy.types.RenderEngine):
     bl_idname = 'CYCLES'
     bl_label = "Cycles Render"

Modified: branches/soc-2011-tomato/intern/cycles/blender/addon/engine.py
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/addon/engine.py	2011-11-27 19:27:13 UTC (rev 42192)
+++ branches/soc-2011-tomato/intern/cycles/blender/addon/engine.py	2011-11-27 19:35:46 UTC (rev 42193)
@@ -56,7 +56,7 @@
 
 def render(engine):
     import bcycles
-    if "session" in dir(engine):
+    if hasattr(engine, "session"):
         bcycles.render(engine.session)
 
 

Modified: branches/soc-2011-tomato/intern/cycles/blender/addon/enums.py
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/addon/enums.py	2011-11-27 19:27:13 UTC (rev 42192)
+++ branches/soc-2011-tomato/intern/cycles/blender/addon/enums.py	2011-11-27 19:35:46 UTC (rev 42193)
@@ -18,7 +18,7 @@
 
 # <pep8 compliant>
 
-from cycles import engine
+from . import engine
 
 
 def get_gpu_device():

Modified: branches/soc-2011-tomato/intern/cycles/blender/addon/properties.py
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/addon/properties.py	2011-11-27 19:27:13 UTC (rev 42192)
+++ branches/soc-2011-tomato/intern/cycles/blender/addon/properties.py	2011-11-27 19:35:46 UTC (rev 42193)
@@ -27,7 +27,7 @@
 
 import math
 
-from cycles import enums
+from . import enums
 
 
 class CyclesRenderSettings(bpy.types.PropertyGroup):

Modified: branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py	2011-11-27 19:27:13 UTC (rev 42192)
+++ branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py	2011-11-27 19:35:46 UTC (rev 42193)
@@ -22,8 +22,7 @@
 
 from bpy.types import Panel, Menu
 
-from cycles import enums
-from cycles import engine
+from . import enums, engine
 
 
 class CYCLES_MT_integrator_presets(Menu):
@@ -324,7 +323,7 @@
     @classmethod
     def poll(cls, context):
         ob = context.object
-        return CyclesButtonsPanel.poll(context) and ob and ob.type in ('MESH', 'CURVE', 'CURVE', 'SURFACE', 'FONT', 'META')  # todo: 'LAMP'
+        return CyclesButtonsPanel.poll(context) and ob and ob.type in {'MESH', 'CURVE', 'CURVE', 'SURFACE', 'FONT', 'META'}  # todo: 'LAMP'
 
     def draw(self, context):
         layout = self.layout
@@ -399,7 +398,7 @@
         split = layout.split()
         col = split.column(align=True)
 
-        if lamp.type in ('POINT', 'SUN', 'SPOT'):
+        if lamp.type in {'POINT', 'SUN', 'SPOT'}:
             col.prop(lamp, "shadow_soft_size", text="Size")
         elif lamp.type == 'AREA':
             col.prop(lamp, "shape", text="")
@@ -460,7 +459,8 @@
     @classmethod
     def poll(cls, context):
         # world = context.world
-        return False  # world and world.node_tree and CyclesButtonsPanel.poll(context)
+        # world and world.node_tree and CyclesButtonsPanel.poll(context)
+        return False
 
     def draw(self, context):
         layout = self.layout
@@ -494,7 +494,8 @@
     @classmethod
     def poll(cls, context):
         # mat = context.material
-        return False  # mat and mat.node_tree and CyclesButtonsPanel.poll(context)
+        # mat and mat.node_tree and CyclesButtonsPanel.poll(context)
+        return False
 
     def draw(self, context):
         layout = self.layout
@@ -730,7 +731,7 @@
 
 
 def get_panels():
-    return [
+    return (
         bpy.types.RENDER_PT_render,
         bpy.types.RENDER_PT_output,
         bpy.types.RENDER_PT_encoding,
@@ -782,7 +783,8 @@
         bpy.types.PARTICLE_PT_field_weights,
         bpy.types.PARTICLE_PT_force_fields,
         bpy.types.PARTICLE_PT_vertexgroups,
-        bpy.types.PARTICLE_PT_custom_props]
+        bpy.types.PARTICLE_PT_custom_props,
+        )
 
 
 def register():

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/material.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/material.c	2011-11-27 19:27:13 UTC (rev 42192)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/material.c	2011-11-27 19:35:46 UTC (rev 42193)
@@ -1178,8 +1178,7 @@
 }
 
 
-/* r g b = current value, col = new value, fac==0 is no change */
-/* if g==NULL, it only does r channel */
+/* r_col = current value, col = new value, fac==0 is no change */
 void ramp_blend(int type, float r_col[3], const float fac, const float col[3])
 {
 	float tmp, facm= 1.0f-fac;
@@ -1187,165 +1186,137 @@
 	switch (type) {
 		case MA_RAMP_BLEND:
 			r_col[0] = facm*(r_col[0]) + fac*col[0];
-			if(r_col[1]) {
-				r_col[1] = facm*(r_col[1]) + fac*col[1];
-				r_col[2] = facm*(r_col[2]) + fac*col[2];
-			}
-				break;
+			r_col[1] = facm*(r_col[1]) + fac*col[1];
+			r_col[2] = facm*(r_col[2]) + fac*col[2];
+			break;
 		case MA_RAMP_ADD:
 			r_col[0] += fac*col[0];
-			if(r_col[1]) {
-				r_col[1] += fac*col[1];
-				r_col[2] += fac*col[2];
-			}
-				break;
+			r_col[1] += fac*col[1];
+			r_col[2] += fac*col[2];
+			break;
 		case MA_RAMP_MULT:
 			r_col[0] *= (facm + fac*col[0]);
-			if(r_col[1]) {
-				r_col[1] *= (facm + fac*col[1]);
-				r_col[2] *= (facm + fac*col[2]);
-			}
-				break;
+			r_col[1] *= (facm + fac*col[1]);
+			r_col[2] *= (facm + fac*col[2]);
+			break;
 		case MA_RAMP_SCREEN:
 			r_col[0] = 1.0f - (facm + fac*(1.0f - col[0])) * (1.0f - r_col[0]);
-			if(r_col[1]) {
-				r_col[1] = 1.0f - (facm + fac*(1.0f - col[1])) * (1.0f - r_col[1]);
-				r_col[2] = 1.0f - (facm + fac*(1.0f - col[2])) * (1.0f - r_col[2]);
-			}
-				break;
+			r_col[1] = 1.0f - (facm + fac*(1.0f - col[1])) * (1.0f - r_col[1]);
+			r_col[2] = 1.0f - (facm + fac*(1.0f - col[2])) * (1.0f - r_col[2]);
+			break;
 		case MA_RAMP_OVERLAY:
 			if(r_col[0] < 0.5f)
 				r_col[0] *= (facm + 2.0f*fac*col[0]);
 			else
 				r_col[0] = 1.0f - (facm + 2.0f*fac*(1.0f - col[0])) * (1.0f - r_col[0]);
-			if(r_col[1]) {
-				if(r_col[1] < 0.5f)
-					r_col[1] *= (facm + 2.0f*fac*col[1]);

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list