[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43221] branches/bmesh/blender: svn merge ^/trunk/blender -r43183:43220
Campbell Barton
ideasman42 at gmail.com
Sun Jan 8 14:09:17 CET 2012
Revision: 43221
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43221
Author: campbellbarton
Date: 2012-01-08 13:09:09 +0000 (Sun, 08 Jan 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r43183:43220
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43183
Modified Paths:
--------------
branches/bmesh/blender/CMakeLists.txt
branches/bmesh/blender/build_files/scons/config/win32-vc-config.py
branches/bmesh/blender/build_files/scons/config/win64-vc-config.py
branches/bmesh/blender/intern/cycles/blender/blender_session.cpp
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_curve.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_render.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py
branches/bmesh/blender/source/blender/blenfont/intern/blf.c
branches/bmesh/blender/source/blender/blenfont/intern/blf_glyph.c
branches/bmesh/blender/source/blender/blenkernel/BKE_blender.h
branches/bmesh/blender/source/blender/blenkernel/BKE_node.h
branches/bmesh/blender/source/blender/blenkernel/intern/node.c
branches/bmesh/blender/source/blender/blenkernel/intern/scene.c
branches/bmesh/blender/source/blender/blenkernel/intern/seqeffects.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/editors/animation/anim_filter.c
branches/bmesh/blender/source/blender/editors/interface/interface_templates.c
branches/bmesh/blender/source/blender/editors/interface/view2d_ops.c
branches/bmesh/blender/source/blender/editors/object/object_edit.c
branches/bmesh/blender/source/blender/editors/screen/screen_ops.c
branches/bmesh/blender/source/blender/editors/space_node/node_draw.c
branches/bmesh/blender/source/blender/editors/space_node/node_edit.c
branches/bmesh/blender/source/blender/editors/space_node/node_intern.h
branches/bmesh/blender/source/blender/imbuf/IMB_imbuf.h
branches/bmesh/blender/source/blender/makesdna/DNA_node_types.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_scene.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_screen.c
branches/bmesh/blender/source/blender/nodes/intern/node_common.c
branches/bmesh/blender/source/blender/nodes/shader/node_shader_util.c
branches/bmesh/blender/source/blender/render/intern/source/pipeline.c
branches/bmesh/blender/source/blender/render/intern/source/rayshade.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_event_system.c
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,42997-42998
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender:39992-43183
+ /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,42997-42998
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender:39992-43220
Modified: branches/bmesh/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/CMakeLists.txt 2012-01-08 11:57:53 UTC (rev 43220)
+++ branches/bmesh/blender/CMakeLists.txt 2012-01-08 13:09:09 UTC (rev 43221)
@@ -270,8 +270,8 @@
message(FATAL_ERROR "WITH_GHOST_SDL requires WITH_SDL to be ON")
endif()
-if(NOT WITH_IMAGE_OPENJPEG AND WITH_IMAGE_REDCODE)
- message(FATAL_ERROR "WITH_IMAGE_REDCODE requires WITH_IMAGE_OPENJPEG")
+if(WITH_IMAGE_REDCODE AND ((NOT WITH_IMAGE_OPENJPEG) OR (NOT WITH_CODEC_FFMPEG)))
+ message(FATAL_ERROR "WITH_IMAGE_REDCODE requires WITH_IMAGE_OPENJPEG and WITH_CODEC_FFMPEG")
endif()
# python module, needs some different options
@@ -711,8 +711,8 @@
add_definitions(/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /D_CONSOLE /D_LIB)
- set(CMAKE_CXX_FLAGS "/nologo /J /W0 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013" CACHE STRING "MSVC MT C++ flags " FORCE)
- set(CMAKE_C_FLAGS "/nologo /J /W0 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013 /EHsc" CACHE STRING "MSVC MT C++ flags " FORCE)
+ set(CMAKE_CXX_FLAGS "/nologo /J /W1 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013" CACHE STRING "MSVC MT C++ flags " FORCE)
+ set(CMAKE_C_FLAGS "/nologo /J /W1 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013 /EHsc" CACHE STRING "MSVC MT C++ flags " FORCE)
if(CMAKE_CL_64)
set(CMAKE_CXX_FLAGS_DEBUG "/Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
Modified: branches/bmesh/blender/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/win32-vc-config.py 2012-01-08 11:57:53 UTC (rev 43220)
+++ branches/bmesh/blender/build_files/scons/config/win32-vc-config.py 2012-01-08 13:09:09 UTC (rev 43221)
@@ -185,7 +185,7 @@
CC = 'cl.exe'
CXX = 'cl.exe'
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W0', '/Gd', '/wd4018', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267', '/we4013']
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W1', '/Gd', '/wd4018', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267', '/we4013']
CXXFLAGS = ['/EHsc']
BGE_CXXFLAGS = ['/O2', '/EHsc', '/GR', '/fp:fast', '/arch:SSE']
Modified: branches/bmesh/blender/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/win64-vc-config.py 2012-01-08 11:57:53 UTC (rev 43220)
+++ branches/bmesh/blender/build_files/scons/config/win64-vc-config.py 2012-01-08 13:09:09 UTC (rev 43221)
@@ -190,7 +190,7 @@
CXX = 'cl.exe'
CFLAGS = []
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W0', '/Gd', '/we4013', '/wd4018', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267']
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W1', '/Gd', '/we4013', '/wd4018', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267']
CXXFLAGS = ['/EHsc']
BGE_CXXFLAGS = ['/O2', '/EHsc', '/GR', '/fp:fast']
Modified: branches/bmesh/blender/intern/cycles/blender/blender_session.cpp
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/blender_session.cpp 2012-01-08 11:57:53 UTC (rev 43220)
+++ branches/bmesh/blender/intern/cycles/blender/blender_session.cpp 2012-01-08 13:09:09 UTC (rev 43221)
@@ -46,8 +46,8 @@
/* offline render */
BL::RenderSettings r = b_scene.render();
- width = (int)(r.resolution_x()*r.resolution_percentage()*0.01f);
- height = (int)(r.resolution_y()*r.resolution_percentage()*0.01f);
+ width = (int)(r.resolution_x()*r.resolution_percentage()/100);
+ height = (int)(r.resolution_y()*r.resolution_percentage()/100);
background = true;
last_redraw_time = 0.0f;
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-43085,43093-43183
+ /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-43085,43093-43220
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_curve.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_curve.py 2012-01-08 11:57:53 UTC (rev 43220)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_curve.py 2012-01-08 13:09:09 UTC (rev 43221)
@@ -217,9 +217,8 @@
row = layout.row()
row.label(text="Cyclic:")
row.prop(act_spline, "use_cyclic_u", text="U")
-
+
layout.prop(act_spline, "use_smooth")
-
else:
col = split.column()
col.label(text="Cyclic:")
@@ -259,11 +258,11 @@
if not is_surf:
col = layout.column()
col.label(text="Interpolation:")
-
+
sub = col.column()
sub.active = (curve.dimensions == '3D')
sub.prop(act_spline, "tilt_interpolation", text="Tilt")
-
+
col.prop(act_spline, "radius_interpolation", text="Radius")
layout.prop(act_spline, "use_smooth")
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_render.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/properties_render.py 2012-01-08 11:57:53 UTC (rev 43220)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_render.py 2012-01-08 13:09:09 UTC (rev 43221)
@@ -418,6 +418,12 @@
rd = context.scene.render
layout.active = rd.use_stamp
+
+ layout.prop(rd, "stamp_font_size", text="Font Size")
+
+ row = layout.row()
+ row.column().prop(rd, "stamp_foreground", slider=True)
+ row.column().prop(rd, "stamp_background", slider=True)
split = layout.split()
@@ -427,19 +433,14 @@
col.prop(rd, "use_stamp_render_time", text="RenderTime")
col.prop(rd, "use_stamp_frame", text="Frame")
col.prop(rd, "use_stamp_scene", text="Scene")
+
+ col = split.column()
col.prop(rd, "use_stamp_camera", text="Camera")
col.prop(rd, "use_stamp_lens", text="Lens")
col.prop(rd, "use_stamp_filename", text="Filename")
col.prop(rd, "use_stamp_marker", text="Marker")
col.prop(rd, "use_stamp_sequencer_strip", text="Seq. Strip")
- col = split.column()
- col.active = rd.use_stamp
- col.prop(rd, "stamp_foreground", slider=True)
- col.prop(rd, "stamp_background", slider=True)
- col.separator()
- col.prop(rd, "stamp_font_size", text="Font Size")
-
row = layout.split(percentage=0.2)
row.prop(rd, "use_stamp_note", text="Note")
sub = row.row()
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py 2012-01-08 11:57:53 UTC (rev 43220)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py 2012-01-08 13:09:09 UTC (rev 43221)
@@ -318,7 +318,7 @@
def draw(self, context):
layout = self.layout
-
+
sc = context.space_data
clip = sc.clip
tracking_object = clip.tracking.objects.active
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py 2012-01-08 11:57:53 UTC (rev 43220)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py 2012-01-08 13:09:09 UTC (rev 43221)
@@ -28,6 +28,7 @@
layout = self.layout
scene = context.scene
+ ob = context.object
snode = context.space_data
snode_id = snode.id
id_from = snode.id_from
@@ -47,10 +48,15 @@
if scene.render.use_shading_nodes:
layout.prop(snode, "shader_type", text="", expand=True)
- if not scene.render.use_shading_nodes or snode.shader_type == 'OBJECT':
- if id_from:
+ if (not scene.render.use_shading_nodes or snode.shader_type == 'OBJECT') and ob:
+ # Show material.new when no active ID/slot exists
+ if not id_from and ob.type in {'MESH', 'CURVE', 'SURFACE', 'FONT', 'METABALL'}:
+ layout.template_ID(ob, "active_material", new="material.new")
+ # Material ID, but not for Lamps
+ if id_from and ob.type != 'LAMP':
layout.template_ID(id_from, "active_material", new="material.new")
- if snode_id:
+ # Don't show "Use Nodes" Button when Engine is BI for Lamps
+ if snode_id and not (scene.render.use_shading_nodes == 0 and ob.type == 'LAMP'):
layout.prop(snode_id, "use_nodes")
elif snode.tree_type == 'TEXTURE':
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py 2012-01-08 11:57:53 UTC (rev 43220)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list