[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55596] branches/soc-2008-mxcurioni: Freestyle changes:
Sergey Sharybin
sergey.vfx at gmail.com
Tue Mar 26 10:59:44 CET 2013
Revision: 55596
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55596
Author: nazgul
Date: 2013-03-26 09:59:43 +0000 (Tue, 26 Mar 2013)
Log Message:
-----------
Freestyle changes:
- Revert some stylistic changes made in branch
They weren't directly related on freestyle project
and better be handled in trunk. Helps reading patches
ad prevents possible merge conflicts.
- Solved issue introduced with recent deprecation of
RenderData.maximize,
Modified Paths:
--------------
branches/soc-2008-mxcurioni/release/bin/blender-softwaregl
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
branches/soc-2008-mxcurioni/source/blender/makesdna/intern/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
Property Changed:
----------------
branches/soc-2008-mxcurioni/release/bin/blender-softwaregl
Modified: branches/soc-2008-mxcurioni/release/bin/blender-softwaregl
===================================================================
--- branches/soc-2008-mxcurioni/release/bin/blender-softwaregl 2013-03-26 09:09:31 UTC (rev 55595)
+++ branches/soc-2008-mxcurioni/release/bin/blender-softwaregl 2013-03-26 09:59:43 UTC (rev 55596)
@@ -1,25 +1,25 @@
-#!/bin/sh
-BF_DIST_BIN=`dirname "$0"`
-BF_PROGRAM="blender" # BF_PROGRAM=`basename "$0"`-bin
-exitcode=0
-
-LD_LIBRARY_PATH=${BF_DIST_BIN}/lib:${LD_LIBRARY_PATH}
-
-if [ -n "$LD_LIBRARYN32_PATH" ]; then
- LD_LIBRARYN32_PATH=${BF_DIST_BIN}/lib:${LD_LIBRARYN32_PATH}
-fi
-if [ -n "$LD_LIBRARYN64_PATH" ]; then
- LD_LIBRARYN64_PATH=${BF_DIST_BIN}/lib:${LD_LIBRARYN64_PATH}
-fi
-if [ -n "$LD_LIBRARY_PATH_64" ]; then
- LD_LIBRARY_PATH_64=${BF_DIST_BIN}/lib:${LD_LIBRARY_PATH_64}
-fi
-
-# Workaround for half-transparent windows when compiz is enabled
-XLIB_SKIP_ARGB_VISUALS=1
-
-export LD_LIBRARY_PATH LD_LIBRARYN32_PATH LD_LIBRARYN64_PATH LD_LIBRARY_PATH_64 LD_PRELOAD XLIB_SKIP_ARGB_VISUALS
-
-"$BF_DIST_BIN/$BF_PROGRAM" ${1+"$@"}
-exitcode=$?
-exit $exitcode
+#!/bin/sh
+BF_DIST_BIN=`dirname "$0"`
+BF_PROGRAM="blender" # BF_PROGRAM=`basename "$0"`-bin
+exitcode=0
+
+LD_LIBRARY_PATH=${BF_DIST_BIN}/lib:${LD_LIBRARY_PATH}
+
+if [ -n "$LD_LIBRARYN32_PATH" ]; then
+ LD_LIBRARYN32_PATH=${BF_DIST_BIN}/lib:${LD_LIBRARYN32_PATH}
+fi
+if [ -n "$LD_LIBRARYN64_PATH" ]; then
+ LD_LIBRARYN64_PATH=${BF_DIST_BIN}/lib:${LD_LIBRARYN64_PATH}
+fi
+if [ -n "$LD_LIBRARY_PATH_64" ]; then
+ LD_LIBRARY_PATH_64=${BF_DIST_BIN}/lib:${LD_LIBRARY_PATH_64}
+fi
+
+# Workaround for half-transparent windows when compiz is enabled
+XLIB_SKIP_ARGB_VISUALS=1
+
+export LD_LIBRARY_PATH LD_LIBRARYN32_PATH LD_LIBRARYN64_PATH LD_LIBRARY_PATH_64 LD_PRELOAD XLIB_SKIP_ARGB_VISUALS
+
+"$BF_DIST_BIN/$BF_PROGRAM" ${1+"$@"}
+exitcode=$?
+exit $exitcode
Property changes on: branches/soc-2008-mxcurioni/release/bin/blender-softwaregl
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:eol-style
+ native
Modified: branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c 2013-03-26 09:09:31 UTC (rev 55595)
+++ branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c 2013-03-26 09:59:43 UTC (rev 55596)
@@ -1069,10 +1069,10 @@
}
}
else
- fd->read = fd_read_from_memory;
+ fd->read = fd_read_from_memory;
fd->flags |= FD_FLAGS_NOT_MY_BUFFER;
-
+
return blo_decode_and_check(fd, reports);
}
}
@@ -1202,19 +1202,19 @@
return oldnewmap_lookup_and_inc(fd->datamap, adr);
}
-static void *newglobadr(FileData *fd, void *adr) /* direct datablocks with global linking */
+static void *newglobadr(FileData *fd, void *adr) /* direct datablocks with global linking */
{
return oldnewmap_lookup_and_inc(fd->globmap, adr);
}
-static void *newimaadr(FileData *fd, void *adr) /* used to restore image data after undo */
+static void *newimaadr(FileData *fd, void *adr) /* used to restore image data after undo */
{
if (fd->imamap && adr)
return oldnewmap_lookup_and_inc(fd->imamap, adr);
return NULL;
}
-static void *newmclipadr(FileData *fd, void *adr) /* used to restore movie clip data after undo */
+static void *newmclipadr(FileData *fd, void *adr) /* used to restore movie clip data after undo */
{
if (fd->movieclipmap && adr)
return oldnewmap_lookup_and_inc(fd->movieclipmap, adr);
@@ -1225,7 +1225,7 @@
{
if (fd->packedmap && adr)
return oldnewmap_lookup_and_inc(fd->packedmap, adr);
-
+
return oldnewmap_lookup_and_inc(fd->datamap, adr);
}
@@ -3423,7 +3423,7 @@
tex->env = newdataadr(fd, tex->env);
if (tex->env) {
tex->env->ima = NULL;
- memset(tex->env->cube, 0, 6*sizeof(void *));
+ memset(tex->env->cube, 0, 6 * sizeof(void *));
tex->env->ok= 0;
}
tex->pd = newdataadr(fd, tex->pd);
@@ -5249,7 +5249,7 @@
if (sce->toolsettings->vpaint) {
sce->toolsettings->vpaint->vpaint_prev = NULL;
sce->toolsettings->vpaint->tot = 0;
- }
+ }
if (sce->toolsettings->wpaint) {
sce->toolsettings->wpaint->wpaint_prev = NULL;
sce->toolsettings->wpaint->tot = 0;
@@ -6048,7 +6048,7 @@
pa->activedata = NULL;
pa->type = NULL;
}
-
+
link_list(fd, &ar->ui_lists);
for (ui_list = ar->ui_lists.first; ui_list; ui_list = ui_list->next) {
@@ -6363,8 +6363,8 @@
sclip->scopes.track_preview = NULL;
sclip->draw_context = NULL;
sclip->scopes.ok = 0;
+ }
}
- }
sa->actionzones.first = sa->actionzones.last = NULL;
@@ -7236,7 +7236,7 @@
/* Convert degrees to radians. */
NodeDefocus *nqd = node->storage;
/* XXX DNA char to float conversion seems to map the char value into the [0.0f, 1.0f] range... */
- nqd->rotation = DEG2RADF(nqd->rotation*255.0f);
+ nqd->rotation = DEG2RADF(nqd->rotation * 255.0f);
}
else if (node->type == CMP_NODE_CHROMA_MATTE) {
/* Convert degrees to radians. */
@@ -7248,7 +7248,7 @@
/* Convert degrees to radians. */
NodeGlare *ndg = node->storage;
/* XXX DNA char to float conversion seems to map the char value into the [0.0f, 1.0f] range... */
- ndg->angle_ofs = DEG2RADF(ndg->angle_ofs*255.0f);
+ ndg->angle_ofs = DEG2RADF(ndg->angle_ofs * 255.0f);
}
/* XXX TexMapping struct is used by other nodes too (at least node_composite_mapValue),
* but not the rot part...
@@ -9049,7 +9049,7 @@
SEQ_END
if (scene->r.bake_samples == 0)
- scene->r.bake_samples = 256;
+ scene->r.bake_samples = 256;
if (scene->world) {
World *world = blo_do_versions_newlibadr(fd, scene->id.lib, scene->world);
@@ -9396,8 +9396,8 @@
/* No load UI for undo memfiles */
if (fd->memfile == NULL) {
- lib_link_windowmanager(fd, main);
- lib_link_screen(fd, main);
+ lib_link_windowmanager(fd, main);
+ lib_link_screen(fd, main);
}
lib_link_scene(fd, main);
lib_link_object(fd, main);
@@ -9488,7 +9488,7 @@
for (kmi=keymap->items.first; kmi; kmi=kmi->next)
direct_link_keymapitem(fd, kmi);
}
-
+
for (addon = user->addons.first; addon; addon = addon->next) {
addon->prop = newdataadr(fd, addon->prop);
if (addon->prop) {
@@ -9710,7 +9710,7 @@
return;
}
else
- id = is_yet_read(fd, ptr, bhead);
+ id = is_yet_read(fd, ptr, bhead);
if (id == NULL) {
read_libblock(fd, ptr, bhead, LIB_READ+LIB_INDIRECT, NULL);
Modified: branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c 2013-03-26 09:09:31 UTC (rev 55595)
+++ branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c 2013-03-26 09:59:43 UTC (rev 55596)
@@ -2469,7 +2469,7 @@
uiItemL(layout, name, icon);
break;
}
-
+
/* free name */
if (namebuf) {
MEM_freeN(namebuf);
@@ -2559,7 +2559,7 @@
if (ui_list_type == NULL) {
RNA_warning("List type %s not found", listtype_name);
return;
- }
+ }
draw_item = ui_list_type->draw_item ? ui_list_type->draw_item : uilist_draw_item_default;
@@ -2574,7 +2574,7 @@
ui_list = MEM_callocN(sizeof(uiList), __func__);
BLI_strncpy(ui_list->list_id, ui_list_id, sizeof(ui_list->list_id));
BLI_addtail(&ar->ui_lists, ui_list);
- }
+ }
/* Because we can't actually pass type across save&load... */
ui_list->type = ui_list_type;
@@ -2669,10 +2669,10 @@
if (icon == ICON_DOT)
icon = ICON_NONE;
draw_item(ui_list, C, row, dataptr, &itemptr, icon, active_dataptr, active_propname, i);
- }
+ }
i++;
-}
+ }
RNA_PROP_END;
}
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp 2013-03-26 09:09:31 UTC (rev 55595)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp 2013-03-26 09:59:43 UTC (rev 55596)
@@ -93,7 +93,7 @@
freestyle_scene->r.tilex = old_scene->r.tilex;
freestyle_scene->r.tiley = old_scene->r.tiley;
freestyle_scene->r.size = 100; // old_scene->r.size
- freestyle_scene->r.maximsize = old_scene->r.maximsize;
+ //freestyle_scene->r.maximsize = old_scene->r.maximsize; /* DEPRECATED */
freestyle_scene->r.ocres = old_scene->r.ocres;
freestyle_scene->r.color_mgt_flag = 0; // old_scene->r.color_mgt_flag;
freestyle_scene->r.scemode = old_scene->r.scemode & ~(R_SINGLE_LAYER);
Modified: branches/soc-2008-mxcurioni/source/blender/makesdna/intern/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/makesdna/intern/CMakeLists.txt 2013-03-26 09:09:31 UTC (rev 55595)
+++ branches/soc-2008-mxcurioni/source/blender/makesdna/intern/CMakeLists.txt 2013-03-26 09:59:43 UTC (rev 55596)
@@ -34,6 +34,7 @@
..
)
+
# -----------------------------------------------------------------------------
# Build makesdna executable
set(SRC
Modified: branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types.c 2013-03-26 09:09:31 UTC (rev 55595)
+++ branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types.c 2013-03-26 09:59:43 UTC (rev 55596)
@@ -79,11 +79,11 @@
};
PyC_FlagSet bpy_bm_hflag_all_flags[] = {
- {BM_ELEM_SELECT, "SELECT"},
- {BM_ELEM_HIDDEN, "HIDE"},
- {BM_ELEM_SEAM, "SEAM"},
- {BM_ELEM_SMOOTH, "SMOOTH"},
- {BM_ELEM_TAG, "TAG"},
+ {BM_ELEM_SELECT, "SELECT"},
+ {BM_ELEM_HIDDEN, "HIDE"},
+ {BM_ELEM_SEAM, "SEAM"},
+ {BM_ELEM_SMOOTH, "SMOOTH"},
+ {BM_ELEM_TAG, "TAG"},
{0, NULL}
};
@@ -103,6 +103,7 @@
PyDoc_STRVAR(bpy_bm_elem_smooth_doc, "Smooth state of this element.\n\n:type: boolean");
PyDoc_STRVAR(bpy_bm_elem_seam_doc, "Seam for UV unwrapping.\n\n:type: boolean");
+
static PyObject *bpy_bm_elem_hflag_get(BPy_BMElem *self, void *flag)
{
const char hflag = (char)GET_INT_FROM_POINTER(flag);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list