[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42195] branches/bmesh/blender: svn merge ^/trunk/blender -r42182:42194
Campbell Barton
ideasman42 at gmail.com
Sun Nov 27 22:19:00 CET 2011
Revision: 42195
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42195
Author: campbellbarton
Date: 2011-11-27 21:18:59 +0000 (Sun, 27 Nov 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r42182:42194
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42182
Modified Paths:
--------------
branches/bmesh/blender/build_files/buildbot/config/user-config-i686.py
branches/bmesh/blender/build_files/buildbot/config/user-config-player-i686.py
branches/bmesh/blender/build_files/buildbot/config/user-config-player-x86_64.py
branches/bmesh/blender/build_files/buildbot/config/user-config-x86_64.py
branches/bmesh/blender/intern/cycles/blender/addon/__init__.py
branches/bmesh/blender/intern/cycles/blender/addon/engine.py
branches/bmesh/blender/intern/cycles/blender/addon/enums.py
branches/bmesh/blender/intern/cycles/blender/addon/properties.py
branches/bmesh/blender/intern/cycles/blender/addon/ui.py
branches/bmesh/blender/source/blender/blenkernel/BKE_tracking.h
branches/bmesh/blender/source/blender/blenkernel/intern/tracking.c
branches/bmesh/blender/source/blender/blenlib/BLI_mempool.h
branches/bmesh/blender/source/blender/blenlib/intern/BLI_mempool.c
branches/bmesh/blender/source/blender/editors/interface/interface_panel.c
branches/bmesh/blender/source/blender/editors/screen/area.c
branches/bmesh/blender/source/blender/editors/space_clip/tracking_ops.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_rna.c
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517
/trunk/blender:39992-42182
+ /branches/soc-2011-cucumber:37517
/trunk/blender:39992-42194
Modified: branches/bmesh/blender/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/bmesh/blender/build_files/buildbot/config/user-config-i686.py 2011-11-27 21:11:17 UTC (rev 42194)
+++ branches/bmesh/blender/build_files/buildbot/config/user-config-i686.py 2011-11-27 21:18:59 UTC (rev 42195)
@@ -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/bmesh/blender/build_files/buildbot/config/user-config-player-i686.py
===================================================================
--- branches/bmesh/blender/build_files/buildbot/config/user-config-player-i686.py 2011-11-27 21:11:17 UTC (rev 42194)
+++ branches/bmesh/blender/build_files/buildbot/config/user-config-player-i686.py 2011-11-27 21:18:59 UTC (rev 42195)
@@ -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/bmesh/blender/build_files/buildbot/config/user-config-player-x86_64.py
===================================================================
--- branches/bmesh/blender/build_files/buildbot/config/user-config-player-x86_64.py 2011-11-27 21:11:17 UTC (rev 42194)
+++ branches/bmesh/blender/build_files/buildbot/config/user-config-player-x86_64.py 2011-11-27 21:18:59 UTC (rev 42195)
@@ -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/bmesh/blender/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- branches/bmesh/blender/build_files/buildbot/config/user-config-x86_64.py 2011-11-27 21:11:17 UTC (rev 42194)
+++ branches/bmesh/blender/build_files/buildbot/config/user-config-x86_64.py 2011-11-27 21:18:59 UTC (rev 42195)
@@ -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/bmesh/blender/intern/cycles/blender/addon/__init__.py
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/addon/__init__.py 2011-11-27 21:11:17 UTC (rev 42194)
+++ branches/bmesh/blender/intern/cycles/blender/addon/__init__.py 2011-11-27 21:18:59 UTC (rev 42195)
@@ -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/bmesh/blender/intern/cycles/blender/addon/engine.py
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/addon/engine.py 2011-11-27 21:11:17 UTC (rev 42194)
+++ branches/bmesh/blender/intern/cycles/blender/addon/engine.py 2011-11-27 21:18:59 UTC (rev 42195)
@@ -56,7 +56,7 @@
def render(engine):
import bcycles
- if "session" in dir(engine):
+ if hasattr(engine, "session"):
bcycles.render(engine.session)
Modified: branches/bmesh/blender/intern/cycles/blender/addon/enums.py
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/addon/enums.py 2011-11-27 21:11:17 UTC (rev 42194)
+++ branches/bmesh/blender/intern/cycles/blender/addon/enums.py 2011-11-27 21:18:59 UTC (rev 42195)
@@ -18,7 +18,7 @@
# <pep8 compliant>
-from cycles import engine
+from . import engine
def get_gpu_device():
Modified: branches/bmesh/blender/intern/cycles/blender/addon/properties.py
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/addon/properties.py 2011-11-27 21:11:17 UTC (rev 42194)
+++ branches/bmesh/blender/intern/cycles/blender/addon/properties.py 2011-11-27 21:18:59 UTC (rev 42195)
@@ -27,7 +27,7 @@
import math
-from cycles import enums
+from . import enums
class CyclesRenderSettings(bpy.types.PropertyGroup):
Modified: branches/bmesh/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/addon/ui.py 2011-11-27 21:11:17 UTC (rev 42194)
+++ branches/bmesh/blender/intern/cycles/blender/addon/ui.py 2011-11-27 21:18:59 UTC (rev 42195)
@@ -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():
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-42182
+ /trunk/blender/release:31524-42194
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_tracking.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_tracking.h 2011-11-27 21:11:17 UTC (rev 42194)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_tracking.h 2011-11-27 21:18:59 UTC (rev 42195)
@@ -58,7 +58,6 @@
int BKE_tracking_has_marker(struct MovieTrackingTrack *track, int framenr);
void BKE_tracking_free_track(struct MovieTrackingTrack *track);
-struct MovieTrackingTrack *BKE_tracking_copy_track(struct MovieTrackingTrack *track);
void BKE_tracking_clear_path(struct MovieTrackingTrack *track, int ref_frame, int action);
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/tracking.c 2011-11-27 21:11:17 UTC (rev 42194)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/tracking.c 2011-11-27 21:18:59 UTC (rev 42195)
@@ -360,18 +360,6 @@
if(track->markers) MEM_freeN(track->markers);
}
-MovieTrackingTrack *BKE_tracking_copy_track(MovieTrackingTrack *track)
-{
- MovieTrackingTrack *new_track= MEM_dupallocN(track);
-
- new_track->next= new_track->prev= NULL;
-
- if(new_track->markers)
- new_track->markers= MEM_dupallocN(new_track->markers);
-
- return new_track;
-}
-
static void put_disabled_marker(MovieTrackingTrack *track, MovieTrackingMarker *ref_marker, int before, int overwrite)
{
MovieTrackingMarker marker_new;
@@ -528,11 +516,173 @@
BKE_tracking_distortion_destroy(tracking->camera.intrinsics);
}
+/*********************** tracks map *************************/
+
+typedef struct TracksMap {
+ int num_tracks;
+ int customdata_size;
+
+ char *customdata;
+ MovieTrackingTrack *tracks;
+
+ GHash *hash;
+
+ int ptr;
+} TracksMap;
+
+static TracksMap *tracks_map_new(int num_tracks, int customdata_size)
+{
+ TracksMap *map= MEM_callocN(sizeof(TracksMap), "TrackingsMap");
+
+ map->num_tracks= num_tracks;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list