Revision: 40990
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40990
Author: nazgul
Date: 2011-10-13 17:44:59 +0000 (Thu, 13 Oct 2011)
Log Message:
-----------
Merging r40960 through r40989 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40960
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40989
Modified Paths:
--------------
branches/soc-2011-tomato/GNUmakefile
branches/soc-2011-tomato/build_files/cmake/Modules/FindOpenCOLLADA.cmake
branches/soc-2011-tomato/doc/python_api/rst/gpu.rst
branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_curve.py
branches/soc-2011-tomato/source/blender/blenkernel/intern/gpencil.c
branches/soc-2011-tomato/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2011-tomato/source/blender/editors/space_action/action_edit.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_input.c
branches/soc-2011-tomato/source/blender/imbuf/intern/anim_movie.c
branches/soc-2011-tomato/source/blender/imbuf/intern/indexer.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_gpencil_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_gpencil.c
branches/soc-2011-tomato/source/blender/python/generic/IDProp.c
branches/soc-2011-tomato/source/blender/python/generic/bgl.c
branches/soc-2011-tomato/source/blender/python/generic/bpy_internal_import.c
branches/soc-2011-tomato/source/blender/python/generic/noise_py_api.c
branches/soc-2011-tomato/source/blender/python/generic/py_capi_utils.c
branches/soc-2011-tomato/source/blender/python/intern/bpy.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_app.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_app_handlers.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_driver.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_interface.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_interface_atexit.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_library.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_operator.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_operator_wrap.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_props.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_rna_anim.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_rna_array.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_traceback.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_util.c
branches/soc-2011-tomato/source/blender/python/intern/gpu.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Color.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Euler.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Quaternion.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_geometry.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/vgroup_modifiers:38694-39989
/trunk/blender:36831-40959
+ /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-40989
Modified: branches/soc-2011-tomato/GNUmakefile
===================================================================
--- branches/soc-2011-tomato/GNUmakefile 2011-10-13 16:47:58 UTC (rev
40989)
+++ branches/soc-2011-tomato/GNUmakefile 2011-10-13 17:44:59 UTC (rev
40990)
@@ -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/soc-2011-tomato/build_files/cmake/Modules/FindOpenCOLLADA.cmake
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/Modules/FindOpenCOLLADA.cmake
2011-10-13 16:47:58 UTC (rev 40989)
+++ branches/soc-2011-tomato/build_files/cmake/Modules/FindOpenCOLLADA.cmake
2011-10-13 17:44:59 UTC (rev 40990)
@@ -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/soc-2011-tomato/doc/python_api/rst/gpu.rst
===================================================================
--- branches/soc-2011-tomato/doc/python_api/rst/gpu.rst 2011-10-13 16:47:58 UTC
(rev 40989)
+++ branches/soc-2011-tomato/doc/python_api/rst/gpu.rst 2011-10-13 17:44:59 UTC
(rev 40990)
@@ -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/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py
===================================================================
--- branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py 2011-10-13
16:47:58 UTC (rev 40989)
+++ branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py 2011-10-13
17:44:59 UTC (rev 40990)
@@ -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/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_curve.py
===================================================================
---
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_curve.py
2011-10-13 16:47:58 UTC (rev 40989)
+++
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_curve.py
2011-10-13 17:44:59 UTC (rev 40990)
@@ -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/soc-2011-tomato/source/blender/blenkernel/intern/gpencil.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/gpencil.c
2011-10-13 16:47:58 UTC (rev 40989)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/gpencil.c
2011-10-13 17:44:59 UTC (rev 40990)
@@ -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/soc-2011-tomato/source/blender/editors/gpencil/drawgpencil.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/gpencil/drawgpencil.c
2011-10-13 16:47:58 UTC (rev 40989)
+++ branches/soc-2011-tomato/source/blender/editors/gpencil/drawgpencil.c
2011-10-13 17:44:59 UTC (rev 40990)
@@ -147,7 +147,7 @@
}
glEnd();
- /* reset for pradictable OpenGL context */
+ /* reset for predictable OpenGL context */
glLineWidth(1.0f);
if (G.f & G_DEBUG) setlinestyle(0);
Modified:
branches/soc-2011-tomato/source/blender/editors/space_action/action_edit.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_action/action_edit.c
2011-10-13 16:47:58 UTC (rev 40989)
+++ branches/soc-2011-tomato/source/blender/editors/space_action/action_edit.c
2011-10-13 17:44:59 UTC (rev 40990)
@@ -246,20 +246,32 @@
/* go through channels, finding max extents */
for (ale= anim_data.first; ale; ale= ale->next) {
AnimData *adt= ANIM_nla_mapping_get(ac, ale);
- FCurve *fcu= (FCurve *)ale->key_data;
- float tmin, tmax;
-
- /* get range and apply necessary scaling before
processing */
- calc_fcurve_range(fcu, &tmin, &tmax, onlySel);
-
- if (adt) {
- tmin= BKE_nla_tweakedit_remap(adt, tmin,
NLATIME_CONVERT_MAP);
- tmax= BKE_nla_tweakedit_remap(adt, tmax,
NLATIME_CONVERT_MAP);
+ if (ale->datatype == ALE_GPFRAME) {
+ bGPDlayer *gpl= ale->data;
+ bGPDframe *gpf;
+
+ /* find gp-frame which is less than or equal to
cframe */
+ for (gpf= gpl->frames.first; gpf; gpf=
gpf->next) {
+ *min= MIN2(*min, gpf->framenum);
+ *max= MAX2(*max, gpf->framenum);
+ }
}
-
- /* try to set cur using these values, if they're more
extreme than previously set values */
- *min= MIN2(*min, tmin);
- *max= MAX2(*max, tmax);
+ else {
+ FCurve *fcu= (FCurve *)ale->key_data;
+ float tmin, tmax;
+
+ /* get range and apply necessary scaling before
processing */
+ calc_fcurve_range(fcu, &tmin, &tmax, onlySel);
+
+ if (adt) {
+ tmin= BKE_nla_tweakedit_remap(adt,
tmin, NLATIME_CONVERT_MAP);
+ tmax= BKE_nla_tweakedit_remap(adt,
tmax, NLATIME_CONVERT_MAP);
+ }
+
+ /* try to set cur using these values, if
they're more extreme than previously set values */
+ *min= MIN2(*min, tmin);
+ *max= MAX2(*max, tmax);
+ }
}
/* free memory */
Property changes on:
branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-40959
+ /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-40989
Modified:
branches/soc-2011-tomato/source/blender/editors/transform/transform_input.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/transform/transform_input.c
2011-10-13 16:47:58 UTC (rev 40989)
+++ branches/soc-2011-tomato/source/blender/editors/transform/transform_input.c
2011-10-13 17:44:59 UTC (rev 40990)
@@ -312,6 +312,15 @@
void initMouseInputMode(TransInfo *t, MouseInput *mi, MouseInputMode mode)
{
+ /* may have been allocated previously */
+ /* TODO, holding R-key can cause mem leak, but this causes [#28903]
+ * disable for now. */
+#if 0
+ if(mi->data) {
+ MEM_freeN(mi->data);
+ mi->data= NULL;
+ }
+#endif
switch(mode)
{
Modified: branches/soc-2011-tomato/source/blender/imbuf/intern/anim_movie.c
===================================================================
--- branches/soc-2011-tomato/source/blender/imbuf/intern/anim_movie.c
2011-10-13 16:47:58 UTC (rev 40989)
+++ branches/soc-2011-tomato/source/blender/imbuf/intern/anim_movie.c
2011-10-13 17:44:59 UTC (rev 40990)
@@ -418,7 +418,6 @@
int frs_num;
double frs_den;
int streamcount;
- int width, height;
#ifdef FFMPEG_SWSCALE_COLOR_SPACE_SUPPORT
/* The following for color space determination */
@@ -475,9 +474,6 @@
pCodecCtx->workaround_bugs = 1;
- width = pCodecCtx->width;
- height = pCodecCtx->height;
-
if(avcodec_open(pCodecCtx, pCodec) < 0) {
av_close_input_file(pFormatCtx);
return -1;
@@ -502,8 +498,8 @@
anim->params = 0;
- anim->x = width;
- anim->y = height;
+ anim->x = pCodecCtx->width;
+ anim->y = pCodecCtx->height;
anim->interlacing = 0;
anim->orientation = 0;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
