[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50417] branches/soc-2011-tomato: Code cleanup -- remove unneeded changes, synchronize some areas with trunk
Sergey Sharybin
sergey.vfx at gmail.com
Wed Sep 5 14:00:09 CEST 2012
Revision: 50417
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50417
Author: nazgul
Date: 2012-09-05 12:00:08 +0000 (Wed, 05 Sep 2012)
Log Message:
-----------
Code cleanup -- remove unneeded changes, synchronize some areas with trunk
Modified Paths:
--------------
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_info.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2011-tomato/source/blender/editors/screen/screen_ops.c
branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c
branches/soc-2011-tomato/source/blender/editors/space_node/space_node.c
branches/soc-2011-tomato/source/blender/imbuf/intern/IMB_filter.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_movieclip_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_space_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_render.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_wm.c
branches/soc-2011-tomato/source/blender/nodes/NOD_shader.h
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_window.c
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_info.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_info.py 2012-09-05 11:43:11 UTC (rev 50416)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_info.py 2012-09-05 12:00:08 UTC (rev 50417)
@@ -356,8 +356,6 @@
def draw(self, context):
import sys
- window = context.window
-
layout = self.layout
layout.operator("wm.window_duplicate")
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_sequencer.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_sequencer.py 2012-09-05 11:43:11 UTC (rev 50416)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_sequencer.py 2012-09-05 12:00:08 UTC (rev 50417)
@@ -874,12 +874,7 @@
col.prop(st, "show_separate_color")
col.prop(st, "proxy_render_size")
- #col = layout.column()
- #col.separator()
- #col.label(text="Color Management:")
- #col.template_colormanaged_view_settings(st, "view_settings", True)
-
class SEQUENCER_PT_modifiers(SequencerButtonsPanel, Panel):
bl_label = "Modifiers"
Modified: branches/soc-2011-tomato/source/blender/editors/screen/screen_ops.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/screen/screen_ops.c 2012-09-05 11:43:11 UTC (rev 50416)
+++ branches/soc-2011-tomato/source/blender/editors/screen/screen_ops.c 2012-09-05 12:00:08 UTC (rev 50417)
@@ -49,7 +49,6 @@
#include "DNA_mask_types.h"
#include "DNA_userdef_types.h"
-#include "BKE_colortools.h"
#include "BKE_context.h"
#include "BKE_customdata.h"
#include "BKE_global.h"
@@ -852,7 +851,7 @@
rect = sa->totrct;
BLI_rcti_translate(&rect, win->posx, win->posy);
newwin = WM_window_open(C, &rect);
-
+
/* allocs new screen and adds to newly created window, using window size */
newsc = ED_screen_add(newwin, CTX_data_scene(C), sc->id.name + 2);
newwin->screen = newsc;
Modified: branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c 2012-09-05 11:43:11 UTC (rev 50416)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c 2012-09-05 12:00:08 UTC (rev 50417)
@@ -43,7 +43,6 @@
#include "BLI_utildefines.h"
#include "BLI_math.h"
-#include "BKE_colortools.h"
#include "BKE_main.h"
#include "BKE_context.h"
#include "BKE_screen.h"
Modified: branches/soc-2011-tomato/source/blender/editors/space_node/space_node.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_node/space_node.c 2012-09-05 11:43:11 UTC (rev 50416)
+++ branches/soc-2011-tomato/source/blender/editors/space_node/space_node.c 2012-09-05 12:00:08 UTC (rev 50417)
@@ -40,7 +40,6 @@
#include "BLI_blenlib.h"
#include "BLI_math.h"
-#include "BKE_colortools.h"
#include "BKE_context.h"
#include "BKE_screen.h"
#include "BKE_node.h"
@@ -307,7 +306,7 @@
static SpaceLink *node_duplicate(SpaceLink *sl)
{
SpaceNode *snoden = MEM_dupallocN(sl);
-
+
/* clear or remove stuff from old */
snoden->nodetree = NULL;
snoden->linkdrag.first = snoden->linkdrag.last = NULL;
Modified: branches/soc-2011-tomato/source/blender/imbuf/intern/IMB_filter.h
===================================================================
--- branches/soc-2011-tomato/source/blender/imbuf/intern/IMB_filter.h 2012-09-05 11:43:11 UTC (rev 50416)
+++ branches/soc-2011-tomato/source/blender/imbuf/intern/IMB_filter.h 2012-09-05 12:00:08 UTC (rev 50417)
@@ -43,8 +43,5 @@
void imb_onehalf_no_alloc(struct ImBuf *ibuf2, struct ImBuf *ibuf1);
-/* tonecurves corrections */
-void IMB_ratio_preserving_odt_tonecurve(float rgbOut[3], const float rgbIn[3]);
-
#endif
Modified: branches/soc-2011-tomato/source/blender/makesdna/DNA_movieclip_types.h
===================================================================
--- branches/soc-2011-tomato/source/blender/makesdna/DNA_movieclip_types.h 2012-09-05 11:43:11 UTC (rev 50416)
+++ branches/soc-2011-tomato/source/blender/makesdna/DNA_movieclip_types.h 2012-09-05 12:00:08 UTC (rev 50417)
@@ -38,7 +38,6 @@
#include "DNA_ID.h"
#include "DNA_tracking_types.h"
#include "DNA_color_types.h" /* for color management */
-#include "DNA_sequence_types.h"
struct anim;
struct AnimData;
Modified: branches/soc-2011-tomato/source/blender/makesdna/DNA_space_types.h
===================================================================
--- branches/soc-2011-tomato/source/blender/makesdna/DNA_space_types.h 2012-09-05 11:43:11 UTC (rev 50416)
+++ branches/soc-2011-tomato/source/blender/makesdna/DNA_space_types.h 2012-09-05 12:00:08 UTC (rev 50417)
@@ -40,6 +40,7 @@
#include "DNA_outliner_types.h" /* for TreeStoreElem */
#include "DNA_image_types.h" /* ImageUser */
#include "DNA_movieclip_types.h" /* MovieClipUser */
+#include "DNA_sequence_types.h" /* SequencerScopes */
/* Hum ... Not really nice... but needed for spacebuts. */
#include "DNA_view2d_types.h"
Modified: branches/soc-2011-tomato/source/blender/makesrna/intern/rna_render.c
===================================================================
--- branches/soc-2011-tomato/source/blender/makesrna/intern/rna_render.c 2012-09-05 11:43:11 UTC (rev 50416)
+++ branches/soc-2011-tomato/source/blender/makesrna/intern/rna_render.c 2012-09-05 12:00:08 UTC (rev 50417)
@@ -327,6 +327,7 @@
func = RNA_def_function(srna, "end_result", "RE_engine_end_result");
prop = RNA_def_pointer(func, "result", "RenderResult", "Result", "");
+ RNA_def_property_flag(prop, PROP_REQUIRED);
prop = RNA_def_boolean(func, "cancel", 0, "Cancel", "Don't merge back results");
RNA_def_property_flag(prop, PROP_REQUIRED);
Modified: branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c
===================================================================
--- branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c 2012-09-05 11:43:11 UTC (rev 50416)
+++ branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c 2012-09-05 12:00:08 UTC (rev 50417)
@@ -152,7 +152,6 @@
#include "ED_sequencer.h"
#include "ED_clip.h"
-#include "IMB_colormanagement.h"
#include "IMB_imbuf_types.h"
static StructRNA *rna_Space_refine(struct PointerRNA *ptr)
@@ -1904,7 +1903,7 @@
{SB_TEXC_MAT_OR_LAMP, "MATERIAL", ICON_MATERIAL, "Material", "Material"},
{0, NULL, 0, NULL, NULL}
}; /*actually populated dynamically trough a function */
-
+
srna = RNA_def_struct(brna, "SpaceProperties", "Space");
RNA_def_struct_sdna(srna, "SpaceButs");
RNA_def_struct_ui_text(srna, "Properties Space", "Properties space data");
Modified: branches/soc-2011-tomato/source/blender/makesrna/intern/rna_wm.c
===================================================================
--- branches/soc-2011-tomato/source/blender/makesrna/intern/rna_wm.c 2012-09-05 11:43:11 UTC (rev 50416)
+++ branches/soc-2011-tomato/source/blender/makesrna/intern/rna_wm.c 2012-09-05 12:00:08 UTC (rev 50417)
@@ -440,8 +440,6 @@
#include "MEM_guardedalloc.h"
-#include "IMB_colormanagement.h"
-
static wmOperator *rna_OperatorProperties_find_operator(PointerRNA *ptr)
{
wmWindowManager *wm = ptr->id.data;
Modified: branches/soc-2011-tomato/source/blender/nodes/NOD_shader.h
===================================================================
--- branches/soc-2011-tomato/source/blender/nodes/NOD_shader.h 2012-09-05 11:43:11 UTC (rev 50416)
+++ branches/soc-2011-tomato/source/blender/nodes/NOD_shader.h 2012-09-05 12:00:08 UTC (rev 50417)
@@ -109,7 +109,6 @@
void register_node_type_sh_tex_musgrave(struct bNodeTreeType *ttype);
void register_node_type_sh_tex_noise(struct bNodeTreeType *ttype);
void register_node_type_sh_tex_checker(struct bNodeTreeType *ttype);
-void register_node_type_sh_tex_brick(struct bNodeTreeType *ttype);
#endif
Modified: branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_window.c
===================================================================
--- branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_window.c 2012-09-05 11:43:11 UTC (rev 50416)
+++ branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_window.c 2012-09-05 12:00:08 UTC (rev 50417)
@@ -49,7 +49,6 @@
#include "BLF_translation.h"
#include "BKE_blender.h"
-#include "BKE_colortools.h"
#include "BKE_context.h"
#include "BKE_library.h"
#include "BKE_global.h"
@@ -244,7 +243,7 @@
win->drawmethod = -1;
win->drawdata = NULL;
-
+
return win;
}
More information about the Bf-blender-cvs
mailing list