[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40998] branches/bmesh/blender: svn merge ^/trunk/blender -r40950:40997, bmesh is in sync with head again
Campbell Barton
ideasman42 at gmail.com
Fri Oct 14 03:49:41 CEST 2011
Revision: 40998
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40998
Author: campbellbarton
Date: 2011-10-14 01:49:37 +0000 (Fri, 14 Oct 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r40950:40997, bmesh is in sync with head again
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40950
Modified Paths:
--------------
branches/bmesh/blender/GNUmakefile
branches/bmesh/blender/build_files/cmake/Modules/FindOpenCOLLADA.cmake
branches/bmesh/blender/doc/python_api/rst/gpu.rst
branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py
branches/bmesh/blender/intern/audaspace/intern/AUD_NULLDevice.cpp
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_curve.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_sequencer.py
branches/bmesh/blender/source/blender/blenkernel/intern/gpencil.c
branches/bmesh/blender/source/blender/blenkernel/intern/sound.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/editors/gpencil/drawgpencil.c
branches/bmesh/blender/source/blender/editors/space_action/action_edit.c
branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_draw.c
branches/bmesh/blender/source/blender/editors/transform/transform_input.c
branches/bmesh/blender/source/blender/imbuf/intern/anim_movie.c
branches/bmesh/blender/source/blender/imbuf/intern/indexer.c
branches/bmesh/blender/source/blender/makesdna/DNA_gpencil_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_object_types.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_gpencil.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_object.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_sequencer.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_image.c
branches/bmesh/blender/source/blender/nodes/intern/node_common.c
branches/bmesh/blender/source/blender/nodes/intern/node_exec.c
branches/bmesh/blender/source/blender/python/generic/IDProp.c
branches/bmesh/blender/source/blender/python/generic/bgl.c
branches/bmesh/blender/source/blender/python/generic/bpy_internal_import.c
branches/bmesh/blender/source/blender/python/generic/noise_py_api.c
branches/bmesh/blender/source/blender/python/generic/py_capi_utils.c
branches/bmesh/blender/source/blender/python/intern/bpy.c
branches/bmesh/blender/source/blender/python/intern/bpy_app.c
branches/bmesh/blender/source/blender/python/intern/bpy_app_handlers.c
branches/bmesh/blender/source/blender/python/intern/bpy_driver.c
branches/bmesh/blender/source/blender/python/intern/bpy_interface.c
branches/bmesh/blender/source/blender/python/intern/bpy_interface_atexit.c
branches/bmesh/blender/source/blender/python/intern/bpy_library.c
branches/bmesh/blender/source/blender/python/intern/bpy_operator.c
branches/bmesh/blender/source/blender/python/intern/bpy_operator_wrap.c
branches/bmesh/blender/source/blender/python/intern/bpy_props.c
branches/bmesh/blender/source/blender/python/intern/bpy_rna.c
branches/bmesh/blender/source/blender/python/intern/bpy_rna_anim.c
branches/bmesh/blender/source/blender/python/intern/bpy_rna_array.c
branches/bmesh/blender/source/blender/python/intern/bpy_traceback.c
branches/bmesh/blender/source/blender/python/intern/bpy_util.c
branches/bmesh/blender/source/blender/python/intern/gpu.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Color.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Euler.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Matrix.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Quaternion.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Vector.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_geometry.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_event_system.c
branches/bmesh/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
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
- /trunk/blender:39992-40950
+ /trunk/blender:39992-40997
Modified: branches/bmesh/blender/GNUmakefile
===================================================================
--- branches/bmesh/blender/GNUmakefile 2011-10-14 01:35:20 UTC (rev 40997)
+++ branches/bmesh/blender/GNUmakefile 2011-10-14 01:49:37 UTC (rev 40998)
@@ -145,6 +145,9 @@
@echo " * check_splint - run blenders source through splint (C only)"
@echo " * check_sparse - run blenders source through sparse (C only)"
@echo ""
+ @echo "Documentation Targets"
+ @echo " * doc_py - generate sphinx python api docs"
+ @echo ""
# -----------------------------------------------------------------------------
# Packages
@@ -222,6 +225,17 @@
cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_sparse.py
+# -----------------------------------------------------------------------------
+# Documentation
+#
+
+# Simple version of ./doc/python_api/sphinx_doc_gen.sh with no PDF generation.
+doc_py:
+ $(BUILD_DIR)/bin/blender --background --factory-startup --python doc/python_api/sphinx_doc_gen.py
+ cd doc/python_api ; sphinx-build -n -b html sphinx-in sphinx-out
+ @echo "docs written into: 'doc/python_api/sphinx-out/index.html'"
+
+
clean:
$(MAKE) -C $(BUILD_DIR) clean
Modified: branches/bmesh/blender/build_files/cmake/Modules/FindOpenCOLLADA.cmake
===================================================================
--- branches/bmesh/blender/build_files/cmake/Modules/FindOpenCOLLADA.cmake 2011-10-14 01:35:20 UTC (rev 40997)
+++ branches/bmesh/blender/build_files/cmake/Modules/FindOpenCOLLADA.cmake 2011-10-14 01:49:37 UTC (rev 40998)
@@ -53,10 +53,11 @@
)
# Fedora openCOLLADA package links these statically
+# note that order is important here ot it wont link
SET(_opencollada_FIND_STATIC_COMPONENTS
+ buffer
+ ftoa
UTF
- ftoa
- buffer
)
SET(_opencollada_SEARCH_DIRS
Modified: branches/bmesh/blender/doc/python_api/rst/gpu.rst
===================================================================
--- branches/bmesh/blender/doc/python_api/rst/gpu.rst 2011-10-14 01:35:20 UTC (rev 40997)
+++ branches/bmesh/blender/doc/python_api/rst/gpu.rst 2011-10-14 01:49:37 UTC (rev 40998)
@@ -1,7 +1,10 @@
-
GPU functions (gpu)
===================
+.. module:: gpu
+
+This module provides access to materials GLSL shaders.
+
*****
Intro
*****
@@ -16,7 +19,6 @@
are are closely related to Blender's internal GLSL code and may change if the GLSL code
is modified (e.g. new uniform type).
-.. module:: gpu
*********
Constants
Modified: branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py
===================================================================
--- branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py 2011-10-14 01:35:20 UTC (rev 40997)
+++ branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py 2011-10-14 01:49:37 UTC (rev 40998)
@@ -83,6 +83,7 @@
"aud",
"bgl",
"blf",
+ "gpu",
"mathutils",
"mathutils.geometry",
)
@@ -1122,6 +1123,8 @@
fw(" bgl.rst\n\n")
if "blf" not in EXCLUDE_MODULES:
fw(" blf.rst\n\n")
+ if "gpu" not in EXCLUDE_MODULES:
+ fw(" gpu.rst\n\n")
if "aud" not in EXCLUDE_MODULES:
fw(" aud.rst\n\n")
if "bpy_extras" not in EXCLUDE_MODULES:
@@ -1262,6 +1265,13 @@
import shutil
shutil.copy2(os.path.join(BASEPATH, "..", "rst", "bgl.rst"), BASEPATH)
+ if "gpu" not in EXCLUDE_MODULES:
+ #import gpu as module
+ #pymodule2sphinx(BASEPATH, "gpu", module, "GPU Shader Module")
+ #del module
+ import shutil
+ shutil.copy2(os.path.join(BASEPATH, "..", "rst", "gpu.rst"), BASEPATH)
+
if "aud" not in EXCLUDE_MODULES:
import aud as module
pymodule2sphinx(BASEPATH, "aud", module, "Audio System")
Modified: branches/bmesh/blender/intern/audaspace/intern/AUD_NULLDevice.cpp
===================================================================
--- branches/bmesh/blender/intern/audaspace/intern/AUD_NULLDevice.cpp 2011-10-14 01:35:20 UTC (rev 40997)
+++ branches/bmesh/blender/intern/audaspace/intern/AUD_NULLDevice.cpp 2011-10-14 01:49:37 UTC (rev 40998)
@@ -69,7 +69,7 @@
float AUD_NULLDevice::AUD_NULLHandle::getPosition()
{
- return 0.0f;
+ return std::numeric_limits<float>::quiet_NaN();
}
AUD_Status AUD_NULLDevice::AUD_NULLHandle::getStatus()
@@ -79,7 +79,7 @@
float AUD_NULLDevice::AUD_NULLHandle::getVolume()
{
- return 0.0f;
+ return std::numeric_limits<float>::quiet_NaN();
}
bool AUD_NULLDevice::AUD_NULLHandle::setVolume(float volume)
@@ -89,7 +89,7 @@
float AUD_NULLDevice::AUD_NULLHandle::getPitch()
{
- return 0.0f;
+ return std::numeric_limits<float>::quiet_NaN();
}
bool AUD_NULLDevice::AUD_NULLHandle::setPitch(float pitch)
@@ -153,7 +153,7 @@
float AUD_NULLDevice::getVolume() const
{
- return 0;
+ return std::numeric_limits<float>::quiet_NaN();
}
void AUD_NULLDevice::setVolume(float volume)
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-40950
+ /trunk/blender/release:31524-40997
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 2011-10-14 01:35:20 UTC (rev 40997)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_curve.py 2011-10-14 01:49:37 UTC (rev 40998)
@@ -259,10 +259,11 @@
if not is_surf:
split = layout.split()
col = split.column()
- col.active = (curve.dimensions == '3D')
col.label(text="Interpolation:")
- col.prop(act_spline, "tilt_interpolation", text="Tilt")
+ colsub = col.column()
+ colsub.active = (curve.dimensions == '3D')
+ colsub.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/space_sequencer.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/space_sequencer.py 2011-10-14 01:35:20 UTC (rev 40997)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/space_sequencer.py 2011-10-14 01:49:37 UTC (rev 40998)
@@ -60,7 +60,6 @@
layout.separator()
layout.operator("sequencer.refresh_all")
- layout.template_running_jobs()
elif st.view_type == 'SEQUENCER_PREVIEW':
layout.separator()
layout.operator("sequencer.refresh_all")
@@ -76,7 +75,9 @@
row.prop(ed, "overlay_frame", text="")
row.prop(ed, "overlay_lock", text="", icon='LOCKED')
+ layout.template_running_jobs()
+
class SEQUENCER_MT_view_toggle(Menu):
bl_label = "View Type"
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/gpencil.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/gpencil.c 2011-10-14 01:35:20 UTC (rev 40997)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/gpencil.c 2011-10-14 01:49:37 UTC (rev 40998)
@@ -185,7 +185,7 @@
/* auto-name */
strcpy(gpl->info, "GP_Layer");
- BLI_uniquename(&gpd->layers, gpl, "GP_Layer", '.', offsetof(bGPDlayer, info[0]), sizeof(gpl->info));
+ BLI_uniquename(&gpd->layers, gpl, "GP_Layer", '.', offsetof(bGPDlayer, info), sizeof(gpl->info));
/* make this one the active one */
gpencil_layer_setactive(gpd, gpl);
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/sound.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/sound.c 2011-10-14 01:35:20 UTC (rev 40997)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/sound.c 2011-10-14 01:49:37 UTC (rev 40998)
@@ -295,7 +295,10 @@
AUD_unload(sound->cache);
sound->cache = AUD_bufferSound(sound->handle);
- sound->playback_handle = sound->cache;
+ if(sound->cache)
+ sound->playback_handle = sound->cache;
+ else
+ sound->playback_handle = sound->handle;
}
void sound_cache_notifying(struct Main* main, struct bSound* sound)
@@ -332,6 +335,8 @@
sound->playback_handle = NULL;
}
+ sound_free_waveform(sound);
+
// XXX unused currently
#if 0
switch(sound->type)
@@ -625,7 +630,7 @@
else
return AUD_getPosition(scene->sound_scene_handle);
}
- return 0.0f;
+ return .0f/.0f;
}
int sound_scene_playing(struct Scene *scene)
@@ -782,7 +787,7 @@
void sound_play_scene(struct Scene *UNUSED(scene)) {}
void sound_stop_scene(struct Scene *UNUSED(scene)) {}
void sound_seek_scene(struct Main *UNUSED(bmain), struct Scene *UNUSED(scene)) {}
-float sound_sync_scene(struct Scene *UNUSED(scene)) { return 0.0f; }
+float sound_sync_scene(struct Scene *UNUSED(scene)) { return .0f/.0f; }
int sound_scene_playing(struct Scene *UNUSED(scene)) { return -1; }
int sound_read_sound_buffer(struct bSound* UNUSED(sound), float* UNUSED(buffer), int UNUSED(length), float UNUSED(start), float UNUSED(end)) { return 0; }
void sound_read_waveform(struct bSound* sound) { (void)sound; }
Modified: branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/bmesh/blender/source/blender/blenloader/intern/readfile.c 2011-10-14 01:35:20 UTC (rev 40997)
+++ branches/bmesh/blender/source/blender/blenloader/intern/readfile.c 2011-10-14 01:49:37 UTC (rev 40998)
@@ -7134,6 +7134,19 @@
}
}
+static void do_versions_nodetree_image_default_alpha_output(bNodeTree *ntree)
+{
+ bNode *node;
+ bNodeSocket *sock;
+ for (node=ntree->nodes.first; node; node=node->next) {
+ if (ELEM(node->type, CMP_NODE_IMAGE, CMP_NODE_R_LAYERS)) {
+ /* default Image output value should have 0 alpha */
+ sock = node->outputs.first;
+ ((bNodeSocketValueRGBA*)sock->default_value)->value[3] = 0.0f;
+ }
+ }
+}
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list